From c260905c8060ee8367cac0635a8c87cad4eef7aa Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Fri, 25 Dec 2020 20:56:41 +0100 Subject: [PATCH 0001/1183] nixos/exim: Make queue runner interval configurable and reduce it to 5m Exim spawns a new queue runner every n minutes as configured by the argument to -q; up to queue_run_max can be active at the same time. Spawning a queue runner only every 30 mins means that a message that failed delivery on the first attempt (e.g. due to greylisting) will only be retried 30 minutes later. A queue runner will immediately exit if the queue is empty, so it is more a function on how quickly Exim will scale to mail load and how quickly it will retry than something that is taxing on an otherwise empty system. --- nixos/modules/services/mail/exim.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/exim.nix b/nixos/modules/services/mail/exim.nix index 892fbd33214a..8927d84b478c 100644 --- a/nixos/modules/services/mail/exim.nix +++ b/nixos/modules/services/mail/exim.nix @@ -67,6 +67,13 @@ in ''; }; + queueRunnerInterval = mkOption { + type = types.str; + default = "5m"; + description = '' + How often to spawn a new queue runner. + ''; + }; }; }; @@ -104,7 +111,7 @@ in wantedBy = [ "multi-user.target" ]; restartTriggers = [ config.environment.etc."exim.conf".source ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/exim -bdf -q30m"; + ExecStart = "${cfg.package}/bin/exim -bdf -q${cfg.queueRunnerInterval}"; ExecReload = "${coreutils}/bin/kill -HUP $MAINPID"; }; preStart = '' From 82a6b7b258da754be9155519edc3d632edc3fb9a Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 26 Jan 2021 22:49:13 +0100 Subject: [PATCH 0002/1183] trousers: 0.3.14 -> 0.3.15 Fix CVE-2020-24332, CVE-2020-24330 and CVE-2020-24331. --- .../trousers/allow-non-tss-config-file-owner.patch | 4 ++-- pkgs/tools/security/trousers/default.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch index 774a14f72bab..391eb1ad589d 100644 --- a/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch +++ b/pkgs/tools/security/trousers/allow-non-tss-config-file-owner.patch @@ -7,10 +7,10 @@ diff -ur trousers-0.3.11.2.orig/src/tcsd/tcsd_conf.c trousers-0.3.11.2/src/tcsd/ +#ifndef ALLOW_NON_TSS_CONFIG_FILE /* make sure user/group TSS owns the conf file */ - if (pw->pw_uid != stat_buf.st_uid || grp->gr_gid != stat_buf.st_gid) { + if (stat_buf.st_uid != 0 || grp->gr_gid != stat_buf.st_gid) { LogError("TCSD config file (%s) must be user/group %s/%s", tcsd_config_file, @@ -775,6 +776,7 @@ - LogError("TCSD config file (%s) must be mode 0600", tcsd_config_file); + LogError("TCSD config file (%s) must be mode 0640", tcsd_config_file); return TCSERR(TSS_E_INTERNAL_ERROR); } +#endif diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index c7a11e16f390..16536409b5e6 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -1,17 +1,15 @@ -{ lib, stdenv, fetchurl, openssl, pkg-config }: +{ lib, stdenv, fetchurl, openssl, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "trousers"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; - sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f"; + sha256 = "0zy7r9cnr2gvwr2fb1q4fc5xnvx405ymcbrdv7qsqwl3a4zfjnqy"; }; - sourceRoot = "."; - - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ openssl ]; patches = [ ./allow-non-tss-config-file-owner.patch ]; From 1db74d1150827d09b9620457af673b2d9b6c2b07 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sun, 15 Nov 2020 11:02:28 +0100 Subject: [PATCH 0003/1183] nixos/spamassassin: Fix network requirement on boot sa-update currently runs as part of the pre-start script of spamd. The network is not guaranteed to be online at that point and even if we were to depend on that, it makes the bootup brittle, as there is a reliance on SpamAssassin's update server as a startup dependency on boot. Refactor the setup to move the pre-start script into its own unit. This allows to perform the setup task only once. Continuous updates are already done by sa-update.service triggered by sa-update.timer. Only run sa-update in case /var/lib/spamassassin is empty. While we are on it, let sa-update.service depend on the network being online. --- nixos/modules/services/mail/spamassassin.nix | 51 ++++++++++++-------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 4e642542ec66..0bbf2df48d40 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -126,6 +126,8 @@ in }; systemd.services.sa-update = { + wants = [ "network-online.target" ]; + after = [ "network-online.target" ]; script = '' set +e ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/" spamd @@ -152,33 +154,44 @@ in }; }; + systemd.services.spamd-init = { + serviceConfig = { + Type = "oneshot"; + }; + script = '' + mkdir -p /var/lib/spamassassin + chown spamd:spamd /var/lib/spamassassin -R + if [ "$(ls -A /var/lib/spamassassin)" = "" ]; then + echo "'/var/lib/spamassassin' is empty, running sa-update..." + set +e + ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/" spamd + v=$? + set -e + # 0 and 1 no error, exitcode > 1 means error: + # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes + if [ $v -gt 1 ]; then + echo "sa-update execution error" + exit $v + fi + echo "sa-update run successfully." + fi + ''; + }; + systemd.services.spamd = { - description = "Spam Assassin Server"; + description = "SpamAssassin Server"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + wants = [ "spamd-init.service" ]; + after = [ + "network.target" + "spamd-init.service" + ]; serviceConfig = { ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/run/spamd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; - - # 0 and 1 no error, exitcode > 1 means error: - # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes - preStart = '' - echo "Recreating '/var/lib/spamasassin' with creating '3.004001' (or similar) and 'sa-update-keys'" - mkdir -p /var/lib/spamassassin - chown spamd:spamd /var/lib/spamassassin -R - set +e - ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/" spamd - v=$? - set -e - if [ $v -gt 1 ]; then - echo "sa-update execution error" - exit $v - fi - chown spamd:spamd /var/lib/spamassassin -R - ''; }; }; } From 624cc51badb6b3b6aff2ebc7cf8a7243edcc0a0d Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Fri, 1 Jan 2021 19:56:52 +0100 Subject: [PATCH 0004/1183] nixos/spamassassin: Simplify services by using StateDirectory Let systemd create SpamAssassin's state directory and populate it using the regular updater service. Depend on the updater service on boot but do not propagate failure to the main service. spamd's commands to start and reload the service are still executed as root but user/group are set to properly chown the state directory to the target user. spamd drops privileges itself for its runner children but preserves root on the main daemon (to listen and re-exec). --- nixos/modules/services/mail/spamassassin.nix | 58 ++++++-------------- 1 file changed, 17 insertions(+), 41 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 0bbf2df48d40..98d9e925dcd7 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -126,22 +126,19 @@ in }; systemd.services.sa-update = { + # Needs to be able to contact the update server. wants = [ "network-online.target" ]; after = [ "network-online.target" ]; - script = '' - set +e - ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/" spamd - v=$? - set -e - if [ $v -gt 1 ]; then - echo "sa-update execution error" - exit $v - fi - if [ $v -eq 0 ]; then - systemctl reload spamd.service - fi - ''; + serviceConfig = { + Type = "oneshot"; + User = "spamd"; + Group = "spamd"; + StateDirectory = "spamassassin"; + ExecStart = "${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/"; + ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; + SuccessExitStatus = "1"; + }; }; systemd.timers.sa-update = { @@ -154,43 +151,22 @@ in }; }; - systemd.services.spamd-init = { - serviceConfig = { - Type = "oneshot"; - }; - script = '' - mkdir -p /var/lib/spamassassin - chown spamd:spamd /var/lib/spamassassin -R - if [ "$(ls -A /var/lib/spamassassin)" = "" ]; then - echo "'/var/lib/spamassassin' is empty, running sa-update..." - set +e - ${pkgs.su}/bin/su -s "${pkgs.bash}/bin/bash" -c "${pkgs.spamassassin}/bin/sa-update --gpghomedir=/var/lib/spamassassin/sa-update-keys/" spamd - v=$? - set -e - # 0 and 1 no error, exitcode > 1 means error: - # https://spamassassin.apache.org/full/3.1.x/doc/sa-update.html#exit_codes - if [ $v -gt 1 ]; then - echo "sa-update execution error" - exit $v - fi - echo "sa-update run successfully." - fi - ''; - }; - systemd.services.spamd = { description = "SpamAssassin Server"; wantedBy = [ "multi-user.target" ]; - wants = [ "spamd-init.service" ]; + wants = [ "sa-update.service" ]; after = [ "network.target" - "spamd-init.service" + "sa-update.service" ]; serviceConfig = { - ExecStart = "${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --virtual-config-dir=/var/lib/spamassassin/user-%u --allow-tell --pidfile=/run/spamd.pid"; - ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = "spamd"; + Group = "spamd"; + ExecStart = "+${pkgs.spamassassin}/bin/spamd ${optionalString cfg.debug "-D"} --username=spamd --groupname=spamd --virtual-config-dir=%S/spamassassin/user-%u --allow-tell --pidfile=/run/spamd.pid"; + ExecReload = "+${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + StateDirectory = "spamassassin"; }; }; }; From 4d4a0b7ccaad49f8ea790ecf6c1f15abd6099b05 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Fri, 1 Jan 2021 20:45:06 +0100 Subject: [PATCH 0005/1183] spamassassin: include dependencies for sa-compile sa-compile requires re2c, gcc and gnumake to compile the expressions to performant C code. This compilation is done post-installation after every ruleset update and stored as local state. --- pkgs/servers/mail/spamassassin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index ff96f0e7c827..f3843502ee30 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, perlPackages, makeWrapper, gnupg }: +{ lib, fetchurl, perlPackages, makeWrapper, gnupg, re2c, gcc, gnumake }: perlPackages.buildPerlPackage rec { pname = "SpamAssassin"; @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage rec { mv "rules/"* $out/share/spamassassin/ for n in "$out/bin/"*; do - wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : "${gnupg}/bin" + wrapProgram "$n" --prefix PERL5LIB : "$PERL5LIB" --prefix PATH : ${lib.makeBinPath [ gnupg re2c gcc gnumake ]} done ''; From cc625c968dfbc783d8f871da7e2b61f1372dd3f7 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sun, 3 Jan 2021 16:43:56 +0100 Subject: [PATCH 0006/1183] nixos/spamassassin: Run sa-compile after updating the rules sa-compile speeds up processing the rules by compiling them from Perl to C. This needs to be run after every update and is saved in the local state directory by Perl and SpamAssassin version. --- nixos/modules/services/mail/spamassassin.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 98d9e925dcd7..036f1bfebd37 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -135,7 +135,10 @@ in User = "spamd"; Group = "spamd"; StateDirectory = "spamassassin"; - ExecStart = "${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/"; + ExecStart = [ + "${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/" + "${pkgs.spamassassin}/bin/sa-compile" + ]; ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; SuccessExitStatus = "1"; }; From c86b339491d0c42540650d86e4ba840cdb686b50 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Tue, 5 Jan 2021 14:53:14 +0100 Subject: [PATCH 0007/1183] nixos/spamassassin: Only run sa-compile when updates have been installed --- nixos/modules/services/mail/spamassassin.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 036f1bfebd37..9bd415ef17ea 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -135,13 +135,21 @@ in User = "spamd"; Group = "spamd"; StateDirectory = "spamassassin"; - ExecStart = [ - "${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/" - "${pkgs.spamassassin}/bin/sa-compile" - ]; ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; SuccessExitStatus = "1"; }; + + script = '' + set +e + ${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/ + rc=$? + set -e + + if [[ $rc -eq 0 ]]; then + # An update was available and installed. + ${pkgs.spamassassin}/bin/sa-compile + fi + ''; }; systemd.timers.sa-update = { From 8854b8251177e242d2869e3effe6ae47e5f229d1 Mon Sep 17 00:00:00 2001 From: Philipp Kern Date: Sun, 10 Jan 2021 12:15:38 +0100 Subject: [PATCH 0008/1183] nixos/spamassassin: Handle return codes correctly For sa-update we care about two successful codes: * 1 -> no updates available: exit successfully * 0 -> updates have been installed: run sa-compile and pass through its return code --- nixos/modules/services/mail/spamassassin.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 9bd415ef17ea..ac878222b26a 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -136,19 +136,26 @@ in Group = "spamd"; StateDirectory = "spamassassin"; ExecStartPost = "+${pkgs.systemd}/bin/systemctl -q --no-block try-reload-or-restart spamd.service"; - SuccessExitStatus = "1"; }; script = '' set +e - ${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=%S/spamassassin/sa-update-keys/ + ${pkgs.spamassassin}/bin/sa-update --verbose --gpghomedir=/var/lib/spamassassin/sa-update-keys/ rc=$? set -e - if [[ $rc -eq 0 ]]; then - # An update was available and installed. - ${pkgs.spamassassin}/bin/sa-compile + if [[ $rc -gt 1 ]]; then + # sa-update failed. + exit $rc fi + + if [[ $rc -eq 1 ]]; then + # No update was available, exit successfully. + exit 0 + fi + + # An update was available and installed. Compile the rules. + ${pkgs.spamassassin}/bin/sa-compile ''; }; From 959d9e1029ddb79fa52edb01fb44fc52f858194e Mon Sep 17 00:00:00 2001 From: Jarrod Pas Date: Wed, 24 Feb 2021 23:05:08 -0600 Subject: [PATCH 0009/1183] wdomirror: init at unstable-2021-01-08 --- pkgs/tools/wayland/wdomirror/default.nix | 38 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/wayland/wdomirror/default.nix diff --git a/pkgs/tools/wayland/wdomirror/default.nix b/pkgs/tools/wayland/wdomirror/default.nix new file mode 100644 index 000000000000..8fddf51f539d --- /dev/null +++ b/pkgs/tools/wayland/wdomirror/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, wayland +, wayland-protocols +}: + +stdenv.mkDerivation { + pname = "wdomirror"; + version = "unstable-2021-01-08"; + + src = fetchFromGitHub { + owner = "progandy"; + repo = "wdomirror"; + rev = "e4a4934e6f739909fbf346cbc001c72690b5c906"; + sha256 = "1fz0sajhdjqas3l6mpik8w1k15wbv65hgh9r9vdgfqvw5l6cx7jv"; + }; + + nativeBuildInputs = [ meson ninja pkg-config wayland-protocols ]; + + buildInputs = [ wayland ]; + + installPhase = '' + runHook preInstall + install -m755 -D wdomirror $out/bin/wdomirror + runHook postInstall + ''; + + meta = with lib; { + description = "Mirrors an output of a wlroots compositor to a window"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ jpas ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33e67fba1260..c44ec76d4c41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1994,6 +1994,8 @@ in wev = callPackage ../tools/wayland/wev { }; + wdomirror = callPackage ../tools/wayland/wdomirror { }; + wl-clipboard = callPackage ../tools/wayland/wl-clipboard { }; wlogout = callPackage ../tools/wayland/wlogout { }; From e2be5dc1f4f12eaab10ae2311d293c114868ca1b Mon Sep 17 00:00:00 2001 From: Kai Harries Date: Sun, 28 Feb 2021 11:45:03 +0100 Subject: [PATCH 0010/1183] systemd-boot-builder: gracefully ignore errors during entry creation Catch and ignore errors during writing of the boot entries. These errors could stem from profile names that are not valid filenames on vfat filesystems. fixes #114552 --- .../boot/loader/systemd-boot/systemd-boot-builder.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 6bee900c6830..c47a5a81fb2e 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 @@ -222,9 +222,12 @@ def main(): gens += get_generations(profile) remove_old_entries(gens) for gen in gens: - write_entry(*gen, machine_id) - if os.readlink(system_dir(*gen)) == args.default_config: - write_loader_conf(*gen) + try: + write_entry(*gen, machine_id) + if os.readlink(system_dir(*gen)) == args.default_config: + write_loader_conf(*gen) + except OSError as e: + print("ignoring profile '{}' in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr) memtest_entry_file = "@efiSysMountPoint@/loader/entries/memtest86.conf" if os.path.exists(memtest_entry_file): From fc2fa3cda56d61d5d81b9a0d2b478aa76d5d7101 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 24 Feb 2021 14:00:06 +0100 Subject: [PATCH 0011/1183] nixos/nixos-containers: default boot.enableContainers to true Related to #85746 which addresses documentation issue, digging deeper for a reason why this was disabled was simply because it wasn't working which is not the case anymore. --- nixos/modules/virtualisation/nixos-containers.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 3754fe6dac6d..c1ff1bb5d479 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -439,21 +439,16 @@ in default = false; description = '' Whether this NixOS machine is a lightweight container running - in another NixOS system. If set to true, support for nested - containers is disabled by default, but can be reenabled by - setting to true. + in another NixOS system. ''; }; boot.enableContainers = mkOption { type = types.bool; - default = !config.boot.isContainer; + default = true; description = '' Whether to enable support for NixOS containers. Defaults to true - (at no cost if containers are not actually used), but only if the - system is not itself a lightweight container of a host. - To enable support for nested containers, this option has to be - explicitly set to true (in the outer container). + (at no cost if containers are not actually used). ''; }; From d23ba22076f64c9daffedde66376b11796046b40 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 24 Feb 2021 14:02:57 +0100 Subject: [PATCH 0012/1183] nixosTests.containers-nested: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/containers-nested.nix | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 nixos/tests/containers-nested.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7d676e15fa97..3784dc6c886f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -74,6 +74,7 @@ in containers-ip = handleTest ./containers-ip.nix {}; containers-macvlans = handleTest ./containers-macvlans.nix {}; containers-names = handleTest ./containers-names.nix {}; + containers-nested = handleTest ./containers-nested.nix {}; containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-portforward = handleTest ./containers-portforward.nix {}; containers-reloadable = handleTest ./containers-reloadable.nix {}; diff --git a/nixos/tests/containers-nested.nix b/nixos/tests/containers-nested.nix new file mode 100644 index 000000000000..a653361494f9 --- /dev/null +++ b/nixos/tests/containers-nested.nix @@ -0,0 +1,30 @@ +# Test for NixOS' container nesting. + +import ./make-test-python.nix ({ pkgs, ... }: { + name = "nested"; + + meta = with pkgs.lib.maintainers; { maintainers = [ sorki ]; }; + + machine = { lib, ... }: + let + makeNested = subConf: { + containers.nested = { + autoStart = true; + privateNetwork = true; + config = subConf; + }; + }; + in makeNested (makeNested { }); + + testScript = '' + machine.start() + machine.wait_for_unit("container@nested.service") + machine.succeed("systemd-run --pty --machine=nested -- machinectl list | grep nested") + print( + machine.succeed( + "systemd-run --pty --machine=nested -- systemd-run --pty --machine=nested -- systemctl status" + ) + ) + ''; +}) + From a20706a61ef3101a9c852fcf8c10c004582e8d9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 9 Mar 2021 16:29:48 +0000 Subject: [PATCH 0013/1183] sqlcipher: 4.4.2 -> 4.4.3 --- pkgs/development/libraries/sqlcipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index 9097d5abe54f..44da759409ee 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -4,13 +4,13 @@ assert readline != null -> ncurses != null; stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.4.2"; + version = "4.4.3"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - sha256 = "0zhww6fpnfflnzp6091npz38ab6cpq75v3ghqvcj5kqg09vqm5na"; + sha256 = "sha256-E23PTNnVZbBQtHL0YjUwHNVUA76XS8rlARBOVvX6zZw="; }; nativeBuildInputs = [ installShellFiles ]; From 6e5d56ddbd0b8f29840b83c614894c8138f3103e Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 28 Jul 2020 19:06:59 +0100 Subject: [PATCH 0014/1183] pythonPackages.jpylyzer: 1.18.0 -> 2.0.0 enable tests --- pkgs/development/python-modules/jpylyzer/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/jpylyzer/default.nix b/pkgs/development/python-modules/jpylyzer/default.nix index 6f9ceb96e3f5..442267b52ea0 100644 --- a/pkgs/development/python-modules/jpylyzer/default.nix +++ b/pkgs/development/python-modules/jpylyzer/default.nix @@ -2,24 +2,24 @@ , fetchFromGitHub , buildPythonPackage , six +, pytestCheckHook }: buildPythonPackage rec { pname = "jpylyzer"; - version = "1.18.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "openpreserve"; repo = pname; rev = version; - sha256 = "0vhrq15l6jd5fm6vj7mczjzjpl2ph1dk8jp89dw4vlccky8660ll"; + sha256 = "01wfbb1bgby9b7m6q7483kvpyc1qhj80dg8d5a6smcxvmy8y6x5n"; }; propagatedBuildInputs = [ six ]; - # there don't appear to be any in-tree tests as such, but the builder's automatic - # runner seems to be upset by the project layout - doCheck = false; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "jpylyzer" ]; meta = with lib; { description = "JP2 (JPEG 2000 Part 1) image validator and properties extractor"; From 659c7dce17118a6b9ff767238189ae89459f20c7 Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Tue, 23 Mar 2021 13:15:15 +0100 Subject: [PATCH 0015/1183] waffle: 1.6.1 -> 1.7.0 --- pkgs/development/libraries/waffle/default.nix | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/waffle/default.nix b/pkgs/development/libraries/waffle/default.nix index dd783036f230..e6d8a98b5335 100644 --- a/pkgs/development/libraries/waffle/default.nix +++ b/pkgs/development/libraries/waffle/default.nix @@ -1,36 +1,34 @@ { stdenv , fetchFromGitLab , lib +, cmake , meson , ninja +, bash-completion , libGL -, libglvnd ? null +, libglvnd , makeWrapper , pkg-config , python3 -, x11Support ? true, libxcb ? null, libX11 ? null -, waylandSupport ? true, wayland ? null -, useGbm ? true, mesa ? null, libudev ? null +, x11Support ? true, libxcb, libX11 +, waylandSupport ? true, wayland, wayland-protocols +, useGbm ? true, mesa, udev }: -assert x11Support -> (libxcb != null && libX11 != null); -assert waylandSupport -> wayland != null; -assert useGbm -> (mesa != null && libudev != null); -assert with stdenv.hostPlatform; isUnix && !isDarwin -> libglvnd != null; - stdenv.mkDerivation rec { pname = "waffle"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "waffle"; rev = "v${version}"; - sha256 = "0s8gislmhccfa04zsj1yqk97lscbbnmxirr2zm4q3p8ybmpfhpqr"; + sha256 = "iY+dAgXutD/uDFocwd9QXjq502IOsk+3RQMA2S/CMV4="; }; buildInputs = [ + bash-completion libGL ] ++ lib.optionals (with stdenv.hostPlatform; isUnix && !isDarwin) [ libglvnd @@ -39,19 +37,25 @@ stdenv.mkDerivation rec { libxcb ] ++ lib.optionals waylandSupport [ wayland + wayland-protocols ] ++ lib.optionals useGbm [ + udev mesa - libudev ]; + dontUseCmakeConfigure = true; + nativeBuildInputs = [ + cmake + makeWrapper meson ninja - makeWrapper pkg-config python3 ]; + PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR= "${placeholder "out"}/share/bash-completion/completions"; + postInstall = '' wrapProgram $out/bin/wflinfo \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL libglvnd ]} From 44f09ccabf645d1f079f71b541d7f1ac0a6b8848 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 5 Feb 2021 16:24:43 +0900 Subject: [PATCH 0016/1183] darwin: move deployment target and sdk version to platform config --- lib/systems/default.nix | 9 +++++++++ pkgs/development/tools/xcbuild/wrapper.nix | 2 +- pkgs/stdenv/darwin/default.nix | 9 +-------- pkgs/stdenv/generic/default.nix | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 1e38dbf531b1..d16b19c03caa 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -112,6 +112,15 @@ rec { aarch64 = "arm64"; }.${final.parsed.cpu.name} or final.parsed.cpu.name; + darwinPlatform = + if final.isMacOS then "macos" + else if final.isiOS then "ios" + else null; + # The canonical name for this attribute is darwinSdkVersion, but some + # platforms define the old name "sdkVer". + darwinSdkVersion = final.sdkVer or "10.12"; + darwinMinVersion = final.darwinSdkVersion; + emulator = pkgs: let qemu-user = pkgs.qemu.override { smartcardSupport = false; diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 861ef0fc8473..4f74b093717b 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -3,7 +3,7 @@ , runtimeShell, callPackage , xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX" , xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1" -, sdkVer ? stdenv.targetPlatform.sdkVer or "10.12" }: +, sdkVer ? stdenv.targetPlatform.darwinSdkVersion or "10.12" }: let diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index a7b91a82a9d2..e8b3ef6c10fd 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,7 +1,5 @@ { lib , localSystem, crossSystem, config, overlays, crossOverlays ? [] -# Minimum required macOS version, used both for compatibility as well as reproducability. -, macosVersionMin ? "10.12" # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { @@ -36,8 +34,6 @@ in rec { export NIX_IGNORE_LD_THROUGH_GCC=1 unset SDKROOT - export MACOSX_DEPLOYMENT_TARGET=${macosVersionMin} - # Workaround for https://openradar.appspot.com/22671534 on 10.11. export gl_cv_func_getcwd_abort_bug=no @@ -147,9 +143,6 @@ in rec { __stdenvImpureHostDeps = commonImpureHostDeps; __extraImpureHostDeps = commonImpureHostDeps; - extraAttrs = { - inherit macosVersionMin; - }; overrides = self: super: (overrides self super) // { inherit ccNoLibcxx; fetchurl = thisStdenv.fetchurlBoot; @@ -523,7 +516,7 @@ in rec { extraAttrs = { libc = pkgs.darwin.Libsystem; shellPackage = pkgs.bash; - inherit macosVersionMin bootstrapTools; + inherit bootstrapTools; }; allowedRequisites = (with pkgs; [ diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 476fab3eed65..8ab9d7344617 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -106,6 +106,8 @@ let '' + lib.optionalString (hostPlatform.isDarwin || (hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.elf && hostPlatform.parsed.kernel.execFormat != lib.systems.parse.execFormats.macho)) '' export NIX_DONT_SET_RPATH=1 export NIX_NO_SELF_RPATH=1 + '' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) '' + export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion} '' # TODO this should be uncommented, but it causes stupid mass rebuilds. I # think the best solution would just be to fixup linux RPATHs so we don't From ba589e6d5812e0ba2e1403b1bb6431e511494305 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Mar 2021 10:52:33 +0000 Subject: [PATCH 0017/1183] gcsfuse: 0.33.2 -> 0.34.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index e39a3d33dacb..3891a384bc83 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.33.2"; + version = "0.34.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-y40JWfD6selBo2IP7VgASmlNUDhXwOdQIRlRHPi3Nh0="; + sha256 = "sha256-lnuf2Xvzqy50L2oY3x8Bpvf5GzkRgx2hRbvKGssGTc8="; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; From 776241d186de9aed6465882f9f2c6102709569ee Mon Sep 17 00:00:00 2001 From: Michael Roitzsch Date: Mon, 29 Mar 2021 20:56:35 +0200 Subject: [PATCH 0018/1183] xcbuild: fix missing library for PlistBuddy PlistBuddy requires liblinenoise.dylib, which is compiled from a third party archive, but not installed --- pkgs/development/tools/xcbuild/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 1f38e49daee5..af0f546eb82a 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -51,6 +51,7 @@ in stdenv.mkDerivation { postInstall = '' mv $out/usr/* $out rmdir $out/usr + cp liblinenoise.* $out/lib/ ''; NIX_CFLAGS_COMPILE = "-Wno-error"; From bc90050dab69a786873f9da849af3ca03cd95c39 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 30 Mar 2021 09:42:32 +0200 Subject: [PATCH 0019/1183] nghttp2: 1.41.0 -> 1.43.0 https://github.com/nghttp2/nghttp2/releases/tag/v1.42.0 https://github.com/nghttp2/nghttp2/releases/tag/v1.43.0 --- pkgs/development/libraries/nghttp2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 6464679b9489..86edacc6166b 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -27,11 +27,11 @@ let inherit (lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.41.0"; + version = "1.43.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0h12wz72paxnj8l9vv2qfgfbmj20c6pz6xbilb7ns9zcwxwa0p34"; + sha256 = "0qhgyphzdv72dgdfxin2xbk9623za3jwbcvhhaxixiwp6djj8vsm"; }; outputs = [ "bin" "out" "dev" "lib" ] From 86001ce7013932c5bc51c106e65bc9bc2bf5f130 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 1 Apr 2021 04:20:00 +0000 Subject: [PATCH 0020/1183] protobuf: 3.15.5 -> 3.15.7 https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.6 https://github.com/protocolbuffers/protobuf/releases/tag/v3.15.7 --- pkgs/development/libraries/protobuf/3.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.15.nix b/pkgs/development/libraries/protobuf/3.15.nix index 63e175d98038..661a552882e8 100644 --- a/pkgs/development/libraries/protobuf/3.15.nix +++ b/pkgs/development/libraries/protobuf/3.15.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.15.5"; - sha256 = "1znxzy4illsr4a08642h6s83jawzrq40m6pzkp05q0cpm8hcpvda"; + version = "3.15.7"; + sha256 = "03fx96rwxfbmr47f1nrflvaq5kk5p3a9wms4688nbnmymyghyml0"; } From ae4613f692eaae9895089726246585598d19f376 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 2 Apr 2021 01:12:28 +0100 Subject: [PATCH 0021/1183] python3Packages.pillow: 8.1.2 -> 8.2.0 --- pkgs/development/python-modules/pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 5fef39ebef07..0f747a8d73e0 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -5,13 +5,13 @@ import ./generic.nix (rec { pname = "Pillow"; - version = "8.1.2"; + version = "8.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0i7w0fi24za3naz3k3qav6lrhf034nzdy6m9025djlj80476cz5h"; + sha256 = "1qf3bz1sfz58ff6hclg8phgqyy210x3aqdk5yzjr8m5vsw8ap1x7"; }; meta = with lib; { From 79cd04d14fd039f45fa122187c25f4ab8b613ed0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 2 Apr 2021 13:55:11 +0200 Subject: [PATCH 0022/1183] pkgsStatic: apply stdenvAdapters to all llvm stdenvs --- pkgs/top-level/static.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 3cddcde603d8..e73eba8e1422 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -83,15 +83,29 @@ self: super: let }); }; + llvmStaticAdapter = llvmPackages: + llvmPackages // { + stdenv = foldl (flip id) llvmPackages.stdenv staticAdapters; + libcxxStdenv = foldl (flip id) llvmPackages.libcxxStdenv staticAdapters; + }; + in { stdenv = foldl (flip id) super.stdenv staticAdapters; + gcc49Stdenv = foldl (flip id) super.gcc49Stdenv staticAdapters; gcc6Stdenv = foldl (flip id) super.gcc6Stdenv staticAdapters; gcc7Stdenv = foldl (flip id) super.gcc7Stdenv staticAdapters; gcc8Stdenv = foldl (flip id) super.gcc8Stdenv staticAdapters; gcc9Stdenv = foldl (flip id) super.gcc9Stdenv staticAdapters; - clangStdenv = foldl (flip id) super.clangStdenv staticAdapters; - libcxxStdenv = foldl (flip id) super.libcxxStdenv staticAdapters; + + llvmPackages_5 = llvmStaticAdapter super.llvmPackages_5; + llvmPackages_6 = llvmStaticAdapter super.llvmPackages_6; + llvmPackages_7 = llvmStaticAdapter super.llvmPackages_7; + llvmPackages_8 = llvmStaticAdapter super.llvmPackages_8; + llvmPackages_9 = llvmStaticAdapter super.llvmPackages_9; + llvmPackages_10 = llvmStaticAdapter super.llvmPackages_10; + llvmPackages_11 = llvmStaticAdapter super.llvmPackages_11; + llvmPackages_12 = llvmStaticAdapter super.llvmPackages_12; boost = super.boost.override { # Don’t use new stdenv for boost because it doesn’t like the From 4d8adb49d5299a62c9168971036ac1417ac44fcb Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Feb 2021 05:17:07 +0000 Subject: [PATCH 0023/1183] wayland: fix build on non-Linux The Wayland libraries themselves only build on Linux, but other platforms need wayland-scanner for cross-compiling to Linux. So for them, disable the libraries so only wayland-scanner is built. --- .../development/libraries/wayland/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index fb7d1972c024..49a0356723c1 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -10,7 +10,8 @@ , libxml2 , wayland , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) -, withDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform +, withLibraries ? stdenv.isLinux +, withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox , doxygen , libxslt @@ -21,6 +22,9 @@ , docbook_xml_dtd_42 }: +# Documentation is only built when building libraries. +assert withDocumentation -> withLibraries; + # Require the optional to be enabled until upstream fixes or removes the configure flag assert expat != null; let @@ -45,7 +49,10 @@ stdenv.mkDerivation rec { outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; - mesonFlags = [ "-Ddocumentation=${lib.boolToString withDocumentation}" ]; + mesonFlags = [ + "-Dlibraries=${lib.boolToString withLibraries}" + "-Ddocumentation=${lib.boolToString withDocumentation}" + ]; postPatch = lib.optionalString withDocumentation '' patchShebangs doc/doxygen/gen-doxygen.py @@ -71,16 +78,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libffi expat libxml2 + ] ++ lib.optionals withLibraries [ + libffi ] ++ lib.optionals withDocumentation [ docbook_xsl docbook_xml_dtd_45 docbook_xml_dtd_42 ]; - meta = { + meta = with lib; { description = "Core Wayland window system code and protocol"; longDescription = '' Wayland is a project to define a protocol for a compositor to talk to its @@ -91,9 +99,9 @@ stdenv.mkDerivation rec { rendering). ''; homepage = "https://wayland.freedesktop.org/"; - license = lib.licenses.mit; # Expat version - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ primeos codyopel ]; + license = licenses.mit; # Expat version + platforms = if withLibraries then platforms.linux else platforms.unix; + maintainers = with maintainers; [ primeos codyopel ]; }; passthru.version = version; From ae758ea389ca67b2b79158ece317eb689fdc1b1d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Feb 2021 05:21:53 +0000 Subject: [PATCH 0024/1183] wayland: add myself to maintainers --- pkgs/development/libraries/wayland/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 49a0356723c1..99800bb2c549 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { homepage = "https://wayland.freedesktop.org/"; license = licenses.mit; # Expat version platforms = if withLibraries then platforms.linux else platforms.unix; - maintainers = with maintainers; [ primeos codyopel ]; + maintainers = with maintainers; [ primeos codyopel qyliss ]; }; passthru.version = version; From 6808269554a26c3da791e931dd93e873d0bafa64 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 2 Apr 2021 18:09:11 +0100 Subject: [PATCH 0025/1183] curl: add patches for CVE-2021-22876, CVE-2021-22890 hand-backported from upstream fixes --- .../curl/7.74.0-CVE-2021-22876.patch | 139 +++++ .../curl/7.74.0-CVE-2021-22890.patch | 473 ++++++++++++++++++ pkgs/tools/networking/curl/default.nix | 5 + 3 files changed, 617 insertions(+) create mode 100644 pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch create mode 100644 pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch diff --git a/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch b/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch new file mode 100644 index 000000000000..f915f298a495 --- /dev/null +++ b/pkgs/tools/networking/curl/7.74.0-CVE-2021-22876.patch @@ -0,0 +1,139 @@ +Based on upstream 7214288898f5625a6cc196e22a74232eada7861c, adapted by ris to +compensate for lack of 95cbcec8f986492766c4be3922af1e7644e1e7c5 + +--- + lib/transfer.c | 25 ++++++++++++++-- + tests/data/Makefile.inc | 2 +- + tests/data/test2081 | 66 +++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 90 insertions(+), 3 deletions(-) + create mode 100644 tests/data/test2081 + +diff --git a/lib/transfer.c b/lib/transfer.c +index 1976bc0338bc..a68c021c84d6 100644 +--- a/lib/transfer.c ++++ b/lib/transfer.c +@@ -1581,6 +1581,9 @@ CURLcode Curl_follow(struct Curl_easy *data, + data->set.followlocation++; /* count location-followers */ + + if(data->set.http_auto_referer) { ++ CURLU *u; ++ char *referer; ++ + /* We are asked to automatically set the previous URL as the referer + when we get the next URL. We pick the ->url field, which may or may + not be 100% correct */ +@@ -1590,9 +1593,27 @@ CURLcode Curl_follow(struct Curl_easy *data, + data->change.referer_alloc = FALSE; + } + +- data->change.referer = strdup(data->change.url); +- if(!data->change.referer) ++ /* Make a copy of the URL without crenditals and fragment */ ++ u = curl_url(); ++ if(!u) ++ return CURLE_OUT_OF_MEMORY; ++ ++ uc = curl_url_set(u, CURLUPART_URL, data->change.url, 0); ++ if(!uc) ++ uc = curl_url_set(u, CURLUPART_FRAGMENT, NULL, 0); ++ if(!uc) ++ uc = curl_url_set(u, CURLUPART_USER, NULL, 0); ++ if(!uc) ++ uc = curl_url_set(u, CURLUPART_PASSWORD, NULL, 0); ++ if(!uc) ++ uc = curl_url_get(u, CURLUPART_URL, &referer, 0); ++ ++ curl_url_cleanup(u); ++ ++ if(uc || referer == NULL) + return CURLE_OUT_OF_MEMORY; ++ ++ data->change.referer = referer; + data->change.referer_alloc = TRUE; /* yes, free this later */ + } + } +diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc +index 2c7a0ca89fd8..ea52683d2254 100644 +--- a/tests/data/Makefile.inc ++++ b/tests/data/Makefile.inc +@@ -225,7 +225,7 @@ test2064 test2065 test2066 test2067 test2068 test2069 \ + test2064 test2065 test2066 test2067 test2068 test2069 test2070 \ + test2071 test2072 test2073 test2074 test2075 test2076 test2077 \ + test2078 \ +-test2080 \ ++test2080 test2081 \ + test2100 \ + \ + test3000 test3001 test3002 test3003 test3004 test3005 test3006 test3007 \ +diff --git a/tests/data/test2081 b/tests/data/test2081 +new file mode 100644 +index 000000000000..a6733e737beb +--- /dev/null ++++ b/tests/data/test2081 +@@ -0,0 +1,66 @@ ++ ++ ++ ++HTTP ++HTTP GET ++referer ++followlocation ++--write-out ++ ++ ++ ++# Server-side ++ ++ ++HTTP/1.1 301 This is a weirdo text message swsclose ++Location: data/%TESTNUMBER0002.txt?coolsite=yes ++Content-Length: 62 ++Connection: close ++ ++This server reply is for testing a simple Location: following ++ ++ ++ ++# Client-side ++ ++ ++http ++ ++ ++Automatic referrer credential and anchor stripping check ++ ++ ++http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --referer ';auto' --write-out '%{referer}\n' ++ ++ ++ ++# Verify data after the test has been "shot" ++ ++ ++52 ++ ++ ++GET /we/want/our/%TESTNUMBER HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic dXNlcjpwYXNz ++User-Agent: curl/%VERSION ++Accept: */* ++ ++GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1 ++Host: %HOSTIP:%HTTPPORT ++Authorization: Basic dXNlcjpwYXNz ++User-Agent: curl/%VERSION ++Accept: */* ++Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER ++ ++ ++ ++HTTP/1.1 301 This is a weirdo text message swsclose ++Location: data/%TESTNUMBER0002.txt?coolsite=yes ++Content-Length: 62 ++Connection: close ++ ++http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER ++ ++ ++ diff --git a/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch b/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch new file mode 100644 index 000000000000..06cc3842e32f --- /dev/null +++ b/pkgs/tools/networking/curl/7.74.0-CVE-2021-22890.patch @@ -0,0 +1,473 @@ +Based on upstream b09c8ee15771c614c4bf3ddac893cdb12187c844, adapted by ris mostly to +compensate for lack of bbe3aa9f881fa27fe828e3c9a36d6831f254a3ee + +diff --git a/lib/vtls/bearssl.c b/lib/vtls/bearssl.c +index 36c32d8d55be..39fc1a29209c 100644 +--- a/lib/vtls/bearssl.c ++++ b/lib/vtls/bearssl.c +@@ -375,7 +375,8 @@ static CURLcode bearssl_connect_step1(struct Curl_easy *data, + void *session; + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &session, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, SSL_IS_PROXY() ? TRUE : FALSE, ++ &session, NULL, sockindex)) { + br_ssl_engine_set_session_parameters(&backend->ctx.eng, session); + infof(data, "BearSSL: re-using session ID\n"); + } +@@ -571,9 +572,13 @@ static CURLcode bearssl_connect_step3(struct Curl_easy *data, + br_ssl_engine_get_session_parameters(&backend->ctx.eng, session); + Curl_ssl_sessionid_lock(conn); +- incache = !(Curl_ssl_getsessionid(conn, &oldsession, NULL, sockindex)); ++ incache = !(Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &oldsession, NULL, sockindex)); + if(incache) + Curl_ssl_delsessionid(conn, oldsession); +- ret = Curl_ssl_addsessionid(conn, session, 0, sockindex); ++ ret = Curl_ssl_addsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ session, 0, sockindex); + Curl_ssl_sessionid_unlock(conn); + if(ret) { + free(session); +diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c +index a75937b4646c..3b0d940a60e1 100644 +--- a/lib/vtls/gtls.c ++++ b/lib/vtls/gtls.c +@@ -727,5 +727,7 @@ gtls_connect_step1(struct Curl_easy *data, + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, &ssl_idsize, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, &ssl_idsize, sockindex)) { + /* we got a session id, use it! */ + gnutls_session_set_data(session, ssl_sessionid, ssl_idsize); +@@ -1286,8 +1287,9 @@ gtls_connect_step3(struct Curl_easy *data, + gnutls_session_get_data(session, connect_sessionid, &connect_idsize); + + Curl_ssl_sessionid_lock(conn); +- incache = !(Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, +- sockindex)); ++ incache = !(Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)); + if(incache) { + /* there was one before in the cache, so instead of risking that the + previous one was rejected, we just kill that and store the new */ +@@ -1295,8 +1297,10 @@ gtls_connect_step3(struct Curl_easy *data, + } + + /* store this session id */ +- result = Curl_ssl_addsessionid(conn, connect_sessionid, connect_idsize, +- sockindex); ++ result = Curl_ssl_addsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ connect_sessionid, connect_idsize, ++ sockindex); + Curl_ssl_sessionid_unlock(conn); + if(result) { + free(connect_sessionid); +diff --git a/lib/vtls/mbedtls.c b/lib/vtls/mbedtls.c +index 95cd4d99b665..93a7ac1fd87d 100644 +--- a/lib/vtls/mbedtls.c ++++ b/lib/vtls/mbedtls.c +@@ -463,7 +463,9 @@ mbed_connect_step1(struct Curl_easy *data, struct connectdata *conn, + void *old_session = NULL; + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &old_session, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &old_session, NULL, sockindex)) { + ret = mbedtls_ssl_set_session(&backend->ssl, old_session); + if(ret) { + Curl_ssl_sessionid_unlock(conn); +@@ -724,6 +726,7 @@ mbed_connect_step3(struct Curl_easy *data, struct connectdata *conn, + int ret; + mbedtls_ssl_session *our_ssl_sessionid; + void *old_ssl_sessionid = NULL; ++ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; + + our_ssl_sessionid = malloc(sizeof(mbedtls_ssl_session)); + if(!our_ssl_sessionid) +@@ -742,10 +745,12 @@ mbed_connect_step3(struct Curl_easy *data, struct connectdata *conn, + + /* If there's already a matching session in the cache, delete it */ + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)) ++ if(!Curl_ssl_getsessionid(conn, isproxy, &old_ssl_sessionid, NULL, ++ sockindex)) + Curl_ssl_delsessionid(conn, old_ssl_sessionid); + +- retcode = Curl_ssl_addsessionid(conn, our_ssl_sessionid, 0, sockindex); ++ retcode = Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, ++ 0, sockindex); + Curl_ssl_sessionid_unlock(conn); + if(retcode) { + mbedtls_ssl_session_free(our_ssl_sessionid); +diff --git a/lib/vtls/mesalink.c b/lib/vtls/mesalink.c +index 4f1ab8627f49..5d6a1495d790 100644 +--- a/lib/vtls/mesalink.c ++++ b/lib/vtls/mesalink.c +@@ -261,7 +261,9 @@ mesalink_connect_step1(struct Curl_easy *data, + void *ssl_sessionid = NULL; + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { + /* we got a session id, use it! */ + if(!SSL_set_session(BACKEND->handle, ssl_sessionid)) { + Curl_ssl_sessionid_unlock(conn); +@@ -345,12 +347,14 @@ mesalink_connect_step3(struct connectdata *conn, int sockindex) + bool incache; + SSL_SESSION *our_ssl_sessionid; + void *old_ssl_sessionid = NULL; ++ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; + + our_ssl_sessionid = SSL_get_session(BACKEND->handle); + + Curl_ssl_sessionid_lock(conn); + incache = +- !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, sockindex)); ++ !(Curl_ssl_getsessionid(conn, isproxy, &old_ssl_sessionid, NULL, ++ sockindex)); + if(incache) { + if(old_ssl_sessionid != our_ssl_sessionid) { + infof(data, "old SSL session ID is stale, removing\n"); +@@ -361,8 +364,9 @@ mesalink_connect_step3(struct connectdata *conn, int sockindex) + } + + if(!incache) { +- result = Curl_ssl_addsessionid( +- conn, our_ssl_sessionid, 0 /* unknown size */, sockindex); ++ result = ++ Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, 0, ++ sockindex); + if(result) { + Curl_ssl_sessionid_unlock(conn); + failf(data, "failed to store ssl session"); +diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c +index 498f8b9d1d08..68b98984b460 100644 +--- a/lib/vtls/openssl.c ++++ b/lib/vtls/openssl.c +@@ -393,12 +393,23 @@ static int ossl_get_ssl_conn_index(void) + */ + static int ossl_get_ssl_sockindex_index(void) + { +- static int ssl_ex_data_sockindex_index = -1; +- if(ssl_ex_data_sockindex_index < 0) { +- ssl_ex_data_sockindex_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, +- NULL); ++ static int sockindex_index = -1; ++ if(sockindex_index < 0) { ++ sockindex_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); + } +- return ssl_ex_data_sockindex_index; ++ return sockindex_index; ++} ++ ++/* Return an extra data index for proxy boolean. ++ * This index can be used with SSL_get_ex_data() and SSL_set_ex_data(). ++ */ ++static int ossl_get_proxy_index(void) ++{ ++ static int proxy_index = -1; ++ if(proxy_index < 0) { ++ proxy_index = SSL_get_ex_new_index(0, NULL, NULL, NULL, NULL); ++ } ++ return proxy_index; + } + + static int passwd_callback(char *buf, int num, int encrypting, +@@ -1174,6 +1185,7 @@ static int ossl_init(void) + + /* Initialize the extra data indexes */ +- if(ossl_get_ssl_conn_index() < 0 || ossl_get_ssl_sockindex_index() < 0) ++ if(ossl_get_ssl_conn_index() < 0 || ++ ossl_get_ssl_sockindex_index() < 0 || ossl_get_proxy_index() < 0) + return 0; + + return 1; +@@ -2432,8 +2443,10 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) + curl_socket_t *sockindex_ptr; + int connectdata_idx = ossl_get_ssl_conn_index(); + int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); ++ bool isproxy; + +- if(connectdata_idx < 0 || sockindex_idx < 0) ++ if(connectdata_idx < 0 || sockindex_idx < 0 || proxy_idx < 0) + return 0; + + conn = (struct connectdata*) SSL_get_ex_data(ssl, connectdata_idx); +@@ -2446,13 +2459,18 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) + sockindex_ptr = (curl_socket_t*) SSL_get_ex_data(ssl, sockindex_idx); + sockindex = (int)(sockindex_ptr - conn->sock); + ++ isproxy = SSL_get_ex_data(ssl, proxy_idx) ? TRUE : FALSE; ++ + if(SSL_SET_OPTION(primary.sessionid)) { + bool incache; + void *old_ssl_sessionid = NULL; + + Curl_ssl_sessionid_lock(conn); +- incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, +- sockindex)); ++ if(isproxy) ++ incache = FALSE; ++ else ++ incache = !(Curl_ssl_getsessionid(conn, isproxy, ++ &old_ssl_sessionid, NULL, sockindex)); + if(incache) { + if(old_ssl_sessionid != ssl_sessionid) { + infof(data, "old SSL session ID is stale, removing\n"); +@@ -2462,8 +2480,8 @@ static int ossl_new_session_cb(SSL *ssl, SSL_SESSION *ssl_sessionid) + } + + if(!incache) { +- if(!Curl_ssl_addsessionid(conn, ssl_sessionid, +- 0 /* unknown size */, sockindex)) { ++ if(!Curl_ssl_addsessionid(conn, isproxy, ssl_sessionid, ++ 0 /* unknown size */, sockindex)) { + /* the session has been put into the session cache */ + res = 1; + } +@@ -3193,16 +3211,26 @@ static CURLcode ossl_connect_step1(struct Curl_easy *data, + void *ssl_sessionid = NULL; + int connectdata_idx = ossl_get_ssl_conn_index(); + int sockindex_idx = ossl_get_ssl_sockindex_index(); ++ int proxy_idx = ossl_get_proxy_index(); + +- if(connectdata_idx >= 0 && sockindex_idx >= 0) { ++ if(connectdata_idx >= 0 && sockindex_idx >= 0 && ++ proxy_idx >= 0) { + /* Store the data needed for the "new session" callback. + * The sockindex is stored as a pointer to an array element. */ + SSL_set_ex_data(backend->handle, connectdata_idx, conn); + SSL_set_ex_data(backend->handle, sockindex_idx, conn->sock + sockindex); ++#ifndef CURL_DISABLE_PROXY ++ SSL_set_ex_data(backend->handle, proxy_idx, SSL_IS_PROXY() ? (void *) 1: ++ NULL); ++#else ++ SSL_set_ex_data(backend->handle, proxy_idx, NULL); ++#endif ++ + } + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { + /* we got a session id, use it! */ + if(!SSL_set_session(backend->handle, ssl_sessionid)) { + Curl_ssl_sessionid_unlock(conn); +diff --git a/lib/vtls/schannel.c b/lib/vtls/schannel.c +index d7b89d43f892..931bd853eb8e 100644 +--- a/lib/vtls/schannel.c ++++ b/lib/vtls/schannel.c +@@ -496,5 +496,7 @@ schannel_connect_step1(struct Curl_easy *data, struct connectdata *conn, + if(SSL_SET_OPTION(primary.sessionid)) { + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ (void **)&old_cred, NULL, sockindex)) { + BACKEND->cred = old_cred; + DEBUGF(infof(data, "schannel: re-using existing credential handle\n")); +@@ -1337,8 +1338,9 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, + struct ssl_connect_data *connssl = &conn->ssl[sockindex]; + SECURITY_STATUS sspi_status = SEC_E_OK; + CERT_CONTEXT *ccert_context = NULL; ++ bool isproxy = SSL_IS_PROXY(); + #ifdef DEBUGBUILD +- const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : ++ const char * const hostname = isproxy ? conn->http_proxy.host.name : + conn->host.name; + #endif + #ifdef HAS_ALPN +@@ -1414,8 +1416,8 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, + struct Curl_schannel_cred *old_cred = NULL; + + Curl_ssl_sessionid_lock(conn); +- incache = !(Curl_ssl_getsessionid(conn, (void **)&old_cred, NULL, +- sockindex)); ++ incache = !(Curl_ssl_getsessionid(conn, isproxy, (void **)&old_cred, ++ NULL, sockindex)); + if(incache) { + if(old_cred != BACKEND->cred) { + DEBUGF(infof(data, +@@ -1426,7 +1428,7 @@ schannel_connect_step3(struct Curl_easy *data, struct connectdata *conn, + } + } + if(!incache) { +- result = Curl_ssl_addsessionid(conn, (void *)BACKEND->cred, ++ result = Curl_ssl_addsessionid(conn, isproxy, BACKEND->cred, + sizeof(struct Curl_schannel_cred), + sockindex); + if(result) { +diff --git a/lib/vtls/sectransp.c b/lib/vtls/sectransp.c +index 05b57dfaad91..e69b99b72cd6 100644 +--- a/lib/vtls/sectransp.c ++++ b/lib/vtls/sectransp.c +@@ -1400,10 +1400,12 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, + char * const ssl_cert = SSL_SET_OPTION(primary.clientcert); + const struct curl_blob *ssl_cert_blob = SSL_SET_OPTION(primary.cert_blob); + #ifndef CURL_DISABLE_PROXY +- const char * const hostname = SSL_IS_PROXY() ? conn->http_proxy.host.name : ++ bool isproxy = SSL_IS_PROXY(); ++ const char * const hostname = isproxy ? conn->http_proxy.host.name : + conn->host.name; + const long int port = SSL_IS_PROXY() ? conn->port : conn->remote_port; + #else ++ const isproxy = FALSE; + const char * const hostname = conn->host.name; + const long int port = conn->remote_port; + #endif +@@ -1613,7 +1615,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, + #ifdef USE_NGHTTP2 + if(data->state.httpversion >= CURL_HTTP_VERSION_2 + #ifndef CURL_DISABLE_PROXY +- && (!SSL_IS_PROXY() || !conn->bits.tunnel_proxy) ++ && (!isproxy || !conn->bits.tunnel_proxy) + #endif + ) { + CFArrayAppendValue(alpnArr, CFSTR(NGHTTP2_PROTO_VERSION_ID)); +@@ -1953,7 +1955,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, + size_t ssl_sessionid_len; + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, (void **)&ssl_sessionid, ++ if(!Curl_ssl_getsessionid(conn, isproxy, (void **)&ssl_sessionid, + &ssl_sessionid_len, sockindex)) { + /* we got a session id, use it! */ + err = SSLSetPeerID(backend->ssl_ctx, ssl_sessionid, ssl_sessionid_len); +@@ -1981,7 +1983,7 @@ static CURLcode sectransp_connect_step1(struct Curl_easy *data, + return CURLE_SSL_CONNECT_ERROR; + } + +- result = Curl_ssl_addsessionid(conn, ssl_sessionid, ssl_sessionid_len, ++ result = Curl_ssl_addsessionid(conn, isproxy, ssl_sessionid, ssl_sessionid_len, + sockindex); + Curl_ssl_sessionid_unlock(conn); + if(result) { +diff --git a/lib/vtls/vtls.c b/lib/vtls/vtls.c +index 6a0069237fdb..95fd6356285f 100644 +--- a/lib/vtls/vtls.c ++++ b/lib/vtls/vtls.c +@@ -367,5 +367,6 @@ void Curl_ssl_sessionid_unlock(struct Curl_easy *data) + */ + bool Curl_ssl_getsessionid(struct connectdata *conn, ++ const bool isProxy, + void **ssl_sessionid, + size_t *idsize, /* set 0 if unknown */ + int sockindex) +@@ -377,7 +378,6 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, + bool no_match = TRUE; + + #ifndef CURL_DISABLE_PROXY +- const bool isProxy = CONNECT_PROXY_SSL(); + struct ssl_primary_config * const ssl_config = isProxy ? + &conn->proxy_ssl_config : + &conn->ssl_config; +@@ -389,10 +389,15 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, + struct ssl_primary_config * const ssl_config = &conn->ssl_config; + const char * const name = conn->host.name; + int port = conn->remote_port; +- (void)sockindex; + #endif ++ (void)sockindex; + *ssl_sessionid = NULL; + ++#ifdef CURL_DISABLE_PROXY ++ if(isProxy) ++ return TRUE; ++#endif ++ + DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); + + if(!SSL_SET_OPTION(primary.sessionid)) +@@ -480,5 +485,6 @@ void Curl_ssl_delsessionid(struct Curl_easy *data, void *ssl_sessionid) + */ + CURLcode Curl_ssl_addsessionid(struct connectdata *conn, ++ bool isProxy, + void *ssl_sessionid, + size_t idsize, + int sockindex) +@@ -492,7 +498,6 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + int conn_to_port; + long *general_age; + #ifndef CURL_DISABLE_PROXY +- const bool isProxy = CONNECT_PROXY_SSL(); + struct ssl_primary_config * const ssl_config = isProxy ? + &conn->proxy_ssl_config : + &conn->ssl_config; +@@ -505,6 +510,7 @@ CURLcode Curl_ssl_addsessionid(struct Curl_easy *data, + const char *hostname = conn->host.name; + (void)sockindex; + #endif ++ (void)sockindex; + DEBUGASSERT(SSL_SET_OPTION(primary.sessionid)); + + clone_host = strdup(hostname); +diff --git a/lib/vtls/vtls.h b/lib/vtls/vtls.h +index 273184f1894a..2b43e7744b19 100644 +--- a/lib/vtls/vtls.h ++++ b/lib/vtls/vtls.h +@@ -235,5 +235,6 @@ void Curl_ssl_sessionid_unlock(struct Curl_easy *data); + */ + bool Curl_ssl_getsessionid(struct connectdata *conn, ++ const bool isproxy, + void **ssl_sessionid, + size_t *idsize, /* set 0 if unknown */ + int sockindex); +@@ -245,5 +246,6 @@ bool Curl_ssl_getsessionid(struct Curl_easy *data, + */ + CURLcode Curl_ssl_addsessionid(struct connectdata *conn, ++ const bool isProxy, + void *ssl_sessionid, + size_t idsize, + int sockindex); +diff --git a/lib/vtls/wolfssl.c b/lib/vtls/wolfssl.c +index 7159ac9d5e64..8fb2ea7acf31 100644 +--- a/lib/vtls/wolfssl.c ++++ b/lib/vtls/wolfssl.c +@@ -516,7 +516,9 @@ wolfssl_connect_step1(struct Curl_easy *data, struct connectdata *conn, + void *ssl_sessionid = NULL; + + Curl_ssl_sessionid_lock(conn); +- if(!Curl_ssl_getsessionid(conn, &ssl_sessionid, NULL, sockindex)) { ++ if(!Curl_ssl_getsessionid(conn, ++ SSL_IS_PROXY() ? TRUE : FALSE, ++ &ssl_sessionid, NULL, sockindex)) { + /* we got a session id, use it! */ + if(!SSL_set_session(backend->handle, ssl_sessionid)) { + char error_buffer[WOLFSSL_MAX_ERROR_SZ]; +@@ -772,10 +774,11 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn, + void *old_ssl_sessionid = NULL; + + our_ssl_sessionid = SSL_get_session(backend->handle); ++ bool isproxy = SSL_IS_PROXY() ? TRUE : FALSE; + + Curl_ssl_sessionid_lock(conn); +- incache = !(Curl_ssl_getsessionid(conn, &old_ssl_sessionid, NULL, +- sockindex)); ++ incache = !(Curl_ssl_getsessionid(conn, isproxy, ++ &old_ssl_sessionid, NULL, sockindex)); + if(incache) { + if(old_ssl_sessionid != our_ssl_sessionid) { + infof(data, "old SSL session ID is stale, removing\n"); +@@ -786,8 +789,8 @@ wolfssl_connect_step3(struct Curl_easy *data, struct connectdata *conn, + } + + if(!incache) { +- result = Curl_ssl_addsessionid(conn, our_ssl_sessionid, +- 0 /* unknown size */, sockindex); ++ result = Curl_ssl_addsessionid(conn, isproxy, our_ssl_sessionid, ++ 0, sockindex); + if(result) { + Curl_ssl_sessionid_unlock(conn); + failf(data, "failed to store ssl session"); diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 89f44e8bb7b3..7c24be7aea75 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { sha256 = "19bp3d91xq9vqwlbzq261j23mk9lz4lyka4gr2fm6dhnd3k66k8g"; }; + patches = [ + ./7.74.0-CVE-2021-22876.patch + ./7.74.0-CVE-2021-22890.patch + ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; From 9acbc0c674c9161b9c810e3a41eddafca54168cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Apr 2021 12:30:38 -0300 Subject: [PATCH 0026/1183] mate: define mateUpdateScript attribute --- pkgs/desktops/mate/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/default.nix b/pkgs/desktops/mate/default.nix index 10c278c8bf9a..291d26afcd5c 100644 --- a/pkgs/desktops/mate/default.nix +++ b/pkgs/desktops/mate/default.nix @@ -1,10 +1,18 @@ -{ newScope }: +{ pkgs, newScope }: let callPackage = newScope self; self = rec { + # Update script tailored to mate packages from git repository + mateUpdateScript = { pname, version, odd-unstable ? true, url ? "https://pub.mate-desktop.org/releases" }: + pkgs.genericUpdater { + inherit pname version odd-unstable; + attrPath = "mate.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-archive-two-level-versions ${url}"; + }; + atril = callPackage ./atril { }; caja = callPackage ./caja { }; caja-dropbox = callPackage ./caja-dropbox { }; From 8a3c28afb5c54df9c381d36751785618e9139e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Apr 2021 13:07:58 -0300 Subject: [PATCH 0027/1183] mate: remove old update script --- pkgs/desktops/mate/update.sh | 64 ------------------------------------ 1 file changed, 64 deletions(-) delete mode 100755 pkgs/desktops/mate/update.sh diff --git a/pkgs/desktops/mate/update.sh b/pkgs/desktops/mate/update.sh deleted file mode 100755 index d214e07f8cdd..000000000000 --- a/pkgs/desktops/mate/update.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p libarchive curl common-updater-scripts - -set -eu -o pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" -root=../../.. -export NIXPKGS_ALLOW_UNFREE=1 - -mate_version=1.24 -theme_version=3.22 -materepo=https://pub.mate-desktop.org/releases/${mate_version} -themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} - -version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" | tr -d '"') -} - -update_package() { - local p=$1 - echo $p - echo "# $p" >> git-commits.txt - - local repo - if [ "$p" = "mate-themes" ]; then - repo=$themerepo - else - repo=$materepo - fi - - local p_version_old=$(version mate.$p) - local p_versions=$(curl -sS ${repo}/ | sed -rne "s/.*\"$p-([0-9]+\\.[0-9]+\\.[0-9]+)\\.tar\\.xz.*/\\1/p") - local p_version=$(echo $p_versions | sed -e 's/ /\n/g' | sort -t. -k 1,1n -k 2,2n -k 3,3n | tail -n1) - - if [[ -z "$p_version" ]]; then - echo "unavailable $p" - echo "# $p not found" >> git-commits.txt - echo - return - fi - - if [[ "$p_version" = "$p_version_old" ]]; then - echo "nothing to do, $p $p_version is current" - echo - return - fi - - # Download package and save hash and file path. - local url="$repo/$p-${p_version}.tar.xz" - mapfile -t prefetch < <(nix-prefetch-url --print-path "$url") - local hash=${prefetch[0]} - local path=${prefetch[1]} - echo "$p: $p_version_old -> $p_version" - (cd "$root" && update-source-version mate.$p "$p_version" "$hash") - echo " git add pkgs/desktops/mate/$p" >> git-commits.txt - echo " git commit -m \"mate.$p: $p_version_old -> $p_version\"" >> git-commits.txt - echo -} - -for d in $(ls -A --indicator-style=none); do - if [ -d $d ]; then - update_package $d - fi -done From a191b2320c5270d1542d3ff04b947af0228b41bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 16:58:16 -0300 Subject: [PATCH 0028/1183] mate: add passthru update script --- pkgs/desktops/mate/atril/default.nix | 3 +++ pkgs/desktops/mate/caja-dropbox/default.nix | 4 +++- pkgs/desktops/mate/caja-extensions/default.nix | 4 +++- pkgs/desktops/mate/caja-with-extensions/default.nix | 2 +- pkgs/desktops/mate/caja/default.nix | 4 +++- pkgs/desktops/mate/engrampa/default.nix | 4 +++- pkgs/desktops/mate/eom/default.nix | 4 +++- pkgs/desktops/mate/libmatekbd/default.nix | 4 +++- pkgs/desktops/mate/libmatemixer/default.nix | 5 ++++- pkgs/desktops/mate/libmateweather/default.nix | 4 +++- pkgs/desktops/mate/marco/default.nix | 4 +++- pkgs/desktops/mate/mate-applets/default.nix | 4 +++- pkgs/desktops/mate/mate-backgrounds/default.nix | 4 +++- pkgs/desktops/mate/mate-calc/default.nix | 4 +++- pkgs/desktops/mate/mate-common/default.nix | 4 +++- pkgs/desktops/mate/mate-control-center/default.nix | 5 ++++- pkgs/desktops/mate/mate-desktop/default.nix | 4 +++- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 4 +++- pkgs/desktops/mate/mate-icon-theme/default.nix | 4 +++- pkgs/desktops/mate/mate-indicator-applet/default.nix | 4 +++- pkgs/desktops/mate/mate-media/default.nix | 4 +++- pkgs/desktops/mate/mate-menus/default.nix | 4 +++- pkgs/desktops/mate/mate-netbook/default.nix | 4 +++- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 +++- pkgs/desktops/mate/mate-panel/default.nix | 4 +++- pkgs/desktops/mate/mate-polkit/default.nix | 4 +++- pkgs/desktops/mate/mate-power-manager/default.nix | 4 +++- pkgs/desktops/mate/mate-screensaver/default.nix | 4 +++- pkgs/desktops/mate/mate-sensors-applet/default.nix | 4 +++- pkgs/desktops/mate/mate-session-manager/default.nix | 4 +++- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 +++- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 +++- pkgs/desktops/mate/mate-terminal/default.nix | 4 +++- pkgs/desktops/mate/mate-themes/default.nix | 7 ++++++- pkgs/desktops/mate/mate-tweak/default.nix | 8 ++++++++ pkgs/desktops/mate/mate-user-guide/default.nix | 4 +++- pkgs/desktops/mate/mate-user-share/default.nix | 4 +++- pkgs/desktops/mate/mate-utils/default.nix | 4 +++- pkgs/desktops/mate/mozo/default.nix | 4 +++- pkgs/desktops/mate/pluma/default.nix | 4 +++- pkgs/desktops/mate/python-caja/default.nix | 4 +++- 41 files changed, 131 insertions(+), 39 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 3f68da288c09..53bec98603b0 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -17,6 +17,7 @@ , enablePostScript ? true, libspectre , enableXps ? true, libgxps , enableImages ? false +, mateUpdateScript }: with lib; @@ -67,6 +68,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 92176493afca..ded175db092b 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, substituteAll , pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox }: +, gtk3, mate, python3, dropbox, mateUpdateScript }: let dropboxd = "${dropbox}/bin/dropbox"; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 64a036fd389a..99438bdd6101 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index 35e3cd198f6b..125e39d1f461 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ] }: +{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 890d3d615481..db1fafffa2a3 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "caja"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 591cac7d8864..26be2ec2bf34 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "engrampa"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 8b447f14d8b2..c4760e1e6dcf 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "eom"; @@ -32,6 +32,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 1b66bb97efee..92bfd4fe8339 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 29d6127c3b31..bc44710e6e72 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -2,7 +2,8 @@ , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false - }: +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatemixer"; @@ -23,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 0f5deb8f5507..a88ba7c6ed31 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 3c16004010c1..2ad91a6b8d43 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index bfa5a1a5d957..e2a324b96712 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Applets for use with the MATE panel"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index b990a53b04a1..26aedcc2818d 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ninja ]; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 2805c86fe890..a5a71bcce563 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 7a2ac74522f6..57f50ad83890 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-common"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 262ca75ac792..362eaf906b87 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook + desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook, + mateUpdateScript }: stdenv.mkDerivation rec { @@ -49,6 +50,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 9102ae3e8b59..4270b0a1f921 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index fd280f3d96ee..f0bca054ae8c 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 530a7b66ff19..d6c16c1c7171 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index a26b593101a1..804bf2352d08 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index f4d8bd738840..fa6b6e4305a0 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 1333af0cdd92..751dcd508594 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 3912ab47c8e0..dc10cca40a41 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE utilities for netbooks"; longDescription = '' diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 5e867085bb10..20461847d343 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: + libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 1ada0171911b..e089811211c7 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 67690161f554..174e2e466248 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index e0c46076a651..2bc98cb1cb02 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index fe309352346b..ee59f6d82630 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Screen saver and locker for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6fed2a654444..4d0fd068af8e 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 08a119ad8d2b..74c36145de1f 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch + wrapGAppsHook, fetchpatch, mateUpdateScript }: stdenv.mkDerivation rec { @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 0a483269c5ef..90b931403c7b 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook }: + wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; @@ -38,6 +38,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 2d89cb2494ba..7e106cbd20da 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "System monitor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 48588cc6d6dd..d17d2fafd1b5 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 3c0d9cf1b024..b220478184a3 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: + gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { + inherit pname version; + url = "https://pub.mate-desktop.org/releases/themes"; + }; + meta = { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index ce97bc416e69..4f49b5f3002e 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -9,6 +9,8 @@ , gobject-introspection , wrapGAppsHook , glib +, genericUpdater +, common-updater-scripts }: python3Packages.buildPythonApplication rec { @@ -72,6 +74,12 @@ python3Packages.buildPythonApplication rec { done ''; + passthru.updateScript = genericUpdater { + inherit pname version; + attrPath = "mate.${pname}"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + meta = with lib; { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 2a91cac5a541..d7c83cc98209 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }: +{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 8aa9591003ca..6b653498ce3d 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-share"; @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "User level public file sharing for the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index c58a3d4bc648..ac235168860f 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-utils"; @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Utilities for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 4d893cd2e741..2487ed97f016 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: +{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "MATE Desktop menu editor"; homepage = "https://github.com/mate-desktop/mozo"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index a879f2df5d10..2fa584b45984 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 2c59d78e86a1..8104da3420e1 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages }: +{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: stdenv.mkDerivation rec { pname = "python-caja"; @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.updateScript = mateUpdateScript { inherit pname version; }; + meta = with lib; { description = "Python binding for Caja components"; homepage = "https://github.com/mate-desktop/python-caja"; From 8c2f8c7aa805fb8f85d82dd9abbd23805f0c13cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0029/1183] mate.caja: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/caja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index db1fafffa2a3..44721a2cab21 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "caja"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0"; + sha256 = "0ylgb4b31vwgqmmknrhm4m9gfa1rzb9azpdd9myi0hscrr3h22z5"; }; nativeBuildInputs = [ From d3022948ee33c242fa6953db7f65d759abd18526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0030/1183] mate.atril: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/atril/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 53bec98603b0..1a6d947153e8 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -24,11 +24,11 @@ with lib; stdenv.mkDerivation rec { pname = "atril"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y"; + sha256 = "06nyicj96dqcv035yqnzmm6pk3m35glxj0ny6lk1vwqkk2l750xl"; }; nativeBuildInputs = [ From 5ff5c807d6782da02fbea00420156708d14c6bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0031/1183] mate.engrampa: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/engrampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 26be2ec2bf34..6ba30c16f59f 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "engrampa"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0akjnz85qkpiqgj1ccn41rzbfid4l3r3nsm4s9s779ilzd7f097y"; + sha256 = "0x26djz73g3fjwzcpr7k60xb6qx5izhw7lf2ggn34iwpihl0sa7f"; }; nativeBuildInputs = [ From a1579e8b7d1373762848dd42ee80415afa5592b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0032/1183] mate.eom: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/eom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index c4760e1e6dcf..75d37e5ea35d 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "eom"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0dralsc0dvs0l38cysdhx6kiaiqlb8qi6g9xz2cm6mjqyq3d3f9f"; + sha256 = "08rjckr1hdw7c31f2hzz3vq0rn0c5z3hmvl409y6k6ns583k1bgf"; }; nativeBuildInputs = [ From e623def756230623520911decafc7112f2b3cd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0033/1183] mate.marco: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/marco/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 2ad91a6b8d43..c5e3372dc48e 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "marco"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "109b41pjrc1b4slw6sx1lakdhrc46x829vczzk4bz3j15kcszg54"; + sha256 = "19s2y2s9immp86ni3395mgxl605m2wn10m8399y9qkgw2b5m10s9"; }; nativeBuildInputs = [ From 43a72457e023b5534eb32dfdd34fd0f3bea39b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0034/1183] mate.mate-calc: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index a5a71bcce563..a3e8d3b5951d 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-calc"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0imdimq5d5rjq8mkjcrsd683a2bn9acmhc0lmvyw71y0040inbaw"; + sha256 = "1yg8j0dqy37fljd20pwxdgna3f1v7k9wmdr9l4r1nqf4a7zwi96l"; }; nativeBuildInputs = [ From b7d8444898e93b7b5041a2458254d104b0ecccb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0035/1183] mate.mate-control-center: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 362eaf906b87..b9c80180087d 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "mate-control-center"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bai47fsmbxlw2lhig9n6c8sxr24ixkd1spq3j0635yzcqighb0"; + sha256 = "18vsqkcl4n3k5aa05fqha61jc3133zw07gd604sm0krslwrwdn39"; }; nativeBuildInputs = [ From 5907b7cb413eb2901e9050f34086153b818b8dff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0036/1183] mate.mate-notification-daemon: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-notification-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 20461847d343..28497084fb63 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-notification-daemon"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ybzr8mni5pgrspf8hqnisd0r0hwdlgk7n5mzsh7xisbkgivpw2b"; + sha256 = "02mf9186cbziyvz7ycb0j9b7rn085a7f9hrm03n28q5kz0z1k92q"; }; nativeBuildInputs = [ From 00815c91035a72dac7433ec5435f93f02ecce2c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0037/1183] mate.mate-panel: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index e089811211c7..c332b700227d 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-panel"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xblqrhfazd01h0jdmx4hvavkb7f9anbd4rjsk5r6wxhp027l64l"; + sha256 = "1sj851h71nq4ssrsd4k5b0vayxmspl5x3rhf488b2xpcj81vmi9h"; }; nativeBuildInputs = [ From 8228ca4025badfcb32d8f0c2a53c40853d985065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:02 -0300 Subject: [PATCH 0038/1183] mate.mate-power-manager: 1.24.2 -> 1.24.3 --- pkgs/desktops/mate/mate-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 2bc98cb1cb02..fe74cf2505a4 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-power-manager"; - version = "1.24.2"; + version = "1.24.3"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fni41p3kraxwjnx9l5mdspng0zib1gfdxwlaiyq31mh4g79yjyj"; + sha256 = "1rmcrpii3hl35qjznk6h5cq72n60cs12n294hjyakxr9kvgns7l6"; }; nativeBuildInputs = [ From 48752e4e3981ca5249d86579c854f11935acd707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0039/1183] mate.mate-screensaver: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-screensaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index ee59f6d82630..f132bbcd26df 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-screensaver"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0imb1z2yvz1h95dzq396c569kkxys9mb2dyc6qxxxcnc5w02a2dw"; + sha256 = "18hxhglryfcbpbns9izigiws7lvdv5dnsaaz226ih3aar5db1ysy"; }; nativeBuildInputs = [ From e1a9cfc9b77caab3664b2e083944c269ceb4758b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0040/1183] mate.mate-session-manager: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-session-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 74c36145de1f..bdd129e0deca 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-session-manager"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zwq8symyp3ijs28pyrknsdi9byf4dpp9wp93ndwdhi0vaip5i51"; + sha256 = "1jcb5k2fx2rwwbrslgv1xlzaiwiwjnxjwnp503qf8cg89w69q2vb"; }; patches = [ From b54b1ea41de30f21fc445c9c3b079b0855f1c014 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0041/1183] mate.mate-themes: 3.22.21 -> 3.22.22 --- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index b220478184a3..8153ea1ec7af 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.21"; + version = "3.22.22"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; + sha256 = "18crdwfpfm3br4pv94wy7rpmzzb69im4j8dgq1b7c8gcbbzay05x"; }; nativeBuildInputs = [ pkg-config gettext gtk3 ]; From ebfbb86478b7469350c8e8f4b97e26fd4346fb41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0042/1183] mate.mate-settings-daemon: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 90b931403c7b..ed908759877b 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mate-settings-daemon"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0n1ywr3ir5p536s7azdbw2mh40ylqlpx3a74mjrivbms1rpjxyab"; + sha256 = "051r7xrx1byllsszbwsk646sq4izyag9yxg8jw2rm6x6mgwb89cc"; }; nativeBuildInputs = [ From 359463ea6cdce8d1a35c626f031543b8de428424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0043/1183] mate.mate-system-monitor: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/mate-system-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 7e106cbd20da..4527c91eed6b 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-system-monitor"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i2r4lw6xsk972yp15g5hm8p8xx9pp6jmcvvzbdq80xyx3x898qz"; + sha256 = "1mbny5hs5805398krvcsvi1jfhyq9a9dfciyrnis67n2yisr1hzp"; }; nativeBuildInputs = [ From 0beeb25b501ffec9aa5640e28303f7d7ac865475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0044/1183] mate.mate-tweak: 20.10.0 -> 21.04.3 --- pkgs/desktops/mate/mate-tweak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 4f49b5f3002e..830cf092f80e 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "mate-tweak"; - version = "20.10.0"; + version = "21.04.3"; src = fetchFromGitHub { owner = "ubuntu-mate"; repo = pname; rev = version; - sha256 = "08gw5i5wjxmzn92h9fv6g7q9i00n8shv1wlpy6cb31xy9wbmjph6"; + sha256 = "0vpzy7awhb1xfsdjsrchy5b9dygj4ixdcvgx5v5w8hllmi4yxpc1"; }; nativeBuildInputs = [ From f320df2d41f68c1bbe6092f185170b7e1b6698fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0045/1183] mate.mozo: 1.24.0 -> 1.24.1 --- pkgs/desktops/mate/mozo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 2487ed97f016..4122e8231654 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -2,14 +2,14 @@ python3.pkgs.buildPythonApplication rec { pname = "mozo"; - version = "1.24.0"; + version = "1.24.1"; format = "other"; doCheck = false; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3"; + sha256 = "14ps43gdh1sfvq49yhl58gxq3rc0d25i2d7r4ghlzf07ssxl53b0"; }; nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; From 538f4509085ff62f9994638c025eb40846b5fafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 18:56:03 -0300 Subject: [PATCH 0046/1183] mate.pluma: 1.24.1 -> 1.24.2 --- pkgs/desktops/mate/pluma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 2fa584b45984..ddebf5a1bb51 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pluma"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sgc5f480icr2ans6gd3akvcax58mr4jp3zjk3xn7bx1mw9i299f"; + sha256 = "183frfhll3sb4r12p24160j1c1cfd102nlp5rrwvyv5qqm7i2fg4"; }; nativeBuildInputs = [ From 21b93fa0cc8c2e296d7078a3300bf1b1f607c141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 2 Apr 2021 22:04:39 -0300 Subject: [PATCH 0047/1183] mate: add some line wrappings Co-authored-by: Sandro --- pkgs/desktops/mate/marco/default.nix | 3 ++- pkgs/desktops/mate/mate-applets/default.nix | 4 +++- pkgs/desktops/mate/mate-control-center/default.nix | 8 ++++---- pkgs/desktops/mate/mate-sensors-applet/default.nix | 3 ++- pkgs/desktops/mate/mate-user-share/default.nix | 3 ++- pkgs/desktops/mate/mate-utils/default.nix | 3 ++- pkgs/desktops/mate/pluma/default.nix | 3 ++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index c5e3372dc48e..aa2ee9d4913b 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop +, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index e2a324b96712..1046e431a3b8 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook +, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-applets"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index b9c80180087d..fd675f0406c8 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,7 +1,7 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib, - libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, - desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook, - mateUpdateScript +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib +, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3 +, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 4d0fd068af8e..849f767c7c20 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify +, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 6b653498ce3d..1126e5851352 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 +, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index ac235168860f..0b7b181bd576 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 +, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index ddebf5a1bb51..279e443e5250 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 +, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; From d754c20366597965115f690970abfdea5a91dbc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 09:25:45 +0200 Subject: [PATCH 0048/1183] python38: 3.8.8 -> 3.8.9 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 39e27ec9944a..8825ae55312a 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -114,10 +114,10 @@ with pkgs; sourceVersion = { major = "3"; minor = "8"; - patch = "8"; + patch = "9"; suffix = ""; }; - sha256 = "fGZCSf935EPW6g5M8OWH6ukYyjxI0IHRkV/iofG8xcw="; + sha256 = "XjkfPsRdopVEGcqwvq79i+OIlepc4zV3w+wUlAxLlXI="; }; }; From 9e83f91bb1b81f0ed172f75a3a6e2f03f33efe6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 09:25:56 +0200 Subject: [PATCH 0049/1183] python39: 3.9.2 -> 3.9.3 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 8825ae55312a..dcccaf1f2b7b 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -173,10 +173,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "2"; + patch = "3"; suffix = ""; }; - sha256 = "PCA0xU+BFEj1FmaNzgnSQAigcWw6eU3YY5tTiMveJH0="; + sha256 = "MIEQOcZeBMFPxpjkI5R+Rk+TFuaftEYQvThEYEa7grU="; inherit (darwin) configd; inherit passthruFun; }; From c1db6868bb2c8b4ef6bdb11b8e533fa29423efa6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Sep 2020 18:57:58 +0800 Subject: [PATCH 0050/1183] pcsctools: use the local smartcard list Use the local file provided with pcsctools or alternatively look in /etc/pcsc. --- pkgs/tools/security/pcsctools/default.nix | 37 +++++++++++++++++------ 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 613388fc6a30..51813526de15 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -1,18 +1,33 @@ -{ stdenv, lib, fetchurl, makeWrapper, pkg-config, udev, dbus, pcsclite -, wget, coreutils, perlPackages +{ stdenv +, lib +, fetchurl +, makeWrapper +, pkg-config +, systemd +, dbus +, pcsclite +, wget +, coreutils +, perlPackages }: -let deps = lib.makeBinPath [ wget coreutils ]; - -in stdenv.mkDerivation rec { - name = "pcsc-tools-1.5.7"; +stdenv.mkDerivation rec { + pname = "pcsc-tools"; + version = "1.5.7"; src = fetchurl { - url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.bz2"; + url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2"; sha256 = "17b9jxvcxmn007lavan20l25v4jvm6dqc4x9dlqzbg6mjs28zsp0"; }; - buildInputs = [ udev dbus perlPackages.perl pcsclite ]; + postPatch = '' + substituteInPlace ATR_analysis \ + --replace /usr/local/pcsc /etc/pcsc \ + --replace /usr/share/pcsc $out/share/pcsc + ''; + + buildInputs = [ dbus perlPackages.perl pcsclite ] + ++ lib.optional stdenv.isLinux systemd; nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -24,14 +39,16 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/ATR_analysis \ --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" wrapProgram $out/bin/pcsc_scan \ - --set PATH "$out/bin:${deps}" + --prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}" + + install -Dm444 -t $out/share/pcsc smartcard_list.txt ''; meta = with lib; { description = "Tools used to test a PC/SC driver, card or reader"; homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; } From 2b93e96d0bdf5cd98c6d7bd60af6e4dded4ab3d1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Sep 2020 20:32:01 +0800 Subject: [PATCH 0051/1183] pcsclite: add policy kit support --- pkgs/tools/security/pcsclite/default.nix | 38 +++++++++++++++++++----- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 2a75c409305e..71bd13c4a729 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, udev, dbus, perl, python3, IOKit }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, pkg-config +, perl +, python3 +, dbus +, polkit +, systemd +, IOKit +}: stdenv.mkDerivation rec { pname = "pcsclite"; @@ -13,14 +24,23 @@ stdenv.mkDerivation rec { patches = [ ./no-dropdir-literals.patch ]; + postPatch = '' + sed -i configure.ac \ + -e "s@polkit_policy_dir=.*@polkit_policy_dir=$bin/share/polkit-1/actions@" + ''; + configureFlags = [ + "--enable-confdir=/etc" # The OS should care on preparing the drivers into this location "--enable-usbdropdir=/var/lib/pcsc/drivers" - "--enable-confdir=/etc" - ] ++ lib.optional stdenv.isLinux - "--with-systemdsystemunitdir=\${out}/etc/systemd/system" - ++ lib.optional (!stdenv.isLinux) - "--disable-libsystemd"; + ] + ++ (if stdenv.isLinux then [ + "--enable-ipcdir=/run/pcscd" + "--enable-polkit" + "--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" + ] else [ + "--disable-libsystemd" + ]); postConfigure = '' sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { @@ -33,10 +53,12 @@ stdenv.mkDerivation rec { moveToOutput bin/pcsc-spy "$dev" ''; - nativeBuildInputs = [ pkg-config perl ]; + enableParallelBuilding = true; + + nativeBuildInputs = [ autoreconfHook pkg-config perl ]; buildInputs = [ python3 ] - ++ lib.optionals stdenv.isLinux [ udev dbus ] + ++ lib.optionals stdenv.isLinux [ dbus polkit systemd ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with lib; { From 6c5934523585bfd2e5c177e78c468cffc282b5da Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 8 Sep 2020 20:32:16 +0800 Subject: [PATCH 0052/1183] nixos/pcscd: use unit files from upstream --- nixos/modules/services/hardware/pcscd.nix | 69 ++++++++++------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index f3fc4c3cc79e..54b6693f85a0 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -10,39 +10,37 @@ let paths = map (p: "${p}/pcsc/drivers") config.services.pcscd.plugins; }; -in { +in +{ ###### interface - options = { + options.services.pcscd = { + enable = mkEnableOption "PCSC-Lite daemon"; - services.pcscd = { - enable = mkEnableOption "PCSC-Lite daemon"; + plugins = mkOption { + type = types.listOf types.package; + default = [ pkgs.ccid ]; + defaultText = "[ pkgs.ccid ]"; + example = literalExample "[ pkgs.pcsc-cyberjack ]"; + description = "Plugin packages to be used for PCSC-Lite."; + }; - plugins = mkOption { - type = types.listOf types.package; - default = [ pkgs.ccid ]; - defaultText = "[ pkgs.ccid ]"; - example = literalExample "[ pkgs.pcsc-cyberjack ]"; - description = "Plugin packages to be used for PCSC-Lite."; - }; + readerConfig = mkOption { + type = types.lines; + default = ""; + example = '' + FRIENDLYNAME "Some serial reader" + DEVICENAME /dev/ttyS0 + LIBPATH /path/to/serial_reader.so + CHANNELID 1 + ''; + description = '' + Configuration for devices that aren't hotpluggable. - readerConfig = mkOption { - type = types.lines; - default = ""; - example = '' - FRIENDLYNAME "Some serial reader" - DEVICENAME /dev/ttyS0 - LIBPATH /path/to/serial_reader.so - CHANNELID 1 - ''; - description = '' - Configuration for devices that aren't hotpluggable. - - See reader.conf - 5 for valid options. - ''; - }; + See reader.conf + 5 for valid options. + ''; }; }; @@ -50,20 +48,15 @@ in { config = mkIf config.services.pcscd.enable { - systemd.sockets.pcscd = { - description = "PCSC-Lite Socket"; - wantedBy = [ "sockets.target" ]; - before = [ "multi-user.target" ]; - socketConfig.ListenStream = "/run/pcscd/pcscd.comm"; - }; + environment.etc."reader.conf".source = cfgFile; + + systemd.packages = [ (getBin pkgs.pcsclite) ]; + + systemd.sockets.pcscd.wantedBy = [ "sockets.target" ]; systemd.services.pcscd = { - description = "PCSC-Lite daemon"; environment.PCSCLITE_HP_DROPDIR = pluginEnv; - serviceConfig = { - ExecStart = "${getBin pkgs.pcsclite}/sbin/pcscd -f -x -c ${cfgFile}"; - ExecReload = "${getBin pkgs.pcsclite}/sbin/pcscd -H"; - }; + restartTriggers = [ "/etc/reader.conf" ]; }; }; } From ea099211e0c4dc8163ad6cbda3abddd3e75bf5b4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Apr 2021 13:36:34 +0200 Subject: [PATCH 0053/1183] wayland: Refactor the Nix expression This should make it a bit easier to read, expat is not optional (only for cross-compiling - WIP), and fetchpatch is no longer required. --- .../development/libraries/wayland/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 99800bb2c549..875b6508d6f0 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -1,16 +1,15 @@ { lib , stdenv , fetchurl -, fetchpatch +, substituteAll , meson , pkg-config -, substituteAll , ninja -, libffi -, libxml2 , wayland -, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +, expat +, libxml2 , withLibraries ? stdenv.isLinux +, libffi , withDocumentation ? withLibraries && stdenv.hostPlatform == stdenv.buildPlatform , graphviz-nox , doxygen @@ -25,8 +24,6 @@ # Documentation is only built when building libraries. assert withDocumentation -> withLibraries; -# Require the optional to be enabled until upstream fixes or removes the configure flag -assert expat != null; let isCross = stdenv.buildPlatform != stdenv.hostPlatform; in @@ -46,6 +43,10 @@ stdenv.mkDerivation rec { }) ]; + postPatch = lib.optionalString withDocumentation '' + patchShebangs doc/doxygen/gen-doxygen.py + ''; + outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; @@ -54,10 +55,6 @@ stdenv.mkDerivation rec { "-Ddocumentation=${lib.boolToString withDocumentation}" ]; - postPatch = lib.optionalString withDocumentation '' - patchShebangs doc/doxygen/gen-doxygen.py - ''; - depsBuildBuild = [ pkg-config ]; From fa410ea63363ff6a53382ae77395e0f3f1bc92c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Apr 2021 15:05:54 +0200 Subject: [PATCH 0054/1183] python27: fix CVE-2021-23336 From the archive `python-gentoo-patches-2.7.18_p8.tar.xz` found at https://dev.gentoo.org/~mgorny/dist/python/, I copied `0024-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch`. --- .../python/cpython/2.7/CVE-2021-23336.patch | 390 ++++++++++++++++++ .../python/cpython/2.7/default.nix | 2 + 2 files changed, 392 insertions(+) create mode 100644 pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch diff --git a/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch new file mode 100644 index 000000000000..760d0e7eed8e --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/CVE-2021-23336.patch @@ -0,0 +1,390 @@ +From e7b005c05dbdbce967a409abd71641281a8604bf Mon Sep 17 00:00:00 2001 +From: Senthil Kumaran +Date: Mon, 15 Feb 2021 11:16:43 -0800 +Subject: [PATCH 24/26] [3.6] bpo-42967: only use '&' as a query string + separator (GH-24297) (GH-24532) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +bpo-42967: [security] Address a web cache-poisoning issue reported in +urllib.parse.parse_qsl(). + +urllib.parse will only us "&" as query string separator by default +instead of both ";" and "&" as allowed in earlier versions. An optional +argument seperator with default value "&" is added to specify the +separator. + +Co-authored-by: Éric Araujo +Co-authored-by: Ken Jin <28750310+Fidget-Spinner@users.noreply.github.com> +Co-authored-by: Adam Goldschmidt + +Rebased for Python 2.7 by Michał Górny +--- + Doc/library/cgi.rst | 7 +++- + Doc/library/urlparse.rst | 23 ++++++++++- + Lib/cgi.py | 20 +++++++--- + Lib/test/test_cgi.py | 29 +++++++++++--- + Lib/test/test_urlparse.py | 38 +++++++++---------- + Lib/urlparse.py | 22 ++++++++--- + .../2021-02-14-15-59-16.bpo-42967.YApqDS.rst | 1 + + 7 files changed, 100 insertions(+), 40 deletions(-) + create mode 100644 Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst + +diff --git a/Doc/library/cgi.rst b/Doc/library/cgi.rst +index ecd62c8c01..b85cdd8b61 100644 +--- a/Doc/library/cgi.rst ++++ b/Doc/library/cgi.rst +@@ -285,10 +285,10 @@ These are useful if you want more control, or if you want to employ some of the + algorithms implemented in this module in other circumstances. + + +-.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing]]]) ++.. function:: parse(fp[, environ[, keep_blank_values[, strict_parsing]]], separator="&") + + Parse a query in the environment or from a file (the file defaults to +- ``sys.stdin`` and environment defaults to ``os.environ``). The *keep_blank_values* and *strict_parsing* parameters are ++ ``sys.stdin`` and environment defaults to ``os.environ``). The *keep_blank_values*, *strict_parsing* and *separator* parameters are + passed to :func:`urlparse.parse_qs` unchanged. + + +@@ -316,6 +316,9 @@ algorithms implemented in this module in other circumstances. + Note that this does not parse nested multipart parts --- use + :class:`FieldStorage` for that. + ++ .. versionchanged:: 3.6.13 ++ Added the *separator* parameter. ++ + + .. function:: parse_header(string) + +diff --git a/Doc/library/urlparse.rst b/Doc/library/urlparse.rst +index 0989c88c30..2f8e4c5a44 100644 +--- a/Doc/library/urlparse.rst ++++ b/Doc/library/urlparse.rst +@@ -136,7 +136,7 @@ The :mod:`urlparse` module defines the following functions: + now raise :exc:`ValueError`. + + +-.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]]) ++.. function:: parse_qs(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]], separator='&') + + Parse a query string given as a string argument (data of type + :mimetype:`application/x-www-form-urlencoded`). Data are returned as a +@@ -157,6 +157,9 @@ The :mod:`urlparse` module defines the following functions: + read. If set, then throws a :exc:`ValueError` if there are more than + *max_num_fields* fields read. + ++ The optional argument *separator* is the symbol to use for separating the ++ query arguments. It defaults to ``&``. ++ + Use the :func:`urllib.urlencode` function to convert such dictionaries into + query strings. + +@@ -166,7 +169,14 @@ The :mod:`urlparse` module defines the following functions: + .. versionchanged:: 2.7.16 + Added *max_num_fields* parameter. + +-.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]]) ++ .. versionchanged:: 2.7.18-gentoo ++ Added *separator* parameter with the default value of ``&``. Earlier ++ Python versions allowed using both ``;`` and ``&`` as query parameter ++ separator. This has been changed to allow only a single separator key, ++ with ``&`` as the default separator. ++ ++ ++.. function:: parse_qsl(qs[, keep_blank_values[, strict_parsing[, max_num_fields]]], separator='&') + + Parse a query string given as a string argument (data of type + :mimetype:`application/x-www-form-urlencoded`). Data are returned as a list of +@@ -186,6 +196,9 @@ The :mod:`urlparse` module defines the following functions: + read. If set, then throws a :exc:`ValueError` if there are more than + *max_num_fields* fields read. + ++ The optional argument *separator* is the symbol to use for separating the ++ query arguments. It defaults to ``&``. ++ + Use the :func:`urllib.urlencode` function to convert such lists of pairs into + query strings. + +@@ -195,6 +208,12 @@ The :mod:`urlparse` module defines the following functions: + .. versionchanged:: 2.7.16 + Added *max_num_fields* parameter. + ++ .. versionchanged:: 2.7.18-gentoo ++ Added *separator* parameter with the default value of ``&``. Earlier ++ Python versions allowed using both ``;`` and ``&`` as query parameter ++ separator. This has been changed to allow only a single separator key, ++ with ``&`` as the default separator. ++ + .. function:: urlunparse(parts) + + Construct a URL from a tuple as returned by ``urlparse()``. The *parts* argument +diff --git a/Lib/cgi.py b/Lib/cgi.py +index 5b903e0347..9d0848b6b1 100755 +--- a/Lib/cgi.py ++++ b/Lib/cgi.py +@@ -121,7 +121,8 @@ log = initlog # The current logging function + # 0 ==> unlimited input + maxlen = 0 + +-def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): ++def parse(fp=None, environ=os.environ, keep_blank_values=0, ++ strict_parsing=0, separator='&'): + """Parse a query in the environment or from a file (default stdin) + + Arguments, all optional: +@@ -140,6 +141,9 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): + strict_parsing: flag indicating what to do with parsing errors. + If false (the default), errors are silently ignored. + If true, errors raise a ValueError exception. ++ ++ separator: str. The symbol to use for separating the query arguments. ++ Defaults to &. + """ + if fp is None: + fp = sys.stdin +@@ -171,7 +175,8 @@ def parse(fp=None, environ=os.environ, keep_blank_values=0, strict_parsing=0): + else: + qs = "" + environ['QUERY_STRING'] = qs # XXX Shouldn't, really +- return urlparse.parse_qs(qs, keep_blank_values, strict_parsing) ++ return urlparse.parse_qs(qs, keep_blank_values, strict_parsing, ++ separator=separator) + + + # parse query string function called from urlparse, +@@ -395,7 +400,7 @@ class FieldStorage: + + def __init__(self, fp=None, headers=None, outerboundary="", + environ=os.environ, keep_blank_values=0, strict_parsing=0, +- max_num_fields=None): ++ max_num_fields=None, separator='&'): + """Constructor. Read multipart/* until last part. + + Arguments, all optional: +@@ -430,6 +435,7 @@ class FieldStorage: + self.keep_blank_values = keep_blank_values + self.strict_parsing = strict_parsing + self.max_num_fields = max_num_fields ++ self.separator = separator + if 'REQUEST_METHOD' in environ: + method = environ['REQUEST_METHOD'].upper() + self.qs_on_post = None +@@ -613,7 +619,8 @@ class FieldStorage: + if self.qs_on_post: + qs += '&' + self.qs_on_post + query = urlparse.parse_qsl(qs, self.keep_blank_values, +- self.strict_parsing, self.max_num_fields) ++ self.strict_parsing, self.max_num_fields, ++ separator=self.separator) + self.list = [MiniFieldStorage(key, value) for key, value in query] + self.skip_lines() + +@@ -629,7 +636,8 @@ class FieldStorage: + query = urlparse.parse_qsl(self.qs_on_post, + self.keep_blank_values, + self.strict_parsing, +- self.max_num_fields) ++ self.max_num_fields, ++ separator=self.separator) + self.list.extend(MiniFieldStorage(key, value) + for key, value in query) + FieldStorageClass = None +@@ -649,7 +657,7 @@ class FieldStorage: + headers = rfc822.Message(self.fp) + part = klass(self.fp, headers, ib, + environ, keep_blank_values, strict_parsing, +- max_num_fields) ++ max_num_fields, separator=self.separator) + + if max_num_fields is not None: + max_num_fields -= 1 +diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py +index 743c2afbd4..f414faa23b 100644 +--- a/Lib/test/test_cgi.py ++++ b/Lib/test/test_cgi.py +@@ -61,12 +61,9 @@ parse_strict_test_cases = [ + ("", ValueError("bad query field: ''")), + ("&", ValueError("bad query field: ''")), + ("&&", ValueError("bad query field: ''")), +- (";", ValueError("bad query field: ''")), +- (";&;", ValueError("bad query field: ''")), + # Should the next few really be valid? + ("=", {}), + ("=&=", {}), +- ("=;=", {}), + # This rest seem to make sense + ("=a", {'': ['a']}), + ("&=a", ValueError("bad query field: ''")), +@@ -81,8 +78,6 @@ parse_strict_test_cases = [ + ("a=a+b&b=b+c", {'a': ['a b'], 'b': ['b c']}), + ("a=a+b&a=b+a", {'a': ['a b', 'b a']}), + ("x=1&y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), +- ("x=1;y=2.0&z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), +- ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), + ("Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env", + {'Hbc5161168c542333633315dee1182227:key_store_seqid': ['400006'], + 'cuyer': ['r'], +@@ -188,6 +183,30 @@ class CgiTests(unittest.TestCase): + self.assertEqual(expect[k], v) + self.assertItemsEqual(expect.values(), d.values()) + ++ def test_separator(self): ++ parse_semicolon = [ ++ ("x=1;y=2.0", {'x': ['1'], 'y': ['2.0']}), ++ ("x=1;y=2.0;z=2-3.%2b0", {'x': ['1'], 'y': ['2.0'], 'z': ['2-3.+0']}), ++ (";", ValueError("bad query field: ''")), ++ (";;", ValueError("bad query field: ''")), ++ ("=;a", ValueError("bad query field: 'a'")), ++ (";b=a", ValueError("bad query field: ''")), ++ ("b;=a", ValueError("bad query field: 'b'")), ++ ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}), ++ ("a=a+b;a=b+a", {'a': ['a b', 'b a']}), ++ ] ++ for orig, expect in parse_semicolon: ++ env = {'QUERY_STRING': orig} ++ fs = cgi.FieldStorage(separator=';', environ=env) ++ if isinstance(expect, dict): ++ for key in expect.keys(): ++ expect_val = expect[key] ++ self.assertIn(key, fs) ++ if len(expect_val) > 1: ++ self.assertEqual(fs.getvalue(key), expect_val) ++ else: ++ self.assertEqual(fs.getvalue(key), expect_val[0]) ++ + def test_log(self): + cgi.log("Testing") + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 86c4a0595c..0b2107339a 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -24,16 +24,20 @@ parse_qsl_test_cases = [ + ("&a=b", [('a', 'b')]), + ("a=a+b&b=b+c", [('a', 'a b'), ('b', 'b c')]), + ("a=1&a=2", [('a', '1'), ('a', '2')]), +- (";", []), +- (";;", []), +- (";a=b", [('a', 'b')]), +- ("a=a+b;b=b+c", [('a', 'a b'), ('b', 'b c')]), +- ("a=1;a=2", [('a', '1'), ('a', '2')]), +- (b";", []), +- (b";;", []), +- (b";a=b", [(b'a', b'b')]), +- (b"a=a+b;b=b+c", [(b'a', b'a b'), (b'b', b'b c')]), +- (b"a=1;a=2", [(b'a', b'1'), (b'a', b'2')]), ++ (b"", []), ++ (b"&", []), ++ (b"&&", []), ++ (b"=", [(b'', b'')]), ++ (b"=a", [(b'', b'a')]), ++ (b"a", [(b'a', b'')]), ++ (b"a=", [(b'a', b'')]), ++ (b"&a=b", [(b'a', b'b')]), ++ (b"a=a+b&b=b+c", [(b'a', b'a b'), (b'b', b'b c')]), ++ (b"a=1&a=2", [(b'a', b'1'), (b'a', b'2')]), ++ (";a=b", [(';a', 'b')]), ++ ("a=a+b;b=b+c", [('a', 'a b;b=b c')]), ++ (b";a=b", [(b';a', b'b')]), ++ (b"a=a+b;b=b+c", [(b'a', b'a b;b=b c')]), + ] + + parse_qs_test_cases = [ +@@ -57,16 +61,10 @@ parse_qs_test_cases = [ + (b"&a=b", {b'a': [b'b']}), + (b"a=a+b&b=b+c", {b'a': [b'a b'], b'b': [b'b c']}), + (b"a=1&a=2", {b'a': [b'1', b'2']}), +- (";", {}), +- (";;", {}), +- (";a=b", {'a': ['b']}), +- ("a=a+b;b=b+c", {'a': ['a b'], 'b': ['b c']}), +- ("a=1;a=2", {'a': ['1', '2']}), +- (b";", {}), +- (b";;", {}), +- (b";a=b", {b'a': [b'b']}), +- (b"a=a+b;b=b+c", {b'a': [b'a b'], b'b': [b'b c']}), +- (b"a=1;a=2", {b'a': [b'1', b'2']}), ++ (";a=b", {';a': ['b']}), ++ ("a=a+b;b=b+c", {'a': ['a b;b=b c']}), ++ (b";a=b", {b';a': [b'b']}), ++ (b"a=a+b;b=b+c", {b'a':[ b'a b;b=b c']}), + ] + + class UrlParseTestCase(unittest.TestCase): +diff --git a/Lib/urlparse.py b/Lib/urlparse.py +index 798b467b60..6c32727fce 100644 +--- a/Lib/urlparse.py ++++ b/Lib/urlparse.py +@@ -382,7 +382,8 @@ def unquote(s): + append(item) + return ''.join(res) + +-def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): ++def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, ++ separator='&'): + """Parse a query given as a string argument. + + Arguments: +@@ -402,17 +403,22 @@ def parse_qs(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): + + max_num_fields: int. If set, then throws a ValueError if there + are more than n fields read by parse_qsl(). ++ ++ separator: str. The symbol to use for separating the query arguments. ++ Defaults to &. ++ + """ + dict = {} + for name, value in parse_qsl(qs, keep_blank_values, strict_parsing, +- max_num_fields): ++ max_num_fields, separator=separator): + if name in dict: + dict[name].append(value) + else: + dict[name] = [value] + return dict + +-def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): ++def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, ++ separator='&'): + """Parse a query given as a string argument. + + Arguments: +@@ -432,17 +438,23 @@ def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None): + max_num_fields: int. If set, then throws a ValueError if there + are more than n fields read by parse_qsl(). + ++ separator: str. The symbol to use for separating the query arguments. ++ Defaults to &. ++ + Returns a list, as G-d intended. + """ ++ if not separator or (not isinstance(separator, (str, bytes))): ++ raise ValueError("Separator must be of type string or bytes.") ++ + # If max_num_fields is defined then check that the number of fields + # is less than max_num_fields. This prevents a memory exhaustion DOS + # attack via post bodies with many fields. + if max_num_fields is not None: +- num_fields = 1 + qs.count('&') + qs.count(';') ++ num_fields = 1 + qs.count(separator) + if max_num_fields < num_fields: + raise ValueError('Max number of fields exceeded') + +- pairs = [s2 for s1 in qs.split('&') for s2 in s1.split(';')] ++ pairs = [s1 for s1 in qs.split(separator)] + r = [] + for name_value in pairs: + if not name_value and not strict_parsing: +diff --git a/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst b/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst +new file mode 100644 +index 0000000000..f08489b414 +--- /dev/null ++++ b/Misc/NEWS.d/next/Security/2021-02-14-15-59-16.bpo-42967.YApqDS.rst +@@ -0,0 +1 @@ ++Fix web cache poisoning vulnerability by defaulting the query args separator to ``&``, and allowing the user to choose a custom separator. +-- +2.31.1 + diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index f905612d0229..d6ba795d20ad 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -123,6 +123,8 @@ let ./CVE-2021-3177.patch + ./CVE-2021-23336.patch + # The workaround is for unittests on Win64, which we don't support. # It does break aarch64-darwin, which we do support. See: # * https://bugs.python.org/issue35523 From 6a30a601c7dfed9d2c763b21c3b05ae6fced8a06 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 3 Apr 2021 15:29:55 +0200 Subject: [PATCH 0055/1183] wayland: Add a "bin" and "dev" output Another advantage is that we can now use the wayland-scanner alias for nativeBuildInputs (which is less confusing than adding "wayland" to both nativeBuildInputs and buildInputs). --- pkgs/development/libraries/wayland/default.nix | 2 +- pkgs/development/libraries/wlroots/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 875b6508d6f0..07671ddebddc 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { patchShebangs doc/doxygen/gen-doxygen.py ''; - outputs = [ "out" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; + outputs = [ "out" "bin" "dev" ] ++ lib.optionals withDocumentation [ "doc" "man" ]; separateDebugInfo = true; mesonFlags = [ diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index a21179e20259..50ccd3608d8c 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland -, libGL, wayland-protocols, libinput, libxkbcommon, pixman +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, wayland-scanner +, libGL, wayland, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage, xcbutilerrors, mesa , libpng, ffmpeg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # $out for the library and $examples for the example programs (in examples): outputs = [ "out" "examples" ]; - nativeBuildInputs = [ meson ninja pkg-config wayland ]; + nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; buildInputs = [ libGL wayland wayland-protocols libinput libxkbcommon pixman diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 88965c6c3358..159fef5a6cf3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17687,6 +17687,7 @@ in wavpack = callPackage ../development/libraries/wavpack { }; wayland = callPackage ../development/libraries/wayland { }; + wayland-scanner = wayland.bin; wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; From dc2638276b9b1e70b513b48869086d23d1169152 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 17:45:02 +0200 Subject: [PATCH 0056/1183] Revert "Merge pull request #117886 from risicle/ris-pygments-tests" This is a pattern that should be avoided. So far hypothesis is the only package using it if I am correct, let's not add more. Instead, we should solve the underlying issue. That is, we build, install and test within one derivation. That we should split up. Doing this more will only result in trouble. This reverts commit 49e0bbb333ad0f55a8dd24d61c57e4ebde45db08, reversing changes made to 2f2a55496a21b20ae7ad9b8b193c83b90ff8256a. --- pkgs/development/python-modules/Pygments/2_5.nix | 4 ++-- pkgs/development/python-modules/Pygments/default.nix | 6 ++---- pkgs/top-level/python-packages.nix | 10 ++-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/2_5.nix b/pkgs/development/python-modules/Pygments/2_5.nix index 965e6f0ec343..aa59c370d2e7 100644 --- a/pkgs/development/python-modules/Pygments/2_5.nix +++ b/pkgs/development/python-modules/Pygments/2_5.nix @@ -3,7 +3,6 @@ , fetchPypi , fetchpatch , docutils -, pytestCheckHook }: buildPythonPackage rec { @@ -26,7 +25,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils ]; - checkInputs = [ pytestCheckHook ]; + # Circular dependency with sphinx + doCheck = false; meta = { homepage = "https://pygments.org/"; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index 48d74fddd436..a879aef02266 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -2,8 +2,6 @@ , buildPythonPackage , fetchPypi , docutils -, pytestCheckHook -, doCheck ? true }: buildPythonPackage rec { @@ -17,8 +15,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ docutils ]; - inherit doCheck; - checkInputs = [ pytestCheckHook ]; + # Circular dependency with sphinx + doCheck = false; meta = { homepage = "https://pygments.org/"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 895cddb57331..c4797e299bfd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6429,24 +6429,18 @@ in { pytest_5 = callPackage ../development/python-modules/pytest/5.nix { - # hypothesis & pygments tests require pytest that causes dependency cycle + # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; - pygments = self.pygments.override { - doCheck = false; - }; }; pytest_6 = callPackage ../development/python-modules/pytest { - # hypothesis & pygments tests require pytest that causes dependency cycle + # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; - pygments = self.pygments.override { - doCheck = false; - }; }; pytest_6_1 = self.pytest_6.overridePythonAttrs (oldAttrs: rec { From 5930166b22e160b654908bcb711729fb61604c99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 22 Mar 2021 18:50:31 +0100 Subject: [PATCH 0057/1183] python3Packages.chardet: 3.0.4 -> 4.0.0 --- .../python-modules/chardet/default.nix | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 65381d40268f..7753d6ccfdeb 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -1,29 +1,32 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, pytest, pytestrunner, hypothesis }: +{ lib +, buildPythonPackage +, fetchPypi +, hypothesis +, pythonOlder +, pytestCheckHook +}: buildPythonPackage rec { pname = "chardet"; - version = "3.0.4"; + version = "4.0.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + sha256 = "sha256-DW9ToV20Eg8rCMlPEefZPSyRHuEYtrMKBOw+6DEBefo="; }; - patches = [ - # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 - (fetchpatch { - url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; - sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; - }) + checkInputs = [ + hypothesis + pytestCheckHook ]; - checkInputs = [ pytest pytestrunner hypothesis ]; + pythonImportsCheck = [ "chardet" ]; meta = with lib; { - homepage = "https://github.com/chardet/chardet"; description = "Universal encoding detector"; - license = licenses.lgpl2; + homepage = "https://github.com/chardet/chardet"; + license = licenses.lgpl21Plus; maintainers = with maintainers; [ domenkozar ]; }; } From 58009e852044b1e7e4b5a5ed4466e4d8605f135b Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Thu, 18 Mar 2021 07:43:05 +0100 Subject: [PATCH 0058/1183] python3Packages.pygments: 2.7.4 -> 2.8.1 --- pkgs/development/python-modules/Pygments/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index a879aef02266..1f4795ac382a 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -6,17 +6,18 @@ buildPythonPackage rec { pname = "Pygments"; - version = "2.7.4"; + version = "2.8.1"; src = fetchPypi { inherit pname version; - sha256 = "df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337"; + sha256 = "153zyxigm879sk2n71lfv03y2pgxb7dl0dlsbwkz9aydxnkf2mi6"; }; propagatedBuildInputs = [ docutils ]; # Circular dependency with sphinx doCheck = false; + pythonImportsCheck = [ "pygments" ]; meta = { homepage = "https://pygments.org/"; From e8ac9df63bdb0626b23f4e729f49a93404dde75d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 12 Mar 2021 19:12:22 +0000 Subject: [PATCH 0059/1183] python38Packages.importlib-resources: 3.3.1 -> 5.1.2 --- .../python-modules/importlib-resources/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index ccb2190cf045..7820342084f1 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "importlib_resources"; - version = "3.3.1"; + version = "5.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0ed250dbd291947d1a298e89f39afcc477d5a6624770503034b72588601bcc05"; + sha256 = "642586fc4740bd1cad7690f836b3321309402b20b332529f25617ff18e8e1370"; }; nativeBuildInputs = [ setuptools_scm toml ]; From aa8101350d8bb631a477c0e15f389b48fe097bbb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0060/1183] python3Packages.absl-py: 0.11.0 -> 0.12.0 --- pkgs/development/python-modules/absl-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix index e70d830b7be0..ddb6ae1c2e92 100644 --- a/pkgs/development/python-modules/absl-py/default.nix +++ b/pkgs/development/python-modules/absl-py/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "absl-py"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "673cccb88d810e5627d0c1c818158485d106f65a583880e2f730c997399bcfa7"; + sha256 = "b44f68984a5ceb2607d135a615999b93924c771238a63920d17d3387b0d229d5"; }; propagatedBuildInputs = [ From 9996669ef189852a4a32a7d047f1355d523fd94a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0061/1183] python3Packages.aiobotocore: 1.1.2 -> 1.2.2 --- pkgs/development/python-modules/aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix index 5d9c3fe16695..f75a0d6bb60b 100644 --- a/pkgs/development/python-modules/aiobotocore/default.nix +++ b/pkgs/development/python-modules/aiobotocore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aiobotocore"; - version = "1.1.2"; + version = "1.2.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "1fn9hgcg3qr9f7srjxc21bzkiix4al9308531slwlm99r0x3xcjl"; + sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43"; }; # relax version constraints: aiobotocore works with newer botocore versions From efbded07f2a218b3d1aee4e22cf089a0ec95c33f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0062/1183] python3Packages.alembic: 1.4.3 -> 1.5.8 --- pkgs/development/python-modules/alembic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 5a4ef5e0bc6e..899bea2acb81 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "alembic"; - version = "1.4.3"; + version = "1.5.8"; src = fetchPypi { inherit pname version; - sha256 = "5334f32314fb2a56d86b4c4dd1ae34b08c03cae4cb888bc699942104d66bc245"; + sha256 = "e27fd67732c97a1c370c33169ef4578cf96436fa0e7dcfaeeef4a917d0737d56"; }; buildInputs = [ pytest pytestcov mock coverage ]; From 2d5e00a5f25c4b0843615a66b2c52752cc66616b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0063/1183] python3Packages.aniso8601: 8.1.1 -> 9.0.1 --- pkgs/development/python-modules/aniso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix index 90d34951e441..f28668a8912b 100644 --- a/pkgs/development/python-modules/aniso8601/default.nix +++ b/pkgs/development/python-modules/aniso8601/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "aniso8601"; - version = "8.1.1"; + version = "9.0.1"; meta = with lib; { description = "Parses ISO 8601 strings."; @@ -17,6 +17,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "be08b19c19ca527af722f2d4ba4dc569db292ec96f7de963746df4bb0bff9250"; + sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973"; }; } From 9a412c8c53ae2f8682cd4a5f82eedf85cadc7594 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0064/1183] python3Packages.arabic_reshaper: 2.1.1 -> 2.1.3 --- pkgs/development/python-modules/arabic-reshaper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arabic-reshaper/default.nix b/pkgs/development/python-modules/arabic-reshaper/default.nix index ad5f64146a69..88675337b4cd 100644 --- a/pkgs/development/python-modules/arabic-reshaper/default.nix +++ b/pkgs/development/python-modules/arabic-reshaper/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "arabic_reshaper"; - version = "2.1.1"; + version = "2.1.3"; src = fetchPypi { inherit pname version; - sha256 = "zzGPpdUdLSJPpJv2vbu0aE9r0sBot1z84OYH+JrBmdw="; + sha256 = "a236fc6e9dde2a61cc6a5ca962b522e42694e1bb2a2d86894ed7a4eba4ce1890"; }; propagatedBuildInputs = [ future ] From 66ebf2b76d42885ca0cf57f66319df2948c91b59 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0065/1183] python3Packages.arrow: 0.17.0 -> 1.0.3 --- pkgs/development/python-modules/arrow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index d87f1ede3ccd..93347d7a4b4b 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.17.0"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; + sha256 = "399c9c8ae732270e1aa58ead835a79a40d7be8aa109c579898eb41029b5a231d"; }; propagatedBuildInputs = [ python-dateutil ] From 9c6bb4f4e7589a2c615977f1190d100db72a062b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0066/1183] python3Packages.arviz: 0.10.0 -> 0.11.2 --- pkgs/development/python-modules/arviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix index 4005c8668117..39a0d38a0e94 100644 --- a/pkgs/development/python-modules/arviz/default.nix +++ b/pkgs/development/python-modules/arviz/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "arviz"; - version = "0.10.0"; + version = "0.11.2"; src = fetchFromGitHub { owner = "arviz-devs"; repo = "arviz"; rev = "v${version}"; - sha256 = "1cnj972knkvi084cfcpc12lv0wxm8xm9clfd55r3hvv42g1ms5d9"; + sha256 = "0npwrpy262y6zqd0znz4w7ikfdyz4kc4gikmkpj6h1j6vxggrfaa"; }; propagatedBuildInputs = [ From b72418c4fbf2349a5254fbf5106ed2ad05432be9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:08 +0100 Subject: [PATCH 0067/1183] python3Packages.astroid: 2.5 -> 2.5.1 --- pkgs/development/python-modules/astroid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 468488ec0cad..77ac408076cc 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.5"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "03dzhjrsc5d2whyjngfrwvxn42058k0cjjr85x2wqzai8psr475k"; + sha256 = "cfc35498ee64017be059ceffab0a25bedf7548ab76f2bea691c5565896e7128d"; }; # From astroid/__pkginfo__.py From 7fd29c14bcbbc4db028098cea6dfecb314bf1a40 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0068/1183] python3Packages.astropy-healpix: 0.5 -> 0.6 --- pkgs/development/python-modules/astropy-healpix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 61f49322d3bb..e82faba97583 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "astropy-healpix"; - version = "0.5"; + version = "0.6"; doCheck = false; # tests require pytest-astropy src = fetchPypi { inherit pname version; - sha256 = "1bfdq33mj6mwk5fkc6n23f9bc9z8j7kmvql3zchz4h58jskmvqas"; + sha256 = "409a6621c383641456c074f0f0350a24a4a58e910eaeef14e9bbce3e00ad6690"; }; propagatedBuildInputs = [ numpy astropy astropy-helpers ]; From 82487fdc79909148116fb3020af8d5184d5afe75 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0069/1183] python3Packages.atlassian-python-api: 2.1.2 -> 3.8.0 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index b1f0df0b3bc0..617d5562b43a 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "2.1.2"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f852bfd293fdcb0ab2d7a9ea907f8303cf14fe6f55e90c103d4de00393ea9555"; + sha256 = "7ef384a91a790c807336e2bd6b7554284691aadd6d7413d199baf752dd84c53e"; }; checkInputs = [ pytestrunner pytest ]; From be9c44db79b20e9a4d27754706836afc42dcd8ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0070/1183] python3Packages.autobahn: 20.12.3 -> 21.3.1 --- pkgs/development/python-modules/autobahn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 12aa86774d88..f21a82e7aadc 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "20.12.3"; + version = "21.3.1"; src = fetchPypi { inherit pname version; - sha256 = "15b8zm7jalwisfwc08szxy3bh2bnn0hd41dbsnswi0lqwbh962j1"; + sha256 = "e126c1f583e872fb59e79d36977cfa1f2d0a8a79f90ae31f406faae7664b8e03"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ From 435b5b17e664abab8b3f78b244625e18966a96d0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0071/1183] python3Packages.autopep8: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index fa3482c07951..491663b56cd0 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.5"; + version = "1.5.6"; src = fetchPypi { inherit pname version; - sha256 = "cae4bc0fb616408191af41d062d7ec7ef8679c7f27b068875ca3a9e2878d5443"; + sha256 = "5454e6e9a3d02aae38f866eec0d9a7de4ab9f93c10a273fb0340f3d6d09f7514"; }; propagatedBuildInputs = [ pycodestyle toml ]; From 5bea275fed6b8b0b8e3d170337e93f7b992ed3e2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0072/1183] python3Packages.aws-sam-translator: 1.32.0 -> 1.35.0 --- .../development/python-modules/aws-sam-translator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 1c067bcec282..d996c34b503d 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.32.0"; + version = "1.35.0"; src = fetchPypi { inherit pname version; - sha256 = "jL+sAlKbeXA1QeJVQbAcgIaPEbD/Ko+QMrI1Ew2dVq4="; + sha256 = "5cf7faab3566843f3b44ef1a42a9c106ffb50809da4002faab818076dcc7bff8"; }; # Tests are not included in the PyPI package From a6966791e10530f0ddc25d0bc002b1b93f0374f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0073/1183] python3Packages.azure-mgmt-synapse: 0.7.0 -> 1.0.0 --- .../development/python-modules/azure-mgmt-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index fcde20b9bf79..fe3a99e62dc1 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-mgmt-synapse"; - version = "0.7.0"; + version = "1.0.0"; disabled = pythonOlder "3"; src = fetchPypi { inherit pname version; - sha256 = "3cf37df471f75441b0afe98a0f3a548434e9bc6a6426dca8c089950b5423f63f"; + sha256 = "d5514dfef93294a2d9b8ff6fdb353b3102abd5750f147d904e6012f24113ff9c"; extension = "zip"; }; From 2034a9174e956726f660cfe1cb3bd4860092d936 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0074/1183] python3Packages.b2sdk: 1.2.0 -> 1.4.0 --- pkgs/development/python-modules/b2sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index cd695132d7ae..fcbbddb61445 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "b2sdk"; - version = "1.2.0"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "8e46ff9d47a9b90d8b9beab1969fcf4920300b02e20e6bf0745be04e09e8a6ff"; + sha256 = "fb82cbaef5dd7499b62622010fc8e328944ca8cbdd00b485530ab6600de1129d"; }; pythonImportsCheck = [ "b2sdk" ]; From 0ffb6c20e28af534b91231dbcfc414c6f5b8d080 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0075/1183] python3Packages.backports.functools_lru_cache: 1.6.1 -> 1.6.3 --- .../python-modules/backports_functools_lru_cache/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 79e11ecae4f7..6c0d1df81f39 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "backports.functools_lru_cache"; - version = "1.6.1"; + version = "1.6.3"; src = fetchPypi { inherit pname version; - sha256 = "8fde5f188da2d593bd5bc0be98d9abc46c95bb8a9dde93429570192ee6cc2d4a"; + sha256 = "d84e126e2a29e4fde8931ff8131240bbf30a0e7dbcc3897a8dbd8ea5ac11419c"; }; nativeBuildInputs = [ setuptools_scm ]; From 81d94e591da29bf203f2321f3b4a40d569f1dd79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0076/1183] python3Packages.blessed: 1.17.12 -> 1.18.0 --- pkgs/development/python-modules/blessed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index f0167625cf64..6be290f0f79f 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "blessed"; - version = "1.17.12"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "580429e7e0c6f6a42ea81b0ae5a4993b6205c6ccbb635d034b4277af8175753e"; + sha256 = "1312879f971330a1b7f2c6341f2ae7e2cbac244bfc9d0ecfbbecd4b0293bc755"; }; checkInputs = [ pytest mock glibcLocales ]; From 8830c7f6b7bba414811c68ca257fadc25705de51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:09 +0100 Subject: [PATCH 0077/1183] python3Packages.bpython: 0.20.1 -> 0.21 --- pkgs/development/python-modules/bpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index 8a37ed0bd978..55e66545538f 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.20.1"; + version = "0.21"; src = fetchPypi { inherit pname version; - sha256 = "6e7738806013b469be57b0117082b9c4557ed7c92c70ceb79f96d674d89c7503"; + sha256 = "88aa9b89974f6a7726499a2608fa7ded216d84c69e78114ab2ef996a45709487"; }; patches = [ (substituteAll { From c6fd758bc8a9eae96be572a76083642c205a20aa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0078/1183] python3Packages.chalice: 1.21.9 -> 1.22.3 --- pkgs/development/python-modules/chalice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 9115b1d57c3f..54ca6e35dc03 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.21.9"; + version = "1.22.3"; src = fetchPypi { inherit pname version; - sha256 = "312f88838c8ea4b4ac79dce0e5b4ba3125130ca66ea99a4694f535501dca95e3"; + sha256 = "5a84a73c4a8d8b22bb64e06ff99060d7f222097db4237e58749dcad5165f082d"; }; checkInputs = [ watchdog pytest hypothesis mock ]; From 91167113774de97785904ba95c1b4f1e50c8e2f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0079/1183] python3Packages.Cheetah3: 3.2.6 -> 3.2.6.post1 --- pkgs/development/python-modules/cheetah3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheetah3/default.nix b/pkgs/development/python-modules/cheetah3/default.nix index a705bffa810a..5efb26290848 100644 --- a/pkgs/development/python-modules/cheetah3/default.nix +++ b/pkgs/development/python-modules/cheetah3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Cheetah3"; - version = "3.2.6"; + version = "3.2.6.post1"; src = fetchPypi { inherit pname version; - sha256 = "f1c2b693cdcac2ded2823d363f8459ae785261e61c128d68464c8781dba0466b"; + sha256 = "58b5d84e5fbff6cf8e117414b3ea49ef51654c02ee887d155113c5b91d761967"; }; doCheck = false; # Circular dependency From 0fa82bc03c6daf017df89aa0b1ae2754627fb607 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0080/1183] python3Packages.cheroot: 8.4.8 -> 8.5.2 --- pkgs/development/python-modules/cheroot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 4d6c71a7e2a5..7e79d5c63a3c 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.4.8"; + version = "8.5.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0r98qqdp9ww5r5ma6wf1n66r9813rrmfvc54z7yij39jkj5c528h"; + sha256 = "f137d03fd5155b1364bea557a7c98168665c239f6c8cedd8f80e81cdfac01567"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; From 4190b57d7f72eeeb3e76a4679af2a37fc723b5ad Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0081/1183] python3Packages.configparser: 5.0.1 -> 5.0.2 --- pkgs/development/python-modules/configparser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index e8610f053da6..47fe88d4e61a 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "configparser"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "005c3b102c96f4be9b8f40dafbd4997db003d07d1caa19f37808be8031475f2a"; + sha256 = "85d5de102cfe6d14a5172676f09d19c465ce63d6019cf0a4ef13385fc535e828"; }; # No tests available From 6e1178db235e5ad04903b448e0732f46c48ba451 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0082/1183] python3Packages.coverage: 5.3.1 -> 5.5 --- pkgs/development/python-modules/coverage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index b7bb3c811344..5a7fe9a534e6 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "5.3.1"; + version = "5.5"; src = fetchPypi { inherit pname version; - sha256 = "38f16b1317b8dd82df67ed5daa5f5e7c959e46579840d77a67a4ceb9cef0a50b"; + sha256 = "ebe78fe9a0e874362175b02371bdfbee64d8edc42a044253ddf4ee7d3c15212c"; }; # No tests in archive From 8846ac710c1d0e6ae6157e68feeccf342b60ef9d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0083/1183] python3Packages.coveralls: 2.2.0 -> 3.0.1 --- pkgs/development/python-modules/coveralls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index 55032864c3f5..46002fae4f26 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "2.2.0"; + version = "3.0.1"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"; + sha256 = "cbb942ae5ef3d2b55388cb5b43e93a269544911535f1e750e1c656aef019ce60"; }; checkInputs = [ From 40ff1b25973395a7a1a3db87003830d82047078c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0084/1183] python3Packages.cx_Freeze: 6.4.2 -> 6.5.3 --- pkgs/development/python-modules/cx_freeze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 53f0ef656e20..c3c3618033ed 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.4.2"; + version = "6.5.3"; src = fetchPypi { inherit pname version; - sha256 = "fe0af7c658442402bcd209f993219a6ab98a951459495b4a141eb03b552a1c68"; + sha256 = "e0d03cabcdf9b9c21354807ed9f06fa9481a8fd5a0838968a830f01a70820ff1"; }; disabled = pythonOlder "3.5"; From 826b8db8f8c3267b0473eeb9068ddf55fe64ca4a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0085/1183] python3Packages.dask-image: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/dask-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a68c86538ee1..a38350f0f6ac 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "dask-image"; src = fetchPypi { inherit pname version; - sha256 = "a6873a39af21b856a4eb7efee6838e6897b1399f21ab9e65403e69eb62f96c2d"; + sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; }; nativeBuildInputs = [ pytest-flake8 ]; From a973c018877cb7e3c377fa630812f3611c5160dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:10 +0100 Subject: [PATCH 0086/1183] python3Packages.datadog: 0.39.0 -> 0.40.1 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 4a1bddfe3692..9d81e9f72eae 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.39.0"; + version = "0.40.1"; src = fetchPypi { inherit pname version; - sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5"; + sha256 = "438c1dde5462e68c5c792b7b4a1d87a0ddd970af3db31b3cf15980eed0c44311"; }; postPatch = '' From 2745308f6ddc3c37d8d89489ad81572dc0b81f47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0087/1183] python3Packages.deepdiff: 5.0.2 -> 5.2.3 --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index e8d2731eb559..20aba1b4fa2b 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.0.2"; + version = "5.2.3"; src = fetchPypi { inherit pname version; - sha256 = "e2b74af4da0ef9cd338bb6e8c97242c1ec9d81fcb28298d7bb24acdc19ea79d7"; + sha256 = "ae2cb98353309f93fbfdda4d77adb08fb303314d836bb6eac3d02ed71a10b40e"; }; # # Extra packages (may not be necessary) From 21b6fbf449d68f33cc158ed179da2db6d3b2fedd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0088/1183] python3Packages.defusedxml: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/defusedxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/defusedxml/default.nix b/pkgs/development/python-modules/defusedxml/default.nix index 797fee025be4..c39ca96bfe17 100644 --- a/pkgs/development/python-modules/defusedxml/default.nix +++ b/pkgs/development/python-modules/defusedxml/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "defusedxml"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "183fz8xwclhkirwpvpldyypn47r8lgzfz2mk9jgyg7b37jg5vcc6"; + sha256 = "1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"; }; checkPhase = '' From 9aa05a1117e0e864142f316904125a57ac9fb08f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0089/1183] python3Packages.dependency-injector: 4.10.3 -> 4.31.1 --- .../python-modules/dependency-injector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 5ed5a3eb152c..9c977ecc5f0c 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "4.10.3"; + version = "4.31.1"; src = fetchPypi { inherit pname version; - sha256 = "93db83fac85bcb861469c0db1af11f4bc874aa2f9380151189a05d38c21afd60"; + sha256 = "b6b28b9571f44d575367c6005ba8aaa9fd2b70310e1c15410925d6f1ee2769ad"; }; propagatedBuildInputs = [ six ]; From 4c9be09efee98f1c6deeebb0d048010953ee9c11 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0090/1183] python3Packages.diff_cover: 4.0.1 -> 5.0.1 --- pkgs/development/python-modules/diff_cover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 91832bc88ff3..e9f6184c528d 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "diff_cover"; - version = "4.0.1"; + version = "5.0.1"; preCheck = '' export LC_ALL=en_US.UTF-8; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "61a98ec126552d985c0e3e3c33cc72e79d7577f91f6edba99f635411a173d3b9"; + sha256 = "e80f7a4979b7a9d373903776588279ed2898f17729e608255c4119462c822edb"; }; propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; From 318ca1d70b5bfa6c0d25cbb91eac0bdb3d8b3781 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0091/1183] python3Packages.django-treebeard: 4.4 -> 4.5.1 --- pkgs/development/python-modules/django_treebeard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index 88536b210d2a..be63c1e9e3c9 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-treebeard"; - version = "4.4"; + version = "4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "f50e4eea146f7af6702decf7ef198ac1eee1fb9bb4af2c5dba276c3c48f76623"; + sha256 = "80150017725239702054e5fa64dc66e383dc13ac262c8d47ee5a82cb005969da"; }; buildInputs = [ pytest ]; From 7e80a1eb89f299c00258a14bc6bec6e2e1b78a0e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0092/1183] python3Packages.dnspython: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/dnspython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 1d224af0354d..afb85fb61f57 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "dnspython"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7"; + sha256 = "e4a87f0b573201a0f3727fa18a516b055fd1107e0e5477cded4a2de497df1dd4"; }; # needs networking for some tests From 0ca9c72d312fd5af88b1a90faa5a1f8429e85f66 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0093/1183] python3Packages.dropbox: 10.10.0 -> 11.4.1 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index ca0283b2cbdc..dca83a57a7bc 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.10.0"; + version = "11.4.1"; src = fetchPypi { inherit pname version; - sha256 = "df43e9e0bdcae6d610dd754a5ec72f2f91a311bbc2c8a28d076df69695b18398"; + sha256 = "7ba43384029424779a4b3ec8d5832362c5c0f37cd644be2fb87e2b30a569849e"; }; # Set DROPBOX_TOKEN environment variable to a valid token. From 391ab15a314c2f3fc34d37c12e422f426cb6af58 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0094/1183] python3Packages.elasticsearch: 7.11.0 -> 7.12.0 --- pkgs/development/python-modules/elasticsearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index 465e8f6c772a..8fe4686f7a7e 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.11.0"; + version = "7.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1e24b33a82bf381b42d3b0d390f76fdb9d6a9d47b310dea8eaeb0a5933c394c0"; + sha256 = "9a77172be02bc4855210d83f0f1346a1e7d421e3cb2ca47ba81ac0c5a717b3a0"; }; # Check is disabled because running them destroy the content of the local cluster! From 78e2af941a545abfa1d71295663075b02de1adc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0095/1183] python3Packages.eth-hash: 0.2.0 -> 0.3.1 --- pkgs/development/python-modules/eth-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index ad58ee3ae2fe..26264444eeec 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "eth-hash"; - version = "0.2.0"; + version = "0.3.1"; src = fetchPypi { inherit pname version; - sha256 = "0xpiz0wrxxj11ki9yapvsibl25qnki90bl3d39nqascg14nw17a9"; + sha256 = "aee46d9c43b98ac6d4ddf957cf75d4d0a5174ee814cc6b53dd6134dcedb459bf"; }; checkInputs = [ pytest ]; From 1409636649fcafda7f1cefe661f2491b678b8159 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0096/1183] python3Packages.eventlet: 0.30.1 -> 0.30.2 --- pkgs/development/python-modules/eventlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 9966dd81d2ee..4eaba48922a4 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.30.1"; + version = "0.30.2"; src = fetchPypi { inherit pname version; - sha256 = "d00649a7e17de0bcddff1a96311ed3baf1b295b3223d4b71aceafe7b45e6d6f8"; + sha256 = "1811b122d9a45eb5bafba092d36911bca825f835cb648a862bbf984030acff9d"; }; propagatedBuildInputs = [ dnspython greenlet monotonic six ] From ebeb299e6a72df60ee4efd6628b1c3ad5ae494af Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0097/1183] python3Packages.fabric: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/Fabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 1025ed6a05ee..146c78a5616b 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fabric"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "19nzdibjfndzcwvby20p59igqwyzw7skrb45v2mxqsjma5yjv114"; + sha256 = "47f184b070272796fd2f9f0436799e18f2ccba4ee8ee587796fca192acd46cd2"; }; propagatedBuildInputs = [ invoke paramiko cryptography ]; From 28f59bead534a857d370d68289eaf6a741746e3f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:11 +0100 Subject: [PATCH 0098/1183] python3Packages.Faker: 5.5.1 -> 6.6.2 --- pkgs/development/python-modules/faker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 990908efe034..8175e1ffb837 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Faker"; - version = "5.5.1"; + version = "6.6.2"; src = fetchPypi { inherit pname version; - sha256 = "1bskhmiir1ajipj7j535j2mxgnp6s3mxbvlag4aryj9zbhgg1c19"; + sha256 = "f43ac743c34affb1c7fccca8b06450371cd482b6ddcb4110e420acb24356e70b"; }; propagatedBuildInputs = [ From 5b44346ebfcfa37179796b6331f6f137759cbe45 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0099/1183] python3Packages.fasteners: 0.15 -> 0.16 --- pkgs/development/python-modules/fasteners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 55b9d3b3023f..32dc93773fde 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "fasteners"; - version = "0.15"; + version = "0.16"; src = fetchPypi { inherit pname version; - sha256 = "3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef"; + sha256 = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933"; }; propagatedBuildInputs = [ six monotonic ]; From 2f092be39aa4c475cfa4d10b5593d0709d482d50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0100/1183] python3Packages.fastrlock: 0.5 -> 0.6 --- pkgs/development/python-modules/fastrlock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 0821778d024f..3ad45be5322f 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.5"; + version = "0.6"; src = fetchPypi { inherit pname version; - sha256 = "9ae1a31f6e069b5f0f28ba63c594d0c952065de0a375f7b491d21ebaccc5166f"; + sha256 = "9f5d6ec9fe130b7490bb04572134392420b72bd0842185e02d461a797d6bc749"; }; meta = with lib; { From b95bfad01a74221342d58ccd8537963b4f1a7920 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0101/1183] python3Packages.fido2: 0.8.1 -> 0.9.1 --- pkgs/development/python-modules/fido2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix index ac8e912ba3d4..8689250dc6f9 100644 --- a/pkgs/development/python-modules/fido2/default.nix +++ b/pkgs/development/python-modules/fido2/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "fido2"; - version = "0.8.1"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "1hzprnd407g2xh9kyv8j8pq949hwr1snmg3fp65pqfbghzv6i424"; + sha256 = "8680ee25238e2307596eb3900a0f8c0d9cc91189146ed8039544f1a3a69dfe6e"; }; propagatedBuildInputs = [ six cryptography ]; From 6a910abeed4754fcc27dfed1235a718e1ae916fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0102/1183] python3Packages.flake8: 3.8.4 -> 3.9.0 --- pkgs/development/python-modules/flake8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 6f1d8181a583..cf2ce36028ed 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "flake8"; - version = "3.8.4"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "aadae8761ec651813c24be05c6f7b4680857ef6afaae4651a4eccaef97ce6c3b"; + sha256 = "78873e372b12b093da7b5e5ed302e8ad9e988b38b063b61ad937f26ca58fc5f0"; }; checkInputs = [ pytest mock pytestrunner ]; From fd26d8a4df64182fbc55a063b87080384814a7b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0103/1183] python3Packages.Flask-Caching: 1.9.0 -> 1.10.1 --- pkgs/development/python-modules/flask-caching/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 57c95cf8800a..8182344487e3 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "Flask-Caching"; - version = "1.9.0"; + version = "1.10.1"; disabled = isPy27; # invalid python2 syntax src = fetchPypi { inherit pname version; - sha256 = "a0356ad868b1d8ec2d0e675a6fe891c41303128f8904d5d79e180d8b3f952aff"; + sha256 = "cf19b722fcebc2ba03e4ae7c55b532ed53f0cbf683ce36fafe5e881789a01c00"; }; propagatedBuildInputs = [ flask ]; From c13e0cb62b5f0dd7801690c6a5863631c4f80afb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0104/1183] python3Packages.Flask-JWT-Extended: 3.25.1 -> 4.1.0 --- .../development/python-modules/flask-jwt-extended/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index dd018d84a6d3..a49aefd5ebcd 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "3.25.1"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "bbf4467f41c56cf1fd8a5870d2556f419c572aad2b4085757581c3f9b4d7767a"; + sha256 = "77ca23f23e80480ea42b9c1d9b0fca214e08db7192583e782c2421416b4a4655"; }; propagatedBuildInputs = [ dateutil flask pyjwt werkzeug ]; From c597f45b248f2b4ebfb193d42aa6b343fd1e9367 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0105/1183] python3Packages.Flask-SQLAlchemy: 2.4.4 -> 2.5.1 --- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 1bac82fb44f6..421bc95332b2 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-SQLAlchemy"; - version = "2.4.4"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "1rgsj49gnx361hnb3vn6c1h17497qh22yc3r70l1r6w0mw71bixz"; + sha256 = "2bda44b43e7cacb15d4e05ff3cc1f8bc97936cc464623424102bfc2c35e95912"; }; propagatedBuildInputs = [ flask sqlalchemy ]; From 892e8ff8ddedf73f463036bb421278e88866eefc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0106/1183] python3Packages.gidgethub: 4.2.0 -> 5.0.0 --- pkgs/development/python-modules/gidgethub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index a28bcfb0ec1b..9d9cc2095e62 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "gidgethub"; - version = "4.2.0"; + version = "5.0.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5526cc2a06bfad707d10ec118393e0d33c2aa524605255d96958c22c93e8e7aa"; + sha256 = "a4a8d8b1ab629757b557d3bcb98a5a77790a3d00b320f5f881a1754cf0e21086"; }; nativeBuildInputs = [ setuptools pytestrunner ]; From 6dc39bca35d1a59912ba2dcd3381962087481737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0107/1183] python3Packages.GitPython: 3.1.13 -> 3.1.14 --- pkgs/development/python-modules/GitPython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 0081051628df..547be5dc4dc5 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "GitPython"; - version = "3.1.13"; + version = "3.1.14"; disabled = isPy27; # no longer supported src = fetchPypi { inherit pname version; - sha256 = "sha256-hiGn53fidqXsg4tZKAulJy3RRKGBacNskD2LOLmfdQo="; + sha256 = "be27633e7509e58391f10207cd32b2a6cf5b908f92d9cd30da2e514e1137af61"; }; patches = [ From 63fd741650e6f4e14dad68b9f0c6c01929abed6f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0108/1183] python3Packages.google-api-core: 1.25.1 -> 1.26.2 --- pkgs/development/python-modules/google-api-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix index 5c684ca126e9..294c41e6e7c1 100644 --- a/pkgs/development/python-modules/google-api-core/default.nix +++ b/pkgs/development/python-modules/google-api-core/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.25.1"; + version = "1.26.2"; src = fetchPypi { inherit pname version; - sha256 = "0e152ec37b8481d1be1258d95844a5a7031cd3d83d7c7046d9e9b2d807042440"; + sha256 = "418a131cd349e8bda036741d93e7fb9caefa691daa7296851193edc60b3c946c"; }; propagatedBuildInputs = [ From 8f174752ae2a2551af939527f05dfb9c768e017a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0109/1183] python3Packages.googleapis-common-protos: 1.52.0 -> 1.53.0 --- .../python-modules/googleapis-common-protos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googleapis-common-protos/default.nix b/pkgs/development/python-modules/googleapis-common-protos/default.nix index 267e0e5f08ae..3a7c0510ad01 100644 --- a/pkgs/development/python-modules/googleapis-common-protos/default.nix +++ b/pkgs/development/python-modules/googleapis-common-protos/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "googleapis-common-protos"; - version = "1.52.0"; + version = "1.53.0"; src = fetchPypi { inherit pname version; - sha256 = "0lakcsd35qm5x4visvw6z5f1niasv9a0mjyf2bd98wqi0z41c1sn"; + sha256 = "a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4"; }; propagatedBuildInputs = [ grpc protobuf ]; From 90196b6cb695b7d1550d5b7dd59166afd4aea476 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0110/1183] python3Packages.google-auth: 1.24.0 -> 1.28.0 --- pkgs/development/python-modules/google-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix index cf456317f8cb..458a24cc6488 100644 --- a/pkgs/development/python-modules/google-auth/default.nix +++ b/pkgs/development/python-modules/google-auth/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.24.0"; + version = "1.28.0"; src = fetchPypi { inherit pname version; - sha256 = "0bmdqkyv8k8n6s8dss4zpbcq1cdxwicpb42kwybd02ia85mh43hb"; + sha256 = "9bd436d19ab047001a1340720d2b629eb96dd503258c524921ec2af3ee88a80e"; }; propagatedBuildInputs = [ From dd6a5f9fd490875c243901eb9b57f85f0a77b7f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:12 +0100 Subject: [PATCH 0111/1183] python3Packages.google-auth-httplib2: 0.0.4 -> 0.1.0 --- .../python-modules/google-auth-httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index bb7836ef85d1..ceaec714176f 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-auth-httplib2"; - version = "0.0.4"; + version = "0.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0fdwnx2yd65f5vhnmn39f4xnxac5j6x0pv2p42qifrdi1z32q2cd"; + sha256 = "a07c39fd632becacd3f07718dfd6021bf396978f03ad3ce4321d060015cc30ac"; }; propagatedBuildInputs = [ From d10e9232910885e30438f4de941748161cc4ed50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0112/1183] python3Packages.google-auth-oauthlib: 0.4.2 -> 0.4.3 --- .../python-modules/google-auth-oauthlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index 7fa7200fbbe5..d57de82d4595 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-auth-oauthlib"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "1nai9k86g7g7w1pxk105dllncgax8nc5hpmk758b3jnqkb1mpdk5"; + sha256 = "54431535309cfab50897d9c181e8c2226268825aa6e42e930b05b99c5041a18c"; }; propagatedBuildInputs = [ From 7c654dea2b2a44177fd75f8bf4f9a10381b6376c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0113/1183] python3Packages.google-cloud-bigquery-datatransfer: 3.0.1 -> 3.1.0 --- .../google-cloud-bigquery-datatransfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix index ccc8aa83975f..8aff49154721 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c5669410018eb41cecf6f9c90136d24d0ca9ed141bda8fbb3d52cd3de7162960"; + sha256 = "98065257189388b6cc797478c4b2bdf86e9e8cdcaca5d170ded027646444a586"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus ]; From 6fd7ad311b565c2447e943c660461cdddb8d3379 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0114/1183] python3Packages.google-cloud-core: 1.5.0 -> 1.6.0 --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 44764a4edb1c..3ac6544c1564 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.5.0"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "01liq4nrd2g3ingg8v0ly4c86db8agnr9h1fiz219c7fz0as0xqj"; + sha256 = "c6abb18527545379fc82efc4de75ce9a3772ccad2fc645adace593ba097cbb02"; }; propagatedBuildInputs = [ google-api-core ]; From 75d8038d5bfbb81405720340bc30afcad918b47a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0115/1183] python3Packages.google-cloud-error-reporting: 1.1.0 -> 1.1.1 --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index bbd51326e0f2..b124c62a6e6d 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "2fd6fe25343f7017c22e2733a0358c64b3171edc1669d0c8a1e1f07f86a048c4"; + sha256 = "cba8409f6e2c9822e7034c10fe1b1f7e566e1affa66e8be91badae69962142f9"; }; postPatch = '' From 8e3fb8a353ff2654a2febf6473e3985eb35fa171 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0116/1183] python3Packages.google-cloud-monitoring: 2.0.1 -> 2.1.0 --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 60783d3ded7d..859dbf2a02b6 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "639408cac9660b6c7c2324bf1b2461c9c8e338518b9ebb7ebfac833a61d753eb"; + sha256 = "9c21e1c0976805022f5358debfcf3fca2640050bd8e745d31547ad6e129e5b18"; }; propagatedBuildInputs = [ libcst google-api-core proto-plus ]; From a755300c27e8b205460019d567638bac231a1264 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0117/1183] python3Packages.google-cloud-org-policy: 0.1.2 -> 0.2.0 --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 10ee559b8f0b..a950665b4d15 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "0.1.2"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0ncgcnbvmgqph54yh2pjx2hh82gnkhsrw5yirp4wlf7jclh6j9xh"; + sha256 = "b463704affab327c1d3fa4af280a858635b5f59a88456b2a08db62a336a352aa"; }; propagatedBuildInputs = [ google-api-core ]; From 11b28d7888ffa8b902cc33e8bdc8bd1232601863 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0118/1183] python3Packages.google-cloud-spanner: 3.0.0 -> 3.2.0 --- .../python-modules/google-cloud-spanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix index c4849dd2f559..a330ef65cd68 100644 --- a/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "060c53bc6f541660a2fe868fd83a695207d4e7b050e04fe103d1e77634b813c7"; + sha256 = "41f9cb72d821fae0ccff518f3d5db49de82e0fe138518802c68fbc6a85fcd9b6"; }; propagatedBuildInputs = [ google-cloud-core grpc_google_iam_v1 libcst proto-plus sqlparse ]; From e869fe69dcb7bb535bf3d8b3e2e3ecc01a2b0b79 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0119/1183] python3Packages.google-cloud-storage: 1.35.1 -> 1.36.2 --- .../python-modules/google-cloud-storage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix index 84706a8b5a91..2ad5417165c4 100644 --- a/pkgs/development/python-modules/google-cloud-storage/default.nix +++ b/pkgs/development/python-modules/google-cloud-storage/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.35.1"; + version = "1.36.2"; src = fetchPypi { inherit pname version; - sha256 = "dc076b6af6da991252416639cb93831f8e50c8328d5ac3fb8e03e40cd8de2290"; + sha256 = "89d3a101c8ca3aae7614253a03a2e7fe77c5e799469df2d4ec44044cccac1ad8"; }; propagatedBuildInputs = [ From ea303d429b7b999b0eeaffc7baafbf6a2eae41c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0120/1183] python3Packages.google-cloud-testutils: 0.1.0 -> 0.2.0 --- .../python-modules/google-cloud-testutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-testutils/default.nix b/pkgs/development/python-modules/google-cloud-testutils/default.nix index 2380e9183b73..559a3011b83b 100644 --- a/pkgs/development/python-modules/google-cloud-testutils/default.nix +++ b/pkgs/development/python-modules/google-cloud-testutils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "0.1.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; + sha256 = "a23be7cc23bccb1ae6debb74a47dc5b51858b6322fcf034ca92fe7a4acb896f3"; }; propagatedBuildInputs = [ google-auth six ]; From d97e17c5745f4c55674209caef7c94f22da73d6c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0121/1183] python3Packages.greenlet: 0.4.17 -> 1.0.0 --- pkgs/development/python-modules/greenlet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 9d00e93739c3..58fcad440047 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "greenlet"; - version = "0.4.17"; + version = "1.0.0"; disabled = isPyPy; # builtin for pypy src = fetchPypi { inherit pname version; - sha256 = "0swdhrcq13bdszv3yz5645gi4ijbzmmhxpb6whcfg3d7d5f87n21"; + sha256 = "719e169c79255816cdcf6dccd9ed2d089a72a9f6c42273aae12d55e8d35bdcf8"; }; propagatedBuildInputs = [ six ]; From 86e0519dee203eb37cd0ae29b02c6b9203aa4d72 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:13 +0100 Subject: [PATCH 0122/1183] python3Packages.guessit: 3.1.1 -> 3.3.1 --- pkgs/development/python-modules/guessit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index d0c1e74ee290..0450dfd07e58 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "guessit"; - version = "3.1.1"; + version = "3.3.1"; src = fetchPypi { inherit pname version; - sha256 = "1c530pb0h34z0ziym256qps21b8mh533ia1lcnx9wqwx9rnqriki"; + sha256 = "8305e0086129614a8820a508303f98f56c584811489499bcc54a7ea6f1b0391e"; }; # Tests require more packages. From 046225cdfb4d8d98afca3fe70e669484539d8958 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0123/1183] python3Packages.gym: 0.17.3 -> 0.18.0 --- pkgs/development/python-modules/gym/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix index 263bdfa2f478..126606af73a9 100644 --- a/pkgs/development/python-modules/gym/default.nix +++ b/pkgs/development/python-modules/gym/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "gym"; - version = "0.17.3"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "96a7dd4e9cdb39e30c7a79e5773570fd9408f7fdb58c714c293cfbb314818eb6"; + sha256 = "a0dcd25c1373f3938f4cb4565f74f434fba6faefb73a42d09c9dddd0c08af53e"; }; propagatedBuildInputs = [ From 445f31181f3c2c254a7c16ca754f1c9250db09ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0124/1183] python3Packages.h5py: 3.1.0 -> 3.2.1 --- pkgs/development/python-modules/h5py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index c167e2115c66..7bf1df61c0dc 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -8,13 +8,13 @@ let mpi = hdf5.mpi; mpiSupport = hdf5.mpiSupport; in buildPythonPackage rec { - version = "3.1.0"; + version = "3.2.1"; pname = "h5py"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1e2516f190652beedcb8c7acfa1c6fa92d99b42331cbef5e5c7ec2d65b0fc3c2"; + sha256 = "89474be911bfcdb34cbf0d98b8ec48b578c27a89fdb1ae4ee7513f1ef8d9249e"; }; # avoid strict pinning of numpy From dc983aa331e02d123851dd632d4830b182a1128b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0125/1183] python3Packages.hg-evolve: 10.2.0.post1 -> 10.3.0 --- pkgs/development/python-modules/hg-evolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index 4c74621b483b..b7bd002c3678 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "10.2.0.post1"; + version = "10.3.0"; src = fetchPypi { inherit pname version; - sha256 = "391aa877a61ed04c58b8d82d465b3771f632bb9b19f22cbf18f0e5a1f42f8d4e"; + sha256 = "5d7f73fc1c357134ae9b4a3ed2d844ab8e75a4ca1303679a9e150e87617e7bc7"; }; doCheck = false; From f2a59da54fb7f2837ce2ccbec5817f16e58c5cdb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0126/1183] python3Packages.humanize: 3.2.0 -> 3.3.0 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index ef66870ddfd7..5db7d6d02545 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "3.2.0"; + version = "3.3.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "09ph6fd1362xdn2hgwdgh30z0zqjp3bgvr1akyvm36b8jm400sdb"; + sha256 = "8bf7abd672b867f38b8b04593829b85b9b6199a61ef6586bf3629cc06458ff35"; }; nativeBuildInputs = [ setuptools_scm ]; From 30b49fba9fce43acf17874425ef3e6f326eba0ab Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0127/1183] python3Packages.hyperlink: 20.0.1 -> 21.0.0 --- pkgs/development/python-modules/hyperlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index bab7986eda22..6cb69a14e723 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hyperlink"; - version = "20.0.1"; + version = "21.0.0"; src = fetchPypi { inherit pname version; - sha256 = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af"; + sha256 = "427af957daa58bc909471c6c40f74c5450fa123dd093fc53efd2e91d2705a56b"; }; propagatedBuildInputs = [ idna ] From 860ff76d5d8fbb9793ecb78c75cc3a305f3841df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0128/1183] python3Packages.idna: 2.10 -> 3.1 --- pkgs/development/python-modules/idna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 613fde773a71..14b366b8eb5a 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.10"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; + sha256 = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"; }; meta = { From fa6b002301a84a71120b9773cd1c08e7cbd4ba5a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0129/1183] python3Packages.incremental: 17.5.0 -> 21.3.0 --- pkgs/development/python-modules/incremental/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index 6241bc869c1c..6cbed7221a8f 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "incremental"; - version = "17.5.0"; + version = "21.3.0"; src = fetchPypi { inherit pname version; - sha256 = "7b751696aaf36eebfab537e458929e194460051ccad279c72b755a167eebd4b3"; + sha256 = "02f5de5aff48f6b9f665d99d48bfc7ec03b6e3943210de7cfc88856d755d6f57"; }; meta = with lib; { From 27da5b4b9cd36f0f63e6ec5894ff45da740c1bc1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0130/1183] python3Packages.intake: 0.6.1 -> 0.6.2 --- pkgs/development/python-modules/intake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 49cf660bf568..41207295a2c9 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "intake"; - version = "0.6.1"; + version = "0.6.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f09800203fcaf1512f9234e54dbd07ec2b5217aafd21716385725ec052f5a52e"; + sha256 = "b0cab1d185a703acb38eecb9cff3edd5cc7004fe18a36d5e42a8f7fffc9cca1c"; }; propagatedBuildInputs = [ From 35134e907169004113c1f02442bde91cebecdd3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0131/1183] python3Packages.invoke: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/invoke/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/invoke/default.nix b/pkgs/development/python-modules/invoke/default.nix index 45f3ee7a04db..08d72cec4961 100644 --- a/pkgs/development/python-modules/invoke/default.nix +++ b/pkgs/development/python-modules/invoke/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "invoke"; - version = "1.4.1"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "de3f23bfe669e3db1085789fd859eb8ca8e0c5d9c20811e2407fa042e8a5e15d"; + sha256 = "f0c560075b5fb29ba14dad44a7185514e94970d1b9d57dcd3723bec5fed92650"; }; patchPhase = '' From b4bc009eec2bede12211fb34f041ed6ec0e99a9e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0132/1183] python3Packages.ipdb: 0.13.4 -> 0.13.7 --- pkgs/development/python-modules/ipdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 7b8c877371cd..fbdfd5b7900a 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.4"; + version = "0.13.7"; disabled = isPyPy || isPy27; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "c85398b5fb82f82399fc38c44fe3532c0dde1754abee727d8f5cfcc74547b334"; + sha256 = "178c367a61c1039e44e17c56fcc4a6e7dc11b33561261382d419b6ddb4401810"; }; propagatedBuildInputs = [ ipython ]; From 2ec4de9b5b434b8c35041e5f7de57f2d0db6746c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0133/1183] python3Packages.ipydatawidgets: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/ipydatawidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index e6e1e605cca5..a0efa9b575db 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "ipydatawidgets"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "d9f94828c11e3b40350fb14a02e027f42670a7c372bcb30db18d552dcfab7c01"; + sha256 = "d0e4b58b59b508165e8562b8f5d1dbfcd739855847ec0477bd9185a5e9b7c5bc"; }; propagatedBuildInputs = [ From 573e2b410ef08bcfe917c2f3fa65d5314ff47fea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0134/1183] python3Packages.ipympl: 0.5.8 -> 0.7.0 --- pkgs/development/python-modules/ipympl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index 4efe8b176c52..44c8c7bfd061 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.5.8"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "0e2f2e540a2dfea61524b7993fc8552c9236b1aaa3826e1f382c75cb2fa5c382"; + sha256 = "f0f1f356d8cb9d4fb51bb86dbbf837c190145316cb72f66081872ebc4d6db0a1"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; From cb065413bd5303bca92246504fa38665b298a702 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:14 +0100 Subject: [PATCH 0135/1183] python3Packages.ipyvuetify: 1.5.1 -> 1.6.2 --- pkgs/development/python-modules/ipyvuetify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index c63cee791232..b581c49d43f4 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.5.1"; + version = "1.6.2"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "593f5d6761e304cbb78bca967030485d8835e8d310ef7d83ac1b0e6a13e4911c"; + sha256 = "056776d359b55343442f707cb4ccd5607800599a36bee06e1f01ef0277f03ddc"; }; propagatedBuildInputs = [ ipyvue ]; From 5ca1739592f663fc4724568866f2b8242a404d88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0136/1183] python3Packages.ipywidgets: 7.5.1 -> 7.6.3 --- pkgs/development/python-modules/ipywidgets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 5f2b3299a024..eb6bf597d40b 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "ipywidgets"; - version = "7.5.1"; + version = "7.6.3"; src = fetchPypi { inherit pname version; - sha256 = "e945f6e02854a74994c596d9db83444a1850c01648f1574adf144fbbabe05c97"; + sha256 = "9f1a43e620530f9e570e4a493677d25f08310118d315b00e25a18f12913c41f0"; }; # Tests are not distributed From 1519095c39505b15af3018a6c0767a0fb68a97b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0137/1183] python3Packages.iterm2: 1.18 -> 1.19 --- pkgs/development/python-modules/iterm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index a62d5068f776..da44563208eb 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.18"; + version = "1.19"; src = fetchPypi { inherit pname version; - sha256 = "88ca7dd76242205dc82761bf98932a42e6c1ba338cb065f1cc775413ef4e0dc2"; + sha256 = "04fad95b2258135814677317529654ab0de92b0a4576e4410689181a6a535805"; }; propagatedBuildInputs = [ protobuf websockets ]; From 7cc21baf885b9a9114a7b917492509b9ff8b76f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0138/1183] python3Packages.jaraco.collections: 3.0.0 -> 3.2.0 --- .../development/python-modules/jaraco_collections/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_collections/default.nix b/pkgs/development/python-modules/jaraco_collections/default.nix index 3c37755366d0..eac4e2ca328a 100644 --- a/pkgs/development/python-modules/jaraco_collections/default.nix +++ b/pkgs/development/python-modules/jaraco_collections/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "jaraco.collections"; - version = "3.0.0"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "be570ef4f2e7290b757449395238fa63d70a9255574624e73c5ff9f1ee554721"; + sha256 = "6d179770493c4f5802395ae5a29e07c66d826dc3cd680ad0b0f0fb9fd6cdf533"; }; pythonNamespaces = [ "jaraco" ]; From 1f82b0f27c230658afce32ff32af72dba6051fc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0139/1183] python3Packages.jaraco.functools: 3.0.1 -> 3.2.1 --- pkgs/development/python-modules/jaraco_functools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index eb176d0d8575..3fa4de9f3d95 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.functools"; - version = "3.0.1"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "9fedc4be3117512ca3e03e1b2ffa7a6a6ffa589bfb7d02bfb324e55d493b94f4"; + sha256 = "97cf88b46ab544c266e2d81fa17bb183622268722a7dd1a3711ea426e9c26f94"; }; nativeBuildInputs = [ setuptools_scm toml ]; From 1d129c31846d37ce09e230ef0a6f89df2b140bb3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0140/1183] python3Packages.jaraco.itertools: 5.0.0 -> 6.0.1 --- pkgs/development/python-modules/jaraco_itertools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index f5d0b0538b66..0ece2527a875 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.itertools"; - version = "5.0.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "6447d567f57efe5efea386265c7864652e9530830a1b80f43e60b4f222b9ab84"; + sha256 = "6939e47806a39330a9f9772bf9ea910da39abc159ff2579d454a763358553439"; }; pythonNamespaces = [ "jaraco" ]; From f4eaaac53953658a4403eed7a320b40ec0ae30a9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0141/1183] python3Packages.jaraco.logging: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/jaraco_logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index 4a6391fbc489..e378240e6ccc 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "jaraco.logging"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "31716fe84d3d5df39d95572942513bd4bf8ae0a478f64031eff4c2ea9e83434e"; + sha256 = "150dc8701207b28bc65a16f0e91c07250a8d1b9da324ce674c0e375774944f13"; }; pythonNamespaces = [ "jaraco" ]; From 9c82faf6bda2577dc0a09f6062e8d0e95d0e29f6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0142/1183] python3Packages.jaraco.stream: 3.0.0 -> 3.0.2 --- pkgs/development/python-modules/jaraco_stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_stream/default.nix b/pkgs/development/python-modules/jaraco_stream/default.nix index 9a4f6d972450..f62cb1db8ba8 100644 --- a/pkgs/development/python-modules/jaraco_stream/default.nix +++ b/pkgs/development/python-modules/jaraco_stream/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jaraco.stream"; - version = "3.0.0"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "287e1cba9f278e0146fdded6bc40518930813a5584579769aeaa1d0bfd178a73"; + sha256 = "86c57fedffd4d5a4b18817f99ddf62ac8ed0a1bc31a1c41b9a88df9c6bb56e0b"; }; pythonNamespaces = [ "jaraco" ]; From 3665a6b41c123692bb37ce2bd833e25fbb6f288d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0143/1183] python3Packages.jaraco.text: 3.2.0 -> 3.5.0 --- pkgs/development/python-modules/jaraco_text/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jaraco_text/default.nix b/pkgs/development/python-modules/jaraco_text/default.nix index c61c8f689ddc..fb945d5b3f6f 100644 --- a/pkgs/development/python-modules/jaraco_text/default.nix +++ b/pkgs/development/python-modules/jaraco_text/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jaraco.text"; - version = "3.2.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1v0hz3h74m31jlbc5bxwkvrx1h2n7887bajrg1n1c3yc4q8qn1z5"; + sha256 = "f07f1076814a17a98eb915948b9a0dc71b1891c833588066ec1feb04ea4389b1"; }; pythonNamespaces = [ "jaraco" ]; From b26fbe7af375bd1334615ae92b7f78f48c0b15a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0144/1183] python3Packages.joblib: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/joblib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index 9c54418bafef..e8d2ced7602b 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "joblib"; - version = "1.0.0"; + version = "1.0.1"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "092bnvr724cfvka8267z687bf086fvm7i1hwslkyrzf1g836dn3s"; + sha256 = "9c17567692206d2f3fb9ecf5e991084254fe631665c450b443761c4186a613f7"; }; checkInputs = [ sphinx numpydoc pytestCheckHook ]; From 916ba213f70e261979e7e01b32c97dd081dee377 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0145/1183] python3Packages.josepy: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/josepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 3f30da8da9b4..4bab64bf7f7e 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "josepy"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "d265414fa16d7a8b7a1d1833b4ebb19a22bd0deae5d44413cf9040fd8491d85a"; + sha256 = "a5a182eb499665d99e7ec54bb3fe389f9cbc483d429c9651f20384ba29564269"; }; postPatch = '' From 460cd9449aa0496bccb7d559751ad958a45b3040 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0146/1183] python3Packages.jsonpatch: 1.27 -> 1.32 --- pkgs/development/python-modules/jsonpatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 8971bac4b497..f77412e4cc14 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.27"; + version = "1.32"; src = fetchPypi { inherit pname version; - sha256 = "4d08af10d71723b5b2924da6ba90f273a4d1a5c6accfb605eb970cb2f9b29cf9"; + sha256 = "b6ddfe6c3db30d81a96aaeceb6baf916094ffa23d7dd5fa2c13e13f8b6e600c2"; }; # test files are missing From 9d518ae5427515eb581ded495535f39062e68679 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0147/1183] python3Packages.jsonpickle: 1.4.2 -> 2.0.0 --- pkgs/development/python-modules/jsonpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index abf3c27e98ff..78d2a5f6c8ce 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "jsonpickle"; - version = "1.4.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c9b99b28a9e6a3043ec993552db79f4389da11afcb1d0246d93c79f4b5e64062"; + sha256 = "0be49cba80ea6f87a168aa8168d717d00c6ca07ba83df3cec32d3b30bfe6fb9a"; }; checkInputs = [ pytest ]; From 622204bb8ac1c5d958330d41e522e741b69580a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0148/1183] python3Packages.jsonpointer: 2.0 -> 2.1 --- pkgs/development/python-modules/jsonpointer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonpointer/default.nix b/pkgs/development/python-modules/jsonpointer/default.nix index e1eaaed6c178..39249c648f56 100644 --- a/pkgs/development/python-modules/jsonpointer/default.nix +++ b/pkgs/development/python-modules/jsonpointer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "jsonpointer"; - version = "2.0"; + version = "2.1"; src = fetchPypi { inherit pname version; - sha256 = "0qjkjy1qlyc1nl3k95wd03ssxac0a717x8889ypgs1cfcj3bm4n1"; + sha256 = "5a34b698db1eb79ceac454159d3f7c12a451a91f6334a4f638454327b7a89962"; }; meta = with lib; { From 9a9ad7512cca3e81f45e43e12df665fbd0e08aea Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:15 +0100 Subject: [PATCH 0149/1183] python3Packages.jsonrpc-async: 1.1.1 -> 2.0.0 --- pkgs/development/python-modules/jsonrpc-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index 00f0d748bbb0..5576196811ab 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-async"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "383f331e28cd8f6e3fa86f3e7052efa541b7ae8bf328a4e692aa045cfc0ecf25"; + sha256 = "52b1cfe584df8bc2d19930fc18c5e982378690c825ba6916103724195ba52099"; }; propagatedBuildInputs = [ aiohttp jsonrpc-base ]; From 2794e7847676fb8a70bf6f7775b5f834bf0944f3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0150/1183] python3Packages.jsonrpc-base: 1.1.0 -> 2.0.0 --- pkgs/development/python-modules/jsonrpc-base/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index db47a2240fb6..bb9dc6bd33e8 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jsonrpc-base"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "7f374c57bfa1cb16d1f340d270bc0d9f1f5608fb1ac6c9ea15768c0e6ece48b7"; + sha256 = "a583a6646cf3860a427d56ea6732e04618a919c5ea4a78d3dcb44d866c11a8e5"; }; propagatedBuildInputs = [ ]; From 7d0091e3890fe7058d08b14fb8d207391df4b39d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0151/1183] python3Packages.jsonrpc-websocket: 1.2.1 -> 3.0.0 --- pkgs/development/python-modules/jsonrpc-websocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index bf8960ad27d9..44e3b1a68e5a 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.2.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "c343d057b572791ed3107b771c17358bc710772a9a6156047a3cfafb409ed895"; + sha256 = "10a5490479970b5b7093b4345528c538a1e1a51d9c58ae09ca2742fa6547bc3a"; }; nativeBuildInputs = [ pep8 ]; From e3c822f204aaef8b450a80feecfa82fbb8faccc4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0152/1183] python3Packages.Jug: 2.0.3 -> 2.1.1 --- pkgs/development/python-modules/jug/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jug/default.nix b/pkgs/development/python-modules/jug/default.nix index 7646c007818c..0750744885d3 100644 --- a/pkgs/development/python-modules/jug/default.nix +++ b/pkgs/development/python-modules/jug/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { pname = "Jug"; - version = "2.0.3"; + version = "2.1.1"; buildInputs = [ nose numpy ]; propagatedBuildInputs = [ bottle @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "3656355c1f9cd1731065c9d589f66d33653cbe5e0879cbe5d8447b51e4ddb4ec"; + sha256 = "8ae7bb45d4495cf3d0dc5dd9df104a35bba2ca83eb4576732cadf8469e7cf1a1"; }; checkInputs = [ pytestCheckHook ]; From f52886cef05b2b5f26c36efccaff246a05191850 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0153/1183] python3Packages.jupyter_client: 6.1.11 -> 6.1.12 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 456e82e75f18..5f534557a9ad 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.11"; + version = "6.1.12"; src = fetchPypi { inherit pname version; - sha256 = "649ca3aca1e28f27d73ef15868a7c7f10d6e70f761514582accec3ca6bb13085"; + sha256 = "c4bca1d0846186ca8be97f4d2fa6d2bae889cce4892a167ffa1ba6bd1f73e782"; }; propagatedBuildInputs = [ From 4527b60b1489076e0f6506dda52481ee17958fa4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0154/1183] python3Packages.jupyter_console: 6.3.0 -> 6.4.0 --- pkgs/development/python-modules/jupyter_console/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_console/default.nix b/pkgs/development/python-modules/jupyter_console/default.nix index 712117d50113..22e057a5654e 100644 --- a/pkgs/development/python-modules/jupyter_console/default.nix +++ b/pkgs/development/python-modules/jupyter_console/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "jupyter_console"; - version = "6.3.0"; + version = "6.4.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "947f66bbdeee2221b4fb3a6b78225d337b8f10832f14cecf7932183635abe1d9"; + sha256 = "242248e1685039cd8bff2c2ecb7ce6c1546eb50ee3b08519729e6e881aec19c7"; }; propagatedBuildInputs = [ From 4d716f12bf9655fa37c70de6e3cef2c48eb7b56b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0155/1183] python3Packages.jupyter-packaging: 0.7.12 -> 0.8.0 --- pkgs/development/python-modules/jupyter-packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index fdc28f08ef4b..3a65fb7620b1 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.7.12"; + version = "0.8.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sUAyV3GIGn33t/LRSZe2GQY/51rnVrkCWFLkNGAAu7g="; + sha256 = "276c9f884286695f6ab57a017f4bb9dd4df4f5e232b783050d2aa55b6b9ed650"; }; propagatedBuildInputs = [ packaging ]; From bace772f44b9ff7d1042787b36d486c667c5f8b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0156/1183] python3Packages.jupyter-repo2docker: 2021.1.0 -> 2021.3.0 --- .../python-modules/jupyter-repo2docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 027ae2e40c8d..7597df0d76aa 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -12,13 +12,13 @@ }: buildPythonPackage rec { - version = "2021.1.0"; + version = "2021.3.0"; pname = "jupyter-repo2docker"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "3e3e671407ef2a7f7695338dc6ce2ca9cc75683ffc7a543829cf119564aca802"; + sha256 = "42e0cf67181bdd03b54dabde695befec0586ed68a4ec1240104e209997d776c4"; }; propagatedBuildInputs = [ From d1ac5e9ab4bf77b28790103105cb3df12795e696 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0157/1183] python3Packages.jupyter_server: 1.4.1 -> 1.5.0 --- pkgs/development/python-modules/jupyter_server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index a9f98781b4fb..1af7d693588b 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "jupyter_server"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sBJvI39nlTPuxGJEz8ZtYeOh+OwPrS1HNS+hnT51Tkc="; + sha256 = "ff127713a57ab7aa7b23f7df9b082951cc4b05d8d64cc0949d01ea02ac24c70c"; }; postPatch = '' From 70ab093ac4e52a0503d717da00c9e41bbc29a38b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0158/1183] python3Packages.jupytext: 1.7.1 -> 1.11.0 --- pkgs/development/python-modules/jupytext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index ba627449c123..eedfcfbcb6e9 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.7.1"; + version = "1.11.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "23123b90c267c67716fe6a022dfae49b84fd3809370d83211f2920eb3106bf40"; + sha256 = "9062d001baaa32430fbb94a2c9394ac906db0a58da94e7aa4e414b73fd7d51bc"; }; propagatedBuildInputs = [ From 296f7272060bfde03439b14603cde7143af05ecc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0159/1183] python3Packages.keyring: 21.5.0 -> 23.0.0 --- pkgs/development/python-modules/keyring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 3e26079f1235..df538a40c958 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "21.5.0"; + version = "23.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "207bd66f2a9881c835dad653da04e196c678bf104f8252141d2d3c4f31051579"; + sha256 = "237ff44888ba9b3918a7dcb55c8f1db909c95b6f071bfb46c6918f33f453a68a"; }; nativeBuildInputs = [ From fef55f8da5a6db31277ae6613cf6db95eaa3bd43 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0160/1183] python3Packages.kmapper: 1.4.1 -> 2.0.0 --- pkgs/development/python-modules/kmapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 548896b47286..6c173661084c 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "kmapper"; - version = "1.4.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3bb09d016ae0dc3308c2901f0775139a26e7f689afacea564a74e5627de35cd7"; + sha256 = "3708d889f96f6bbe89c52000dd9378ca4c35638180ff894b64ebbdfcfe62aab2"; }; propagatedBuildInputs = [ From f47c7f2daeecb8c2137dcd08285ea5245f1c4dae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0161/1183] python3Packages.labelbox: 2.4.11 -> 2.5.1 --- pkgs/development/python-modules/labelbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index 1c29d7473681..ce7cff4d79b8 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.11"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "e5a631a94ac2059648a884bebf39f7ca1e689baef4a2497f9aa5ec598e24deb7"; + sha256 = "7f2cbc5d4869d8acde865ad519fc1cc85338247cd7cf534334f988a040679219"; }; propagatedBuildInputs = [ From 3a4248c7fafacb20ba5209db2657c6bde21562e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:16 +0100 Subject: [PATCH 0162/1183] python3Packages.langcodes: 2.1.0 -> 3.1.0 --- pkgs/development/python-modules/langcodes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index f9d90e42686b..485bc44ff6e2 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "langcodes"; - version = "2.1.0"; + version = "3.1.0"; disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "75bcaca8825e1a321965b136815dee53083c63314975e024ad0ccff8545e681f"; + sha256 = "1ccd37e3a68760d29ec3b17f5962cd1d8f242f4d9705ad1601c5cb7fab48199c"; }; propagatedBuildInputs = [ marisa-trie ]; From ef94d1152366c52a7e6191cf3c3fafc935e98df9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0163/1183] python3Packages.lazy-object-proxy: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/lazy-object-proxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index 82a784cfe3c6..c6e479a21b9e 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lazy-object-proxy"; - version = "1.5.2"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "5944a9b95e97de1980c65f03b79b356f30a43de48682b8bdd90aa5089f0ec1f4"; + sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; }; nativeBuildInputs = [ setuptools_scm ]; From d7e2c29fcc73b80d6972f8d97e54f8268b4cc687 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0164/1183] python3Packages.ldap3: 2.8.1 -> 2.9 --- pkgs/development/python-modules/ldap3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 71af0d294a2d..3c613d74e272 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.8.1"; + version = "2.9"; src = fetchPypi { inherit pname version; - sha256 = "37d633e20fa360c302b1263c96fe932d40622d0119f1bddcb829b03462eeeeb7"; + sha256 = "18c3ee656a6775b9b0d60f7c6c5b094d878d1d90fc03d56731039f0a4b546a91"; }; propagatedBuildInputs = [ pyasn1 ]; From 14fab2a1e5807c1b9469b7295b3f45b21fd0c85d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0165/1183] python3Packages.libversion: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/libversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 4bc2dfa2ffda..fb77eeed4c2c 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libversion"; - version = "1.2.2"; + version = "1.2.3"; src = fetchPypi { inherit pname version; - sha256 = "cf9ef702d0bc750f0ad44a2cffe8ebd83cd356b92cc25f767846509f84ea7e73"; + sha256 = "e6e903cc6307c3eda90401373eb81bfd0dd2dc93772ddab3d23705bed0c6f6e9"; }; nativeBuildInputs = [ pkg-config ]; From 5199827869852c6cf4b2a77cc53fbf88bc3363e4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0166/1183] python3Packages.llvmlite: 0.35.0 -> 0.36.0 --- pkgs/development/python-modules/llvmlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 609dcb82237d..b5e6847a9f0c 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.35.0"; + version = "0.36.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "80e51d5aa02ad72da9870e89d21f9b152b0220ca551b4596a6c0614bcde336fc"; + sha256 = "765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"; }; nativeBuildInputs = [ llvm ]; From 29a48e4334b4ef65952d5ce58820d73028f5130d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0167/1183] python3Packages.lmdb: 1.0.0 -> 1.1.1 --- pkgs/development/python-modules/lmdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index f3e7a86a2aae..fc7748765f31 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "1.0.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "4136ffdf0aad61da86d1402808029d002a771b2a9ccc9b39c6bcafa7847c21b6"; + sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac"; }; buildInputs = [ lmdb ]; From 3cae08d78a546c93859da06a8a45f1898f834cc3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0168/1183] python3Packages.logzero: 1.6.3 -> 1.7.0 --- pkgs/development/python-modules/logzero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 015d387f27d8..4e3ffd255e07 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "logzero"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1435284574e409b8ec8b680f276bca04cab41f93d6eff4dc8348b7630cddf560"; + sha256 = "7f73ddd3ae393457236f081ffebd044a3aa2e423a47ae6ddb5179ab90d0ad082"; }; checkInputs = [ pytest ]; From 656442bd287cfe87c8978e33b04c3a9c840d0ee5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0169/1183] python3Packages.manhole: 1.6.0 -> 1.7.0 --- pkgs/development/python-modules/manhole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index b9d57a7c0899..2019d7e31805 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "manhole"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d4ab98198481ed54a5b95c0439f41131f56d7d3755eedaedce5a45ca7ff4aa42"; + sha256 = "224985bf1dd032f2dc0ca4107f727835b6f50e1df6d78781d6c9f4cae8b585e2"; }; # test_help expects architecture-dependent Linux signal numbers. From d78ba1f60f30177e3d4db06d390631fc27433884 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0170/1183] python3Packages.Markdown: 3.3.3 -> 3.3.4 --- pkgs/development/python-modules/markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index 22b0d5c27f89..c0175a2e888b 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "Markdown"; - version = "3.3.3"; + version = "3.3.4"; src = fetchPypi { inherit pname version; - sha256 = "5d9f2b5ca24bc4c7a390d22323ca4bad200368612b5aaa7796babf971d2b2f18"; + sha256 = "31b5b491868dcc87d6c24b7e3d19a0d730d59d3e46f4eea6430a321bed387a49"; }; propagatedBuildInputs = [ From 53045ae6c2c7c1f6ec8e3cc2186c749ee7e92f83 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0171/1183] python3Packages.Markups: 3.0.0 -> 3.1.1 --- pkgs/development/python-modules/Markups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index eb802989a5c2..012f31c266b2 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "Markups"; - version = "3.0.0"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "1ea19458dfca6a4562044e701aa8698089a0c659fc535689ed260f89a04f8d39"; + sha256 = "e309d79dde0935576ce1def6752f2127a12e2c2ea2ae8b0c69f99ff8bc12181d"; }; checkInputs = [ markdown docutils pygments ]; From f770e1e9d1ac39124eb58326e02ea0b518f4c072 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:17 +0100 Subject: [PATCH 0172/1183] python3Packages.marshmallow: 3.9.1 -> 3.10.0 --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index afc378d4aaa8..a7ca14beb942 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.9.1"; + version = "3.10.0"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "73facc37462dfc0b27f571bdaffbef7709e19f7a616beb3802ea425b07843f4e"; + sha256 = "4ab2fdb7f36eb61c3665da67a7ce281c8900db08d72ba6bf0e695828253581f7"; }; propagatedBuildInputs = [ dateutil simplejson ]; From b43c9f08d24d05fad700dfb750d5affeebc9df26 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0173/1183] python3Packages.minio: 6.0.2 -> 7.0.2 --- pkgs/development/python-modules/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 00ea5b06c646..df0f421c17aa 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "minio"; - version = "6.0.2"; + version = "7.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "acae9bfae0aec1b92025bd63e18135ebb4994c84600716c5323e14cb0c9a0b03"; + sha256 = "f2f6022cfe4694d946972efef2a752f87d08cc030940faa50a640088772953c8"; }; propagatedBuildInputs = [ From 84588defdc652492e1a7d23067bde66c48fd59db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0174/1183] python3Packages.mlflow: 1.12.1 -> 1.14.1 --- pkgs/development/python-modules/mlflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 5ffde397337c..13cfc0b63df2 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.12.1"; + version = "1.14.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9b8af18d6e779fbbb094edfeb963691e485bba62eeec39fd62dfbe34bc12afeb"; + sha256 = "e3abff0831564d9a4b5d5a15e5ee76b0f5b4580b362c24a58ee821634c8fb1a3"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config From 555e2d07df97796df37319a5c8fc8a50a589fbe7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0175/1183] python3Packages.moderngl: 5.5.4 -> 5.6.4 --- pkgs/development/python-modules/moderngl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 48abc30c9f7d..f32f541573eb 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.5.4"; + version = "5.6.4"; src = fetchPypi { inherit pname version; - sha256 = "08badabb6a1bbc9aa9e65fae8ecd3275d8342cb45d9c457b19e32b3312a8b663"; + sha256 = "8c6d04559f5e3bf75a18525cd46d213c0f3a8409363718978e6de691bdb551fb"; }; disabled = !isPy3k; From 759349e1117088080019ddc27786107dde6048b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0176/1183] python3Packages.mpmath: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/mpmath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index 42de3d2da9a8..b7d3c2f7ff62 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "mpmath"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "fc17abe05fbab3382b61a123c398508183406fa132e0223874578e20946499f6"; + sha256 = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a"; }; # error: invalid command 'test' From 2728cb0470ce4838770de50654ca99ba80c59279 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0177/1183] python3Packages.mypy-protobuf: 1.23 -> 2.4 --- pkgs/development/python-modules/mypy-protobuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 69178edb6919..52dd37c1533b 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.23"; + version = "2.4"; src = fetchPypi { inherit pname version; - sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; + sha256 = "77e10c476cdd3ee14535c2357e64deac6b1a69f33eb500d795b064acda48c66f"; }; propagatedBuildInputs = [ protobuf ]; From 32a2a5e0a4f9cee5c63dafbcd92e548614d71d71 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0178/1183] python3Packages.nbsphinx: 0.8.1 -> 0.8.2 --- pkgs/development/python-modules/nbsphinx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 2622b815f1ee..c02baa571ed2 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.1"; + version = "0.8.2"; src = fetchPypi { inherit pname version; - sha256 = "19lf036h0d9ryqasrh91myhn3dq5zcw4rik9jy6sayq7l6irmm94"; + sha256 = "53352237e2363079f6e38637a8ce90b47e720c8e2eb133a6a6f66fc13ff494cb"; }; propagatedBuildInputs = [ From bc44c6be1f81dd498cac54c8394ca7bfb74be4e0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0179/1183] python3Packages.ncclient: 0.6.9 -> 0.6.10 --- pkgs/development/python-modules/ncclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index ba3b9e4b0873..2e352be412c1 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit pname version; - sha256 = "0112f2ad41fb658f52446d870853a63691d69299c73c7351c520d38dbd8dc0c4"; + sha256 = "67b1eba5a6c7c6075746d8c33d4e8f4ded17604034c1fcd1c78996ef52bf66ff"; }; checkInputs = [ nose rednose ]; From 7bbffef45c8e6c1f3f22b7be702ada35d0e9794b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0180/1183] python3Packages.nest_asyncio: 1.4.3 -> 1.5.1 --- pkgs/development/python-modules/nest-asyncio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index 56c6044ba746..33c37d5e9807 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.4.3"; + version = "1.5.1"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "eaa09ef1353ebefae19162ad423eef7a12166bcc63866f8bff8f3635353cd9fa"; + sha256 = "afc5a1c515210a23c461932765691ad39e8eba6551c055ac8d5546e69250d0aa"; }; # tests not packaged with source dist as of 1.3.2/1.3.2, and From 6844c40a26ce7c480ef19fdce2b1f6fc345fc4ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0181/1183] python3Packages.nilearn: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/nilearn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index e1efdf26de80..e3ce770398e4 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "nilearn"; - version = "0.7.0"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "1rhpy6na7hkhc211ri14zghvmb2fxkh995wi09pkc68klf1dzjg7"; + sha256 = "8b1409a5e1f0f6d1a1f02555c2f11115a2364f45f1e57bcb5fb3c9ea11f346fa"; }; checkInputs = [ pytestCheckHook ]; From 0583e82103f21b5ff832fd0b2129fb07cf36b7ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:18 +0100 Subject: [PATCH 0182/1183] python3Packages.notebook: 6.2.0 -> 6.3.0 --- pkgs/development/python-modules/notebook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index bfc5d8c60c1a..c7dc40d70791 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.2.0"; + version = "6.3.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0464b28e18e7a06cec37e6177546c2322739be07962dd13bf712bcb88361f013"; + sha256 = "cbc9398d6c81473e9cdb891d2cae9c0d3718fca289dda6d26df5cb660fcadc7d"; }; LC_ALL = "en_US.utf8"; From c62be12e4693707f1f9dd48ba9eaaadb573b75e3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0183/1183] python3Packages.numba: 0.52.0 -> 0.53.0 --- pkgs/development/python-modules/numba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 48ed52499c5e..211e9d6185f6 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { - version = "0.52.0"; + version = "0.53.0"; pname = "numba"; # uses f-strings, python 3.9 is not yet supported disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "44661c5bd85e3d3619be0a40eedee34e397e9ccb3d4c458b70e10bf95d1ce933"; + sha256 = "55c11d7edbba2ba715f2b56f5294cad55cfd87bff98e2627c3047c2d5cc52d16"; }; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; From cf982c6ee45fb3bb613be32d61ce4dbb28332c8a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0184/1183] python3Packages.numexpr: 2.7.2 -> 2.7.3 --- pkgs/development/python-modules/numexpr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix index e5a36fe454f8..c2630d75eb45 100644 --- a/pkgs/development/python-modules/numexpr/default.nix +++ b/pkgs/development/python-modules/numexpr/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "numexpr"; - version = "2.7.2"; + version = "2.7.3"; src = fetchPypi { inherit pname version; - sha256 = "1ai3i5n07csnzfsxf2dxp8cpdk6ajl5iv8rv0fj6n9ag7qphixac"; + sha256 = "43616529f9b7d1afc83386f943dc66c4da5e052f00217ba7e3ad8dd1b5f3a825"; }; # Remove existing site.cfg, use the one we built for numpy. From e50f670ecd8d2c84bf67af14ebbdc791677e5233 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0185/1183] python3Packages.nunavut: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index df831ab6b535..5bb173b9153b 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.0.2"; + version = "1.0.3"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "c6fe0a1b92c44bb64b2427f944fee663fe1aaf3d4d4080d04ad9c212b40a8763"; + sha256 = "474392035e9e20b2c74dced7df8bda135fd5c0ead2b2cf64523a4968c785ea73"; }; propagatedBuildInputs = [ From 4d30a2da884f7178c72c281ed8723da35769e722 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0186/1183] python3Packages.openapi-spec-validator: 0.2.9 -> 0.3.0 --- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 02f51bc3e66f..1cd95bcd6ab3 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.2.9"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1jw59mmd3n1d5zihdqz2a3j2axxf3m34lqp1190fw8rlndlilf3r"; + sha256 = "53ba3d884e98ff2062d5ada025aa590541dcd665b8f81067dc82dd61c0923759"; }; propagatedBuildInputs = [ jsonschema pyyaml six setuptools ] From 801f895190ddbead0a9598f269f0be6b0958584c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0187/1183] python3Packages.openpyxl: 3.0.6 -> 3.0.7 --- pkgs/development/python-modules/openpyxl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index 48941c808161..317aba65621a 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "openpyxl"; - version = "3.0.6"; + version = "3.0.7"; disabled = isPy27; # 2.6.4 was final python2 release src = fetchPypi { inherit pname version; - sha256 = "b229112b46e158b910a5d1b270b212c42773d39cab24e8db527f775b82afc041"; + sha256 = "6456a3b472e1ef0facb1129f3c6ef00713cebf62e736cd7a75bcc3247432f251"; }; checkInputs = [ pytest ]; From 0c52670268880df910d70dc22508590eb7e48960 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0188/1183] python3Packages.OWSLib: 0.21.0 -> 0.23.0 --- pkgs/development/python-modules/owslib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 92a78ce0cf3f..661754d89c3c 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi, dateutil, requests, pytz, pyproj , pytest, pyyaml } : buildPythonPackage rec { pname = "OWSLib"; - version = "0.21.0"; + version = "0.23.0"; src = fetchPypi { inherit pname version; - sha256 = "408d40b3a6a210bcb3f3609b607960eeedaa63ffd574dde7896906691c354814"; + sha256 = "0a03a9978673f377df45107024e2aae006f85afe7ef7bf4640ef663167a4386f"; }; buildInputs = [ pytest ]; From 21aae701e2b794b09cd613bad8a02f0bb1db01fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0189/1183] python3Packages.panel: 0.9.7 -> 0.11.1 --- pkgs/development/python-modules/panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 10dafc0072a3..5628b8cc19e4 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "panel"; - version = "0.9.7"; + version = "0.11.1"; # Version 10 attempts to download models from the web during build-time # https://github.com/holoviz/panel/issues/1819 src = fetchPypi { inherit pname version; - sha256 = "2e86d82bdd5e7664bf49558eedad62b664d5403ec9e422e5ddfcf69e3bd77318"; + sha256 = "ce531e5c0c8a8ae74d523762aeb1666650caebbe1867aba16129d29791e921f9"; }; propagatedBuildInputs = [ From 09b5ffe0bd96d31fb35fabee2c5deda7f381b6db Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0190/1183] python3Packages.papermill: 2.3.2 -> 2.3.3 --- pkgs/development/python-modules/papermill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 0311e783d397..2ef394745964 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "papermill"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-ptwZXypS9b7Y1CkszqOa8PMzgyS+r9VikPlhbJUDNiM="; + sha256 = "349aecd526c15c39f73a08df836467e2fead877c474d82c7df349f27ad272525"; }; propagatedBuildInputs = [ From 1367aba5ba561520331008fd8b78076aaecef6b0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0191/1183] python3Packages.parse: 1.18.0 -> 1.19.0 --- pkgs/development/python-modules/parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index c5c0c1d7ae6d..1ce34bfaab68 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.18.0"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"; + sha256 = "9ff82852bcb65d139813e2a5197627a94966245c897796760a3a2a8eb66f020b"; }; checkPhase = '' From 6c23d90cb1968e682eb935b7a21de9133c0fe7ba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0192/1183] python3Packages.persim: 0.1.3 -> 0.3.0 --- pkgs/development/python-modules/persim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 0979afa92f4a..d016d1ccea8b 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "persim"; - version = "0.1.3"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "be4ea4bfc2a0c6fcfc28ebd52e23a351ee00b0ef0ddaf527526bd0f919145348"; + sha256 = "5db2f7f65b1ad7b2cbfa254afb692ca0a91aeb686e82d6905838c41f516e6a13"; }; propagatedBuildInputs = [ From ec06ce438818369c37e56652fdfd4e1b60ea999a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0193/1183] python3Packages.pex: 2.1.30 -> 2.1.34 --- pkgs/development/python-modules/pex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 588a27159e8e..f8374a02a9b9 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.30"; + version = "2.1.34"; src = fetchPypi { inherit pname version; - sha256 = "ac170d656d2083d02048850005415d03d1767087e4f5037bc86defb6b23e712d"; + sha256 = "988e6a4e12933522e0c647da78c6e30fc42e3a172ba52cfb0332affcfc9ee29e"; }; nativeBuildInputs = [ setuptools ]; From ee0b10943f0b6b1405c32beb04dd1b75e0686be1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:19 +0100 Subject: [PATCH 0194/1183] python3Packages.pgspecial: 1.11.10 -> 1.12.1 --- pkgs/development/python-modules/pgspecial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index 476921da632f..d0cbf5bafe41 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pgspecial"; - version = "1.11.10"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "1jrq6bhzwvz6db8ays8zff15hbk1iazs2qxrzvrnlkgxxjkp8p7n"; + sha256 = "b68feb0005f57861573d3fbb82c5c777950decfbb2d1624af57aec825db02c02"; }; checkInputs = [ pytest ]; From 6d97990b4aff66a1129ec747ba6551e1c61ca3df Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0195/1183] python3Packages.phonenumbers: 8.12.18 -> 8.12.20 --- pkgs/development/python-modules/phonenumbers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 72c61e08ce4b..64884393b79b 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.18"; + version = "8.12.20"; src = fetchPypi { inherit pname version; - sha256 = "0aa0f5e1382d292a7ff2f8bc08673126521461c7f908e0220756449a734d8fef"; + sha256 = "ee5a8508c4a414262abad92ec33f050347f681973ed0fb36e98b52bfe159f6b8"; }; meta = with lib; { From ec8a68269fedd9e93e9cd5b7f96d83e23bb4ffcd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0196/1183] python3Packages.phonopy: 2.9.1 -> 2.9.3 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e68516fb07f7..1c401b626478 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.9.1"; + version = "2.9.3"; src = fetchPypi { inherit pname version; - sha256 = "1jaizhkb59ixknvc75nrhfq51bh75912q8ay36bxpf4g5hzyhw3a"; + sha256 = "389dd33f5bfe35733c8346af6cc43bbd015ccf0efa947eb04b38bd5cb9d0b89b"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py spglib ]; From a5438a2508cb2ede9459ef5171c5117bd5c72bc5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0197/1183] python3Packages.pika: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index c1bfe5297d71..ef3250732164 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pika"; - version = "1.1.0"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1gqx9avb9nwgiyw5nz08bf99v9b0hvzr1pmqn9wbhd2hnsj6p9wz"; + sha256 = "f023d6ac581086b124190cb3dc81dd581a149d216fa4540ac34f9be1e3970b89"; }; checkInputs = [ nose mock twisted tornado ]; From e02e3cb769c25e4eca062fbe5a492bf550760d04 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0198/1183] python3Packages.pikepdf: 2.8.0 -> 2.9.1 --- pkgs/development/python-modules/pikepdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index 565822c33558..adf30d57322d 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "2.8.0"; + version = "2.9.1"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "74ff96fddd21cd4c0830eb549137ea9eccbdbff8cef4f684322b9afb8e42ccb5"; + sha256 = "99c19cf0dd0fc89fc9e6a0de61e974e34d4111dd69802aeaee3e61fb1a74a3d8"; }; buildInputs = [ From 6395fd30a365786d596707bd7aaca9da11e76598 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0199/1183] python3Packages.pillowfight: 0.3 -> 0.4 --- pkgs/development/python-modules/pillowfight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pillowfight/default.nix b/pkgs/development/python-modules/pillowfight/default.nix index c022fdb988d5..b0a8d6d913c6 100644 --- a/pkgs/development/python-modules/pillowfight/default.nix +++ b/pkgs/development/python-modules/pillowfight/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pillowfight"; - version = "0.3"; + version = "0.4"; src = fetchPypi { inherit pname version; - sha256 = "913869b0563c5982bcf08cb1ea56fb0f87e3573d738e3e3692301bf45dba6252"; + sha256 = "4923f4d1e78be15f19f03a608fb34ba9cb71bf5205de3c9fe7461c49078167a7"; }; propagatedBuildInputs = [ pillow ]; From 4e556b528cc6a0ac596250b014d8ad735dbc39a6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0200/1183] python3Packages.pip-tools: 5.4.0 -> 6.0.1 --- pkgs/development/python-modules/pip-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 4ea6f75932cd..48f15181ce00 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.4.0"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a4d3990df2d65961af8b41dacc242e600fdc8a65a2e155ed3d2fc18a5c209f20"; + sha256 = "3b0c7b95e8d3dfb011bb42cb38f356fcf5d0630480462b59c4d0a112b8d90281"; }; LC_ALL = "en_US.UTF-8"; From 5cfe65e58da240b4ff8d395c1eb9cbf4fe27ab0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0201/1183] python3Packages.pkginfo: 1.6.1 -> 1.7.0 --- pkgs/development/python-modules/pkginfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 5216ab17879d..1b1834e324bb 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pkginfo"; - version = "1.6.1"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a6a4ac943b496745cec21f14f021bbd869d5e9b4f6ec06918cffea5a2f4b9193"; + sha256 = "029a70cb45c6171c329dfc890cde0879f8c52d6f3922794796e06f577bb03db4"; }; doCheck = false; # I don't know why, but with doCheck = true it fails. From 65fec17221537b5cbfeee58157ce42d3f654c8bc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0202/1183] python3Packages.plac: 1.2.0 -> 1.3.3 --- pkgs/development/python-modules/plac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 9261133bc925..bf66f7d01f19 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "plac"; - version = "1.2.0"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "ca03587234e5bdd2a3fa96f19a04a01ebb5b0cd66d48ecb5a54d42bc9b287320"; + sha256 = "51e332dabc2aed2cd1f038be637d557d116175101535f53eaa7ae854a00f2a74"; }; checkPhase = '' From fa09e09e0b18e51ed704a2657055ff19e74c3e49 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0203/1183] python3Packages.plaid-python: 7.2.0 -> 7.2.1 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index aa329953a391..040b51b9f6e6 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, requests, pytest }: buildPythonPackage rec { - version = "7.2.0"; + version = "7.2.1"; pname = "plaid-python"; src = fetchPypi { inherit pname version; - sha256 = "bd599b384f94d8883344925f0ef223e1ab50f218872434aa40ba8c645937699c"; + sha256 = "af2ad326e8377c8c86d97184f60c0be41cd71f5075201dfdb3331cc85d4de513"; }; checkInputs = [ pytest ]; From e0b01b9340c96ceaa83d824a4b3e1f21f113aa66 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0204/1183] python3Packages.plumbum: 1.6.9 -> 1.7.0 --- pkgs/development/python-modules/plumbum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index e08537ff1abf..278caa44b143 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.9"; + version = "1.7.0"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; + sha256 = "317744342c755319907c773cc87c3a30adaa3a41b0d34c0ce02d9d1904922dce"; }; } From 921dae14e42047c69bc4f2ee3d305eff7a1b68b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0205/1183] python3Packages.prettytable: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/prettytable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index 5463403dec7b..d349a58960a1 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prettytable"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "e37acd91976fe6119172771520e58d1742c8479703489321dc1d9c85e7259922"; + sha256 = "5882ed9092b391bb8f6e91f59bcdbd748924ff556bb7c634089d5519be87baa0"; }; nativeBuildInputs = [ setuptools_scm ]; From fdf6cc1a8abeb4325eb19af626775e42e7ee4cce Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0206/1183] python3Packages.prompt_toolkit: 3.0.16 -> 3.0.18 --- pkgs/development/python-modules/prompt_toolkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index e43931d914c5..ac128c098ecc 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.16"; + version = "3.0.18"; src = fetchPypi { inherit pname version; - sha256 = "0fa02fa80363844a4ab4b8d6891f62dd0645ba672723130423ca4037b80c1974"; + sha256 = "e1b4f11b9336a28fa11810bc623c357420f69dfdb6d2dac41ca2c21a55c033bc"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' From aed440017670a6e07d217b5045b4851f8f65a567 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:20 +0100 Subject: [PATCH 0207/1183] python3Packages.proto-plus: 1.13.0 -> 1.18.1 --- pkgs/development/python-modules/proto-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/proto-plus/default.nix b/pkgs/development/python-modules/proto-plus/default.nix index 4784dcdfa2f1..3fa782cb471b 100644 --- a/pkgs/development/python-modules/proto-plus/default.nix +++ b/pkgs/development/python-modules/proto-plus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.13.0"; + version = "1.18.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1i5jjnwpd288378h37zads08h695iwmhxm0sxbr3ln6aax97rdb1"; + sha256 = "cfc45474c7eda0fe3c4b9eca2542124f2a0ff5543242bec61e8d08bce0f5bd48"; }; propagatedBuildInputs = [ protobuf ]; From 9ac406176778bdc8dbcd7c835cf0b2b0647cf09f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0208/1183] python3Packages.ptpython: 3.0.16 -> 3.0.17 --- pkgs/development/python-modules/ptpython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 51ad2e85ff2e..65915c858696 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.16"; + version = "3.0.17"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "4b0f6e381a8251ec8d6aa94fe12f3400bf6edf789f89c8a6099f8a91d4a5d2e1"; + sha256 = "911d25cca31a8e4f9b2ecd16dcdad793b8859e94fca1275f3485d8cdf20b13de"; }; propagatedBuildInputs = [ From 81dc160a0dcd88b6b1e5543c53ad8c45b23a5aa4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0209/1183] python3Packages.ptyprocess: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/ptyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 233dc6fb3148..48b0ab48c739 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ptyprocess"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0"; + sha256 = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"; }; meta = { From 6e2de8d5909045b16f25b3ead4ed9982a152dca6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0210/1183] python3Packages.pudb: 2019.2 -> 2020.1 --- pkgs/development/python-modules/pudb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix index db48fbf1e480..af653f260cd3 100644 --- a/pkgs/development/python-modules/pudb/default.nix +++ b/pkgs/development/python-modules/pudb/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pudb"; - version = "2019.2"; + version = "2020.1"; src = fetchPypi { inherit pname version; - sha256 = "1p2qizb35f9lfhklldzrn8g9mwiar3zmpc44463h5n1ln40ymw78"; + sha256 = "2ef23d3371439f13fffbe7f8b9fc180a19d4183dc9cab204d878d7c7766464bf"; }; propagatedBuildInputs = [ pygments urwid ]; From 0fb2e00f7c614e0557085599bf35efa153dbd7ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0211/1183] python3Packages.pulsectl: 20.5.1 -> 21.3.4 --- pkgs/development/python-modules/pulsectl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix index 2a66357f8494..aa853dcd3658 100644 --- a/pkgs/development/python-modules/pulsectl/default.nix +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pulsectl"; - version = "20.5.1"; + version = "21.3.4"; src = fetchPypi { inherit pname version; - sha256 = "39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db"; + sha256 = "faa8b9336237565990298f20870e13dd1678a4586847ca5a7ff2abf10752f356"; }; patches = [ From 28e17d507c418f3794edc471ea3d5cb5928ed142 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0212/1183] python3Packages.py3exiv2: 0.8.0 -> 0.9.3 --- pkgs/development/python-modules/py3exiv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix index 0c2ae1288279..236a38c7e69a 100644 --- a/pkgs/development/python-modules/py3exiv2/default.nix +++ b/pkgs/development/python-modules/py3exiv2/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "py3exiv2"; - version = "0.8.0"; + version = "0.9.3"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "1v419f1kkqw8hqyc3yhzslnbzk52j8j3wfknfkjg308n5mf5bn09"; + sha256 = "838836e58ca22557d83d1f0ef918bcce899b4c2666340b924b940dcdebf1d18c"; }; buildInputs = [ exiv2 boost ]; From c14f2682d81d2db48adcb642e2b6f7ecd9fdb534 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0213/1183] python3Packages.py3status: 3.31 -> 3.35 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index bd0f179dc850..9967394d28e0 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,11 +24,11 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.31"; + version = "3.35"; src = fetchPypi { inherit pname version; - sha256 = "426cff33c1d3a5ee6ae388089fd41dc47c4221800f43bd51779f823c781fb83b"; + sha256 = "1508fa481a2f1b55b9a9792f0480c7f54cad107c668ffc98a7c73622676e1c23"; }; doCheck = false; From 498d15dcccf4acc8066f971626d552e9a2b34ac4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0214/1183] python3Packages.py4j: 0.10.9.1 -> 0.10.9.2 --- pkgs/development/python-modules/py4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index 8eb1649fcc5e..6ad9673b9755 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "py4j"; - version = "0.10.9.1"; + version = "0.10.9.2"; src = fetchPypi { inherit pname version; - sha256 = "7605e512bf9b002245f5a9121a8c2df9bfd1a6004fe6dd3ff29d46f901719d53"; + sha256 = "624f97c363b8dd84822bc666b12fa7f7d97824632b2ff3d852cc491359ce7615"; }; # No tests in archive From de91553d26fafb85fe12145f2cb29094a5274eb6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0215/1183] python3Packages.pyaftership: 0.1.2 -> 21.1.0 --- pkgs/development/python-modules/pyaftership/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaftership/default.nix b/pkgs/development/python-modules/pyaftership/default.nix index 4deee467f84e..e65812cb3133 100644 --- a/pkgs/development/python-modules/pyaftership/default.nix +++ b/pkgs/development/python-modules/pyaftership/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyaftership"; - version = "0.1.2"; + version = "21.1.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "057dwzacc0lmsq00ipfbnxkq4rc2by8glmza6s8i6dzi1cc68v98"; + sha256 = "28b62c323d06492399b60d8135a58d6feaa1d60837eddc14e57ea2b69d356c0a"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; From 7a7889af9159370811849cf351ac177deb017b50 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0216/1183] python3Packages.pybase64: 1.0.2 -> 1.1.4 --- pkgs/development/python-modules/pybase64/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index aa65d7ccadfe..048d218a9ea1 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.0.2"; + version = "1.1.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "c430b36751dd89820c867aadd0130bbe8ce007ee570cbe91bb23012fb6f52e87"; + sha256 = "f0e0db1dee2a2cbf35e6710ea138594ecc1e0f491ff9103f136de83d8f159315"; }; propagatedBuildInputs = [ six ]; From 7aae235e908347a1cb255aaec2fd776bc6e284c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0217/1183] python3Packages.pybtex: 0.23.0 -> 0.24.0 --- pkgs/development/python-modules/pybtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybtex/default.nix b/pkgs/development/python-modules/pybtex/default.nix index fb6fbf8dd381..0ce28e574924 100644 --- a/pkgs/development/python-modules/pybtex/default.nix +++ b/pkgs/development/python-modules/pybtex/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, latexcodec, pyyaml }: buildPythonPackage rec { - version = "0.23.0"; + version = "0.24.0"; pname = "pybtex"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version pname; - sha256 = "b92be18ccd5e9a37895949dcf359a1f6890246b73646dddf1129178ee12e4bef"; + sha256 = "818eae35b61733e5c007c3fcd2cfb75ed1bc8b4173c1f70b56cc4c0802d34755"; }; meta = with lib; { From a6fae85ffb030a66d35b8888439cae8d5466b4b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0218/1183] python3Packages.pybullet: 3.0.8 -> 3.1.0 --- pkgs/development/python-modules/pybullet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 554a6ab0b02d..195167b24377 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "3.0.8"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "623061d305bd5513a911abb2cbd0e37670be166a270123b43ca757bf78e4b438"; + sha256 = "ced62167216c75b58d5550adc74a0d328a166ded8b37b52ce90bc9736f597187"; }; buildInputs = [ From a02f0176c509440c86b7b3630b0743877aa6140e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0219/1183] python3Packages.pycmarkgfm: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/pycmarkgfm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycmarkgfm/default.nix b/pkgs/development/python-modules/pycmarkgfm/default.nix index f1d92a63d401..36b171c22b12 100644 --- a/pkgs/development/python-modules/pycmarkgfm/default.nix +++ b/pkgs/development/python-modules/pycmarkgfm/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pycmarkgfm"; - version = "1.0.1"; + version = "1.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0wkbbma214f927ikn3cijxsrzkmm5cqz1x4fimrwx9s2wfphj250"; + sha256 = "694cb242f4961437c30b5b015dfbce9d1a1fa48305c2e39f902ce7c65b4cbe0e"; }; propagatedBuildInputs = [ cffi ]; From 585ab73e6991028e064b2ddc62ecd9efc414b4fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:21 +0100 Subject: [PATCH 0220/1183] python3Packages.pycodestyle: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/pycodestyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index e1d21a6a2eb1..0e92196f7453 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pycodestyle"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"; + sha256 = "c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"; }; dontUseSetuptoolsCheck = true; From d4dbaaab210aaf650ba0e7327a41dda64400e02b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0221/1183] python3Packages.pycryptodome: 3.9.9 -> 3.10.1 --- pkgs/development/python-modules/pycryptodome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index e88b8529a356..0c57ad9c96f2 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.9.9"; + version = "3.10.1"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "910e202a557e1131b1c1b3f17a63914d57aac55cf9fb9b51644962841c3995c4"; + sha256 = "3e2e3a06580c5f190df843cdb90ea28d61099cf4924334d5297a995de68e4673"; }; meta = with lib; { From 14210bd25529270d538b6e3fbe9c81d01ec9187a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0222/1183] python3Packages.py: 1.9.0 -> 1.10.0 --- pkgs/development/python-modules/py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index aa12deabb37e..8c38723207a7 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.9.0"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"; + sha256 = "21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3"; }; # Circular dependency on pytest From b826ad87ab76316b9273cb493582463a471c91a2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0223/1183] python3Packages.pyenchant: 3.1.1 -> 3.2.0 --- pkgs/development/python-modules/pyenchant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index fe4182fd53d8..fec3efb9b3ab 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.1.1"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ce0915d7acd771fde6e8c2dce8ad0cb0e6f7c4fa8430cc96e3e7134e99aeb12f"; + sha256 = "6b97e9a9f132fa7c9029a6635d821ccad67d4980e68186d02c765b4256b6f152"; }; propagatedBuildInputs = [ enchant2 ]; From 6a0bd5c9ecbf968ebad0ab5019efcc4933dcbce1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0224/1183] python3Packages.pyface: 7.1.0 -> 7.3.0 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index d317ebdf21b8..7ad1fb41526d 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.1.0"; + version = "7.3.0"; src = fetchPypi { inherit pname version; - sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d"; + sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; }; propagatedBuildInputs = [ setuptools six traits ]; From ed0161c5d0edbf2edcc6054ea4ebdcf8d384a17c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0225/1183] python3Packages.pyfaidx: 0.5.9.2 -> 0.5.9.5 --- pkgs/development/python-modules/pyfaidx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfaidx/default.nix b/pkgs/development/python-modules/pyfaidx/default.nix index 9e21854a7c42..13c00d80a62c 100644 --- a/pkgs/development/python-modules/pyfaidx/default.nix +++ b/pkgs/development/python-modules/pyfaidx/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyfaidx"; - version = "0.5.9.2"; + version = "0.5.9.5"; src = fetchPypi { inherit pname version; - sha256 = "73e740eaa45c097a09e543450f88d5ed06c0ece4b6936dad7e71077f67797b74"; + sha256 = "9965644c5bd62bedc0ff7f336cbb2baef6406a36b4ec5c786b199872ce46192b"; }; propagatedBuildInputs = [ six ]; From 50dec83c5ba8b124561c4183138f5a4c62f149c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0226/1183] python3Packages.pyfakefs: 4.3.3 -> 4.4.0 --- pkgs/development/python-modules/pyfakefs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 8ba9b3fc46fc..cc7031db54ac 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "4.3.3"; + version = "4.4.0"; pname = "pyfakefs"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/7KrJkoLg69Uii2wxQl5jiCDYd85YBuomK5lzs+1nLs="; + sha256 = "082d863e0e2a74351f697da404e329a91e18e5055942e59d1b836e8459b2c94c"; }; postPatch = '' From d6797ac32720650b48bed606fbdb5424c8da6c0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0227/1183] python3Packages.pyflakes: 2.2.0 -> 2.3.0 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index cf1b88781837..a613101832de 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "35b2d75ee967ea93b55750aa9edbbf72813e06a66ba54438df2cfac9e3c27fc8"; + sha256 = "e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"; }; checkInputs = [ unittest2 ]; From 393d9e7519196e6fa8e7b94814557e356645c0f1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0228/1183] python3Packages.pygit2: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/pygit2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 5326a1963aa8..46117d13f41c 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pygit2"; - version = "1.4.0"; + version = "1.5.0"; src = fetchPypi { inherit pname version; - sha256 = "cbeb38ab1df9b5d8896548a11e63aae8a064763ab5f1eabe4475e6b8a78ee1c8"; + sha256 = "9711367bd05f96ad6fc9c91d88fa96126ba2d1f1c3ea6f23c11402c243d66a20"; }; preConfigure = lib.optionalString stdenv.isDarwin '' From 8ed7b77a18925e9f5d6f52579d55ea8bfee4f649 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0229/1183] python3Packages.PyJWT: 1.7.1 -> 2.0.1 --- pkgs/development/python-modules/pyjwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 9255c02ac2ee..c33f2b068087 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "PyJWT"; - version = "1.7.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + sha256 = "a5c70a06e1f33d81ef25eecd50d50bd30e34de1ca8b2b9fa3fe0daaabcf69bf7"; }; propagatedBuildInputs = [ cryptography ecdsa ]; From 9a2f50210c2c4df099fffe27044c7a8c919c89ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0230/1183] python3Packages.pykeepass: 3.2.1 -> 4.0.0 --- pkgs/development/python-modules/pykeepass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index 584c98f6cb09..294e47872fc1 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "pykeepass"; - version = "3.2.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284"; + sha256 = "1b41b3277ea4e044556e1c5a21866ea4dfd36e69a4c0f14272488f098063178f"; }; postPatch = '' From b37907f88d67cfbd10fea8a99ab1612e9d8fdf69 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0231/1183] python3Packages.pykmtronic: 0.0.3 -> 0.2.0 --- pkgs/development/python-modules/pykmtronic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykmtronic/default.nix b/pkgs/development/python-modules/pykmtronic/default.nix index 50260afab10f..7a055c1ed3fe 100644 --- a/pkgs/development/python-modules/pykmtronic/default.nix +++ b/pkgs/development/python-modules/pykmtronic/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pykmtronic"; - version = "0.0.3"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU="; + sha256 = "9d0301882f06a0c4865c89bb6c2a381c4a1ba6fe2a7a07d56351bdf5f96c9fa5"; }; propagatedBuildInputs = [ aiohttp lxml ]; From c8109fbd4d1c5f26e71b93d582d1fb2b204159b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0232/1183] python3Packages.pykwalify: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/pykwalify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pykwalify/default.nix b/pkgs/development/python-modules/pykwalify/default.nix index d2b31ebbf4cd..ee5347d77a32 100644 --- a/pkgs/development/python-modules/pykwalify/default.nix +++ b/pkgs/development/python-modules/pykwalify/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "1.8.0"; pname = "pykwalify"; src = fetchPypi { inherit pname version; - sha256 = "1cnfzkg1b01f825ikpw2fhjclf9c8akxjfrbd1vc22x1lg2kk2vy"; + sha256 = "796b2ad3ed4cb99b88308b533fb2f559c30fa6efb4fa9fda11347f483d245884"; }; propagatedBuildInputs = [ From 9bc67172be12e6a6e683b9f9da0cec7d84d18e20 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:22 +0100 Subject: [PATCH 0233/1183] python3Packages.pylint: 2.7.1 -> 2.7.2 --- 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 43183482eceb..10935d2d8880 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.7.1"; + version = "2.7.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "10nrvzk1naf5ryawmi59wp99k31053sz37q3x9li2hj2cf7i1kl1"; + sha256 = "0e21d3b80b96740909d77206d741aa3ce0b06b41be375d92e1f3244a274c1f8a"; }; nativeBuildInputs = [ From ba0c72404d804b960b085154953ca3ea17416bfd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0234/1183] python3Packages.pymatgen: 2020.12.31 -> 2022.0.5 --- pkgs/development/python-modules/pymatgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index fdf6b089844b..f6f2ebe62108 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2020.12.31"; + version = "2022.0.5"; src = fetchPypi { inherit pname version; - sha256 = "5002490facd47c55d2dae42c35712e061c1f5d881180485c0543a899589856d6"; + sha256 = "69c370ebd2ff9aceb15bb6efd364473609ffb23d2b2f02a3eb64fd537df69de0"; }; nativeBuildInputs = [ glibcLocales ]; From 05b1df70b419e8cab042b50aed63f02a6da322d6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0235/1183] python3Packages.pymazda: 0.0.10 -> 0.1.0 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 8b390ac12faf..4f6986b0c1b5 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.0.10"; + version = "0.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sJj4RkVaELNitcz1H8YitNgIx4f35WeQf7M5miYD5yI="; + sha256 = "174c58e6e78081af3105524074ae26e62be683389e495ab85a30e2adbf7ba365"; }; propagatedBuildInputs = [ aiohttp pycryptodome ]; From 0f9daf53f2c8ef0cf529dc353bb1b21c8c444df3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0236/1183] python3Packages.pymc3: 3.9.3 -> 3.11.2 --- pkgs/development/python-modules/pymc3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index dfbfe90d2421..e322bb14f7ba 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.9.3"; + version = "3.11.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "abe046f5a5d0e5baee80b7c4bc0a4c218f61b517b62d77be4f89cf4784c27d78"; + sha256 = "d3b93c8923ae8c8107c5adfd22f7c37fa0849a00a9723e0e0a0ca6afb582d6c3"; }; # No need for coverage stats in Nix builds From 11bcaa69138c9aac86df0082aee417dfd7ac95a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0237/1183] python3Packages.PyMeeus: 0.3.13 -> 0.5.11 --- pkgs/development/python-modules/pymeeus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymeeus/default.nix b/pkgs/development/python-modules/pymeeus/default.nix index 047b7d697c9e..162f3ab55966 100644 --- a/pkgs/development/python-modules/pymeeus/default.nix +++ b/pkgs/development/python-modules/pymeeus/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyMeeus"; - version = "0.3.13"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "43b800a2571f3237e558d8d305e97f6ac4027977666e22af98448e0f1f86af86"; + sha256 = "bb9d670818d8b0594317b48a7dadea02a0594e5344263bf2054e1a011c8fed55"; }; checkInputs = [ pytest ]; From d249365eafe7c954835fb53ce23098bde5023027 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0238/1183] python3Packages.pymetar: 1.1 -> 1.2 --- pkgs/development/python-modules/pymetar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 72a17f27dca9..ef5273936cf4 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pymetar"; - version = "1.1"; + version = "1.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0y42l7mmp7jn4pzg66x3k57c6hqpxc22mgzgaqqpblkx2kzh42n9"; + sha256 = "f9a8caa21eff5367427da55a469ef396293ae4cc93797ab2f1a66a2924fbdc68"; }; checkPhase = '' From e6835f7733e10b1b4166f161623b8bb029176c70 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0239/1183] python3Packages.PyMySQL: 0.10.1 -> 1.0.2 --- pkgs/development/python-modules/pymysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index c243bf8f9540..888b5b9d309c 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "PyMySQL"; - version = "0.10.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "263040d2779a3b84930f7ac9da5132be0fefcd6f453a885756656103f8ee1fdd"; + sha256 = "816927a350f38d56072aeca5dfb10221fe1dc653745853d30a216637f5d7ad36"; }; propagatedBuildInputs = [ cryptography ]; From 9512cbf2b272b047e16f0641174a711698342f88 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0240/1183] python3Packages.pynamodb: 4.3.3 -> 5.0.3 --- pkgs/development/python-modules/pynamodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 53df38b5836b..5237ce99557d 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.3.3"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "ced47c200073dbbfafb10b26931b9c9bf3c6b898f41dffa3676f5c2e2eddc2f0"; + sha256 = "01741df673abb518d5cf9f00223a227f5d0ab9e0a6b19e444ceb38d497019f31"; }; propagatedBuildInputs = [ python-dateutil botocore ]; From 1000eff51087e81579201d3f65bd5df1f03b0219 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0241/1183] python3Packages.pynisher: 0.6.3 -> 0.6.4 --- pkgs/development/python-modules/pynisher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 28e9922e1720..a908945fad5d 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pynisher"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "e4e1d9366fc4ca60b4b2354b6d12e65600600a8c7bf4392c84f2f4ff4abc85ff"; + sha256 = "111d91aad471375c0509a912415ff90053ef909100facf412511383af107c124"; }; propagatedBuildInputs = [ psutil docutils ]; From 813514d83b508bfad63eda0bcff83010f23eb0ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0242/1183] python3Packages.pynvim: 0.4.2 -> 0.4.3 --- pkgs/development/python-modules/pynvim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 53bb06b13dd0..379edc7bd45f 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "pynvim"; - version = "0.4.2"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "6bc6204d465de5888a0c5e3e783fe01988b032e22ae87875912280bef0e40f8f"; + sha256 = "3a795378bde5e8092fbeb3a1a99be9c613d2685542f1db0e5c6fd467eed56dff"; }; nativeBuildInputs = [ From 9e46eeb254f2ac995c4f80f96c1e7f1915ad0d4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0243/1183] python3Packages.pyobjc: 7.0.1 -> 7.1 --- pkgs/development/python-modules/pyobjc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 541a733b3f80..cd100d005dbb 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyobjc"; - version = "7.0.1"; + version = "7.1"; # Gives "No matching distribution found for # pyobjc-framework-Collaboration==4.0b1 (from pyobjc==4.0b1)" @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f4fd120683b19a2abeac351784204e6b092cf1fb94f597b6eb22f30c117b2ef0"; + sha256 = "1dfce78545df1af25d1dcd710309dd243083d90c977a8c84c483f8254967417b"; }; meta = with lib; { From 97065363ba3de27b20877d6ac3a5f1b9f0ac1600 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:23 +0100 Subject: [PATCH 0244/1183] python3Packages.pyopencl: 2020.3.1 -> 2021.1.4 --- pkgs/development/python-modules/pyopencl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index cf881a580482..b1e81140a906 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2020.3.1"; + version = "2021.1.4"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "abc689307cf34d3dcc94d43815f64e2265469b50ecce6c903a3180589666fb36"; + sha256 = "6a9665e89c15e1c684789263bd3a632567e7c7bd25a657092df4b185b3468971"; }; # py.test is not needed during runtime, so remove it from `install_requires` From 5c4c5e5192965ab17fc7fc08a7381b8194dec657 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0245/1183] python3Packages.pyperclip: 1.8.1 -> 1.8.2 --- pkgs/development/python-modules/pyperclip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix index 0df0da0cc5ed..c04cc9eec346 100644 --- a/pkgs/development/python-modules/pyperclip/default.nix +++ b/pkgs/development/python-modules/pyperclip/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { - version = "1.8.1"; + version = "1.8.2"; pname = "pyperclip"; src = fetchPypi { inherit pname version; - sha256 = "9abef1e79ce635eb62309ecae02dfb5a3eb952fa7d6dce09c1aef063f81424d3"; + sha256 = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57"; }; doCheck = false; From 64dbd272cf25584743e8c51a0304ea94938b94a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0246/1183] python3Packages.pyperf: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index f17f83bd17b9..fcd326a52ca4 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "2189fbc4af08d519f85468e70e32c902eab0f1341b2c41028b94b2832d3169a7"; + sha256 = "1257d673d89fdcdbaec8077afeb365e7a94739c1b263572b09403cac25708ad3"; }; checkInputs = [ nose psutil ] ++ From 92ac2fe9bec3b10ddc85e4d157f2c6833a5eb564 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0247/1183] python3Packages.pyramid: 1.10.5 -> 2.0 --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a26eff37ef21..da9569b7fb73 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "1.10.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467"; + sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; }; checkInputs = [ webtest zope_component ]; From 9004ba849d1bfd85e575704cd4790b013d195f12 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0248/1183] python3Packages.Pyro5: 5.11 -> 5.12 --- pkgs/development/python-modules/pyro5/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index 5afce4a37dac..97b41b03daf8 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.11"; + version = "5.12"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "867cdd291d85560373e0c468da7fd18754f2568ef60e0bc504af42f391d7a3e5"; + sha256 = "616e6957c341da0ca26f947805c9c97b42031941f59ca5613537d1420ff4f2e2"; }; propagatedBuildInputs = [ serpent ]; From 43d06dc8217ef98958d5d7c4f6ca6a9196bab0ef Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0249/1183] python3Packages.pyroma: 2.6.1 -> 3.1 --- pkgs/development/python-modules/pyroma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix index 9fee5ec56c0e..c8fc988b96c0 100644 --- a/pkgs/development/python-modules/pyroma/default.nix +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyroma"; - version = "2.6.1"; + version = "3.1"; src = fetchPypi { inherit pname version; - sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; + sha256 = "45ad8201da9a813b5597bb85c80bbece93af9ec89170fc2be5ad85fa9463cef1"; }; postPatch = '' From 447329f848b2ee586e52334d0090cfddf7a082f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0250/1183] python3Packages.pyro-ppl: 1.5.2 -> 1.6.0 --- pkgs/development/python-modules/pyro-ppl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 1d5608ec777a..96f0ba057f65 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -2,12 +2,12 @@ , graphviz, networkx, six, opt-einsum, tqdm, pyro-api }: buildPythonPackage rec { - version = "1.5.2"; + version = "1.6.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "8a93af3a007ac507a8b50fd1165dbb355182d17df29d3b5bc498b02b479fdb27"; + sha256 = "ee181852713058f59d600dfa2e05bbc6f7f9b88fcdb4d2f1ccf61b0bf4794088"; }; propagatedBuildInputs = [ From 45c400f86f26796e57ab1b7fd9c48789c0d2047a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0251/1183] python3Packages.pyspark: 3.0.2 -> 3.1.1 --- pkgs/development/python-modules/pyspark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 2d09a0a0c3b0..064a8db88e2d 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "3.0.2"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "d4f2ced43394ad773f7b516a4bbcb5821a940462a17b1a25f175c83771b62ebc"; + sha256 = "104abc146d4ffb72d4c683d25d7af5a6bf955d94590a76f542ee23185670aa7e"; }; # pypandoc is broken with pandoc2, so we just lose docs. From cfc6d8051e5016b12556641e06510a60f0d7e390 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0252/1183] python3Packages.pytest-cov: 2.10.1 -> 2.11.1 --- pkgs/development/python-modules/pytest-cov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 003d7e14ab59..a41c26b753b7 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.10.1"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"; + sha256 = "359952d9d39b9f822d9d29324483e7ba04a3a17dd7d05aa6beb7ea01e359e5f7"; }; buildInputs = [ pytest ]; From ab2f4426274fa58b0911727418447b3c4ae383fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0253/1183] python3Packages.pytest-doctestplus: 0.8.0 -> 0.9.0 --- .../development/python-modules/pytest-doctestplus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index bf8dc9f8dfce..335846fc3425 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.8.0"; + version = "0.9.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; + sha256 = "6fe747418461d7b202824a3486ba8f4fa17a9bd0b1eddc743ba1d6d87f03391a"; }; buildInputs = [ pytest ]; From 88124b94f88ceccdee13faacaf671e653c41529d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0254/1183] python3Packages.pytest-flask: 1.1.0 -> 1.2.0 --- pkgs/development/python-modules/pytest-flask/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix index e55d98ce46be..f5fd4c5251d4 100644 --- a/pkgs/development/python-modules/pytest-flask/default.nix +++ b/pkgs/development/python-modules/pytest-flask/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pytest-flask"; - version = "1.1.0"; + version = "1.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9c136afd6d0fb045b0b8fd2363421b6670bfebd21d9141f79669d9051c9d2d05"; + sha256 = "46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d"; }; doCheck = false; From c6e9121c67d6d09ccd408f42c5993686f198b69c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0255/1183] python3Packages.pytest-isort: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/pytest-isort/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index fb65f8aceadb..fe74f692df5e 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-isort"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "f0fcf9674f3a627b36e07466d335e82b0f7c4f9e0f7ec39f2a1750b0189d5371"; + sha256 = "46a12331a701e2f21d48548b2828c8b0a7956dbf1cd5347163f537deb24332dd"; }; propagatedBuildInputs = [ isort ]; From 6c4ba2084181a641a621ca6174f011c4bc9b1053 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0256/1183] python3Packages.pytest-mypy: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/pytest-mypy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 370416c4aa82..88b8017e1c09 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "63d418a4fea7d598ac40b659723c00804d16a251d90a5cfbca213eeba5aaf01c"; + sha256 = "1fa55723a4bf1d054fcba1c3bd694215a2a65cc95ab10164f5808afd893f3b11"; }; nativeBuildInputs = [ setuptools_scm ]; From 113493280a27965cd50a856584f4deaacec311b8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:24 +0100 Subject: [PATCH 0257/1183] python3Packages.pytest-order: 0.9.5 -> 0.10.0 --- pkgs/development/python-modules/pytest-order/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index 8e10cd4f587a..2d94b26c5327 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "0.9.5"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "9c9e4f1b060414c642e88ad98ca60f1fd37937debd704bd8f4a2ef8e08b9cb6d"; + sha256 = "2da32cb95e63fac6972d34f5ddb53997fc66305355425be0f55f4092d666293d"; }; buildInputs = [ pytest ]; From baa58b4af3605284ec90e7fdb73c6a0f23d8ef4c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0258/1183] python3Packages.pytest-runner: 5.2 -> 5.3.0 --- pkgs/development/python-modules/pytestrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index d6203276b827..6f68bcd02354 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-runner"; - version = "5.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; + sha256 = "ca3f58ff4957e8be6c54c55d575b235725cbbcf4dc0d5091c29c6444cfc8a5fe"; }; nativeBuildInputs = [ setuptools_scm pytest ]; From 695ceb12d2b9d49172a837a8fc30f43bf0108fc7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0259/1183] python3Packages.pytest-subtesthack: 0.1.1 -> 0.1.2 --- .../development/python-modules/pytest-subtesthack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index 5006ac51150f..d15df7115fbf 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytest-subtesthack"; - version = "0.1.1"; + version = "0.1.2"; src = fetchPypi { inherit pname version; - sha256 = "15kzcr5pchf3id4ikdvlv752rc0j4d912n589l4rifp8qsj19l1x"; + sha256 = "0711e5d04c291ac9ac6c9eff447ec2811b1d23ccdfe1417d16d4f96481efcbe6"; }; buildInputs = [ pytest ]; From 18816cf72bfef8e11dc89393dbe4db9ce63c7bc2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0260/1183] python3Packages.pytest-xprocess: 0.17.0 -> 0.17.1 --- pkgs/development/python-modules/pytest-xprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-xprocess/default.nix b/pkgs/development/python-modules/pytest-xprocess/default.nix index 6e557a7adceb..5949840d1e81 100644 --- a/pkgs/development/python-modules/pytest-xprocess/default.nix +++ b/pkgs/development/python-modules/pytest-xprocess/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pytest-xprocess"; - version = "0.17.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "2506d637c4f54c65dd195c1d094abdeedacc9bf0689131d847a324ad0fc951c0"; + sha256 = "59c739edee7f3f2258e7c77989241698e356c552f5efb28bb46b478616888bf6"; }; nativeBuildInputs = [ setuptools_scm ]; From dd14158e2508d91e95caf24a7c20787ea7e2e94c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0261/1183] python3Packages.python-daemon: 2.2.4 -> 2.3.0 --- pkgs/development/python-modules/python-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index d8b501d62e5a..246e253e191d 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.4"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766"; + sha256 = "bda993f1623b1197699716d68d983bb580043cf2b8a66a01274d9b8297b0aeaf"; }; nativeBuildInputs = [ twine ]; From 619aecf7a1feacd2d4a925bc143edbe915c90851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0262/1183] python3Packages.python-gitlab: 2.5.0 -> 2.6.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 1a2e28d57aba..4dc3cfb5693f 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "68b42aafd4b620ab2534ff78a52584c7f799e4e55d5ac297eab4263066e6f74b"; + sha256 = "a862c6874524ab585b725a17b2cd2950fc09d6d74205f40a11be2a4e8f2dcaa1"; }; propagatedBuildInputs = [ requests ]; From 9bd3ae042af3139a1dc8006455e5519eaec5b090 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0263/1183] python3Packages.python-gnupg: 0.4.6 -> 0.4.7 --- pkgs/development/python-modules/python-gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index fe6867611070..7189a235deda 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gnupg"; - version = "0.4.6"; + version = "0.4.7"; src = fetchPypi { inherit pname version; - sha256 = "3aa0884b3bd414652c2385b9df39e7b87272c2eca1b8fcc3089bc9e58652019a"; + sha256 = "2061f56b1942c29b92727bf9aecbd3cea3893acc9cccbdc7eb4604285efe4ac7"; }; # Let's make the library default to our gpg binary From f65ce1c8049cc07d3f490a19149513dd5426f43e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0264/1183] python3Packages.python-periphery: 2.1.1 -> 2.3.0 --- pkgs/development/python-modules/python-periphery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index e0461dd1efe6..b52ad018d577 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-periphery"; - version = "2.1.1"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "ed07adc27c8b4df9cd40b2d935f86400a7b495b311df5bfaf9ecaeafc5413fd5"; + sha256 = "8a8ec019d9b330a6a6f69a7de61d14b4c98b102d76359047c5ce0263e12246a6"; }; # Some tests require physical probing and additional physical setup From 5dc71415eba3d30e2b3c7bda1bd30e5f5ab7d8ae Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0265/1183] python3Packages.python-ptrace: 0.9.7 -> 0.9.8 --- pkgs/development/python-modules/python-ptrace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 1af58300c2f0..0ea759d92dcf 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "b998e3436cec975b6907552af6e7f3ff8779097e32d2b905696e5a9feb09e070"; + sha256 = "1e3bc6223f626aaacde8a7979732691c11b13012e702fee9ae16c87f71633eaa"; }; # requires distorm, which is optionally From dc3955c724f470e23c29b351f09a698ec4d8c059 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0266/1183] python3Packages.python-rapidjson: 0.9.4 -> 1.0 --- pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 4ef3b9f83790..63dc4018b27d 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -8,13 +8,13 @@ }: buildPythonPackage rec { - version = "0.9.4"; + version = "1.0"; pname = "python-rapidjson"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "d79a412d7df30f01d3cb12e0e8863a48cfecd2fd7612719e16bc76eb1b65b332"; + sha256 = "a61fa61e41b0b85ba9e78444242fddcb3be724de1df79314e6b4766b66e4e11c"; }; LC_ALL="en_US.utf-8"; From 6513dcd26315012904f1129075747108e25a50b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0267/1183] python3Packages.python-stdnum: 1.14 -> 1.16 --- pkgs/development/python-modules/python-stdnum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index eb912b2bc593..581813fac4d9 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.14"; + version = "1.16"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "fd3a92b8ec82a159c41dbaa3c5397934d090090c92b04e346412e0fd7e6a1b1c"; + sha256 = "4248d898042a801fc4eff96fbfe4bf63a43324854efe3b5534718c1c195c6f43"; }; checkInputs = [ nose ]; From 9c742ad5d894394bf1afb073986b7e9f7e15c841 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:25 +0100 Subject: [PATCH 0268/1183] python3Packages.python-utils: 2.4.0 -> 2.5.6 --- pkgs/development/python-modules/python-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 60160d270b75..637c25cc5aab 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-utils"; - version = "2.4.0"; + version = "2.5.6"; src = fetchPypi { inherit pname version; - sha256 = "12c0glzkm81ljgf6pwh0d4rmdm1r7vvgg3ifzp8yp9cfyngw07zj"; + sha256 = "352d5b1febeebf9b3cdb9f3c87a3b26ef22d3c9e274a8ec1e7048ecd2fac4349"; }; postPatch = '' From 2ab0a798621b94af656add7bec4019da11d6cc84 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0269/1183] python3Packages.pytools: 2020.4.4 -> 2021.2.1 --- pkgs/development/python-modules/pytools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 5c7faf50cea6..83de3cb459aa 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2020.4.4"; + version = "2021.2.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3645ed839cf4d79cb4bf030f37ddaeecd7fe5e2d6698438cc36c24a1d5168809"; + sha256 = "ebbcc38c7a30b1a0ce1a74816c85db9f2556bb4d5b9a71f85f5d88f69ddcb96b"; }; checkInputs = [ pytest ]; From 48174c837fb1345408821f01601c3fb5ea5c01b4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0270/1183] python3Packages.py-vapid: 1.7.1 -> 1.8.0 --- pkgs/development/python-modules/py-vapid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 2f4a60b420aa..dd8cbdcc5f0e 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "py-vapid"; - version = "1.7.1"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "f05cecaa9fc009515086d04b6117324f30eedf1a196f67fb1ec360a9dbdad4ee"; + sha256 = "9e8de790cce397d9bc567a2148c3c5d88740f668342c59aaff9ed004f716a111"; }; propagatedBuildInputs = [ cryptography ]; From 47bcdf634dde93394a7d5300c8c46a95b3ac41c8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0271/1183] python3Packages.pyvex: 9.0.5903 -> 9.0.6588 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 13c54f6a41e6..a7fcf5e137b8 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.5903"; + version = "9.0.6588"; src = fetchPypi { inherit pname version; - sha256 = "sha256-qhLlRlmb48zhjX2u9w6TVVv2gb0E9kSapabiv+u4J2s="; + sha256 = "a77d29a5fffb8ddeed092a586086c46d489a5214a1b06829f51068486b3b6be3"; }; propagatedBuildInputs = [ From 328643cf631aea26fb63514d615a68bd4b0d7838 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0272/1183] python3Packages.pyviz_comms: 0.7.6 -> 2.0.1 --- pkgs/development/python-modules/pyviz-comms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 260311a51ad6..d2771da1b525 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.6"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "cd9649a9ea9dfcb9b34d78f9a64e1870aa8b6b94de546e2c99c6bb53d64ab5d1"; + sha256 = "be63957a49772895ddebeac02c697e1675e0bdf1515824f60fcc261914f23624"; }; propagatedBuildInputs = [ param ]; From d63019eac0bd0f85f6c8dec04d76e8ade24a8410 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0273/1183] python3Packages.pywebpush: 1.11.0 -> 1.13.0 --- pkgs/development/python-modules/pywebpush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 5bb8989506f2..9fe3dc935bb6 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pywebpush"; - version = "1.11.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "596c74020f9cbabc99f7964127ab0bb6cc045fcfe781b7c73cffb3ea45947820"; + sha256 = "97ef000a685cd1f63d9d3553568508508904bfe419485df2b83b025d94e9ae54"; }; propagatedBuildInputs = [ From 78edec163d0f0d02ee6c04dd70471427dc475ee9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0274/1183] python3Packages.pyzmq: 20.0.0 -> 22.0.3 --- pkgs/development/python-modules/pyzmq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index c80dfe93aee0..953a327d1991 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "20.0.0"; + version = "22.0.3"; src = fetchPypi { inherit pname version; - sha256 = "824ad5888331aadeac772bce27e1c2fbcab82fade92edbd234542c4e12f0dca9"; + sha256 = "f7f63ce127980d40f3e6a5fdb87abf17ce1a7c2bd8bf2c7560e1bbce8ab1f92d"; }; checkInputs = [ From b57ae774d04dac36b7445c2083e871bc7a60188a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0275/1183] python3Packages.qtconsole: 5.0.2 -> 5.0.3 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index da45b37bee95..47c36fcc126d 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.0.2"; + version = "5.0.3"; src = fetchPypi { inherit pname version; - sha256 = "404994edfe33c201d6bd0c4bd501b00c16125071573c938533224992bea0b30f"; + sha256 = "c091a35607d2a2432e004c4a112d241ce908086570cf68594176dd52ccaa212d"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 5446c0cc1cf5173ca73d068af7663c6a4b188977 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0276/1183] python3Packages.radio_beam: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/radio_beam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index 8ed5c720ef31..f1f3200bb7b0 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "radio_beam"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - sha256 = "0g1nqiikv023ab60gfqrvc13kfjv8m70bpfk264vlliaq6mvxdf2"; + sha256 = "e34902d91713ccab9f450b9d3e82317e292cf46a30bd42f9ad3c9a0519fcddcd"; }; propagatedBuildInputs = [ astropy ]; From 08e7bb0085a453a5e1dd419ed98c10b28ce682ec Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0277/1183] python3Packages.readthedocs-sphinx-ext: 2.1.3 -> 2.1.4 --- .../python-modules/readthedocs-sphinx-ext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index ef6975b29df7..74f1c05a2010 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "2.1.3"; + version = "2.1.4"; src = fetchPypi { inherit pname version; - sha256 = "209c4b5ecf233b8bb44fcb8b4548460b0806e347ce50fd8172adcb7d23969a4a"; + sha256 = "2ba023376057c6ba5d07b4fd016ec1d526f1b4fc5ad7a7ce7f0ed8a91dc54bbe"; }; propagatedBuildInputs = [ requests ]; From 08628396b4b5e65eec9cc405b964b5f639ccdcd2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0278/1183] python3Packages.rebulk: 2.0.1 -> 3.0.1 --- pkgs/development/python-modules/rebulk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index 8a4754e7a61d..fae0bf08e54b 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "2.0.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a"; + sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; }; # Some kind of trickery with imports that doesn't work. From 327447c759b8edc624f477e1a1576fb859f6e28b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0279/1183] python3Packages.regex: 2020.11.13 -> 2021.3.17 --- pkgs/development/python-modules/regex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index e4d6baeb425b..efb299161b8e 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2020.11.13"; + version = "2021.3.17"; src = fetchPypi { inherit pname version; - sha256 = "83d6b356e116ca119db8e7c6fc2983289d87b27b3fac238cfe5dca529d884562"; + sha256 = "4b8a1fb724904139149a43e172850f35aa6ea97fb0545244dc0b805e0154ed68"; }; postCheck = '' From a5494d22781639f7e841d0bc362b415aea06d0b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0280/1183] python3Packages.reportlab: 3.5.59 -> 3.5.66 --- pkgs/development/python-modules/reportlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index ace36423c191..7b5cc0a8c20a 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.59"; + version = "3.5.66"; src = fetchPypi { inherit pname version; - sha256 = "a755cca2dcf023130b03bb671670301a992157d5c3151d838c0b68ef89894536"; + sha256 = "63fba51babad0047def4ffaa41d0065248ca39d680e98dc9e3010de5425539b4"; }; checkInputs = [ glibcLocales ]; From bf68388b086e02fd872c537186214ce1f4d50d4f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:26 +0100 Subject: [PATCH 0281/1183] python3Packages.responses: 0.12.1 -> 0.13.1 --- pkgs/development/python-modules/responses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 624094e581e9..6b2bd4ac1978 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.12.1"; + version = "0.13.1"; src = fetchPypi { inherit pname version; - sha256 = "2e5764325c6b624e42b428688f2111fea166af46623cb0127c05f6afb14d3457"; + sha256 = "cf62ab0f4119b81d485521b2c950d8aa55a885c90126488450b7acb8ee3f77ac"; }; propagatedBuildInputs = [ cookies mock requests six ]; From 2a4beefedb08e790952ca8928ed6eecedd006189 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0282/1183] python3Packages.robotframework: 3.2.2 -> 4.0 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index cc57fa0d0264..04e8ccf0bcf8 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "robotframework"; - version = "3.2.2"; + version = "4.0"; src = fetchPypi { inherit pname version; - sha256 = "a0786a916d0572bd9d6afe26e95c6021e3df5dcafa0ece6b302e36366e58c24e"; + sha256 = "a02a6f4af3b0830e4396058694c333cb63eb47f50acf6723be34f0f7a4d73ad7"; extension = "zip"; }; From da117ddf1c95c4cc1cdf9c6f0bc244e6c958809a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0283/1183] python3Packages.robotframework-requests: 0.7.2 -> 0.8.1 --- .../python-modules/robotframework-requests/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index f23979f21fd1..5935c23185fa 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.8.1"; pname = "robotframework-requests"; src = fetchPypi { inherit pname version; - sha256 = "662e0ce5036a55bcb4cb46ff9741f40c78c670f4fb64cd37714cf83d5fd31774"; + sha256 = "b26f4ae617ff8c4b522fba422b7c8f83545a98aec3e2deb7f1aa53dcd68defe2"; }; buildInputs = [ unittest2 ]; From 34a0e2a0a343f77ec50324d3a172945bb992929f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0284/1183] python3Packages.robotframework-sshlibrary: 3.5.1 -> 3.6.0 --- .../python-modules/robotframework-sshlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index 62fb43e02691..4d72a2b3b0a1 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.5.1"; + version = "3.6.0"; pname = "robotframework-sshlibrary"; src = fetchPypi { inherit pname version; - sha256 = "843af44722d1d4e39f616e5441d6f49e82202cd1a8cc9d16637a6475a8ecb023"; + sha256 = "169c343f4db71e1969169fa6f383ca7fff549aa8f83bdd3d9cbd03cea928b688"; }; # unit tests are impure From 9d4fd699b3c6ef9242401e35b688ffc275f193ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0285/1183] python3Packages.rpy2: 3.4.2 -> 3.4.3 --- pkgs/development/python-modules/rpy2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index c913ab53b286..0a5dbb8c60db 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -24,13 +24,13 @@ }: buildPythonPackage rec { - version = "3.4.2"; + version = "3.4.3"; pname = "rpy2"; disabled = isPyPy; src = fetchPypi { inherit version pname; - sha256 = "8f7d1348b77bc45425b846a0d625f24a51a1c4f32ef2cd1c07a24222aa64e2e0"; + sha256 = "a39f2d75c24c688d5f48dfb2ef82efc006f2a51591941743026e1182353bf558"; }; patches = [ From 476875ac723964bbc583ce6b1ca1764a07db4399 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0286/1183] python3Packages.rsa: 4.6 -> 4.7.2 --- pkgs/development/python-modules/rsa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 7a990061e00e..247fd2a2a7f8 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.6"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa"; + sha256 = "9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9"; }; checkInputs = [ unittest2 mock ]; From af21e66986e02d4fc923811bc81195f2427d12a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0287/1183] python3Packages.ruamel.yaml: 0.16.12 -> 0.16.13 --- pkgs/development/python-modules/ruamel_yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 6bda50d24ad5..7a7d8356cabb 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ruamel.yaml"; - version = "0.16.12"; + version = "0.16.13"; src = fetchPypi { inherit pname version; - sha256 = "076cc0bc34f1966d920a49f18b52b6ad559fbe656a0748e3535cf7b3f29ebf9e"; + sha256 = "bb48c514222702878759a05af96f4b7ecdba9b33cd4efcf25c86b882cef3a942"; }; # Tests use relative paths From a0961d746d8bd394daa90a5220c39f3b38f36f51 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0288/1183] python3Packages.s3transfer: 0.3.4 -> 0.3.6 --- pkgs/development/python-modules/s3transfer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 51d3f3ab14ac..0246b3730444 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "s3transfer"; - version = "0.3.4"; + version = "0.3.6"; src = fetchPypi { inherit pname version; - sha256 = "7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2"; + sha256 = "c5dadf598762899d8cfaecf68eba649cd25b0ce93b6c954b156aaa3eed160547"; }; propagatedBuildInputs = From 84c416230e9465c1aca2ed014a626cb9fed5b5d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0289/1183] python3Packages.sacn: 1.4.6 -> 1.6.2 --- pkgs/development/python-modules/sacn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 35c7a7443299..9b1e935d6ed9 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.4.6"; + version = "1.6.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "015wa9nhqgd0kb60bw19g86ga25s9mpvsbqkahi3kw6df6j0wzss"; + sha256 = "2fea82a1dd83b0a67dc0be68a53b1fef1c44b12f3f018e47ac736bd15b36c068"; }; # no tests From 97e0959e9fd5a35641ea8cfb8c164a4ed0fd0fbe Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0290/1183] python3Packages.sanic: 20.9.1 -> 21.3.2 --- pkgs/development/python-modules/sanic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index e5faa440ad8d..bd9e91837465 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "sanic"; - version = "20.9.1"; + version = "21.3.2"; src = fetchPypi { inherit pname version; - sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6"; + sha256 = "84a04c5f12bf321bed3942597787f1854d15c18f157aebd7ced8c851ccc49e08"; }; postPatch = '' From d90be1b442e6064fa1157035419b9f53753eb74d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0291/1183] python3Packages.schedule: 0.6.0 -> 1.0.0 --- pkgs/development/python-modules/schedule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 2eda0cd6ac98..e6028d2c6cb8 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "schedule"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f9fb5181283de4db6e701d476dd01b6a3dd81c38462a54991ddbb9d26db857c9"; + sha256 = "1654cf70860a6d4d58236c98b0f1bb71521cc2a4bbf031b6cc39c96e77d59a91"; }; buildInputs = [ mock ]; From 9284a4e3056e719d1aaeffcb95d725a1e6b4f72d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0292/1183] python3Packages.scikit-fmm: 2019.1.30 -> 2021.2.2 --- pkgs/development/python-modules/scikit-fmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 8705488ba14c..08101bd2d00d 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2019.1.30"; + version = "2021.2.2"; src = fetchPypi { inherit pname version; - sha256 = "eb64b6d8e30b8df8f8636d5fc4fd7ca6a9b05938ccd62518c80c1d9e823069dd"; + sha256 = "809e20016e6341e4de29b6be4befc477b7002cfd5e2a11b80deae16005f35670"; }; propagatedBuildInputs = [ From 3f8cf06f0172130a4e06c3f51d73da0757e1806d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0293/1183] python3Packages.scikit-image: 0.17.2 -> 0.18.1 --- pkgs/development/python-modules/scikit-image/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index 44d2c240ce54..f7d3fd63b17b 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "scikit-image"; - version = "0.17.2"; + version = "0.18.1"; src = fetchPypi { inherit pname version; - sha256 = "bd954c0588f0f7e81d9763dc95e06950e68247d540476e06cb77bcbcd8c2d8b3"; + sha256 = "fbb618ca911867bce45574c1639618cdfb5d94e207432b19bc19563d80d2f171"; }; nativeBuildInputs = [ cython ]; From 2fa8b8a3b2260793b8c074815c7506ddc61db977 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:27 +0100 Subject: [PATCH 0294/1183] python3Packages.sentinel: 0.1.2 -> 0.3.0 --- pkgs/development/python-modules/sentinel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentinel/default.nix b/pkgs/development/python-modules/sentinel/default.nix index 6c69ea26b2a6..0fd10294bbe9 100644 --- a/pkgs/development/python-modules/sentinel/default.nix +++ b/pkgs/development/python-modules/sentinel/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentinel"; - version = "0.1.2"; + version = "0.3.0"; src = fetchPypi { inherit pname version; - sha256 = "c7aeee3f57c56a8e52771fc64230345deecd62c48debbbe1f1aca453439741d0"; + sha256 = "f28143aa4716dbc8f6193f5682176a3c33cd26aaae05d9ecf66c186a9887cc2d"; }; meta = with lib; { From 16d20262b1fa485130731d01d218d143f600df2d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0295/1183] python3Packages.setuptools_scm: 4.1.2 -> 6.0.1 --- pkgs/development/python-modules/setuptools_scm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index fa3a3de85328..a4cff6d056b0 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "setuptools_scm"; - version = "4.1.2"; + version = "6.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a8994582e716ec690f33fec70cca0f85bd23ec974e3f783233e4879090a7faa8"; + sha256 = "d1925a69cb07e9b29416a275b9fadb009a23c148ace905b2fb220649a6c18e92"; }; propagatedBuildInputs = [ toml ]; From 29107cbadecc6cb2bd16ec3455c1b21d396b704e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0296/1183] python3Packages.singledispatch: 3.4.0.3 -> 3.6.1 --- pkgs/development/python-modules/singledispatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index 789a24f3e818..a43add15ac72 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "singledispatch"; - version = "3.4.0.3"; + version = "3.6.1"; src = fetchPypi { inherit pname version; - sha256 = "5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c"; + sha256 = "58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"; }; propagatedBuildInputs = [ six ]; From b13deb957fd31f89a49ea054314c98757cbd18c0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0297/1183] python3Packages.skein: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/skein/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skein/default.nix b/pkgs/development/python-modules/skein/default.nix index ad7cc0214393..56e853f73e2e 100644 --- a/pkgs/development/python-modules/skein/default.nix +++ b/pkgs/development/python-modules/skein/default.nix @@ -10,10 +10,10 @@ let pname = "skein"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "0nb64p1hzshgi1kfc2jx1v9vn8b0wzs50460wfra3fsxh0ap66ab"; + sha256 = "04208b4be9df2dc68ac5b3e3ae51fd9b589add95ea1b67222a8de754d17b1efa"; }; skeinJar = callPackage ./skeinjar.nix { inherit src version; }; in From e9ddf0eb0981acc55620b4f85e1967d6a0c6df80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0298/1183] python3Packages.skorch: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/skorch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skorch/default.nix b/pkgs/development/python-modules/skorch/default.nix index fd161ecd7531..3504557b5027 100644 --- a/pkgs/development/python-modules/skorch/default.nix +++ b/pkgs/development/python-modules/skorch/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "skorch"; - version = "0.9.0"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bdce9370153fd80c5c4ec499a639f55eef0620e45d4b15fbf7d7ff2a225a3d40"; + sha256 = "9910f97339e654c8d38e0075d87b735e69e5eb11db59c527fb36705b30c8d0a4"; }; propagatedBuildInputs = [ numpy pytorch scikitlearn scipy tabulate tqdm ]; From 7f35f9516f2a4b3b3cd49808e7d9cb77c0edb1f8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0299/1183] python3Packages.smart_open: 4.1.2 -> 4.2.0 --- pkgs/development/python-modules/smart_open/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index 99c9c28a16a8..4f3423b7df32 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "smart_open"; - version = "4.1.2"; + version = "4.2.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4bbb6233364fc1173cc0af6b7a56ed76fce32509514f1978a995a5835f3177f1"; + sha256 = "d9f5a0f173ccb9bbae528db5a3804f57145815774f77ef755b9b0f3b4b2a9dcb"; }; # moto>=1.0.0 is backwards-incompatible and some tests fail with it, From 2daa0177bcb1fc295a8cb0b7fd5bcae948754950 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0300/1183] python3Packages.smmap: 3.0.5 -> 4.0.0 --- pkgs/development/python-modules/smmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/smmap/default.nix b/pkgs/development/python-modules/smmap/default.nix index 1b0f310f4251..800cf0842582 100644 --- a/pkgs/development/python-modules/smmap/default.nix +++ b/pkgs/development/python-modules/smmap/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "smmap"; - version = "3.0.5"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "84c2751ef3072d4f6b2785ec7ee40244c6f45eb934d9e543e2c51f1bd3d54c50"; + sha256 = "7e65386bd122d45405ddf795637b7f7d2b532e7e401d46bbe3fb49b9986d5182"; }; checkInputs = [ nosexcover ]; From 94039ffdce936582cb12a07485d8d5851c69c193 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0301/1183] python3Packages.snowballstemmer: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/snowballstemmer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 84b2bb2e1435..5f3029de2a70 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "snowballstemmer"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "df3bac3df4c2c01363f3dd2cfa78cce2840a79b9f1c2d2de9ce8d31683992f52"; + sha256 = "e997baa4f2e9139951b6f4c631bad912dfd3c792467e2f03d7239464af90e914"; }; # No tests included From b00c86c59fabc00e2d1ff9ae7ef503679f09ef22 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0302/1183] python3Packages.snowflake-connector-python: 2.3.10 -> 2.4.1 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0679b25ad417..fdf984563ea0 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.3.10"; + version = "2.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f"; + sha256 = "5c9180e61202a7beb1df83231688423091ca0a04ee559d2a78ff77f9c727baae"; }; postPatch = '' From 3aa96dbea66fe744eade3be5175e5be18d57c1f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0303/1183] python3Packages.soupsieve: 2.0.1 -> 2.2.1 --- pkgs/development/python-modules/soupsieve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 22d1926d8bb4..954599ffefaa 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "2.0.1"; + version = "2.2.1"; src = fetchPypi { inherit pname version; - sha256 = "a59dc181727e95d25f781f0eb4fd1825ff45590ec8ff49eadfd7f1a537cc0232"; + sha256 = "052774848f448cf19c7e959adf5566904d525f33a3f8b6ba6f6f8f26ec7de0cc"; }; checkPhase = '' From 86ef01175e1e4546bb9389940dccfbc0a506698c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0304/1183] python3Packages.spacy: 2.3.5 -> 3.0.5 --- 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 eef7b116b894..077ac0e6a3bc 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "spacy"; - version = "2.3.5"; + version = "3.0.5"; src = fetchPypi { inherit pname version; - sha256 = "315278ab60094643baecd866017c7d4cbd966efd2d517ad0e6c888edf7fa5aef"; + sha256 = "9f7a09fbad53aac2a3cb7696a902de62b94575a15d249dd5e26a98049328060e"; }; propagatedBuildInputs = [ From a0c5148f9a753d6cc9c41496536725084e3b852f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0305/1183] python3Packages.sparse: 0.11.2 -> 0.12.0 --- pkgs/development/python-modules/sparse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index 93ffa89c76c4..dc41aaa8e3d4 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sparse"; - version = "0.11.2"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "bc5c35dbc81242237feb7a8e1f7d9c5e9dd9bb0910f6ec55f50dcc379082864f"; + sha256 = "2c95c3b8ee00211a5aa4ef5e46006d25bf35009a66e406b7ea9b25b327fb9516"; }; checkInputs = [ pytest dask ]; From 4b25b312bfacb368bc7d9e90e3a9a63509f3b46a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:28 +0100 Subject: [PATCH 0306/1183] python3Packages.sphinx-autobuild: 2020.9.1 -> 2021.3.14 --- pkgs/development/python-modules/sphinx-autobuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx-autobuild/default.nix b/pkgs/development/python-modules/sphinx-autobuild/default.nix index 94047b359aa9..7d4629be50c7 100644 --- a/pkgs/development/python-modules/sphinx-autobuild/default.nix +++ b/pkgs/development/python-modules/sphinx-autobuild/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sphinx-autobuild"; - version = "2020.9.1"; + version = "2021.3.14"; src = fetchPypi { inherit pname version; - sha256 = "1vbaf4vrxahylyp8zrlw5dx1d2faajp926c3pl5i1wlkp1yll62b"; + sha256 = "de1ca3b66e271d2b5b5140c35034c89e47f263f2cd5db302c9217065f7443f05"; }; propagatedBuildInputs = [ sphinx livereload ]; From f0a8460837c2739271b18a4cdd74d6dba227498a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0307/1183] python3Packages.sphinx-autoapi: 1.5.1 -> 1.7.0 --- .../python-modules/sphinxcontrib-autoapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix index 068c4d5d2e94..c60d99d5e629 100644 --- a/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-autoapi/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sphinx-autoapi"; - version = "1.5.1"; + version = "1.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "19m9yvlqwaw3b05lbb1vcla38irn4riw2ij0vjmnc2xq4f1qfl2d"; + sha256 = "48caa054a99c21156e9a1d26559281dc27f86ab8ef8bb6ef160f8cd9f4a0053d"; }; propagatedBuildInputs = [ astroid jinja2 pyyaml sphinx unidecode ]; From 73b279da3a6861122d8cc5b2c200166ff132f7e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0308/1183] python3Packages.sphinxcontrib-bibtex: 2.1.4 -> 2.2.0 --- .../python-modules/sphinxcontrib-bibtex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 931af4b4dde2..b31c79c3f75f 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { - version = "2.1.4"; + version = "2.2.0"; pname = "sphinxcontrib-bibtex"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "f53ec0cd534d2c8f0a51b4b3473ced46e9cb0dd99a7c5019249fe0ef9cbef18e"; + sha256 = "7500843e154d76983c23bca5ca7380965e0725c46b8f484c1322d0b58a6ce3b2"; }; propagatedBuildInputs = [ oset pybtex pybtex-docutils sphinx ]; From f918aa480a037063150980ce9e078395cdd3e7fa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0309/1183] python3Packages.sphinxcontrib-plantuml: 0.19 -> 0.20 --- .../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 e028b6eea80e..51fd34803dff 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.19"; + version = "0.20"; src = fetchPypi { inherit pname version; - sha256 = "98b9f02282907b0c5b7a93a446c4649909aaf5785d2da0dd263c8ad68e00e288"; + sha256 = "041d8f79599522949eda129146a60955d0b7544963790411106fff6f9f3daab4"; }; # No tests included. From 72ccdc1ff46f2ab4b21a0d0c37ff0f6f9a681d5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0310/1183] python3Packages.sphinx_rtd_theme: 0.4.3 -> 0.5.1 --- pkgs/development/python-modules/sphinx_rtd_theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 87da4131351d..3062f35669ed 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinx_rtd_theme"; - version = "0.4.3"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "728607e34d60456d736cc7991fd236afb828b21b82f956c5ea75f94c8414040a"; + sha256 = "eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5"; }; propagatedBuildInputs = [ sphinx ]; From 2c3da98105c347939bd833d2066a4d3708b72af0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0311/1183] python3Packages.spyder: 4.2.1 -> 4.2.4 --- pkgs/development/python-modules/spyder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index dd65079e6a13..0293699a450c 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.2.1"; + version = "4.2.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7f93bc5b8b119cc1e195ce3efcc1598386e082c4096334c1fa2b018938ac79b9"; + sha256 = "ec3a6949a3210f7a35142ddd0e8ec529bdd382ae0cae9d1537f2009f557214c8"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; From 5863b6581d990624a320e6bb42ac25a4024d1029 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0312/1183] python3Packages.spyder-kernels: 1.10.1 -> 1.10.2 --- pkgs/development/python-modules/spyder-kernels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix index 614f64a0fbe1..410e1ad06163 100644 --- a/pkgs/development/python-modules/spyder-kernels/default.nix +++ b/pkgs/development/python-modules/spyder-kernels/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "spyder-kernels"; - version = "1.10.1"; + version = "1.10.2"; src = fetchPypi { inherit pname version; - sha256 = "416534d7504c0f337e6e6e2cbd893d1866ad20d3bec99a94ad617d2fd60699ae"; + sha256 = "a507397f5ff0426cff50f1b67996b191bdc8148583aa565f5dffd3d0111c0262"; }; propagatedBuildInputs = [ From 685d83cacfd61edb7a4715d25ab47532aefc29a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0313/1183] python3Packages.sqlalchemy-citext: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/sqlalchemy-citext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index bf8a9d3bbdbd..f701da577245 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; - version = "1.7.0"; + version = "1.8.0"; src = fetchPypi { inherit pname version; - sha256 = "69ba00f5505f92a1455a94eefc6d3fcf72dda3691ab5398a0b4d0d8d85bd6aab"; + sha256 = "a1740e693a9a334e7c8f60ae731083fe75ce6c1605bb9ca6644a6f1f63b15b77"; }; propagatedBuildInputs = [ From cff4dba1eddb6ed1276d58983c7cb13cdb33f548 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0314/1183] python3Packages.SQLObject: 3.8.1 -> 3.9.1 --- pkgs/development/python-modules/sqlobject/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlobject/default.nix b/pkgs/development/python-modules/sqlobject/default.nix index f3c438342bce..2335a0204e48 100644 --- a/pkgs/development/python-modules/sqlobject/default.nix +++ b/pkgs/development/python-modules/sqlobject/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "SQLObject"; - version = "3.8.1"; + version = "3.9.1"; src = fetchPypi { inherit pname version; - sha256 = "620657105ab5720658222d10ad13c52281fe524137b59ab166eee4427ee2f548"; + sha256 = "45064184decf7f42d386704e5f47a70dee517d3e449b610506e174025f84d921"; }; checkInputs = [ pytest ]; From 817bfe712994f9839d15def89dee20dbd72c1caf Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0315/1183] python3Packages.stevedore: 3.2.2 -> 3.3.0 --- pkgs/development/python-modules/stevedore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 06d614feaacf..c9ea20440482 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.2.2"; + version = "3.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0"; + sha256 = "3a5bbd0652bf552748871eaa73a4a8dc2899786bc497a2aa1fcb4dcdb0debeee"; }; propagatedBuildInputs = [ pbr setuptools six ] From 1e87ebe674b36d982a3635e76dc847e19440a3a5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0316/1183] python3Packages.stripe: 2.55.2 -> 2.56.0 --- pkgs/development/python-modules/stripe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 96ac2d208b3d..4be51c488d42 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.55.2"; + version = "2.56.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e32c68194a47522a10945eb893218e5cb5ee65e3a3c2c4df7efca117a6bf1902"; + sha256 = "2ff904fb8dee0d25f135059468a876852d24dc8cbe0b45d7aff56a028045777c"; }; propagatedBuildInputs = [ requests ]; From 4c629e3c82f47d8c9ed74c8bd98e4a7f228e3ff0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0317/1183] python3Packages.structlog: 20.1.0 -> 21.1.0 --- pkgs/development/python-modules/structlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 8f7e73a454a4..dc7aea0c3bf9 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "structlog"; - version = "20.1.0"; + version = "21.1.0"; src = fetchPypi { inherit pname version; - sha256 = "7a48375db6274ed1d0ae6123c486472aa1d0890b08d314d2b016f3aa7f35990b"; + sha256 = "d9d2d890532e8db83c6977a2a676fb1889922ff0c26ad4dc0ecac26f9fafbc57"; }; checkInputs = [ pytest pytest-asyncio pretend freezegun simplejson twisted ] From 614bd486721a90a7d2ca3959ad463b35b96176f5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:29 +0100 Subject: [PATCH 0318/1183] python3Packages.sunpy: 2.0.7 -> 2.1.2 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 3ad8b6fea1d7..dfa612a64943 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -29,12 +29,12 @@ buildPythonPackage rec { pname = "sunpy"; - version = "2.0.7"; + version = "2.1.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d13ac67c14ea825652dc3e12c4c627e782e8e843e96a1d54440d39dd2ceb6a5c"; + sha256 = "8bbc440e606a4f3fcbd1441150d81da6f0208adace9dc06f6afd2c9cb7c08908"; }; nativeBuildInputs = [ From b82c6b40690bb95d6b36c6963e36941703c25425 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0319/1183] python3Packages.supervisor: 4.2.1 -> 4.2.2 --- pkgs/development/python-modules/supervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 93569fe3da73..a7153b07750f 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "supervisor"; - version = "4.2.1"; + version = "4.2.2"; src = fetchPypi { inherit pname version; - sha256 = "c479c875853e9c013d1fa73e529fd2165ff1ecaecc7e82810ba57e7362ae984d"; + sha256 = "5b2b8882ec8a3c3733cce6965cc098b6d80b417f21229ab90b18fe551d619f90"; }; # wants to write to /tmp/foo which is likely already owned by another From 1c1877ed78c9be172d8bd2dc51d5cd6bc0ccf8b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0320/1183] python3Packages.svg.path: 4.0.2 -> 4.1 --- pkgs/development/python-modules/svg-path/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index 820d4121633b..e01909fc93a8 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -1,11 +1,11 @@ { lib, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "svg.path"; - version = "4.0.2"; + version = "4.1"; src = fetchPypi { inherit pname version; - sha256 = "4bd627ec6526cd5da14f3c6a51205d930187db2d8992aed626825492c033b195"; + sha256 = "7e6847ba690ff620e20f152818d52e1685b993aacbc41b321f8fee3d1cb427db"; }; meta = with lib; { From 75c772a07bcbbcb9c9867a5d50c783e6cafa97a4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0321/1183] python3Packages.sysv_ipc: 1.0.1 -> 1.1.0 --- pkgs/development/python-modules/sysv_ipc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 5d9b5a034c2b..a58b714a4ac8 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sysv_ipc"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1p5lx3yz4p40rfb453m80a4hh8341yp4dki2nhhxz7bq2zfi1zwf"; + sha256 = "0f063cbd36ec232032e425769ebc871f195a7d183b9af32f9901589ea7129ac3"; }; meta = with lib; { From 6319cb3a8b1cc3058801bf206d8be2fb655f4ed9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0322/1183] python3Packages.tablib: 2.0.0 -> 3.0.0 --- pkgs/development/python-modules/tablib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tablib/default.nix b/pkgs/development/python-modules/tablib/default.nix index b1427a813312..5216fc7d0d92 100644 --- a/pkgs/development/python-modules/tablib/default.nix +++ b/pkgs/development/python-modules/tablib/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "tablib"; - version = "2.0.0"; + version = "3.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1rvvdchdva7j9b29ay0sg8y33pjhpmzynl38wz2rl89pph8gmhlc"; + sha256 = "f83cac08454f225a34a305daa20e2110d5e6335135d505f93bc66583a5f9c10d"; }; propagatedBuildInputs = [ xlwt openpyxl pyyaml xlrd odfpy ]; From 703d4abaf7d95a7416127974df889318feffb4a0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0323/1183] python3Packages.tabulate: 0.8.8 -> 0.8.9 --- pkgs/development/python-modules/tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index 2d841918f110..621445b2d516 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.8"; + version = "0.8.9"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "26f2589d80d332fefd2371d396863dedeb806f51b54bdb4b264579270b621e92"; + sha256 = "eb1d13f25760052e8931f2ef80aaf6045a6cceb47514db8beab24cded16f13a7"; }; checkInputs = [ nose ]; From 429e5203424bfb98f59d737d29e1b7e3ee44a25d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0324/1183] python3Packages.taskw: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/taskw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index 9e1ae3302c12..523d3e303b32 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -11,12 +11,12 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "taskw"; src = fetchPypi { inherit pname version; - sha256 = "fadd8afc12df026c3c2d39b633c55d3337f7dca95602fce2239455a048bc85fe"; + sha256 = "7673d80b3d5bace5b35eb71f5035e313a92daab6e437694128d8ce7dcdaf66fb"; }; patches = [ ./use-template-for-taskwarrior-install-path.patch ]; From 7ca09f655f98c48d583f7acdeca90c8515dea933 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0325/1183] python3Packages.tenacity: 6.3.1 -> 7.0.0 --- pkgs/development/python-modules/tenacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index 51f055d06607..e23567ab0691 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "6.3.1"; + version = "7.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0zsdajdpcjd7inrl7r9pwiyh7qpgh9jk7g2bj1iva2d3n0gijkg1"; + sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; }; nativeBuildInputs = [ pbr setuptools_scm ]; From 936dc86f121770fd92e99a53650d3d3d4bfc87b9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0326/1183] python3Packages.terminado: 0.9.2 -> 0.9.3 --- pkgs/development/python-modules/terminado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index 0f02da4866f2..846c8157b75f 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "terminado"; - version = "0.9.2"; + version = "0.9.3"; src = fetchPypi { inherit pname version; - sha256 = "89e6d94b19e4bc9dce0ffd908dfaf55cc78a9bf735934e915a4a96f65ac9704c"; + sha256 = "261c0b7825fecf629666e1820b484a5380f7e54d6b8bd889fa482e99dcf9bde4"; }; propagatedBuildInputs = [ ptyprocess tornado ]; From 12b477798466ec154c1bf0234765dba624ca2619 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0327/1183] python3Packages.testfixtures: 6.15.0 -> 6.17.1 --- pkgs/development/python-modules/testfixtures/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index b9803b115083..cd08fe58dcab 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.15.0"; + version = "6.17.1"; src = fetchPypi { inherit pname version; - sha256 = "409f77cfbdad822d12a8ce5c4aa8fb4d0bb38073f4a5444fede3702716a2cec2"; + sha256 = "5ec3a0dd6f71cc4c304fbc024a10cc293d3e0b852c868014b9f233203e149bda"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; From 63f0b323a7fa4b5ef80969b23fda644cfc110190 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0328/1183] python3Packages.thinc: 7.4.5 -> 8.0.2 --- pkgs/development/python-modules/thinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index 75e1a029a256..ceefc2fd9d14 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.5"; + version = "8.0.2"; src = fetchPypi { inherit pname version; - sha256 = "5743fde41706252ec6ce4737c68d3505f7e1cc3d4431174a17149838d594f8cb"; + sha256 = "20f033b3d9fbd02389d8f828cebcd3a42aee3e17ed4c2d56c6d5163af83a9cee"; }; buildInputs = [ cython ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ From d5948926be33e365efbcda9a17f1af62d47e37ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0329/1183] python3Packages.tifffile: 2020.11.26 -> 2021.3.17 --- pkgs/development/python-modules/tifffile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 9383cf947c20..14a62d2a5aed 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2020.11.26"; + version = "2021.3.17"; src = fetchPypi { inherit pname version; - sha256 = "c712df6f201385fbd3500e26e45dc20fabcbb0c6c1fbfb4c1e44538a9d0269a8"; + sha256 = "1b72c92ecd2273e52686c0f8792d1d1c4da4109b241dd1723dfe56ef4d1ad612"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; From 242ae8be784ad2919cb5e0464d0e59ffb99ad443 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0330/1183] python3Packages.timezonefinder: 4.5.0 -> 5.2.0 --- pkgs/development/python-modules/timezonefinder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 0ba9c4c53d8f..48aff396aaad 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "4.5.0"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "99b0cea5abf304e8738ecf5cceae0c0e5182534843f19638a26a220fa212fbad"; + sha256 = "a374570295a8dbd923630ce85f754e52578e288cb0a9cf575834415e84758352"; }; propagatedBuildInputs = [ From 86733d5e58d4465e74df15e68055e04a5206cf9a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:30 +0100 Subject: [PATCH 0331/1183] python3Packages.titlecase: 1.1.1 -> 2.0.0 --- pkgs/development/python-modules/titlecase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index acc8b9c56705..9dc09db98f45 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "titlecase"; - version = "1.1.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; + sha256 = "d6b24c4bfce6b05ee55da48901a1aa39eac20f223160b7872dcf1b8182214bec"; }; propagatedBuildInputs = [ regex ]; From d6958c85490591f0f63fe9b04981a5417f7b0fda Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0332/1183] python3Packages.tox: 3.20.1 -> 3.23.0 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 9dad7d77ff90..0fc0ffbf2e72 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.20.1"; + version = "3.23.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6"; + sha256 = "05a4dbd5e4d3d8269b72b55600f0b0303e2eb47ad5c6fe76d3576f4c58d93661"; }; meta = with lib; { From a0075b99d63b09c78a5528b515b77197a2319887 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0333/1183] python3Packages.tqdm: 4.58.0 -> 4.59.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 950a618a5275..2511aba26a7f 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.58.0"; + version = "4.59.0"; src = fetchPypi { inherit pname version; - sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2"; + sha256 = "d666ae29164da3e517fcf125e41d4fe96e5bb375cd87ff9763f6b38b5592fe33"; }; nativeBuildInputs = [ From ba5c07843e4e9f466256b840486fcc798914d364 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0334/1183] python3Packages.traits: 6.1.1 -> 6.2.0 --- pkgs/development/python-modules/traits/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index d9986dd87fe1..e4e82db9e446 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "traits"; - version = "6.1.1"; + version = "6.2.0"; disabled = isPy27; # setup.py no longer py3 compat src = fetchPypi { inherit pname version; - sha256 = "807da52ee0d4fc1241c8f8a04d274a28d4b23d3a5f942152497d19405482d04f"; + sha256 = "16fa1518b0778fd53bf0547e6a562b1787bf68c8f6b7995a13bd1902529fdb0c"; }; # Use pytest because its easier to discover tests From b29c189a983b98e8e21f47c72442384b4936f9f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0335/1183] python3Packages.transmission-rpc: 3.2.2 -> 3.2.4 --- pkgs/development/python-modules/transmission-rpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/transmission-rpc/default.nix b/pkgs/development/python-modules/transmission-rpc/default.nix index 235540209e37..533b34ca343b 100644 --- a/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/pkgs/development/python-modules/transmission-rpc/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.2"; + version = "3.2.4"; src = fetchPypi { inherit pname version; - sha256 = "1y5048109j6z4smzwysvdjfn6cj9698dsxfim9i4nqam4nmw2wi7"; + sha256 = "f852d1afd0f0d4f515fe20f0de94d57b6d2e36cbac45e07da43ea0b6518f535c"; }; propagatedBuildInputs = [ From 243bd5255609773e1a1a73223e6c0cc64b8da6e1 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0336/1183] python3Packages.treq: 20.9.0 -> 21.1.0 --- pkgs/development/python-modules/treq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 447e2a5b9863..ec648281c89a 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "treq"; - version = "20.9.0"; + version = "21.1.0"; src = fetchPypi { inherit pname version; - sha256 = "83cd2ca75aef4f1fbdbe144c186426d930c3e8b20385df8cec9e12d442986da2"; + sha256 = "fdae0c872c444ed96c3cb11be8445d22e4afb731e87fdddae3b00c609e77199f"; }; propagatedBuildInputs = [ From 1c2ad4046ffb24fb5c4945bc48c348c9fdbecbe2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0337/1183] python3Packages.trimesh: 3.9.7 -> 3.9.10 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index d4a021a0e311..aad81957d72d 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.7"; + version = "3.9.10"; src = fetchPypi { inherit pname version; - sha256 = "63dd76531a4c6ddd53e00209b971e83d3fbfd9b012f4033a1c4b0f04f1f551e3"; + sha256 = "7ed243bc818f7a9a021d8dd39f69ae7ed366dfd9582b13d686e1b1e8c8326bcf"; }; propagatedBuildInputs = [ numpy ]; From 4620a999f7b81483eebbab357f977b6783acdff9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0338/1183] python3Packages.trustme: 0.6.0 -> 0.7.0 --- pkgs/development/python-modules/trustme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 4c99c8e93770..d98d99aaaad7 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "9dfb18b568729d0219f758cddca1a91bab59f62ca41ee0e8acce5e657ec97b6c"; + sha256 = "1fde1dd27052ab5e5693e1fbe3ba091a6496daf1125409d73232561145fca369"; }; checkInputs = [ From 5faabdaf9b1007504ad54c4c69365ae4a4e0ecdb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0339/1183] python3Packages.trytond: 5.8.4 -> 5.8.5 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 20394fb2de65..1be8fc18d27f 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -23,12 +23,12 @@ buildPythonApplication rec { pname = "trytond"; - version = "5.8.4"; + version = "5.8.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "28e467b51f6dc67b8b4ca60afec82614bba8cf78852c1941cc9071d615ba7972"; + sha256 = "62753cebdae2d9e2d6bf8a5dde840ef77540414c4df76c8ed202c0c0d0bedb02"; }; # Tells the tests which database to use From 053d77a0d2746219f053f24efb5dea5e2663561d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0340/1183] python3Packages.tweepy: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/tweepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 1c5535ec079b..dd11e60aff6c 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604"; + sha256 = "76e6954b806ca470dda877f57db8792fff06a0beba0ed43efc3805771e39f06a"; }; doCheck = false; From c6098eab4da05a683ea777df4d125bba092cebc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0341/1183] python3Packages.twill: 2.0.2 -> 3.0 --- pkgs/development/python-modules/twill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index e234084d31de..36a7edcf7de8 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "twill"; - version = "2.0.2"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "fc694ac1cb0616cfba2f9db4720e9d354bf656c318e21ef604a7e3caaef83d10"; + sha256 = "01770eddb34f5fe6ee59992b84619968885d359ad3d6d9191e8ba8eec93482aa"; }; checkInputs = [ nose ]; From ffc694fb8c519c430676505933f24f265f9a5bc8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0342/1183] python3Packages.twine: 3.2.0 -> 3.4.1 --- pkgs/development/python-modules/twine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 47f9fe1a034e..67c66e623c3d 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -14,12 +14,12 @@ buildPythonPackage rec { pname = "twine"; - version = "3.2.0"; + version = "3.4.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34352fd52ec3b9d29837e6072d5a2a7c6fe4290e97bba46bb8d478b5c598f7ab"; + sha256 = "a56c985264b991dc8a8f4234eb80c5af87fa8080d0c224ad8f2cd05a2c22e83b"; }; nativeBuildInputs = [ setuptools_scm ]; From c8d5d32620706cb15262906a2d727a5fdba5bff9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0343/1183] python3Packages.txaio: 20.4.1 -> 21.2.1 --- pkgs/development/python-modules/txaio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix index 814b6234ee3b..c2f2c9451bdc 100644 --- a/pkgs/development/python-modules/txaio/default.nix +++ b/pkgs/development/python-modules/txaio/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "txaio"; - version = "20.4.1"; + version = "21.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "17938f2bca4a9cabce61346758e482ca4e600160cbc28e861493eac74a19539d"; + sha256 = "7d6f89745680233f1c4db9ddb748df5e88d2a7a37962be174c0fd04c8dba1dc8"; }; checkInputs = [ pytest mock ]; From 103e2c6507ecc4c45e4f49b29579949cc9fa1e0a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0344/1183] python3Packages.typeguard: 2.10.0 -> 2.11.1 --- pkgs/development/python-modules/typeguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 7aced09b33da..9d00adfea831 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.10.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "d830132dcd544d3f8a2a842ea739eaa0d7c099fcebb9dcdf3802f4c9929d8191"; + sha256 = "33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64"; }; buildInputs = [ setuptools_scm ]; From fbebe8e03f9b116347fd568e5ad47075964aaa74 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:31 +0100 Subject: [PATCH 0345/1183] python3Packages.Unidecode: 1.1.2 -> 1.2.0 --- pkgs/development/python-modules/unidecode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 65cb0882380f..3ff2e3b981ed 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Unidecode"; - version = "1.1.2"; + version = "1.2.0"; src = fetchPypi { inherit pname version; - sha256 = "a039f89014245e0cad8858976293e23501accc9ff5a7bdbc739a14a2b7b85cdc"; + sha256 = "8d73a97d387a956922344f6b74243c2c6771594659778744b2dbdaad8f6b727d"; }; LC_ALL="en_US.UTF-8"; From 005361e07c2786d6ef88d54ff5c849b993135bbb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0346/1183] python3Packages.uproot3-methods: 0.10.0 -> 0.10.1 --- pkgs/development/python-modules/uproot3-methods/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uproot3-methods/default.nix b/pkgs/development/python-modules/uproot3-methods/default.nix index aca6095d333f..f5760b974ffd 100644 --- a/pkgs/development/python-modules/uproot3-methods/default.nix +++ b/pkgs/development/python-modules/uproot3-methods/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "0.10.0"; + version = "0.10.1"; pname = "uproot3-methods"; src = fetchPypi { inherit pname version; - sha256 = "1rk9i1ra3panli96ghz80ddpqk77xb1kpxs3wf8rw0jy5d88pc26"; + sha256 = "dd68f90be1ea276360b96369836849df29045f7fe4e534f9ac21ea00798ee358"; }; nativeBuildInputs = [ awkward0 ]; From a655c69c49d4bb3229415302a5e3e6f25cfa54c5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0347/1183] python3Packages.uritools: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/uritools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uritools/default.nix b/pkgs/development/python-modules/uritools/default.nix index 2f4710eea46b..d90bf39f3360 100644 --- a/pkgs/development/python-modules/uritools/default.nix +++ b/pkgs/development/python-modules/uritools/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "uritools"; - version = "3.0.0"; + version = "3.0.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "405917a31ce58a57c8ccd0e4ea290f38baf2f4823819c3688f5331f1aee4ccb0"; + sha256 = "a3e9c794d44fdbd54642dcb7d6ef3ba9866d953eb34f65aeca3754b7ad5c1ea0"; }; meta = with lib; { From 44943bd920209c7e2f98c0f80e2cb2d4187237a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0348/1183] python3Packages.PyVirtualDisplay: 2.0 -> 2.1 --- pkgs/development/python-modules/virtual-display/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/virtual-display/default.nix index 7559ae1ccca5..bf47297b1c54 100644 --- a/pkgs/development/python-modules/virtual-display/default.nix +++ b/pkgs/development/python-modules/virtual-display/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "PyVirtualDisplay"; - version = "2.0"; + version = "2.1"; propagatedBuildInputs = [ EasyProcess ]; src = fetchPypi { inherit pname version; - sha256 = "3cdacd70970a74d163a2417d8581f43a56bb1ac8d31c71a1a6a4348969062d65"; + sha256 = "9d4c6957ec2c4753b5293fb6a60a90d7c27fc01bc5de9b5aa863f7c1e3fb4efc"; }; # requires X server From e0372c7c8e8f2bb39e4727b43383891e1fcac752 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0349/1183] python3Packages.virtualenv: 20.2.2 -> 20.4.3 --- pkgs/development/python-modules/virtualenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index ec22660830bd..bcd672601534 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.2.2"; + version = "20.4.3"; src = fetchPypi { inherit pname version; - sha256 = "b7a8ec323ee02fb2312f098b6b4c9de99559b462775bc8fe3627a73706603c1b"; + sha256 = "49ec4eb4c224c6f7dd81bb6d0a28a09ecae5894f4e593c89b0db0885f565a107"; }; nativeBuildInputs = [ From 0cbf8b8384b3b686e209c13ec715ff7195ed2edb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0350/1183] python3Packages.waitress: 1.4.4 -> 2.0.0 --- pkgs/development/python-modules/waitress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index 4edd4c6ccffb..aa09b0068d9a 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "waitress"; - version = "1.4.4"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1bb436508a7487ac6cb097ae7a7fe5413aefca610550baf58f0940e51ecfb261"; + sha256 = "69e1f242c7f80273490d3403c3976f3ac3b26e289856936d1f620ed48f321897"; }; doCheck = false; From 54440712099642f9ac250c382ecee8be31d9fae8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0351/1183] python3Packages.wcmatch: 8.1.1 -> 8.1.2 --- pkgs/development/python-modules/wcmatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wcmatch/default.nix b/pkgs/development/python-modules/wcmatch/default.nix index ade529e56274..bda48d3ec587 100644 --- a/pkgs/development/python-modules/wcmatch/default.nix +++ b/pkgs/development/python-modules/wcmatch/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "wcmatch"; - version = "8.1.1"; + version = "8.1.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-e6CRkflYLoLYZIKb37qwLfRuJqRqME5Xx/5WUvB/KXo="; + sha256 = "efda751de15201b395b6d6e64e6ae3b6b03dc502a64c3c908aa5cad14c27eee5"; }; propagatedBuildInputs = [ bracex ]; From 45c1aed0854362400249019096d608ee038fd8dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0352/1183] python3Packages.west: 0.8.0 -> 0.10.1 --- pkgs/development/python-modules/west/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 8958f37b0f85..b04dee437b55 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.10.1"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "672053c3392248846694e5619a7fe6ab4c40f010a8f5be6350821b39f6132a26"; + sha256 = "8306ebc674348f4155d82bfe8501282b41ed86cb44c3fc636a8ccf8e057b1847"; }; propagatedBuildInputs = [ From 21ee7ed40b3a05ab28b30e5c2a92b11219e76c9b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0353/1183] python3Packages.xarray: 0.16.2 -> 0.17.0 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index 42402c259ab0..e69e144ccfe9 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.16.2"; + version = "0.17.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-OOhDnWyRvNW3wPyjSdr44GQ6xohQyYcmLVNSbp19AeQ="; + sha256 = "9c2edad2a4e588f9117c666a4249920b9717fb75703b96998cf65fcd4f60551f"; }; nativeBuildInputs = [ setuptools-scm ]; From 073cc50c21e5ad5d9d3febc5a0fe2ea9c7ba2472 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0354/1183] python3Packages.xlrd: 1.2.0 -> 2.0.1 --- pkgs/development/python-modules/xlrd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index d880fd833965..9730338a0c27 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "xlrd"; - version = "1.2.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "546eb36cee8db40c3eaa46c351e67ffee6eeb5fa2650b71bc4c758a29a1b29b2"; + sha256 = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"; }; checkInputs = [ pytest ]; From 18ddd47719db3e4290d6d7dfb36a2552bbf85895 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0355/1183] python3Packages.xml2rfc: 3.5.0 -> 3.6.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index fdf042c2ac29..5b50716f2f19 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.5.0"; + version = "3.6.0"; disabled = pythonAtLeast "3.9"; src = fetchPypi { inherit pname version; - sha256 = "3ec836a9545f549707a8c8176038160185b9d08c1dd80304a906527da21bff68"; + sha256 = "a9aa2e7c156a1acb0931086637d31efe9302a771641bc35938383cefbd27ba9d"; }; propagatedBuildInputs = [ From 751d7c495c4ac376f907e20050e91ddd6f031851 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:32 +0100 Subject: [PATCH 0356/1183] python3Packages.yamlloader: 0.5.5 -> 1.0.0 --- pkgs/development/python-modules/yamlloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index c8b2d5949cbf..5126afde05fa 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "yamlloader"; - version = "0.5.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "3KtfFrObsD0Q3aTNTzDJQ2dexMd3GAf8Z+fxuzGb9Mg="; + sha256 = "e96dc3dc6895d814c330c054c966d993fc81ef1dbf5a30a4bdafeb256359e058"; }; propagatedBuildInputs = [ From fbf959f8dba493384f8db9659a3c59be71c99d42 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0357/1183] python3Packages.zipp: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/zipp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 1dafe8cbb0c5..ccb916a147a7 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zipp"; - version = "3.4.0"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb"; + sha256 = "3607921face881ba3e026887d8150cca609d517579abe052ac81fc5aeffdbd76"; }; nativeBuildInputs = [ setuptools_scm toml ]; From 8e07d6c2503e102d7e3c9cdd0a499c2a42e1c2b2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0358/1183] python3Packages.zope.component: 4.6.2 -> 5.0.0 --- pkgs/development/python-modules/zope_component/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 65556c9dc417..41c15fcd1307 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "zope.component"; - version = "4.6.2"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "91628918218b3e6f6323de2a7b845e09ddc5cae131c034896c051b084bba3c92"; + sha256 = "df541a0501c79123f9ac30c6686a9e45c2690c5c3ae4f2b7f4c6fd1a3aaaf614"; }; propagatedBuildInputs = [ From 8a525e5902c0c7dcc5ccb5d73ea708f3fb7c8737 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0359/1183] python3Packages.zope.interface: 5.2.0 -> 5.3.0 --- pkgs/development/python-modules/zope_interface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index 7b5d7abf682f..15a179c0d643 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.interface"; - version = "5.2.0"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8251f06a77985a2729a8bdbefbae79ee78567dddc3acbd499b87e705ca59fe24"; + sha256 = "b18a855f8504743e0a2d8b75d008c7720d44e4c76687e13f959e35d9a13eb397"; }; propagatedBuildInputs = [ zope_event ]; From 8808ae64ee4f8cb9eace763650d3db45de5f1ba3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0360/1183] python3Packages.zope.schema: 6.0.1 -> 6.1.0 --- pkgs/development/python-modules/zope_schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index 43fab18daeb3..00defd161509 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.schema"; - version = "6.0.1"; + version = "6.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9b3fc3ac656099aa9ebf3beb2bbd83d2d6ee6f94b9ac6969d6e3993ec9c4a197"; + sha256 = "9fa04d95e8e7e9056091eed9819da6e65dde68de39c2b93617d361d1eb8a7c0c"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ]; From 45b0e4b152c19174b5f31b76fba3fdb79ffe4968 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0361/1183] python3Packages.zope.testing: 4.7 -> 4.9 --- pkgs/development/python-modules/zope_testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 2f37f15453da..ea2d531f7632 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "zope.testing"; - version = "4.7"; + version = "4.9"; src = fetchPypi { inherit pname version; - sha256 = "d66be8d1de37e8536ca58a1d9f4d89a68c9cc75cc0e788a175c8a20ae26003ea"; + sha256 = "475cb847a7af9d547313ee93f5d0b8800bf627e6d0d9a51d11967984083cb54e"; }; doCheck = !isPyPy; From f78577eef4c60348f033f8f503cda8b348235487 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0362/1183] python3Packages.zope.testrunner: 5.2 -> 5.3.0 --- pkgs/development/python-modules/zope_testrunner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 5ee42c842753..c3bc0d0bff4d 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.2"; + version = "5.3.0"; src = fetchPypi { inherit pname version; - sha256 = "873d6017abadc213992a0c38c786ed020341b6e0fe78d14bc2a684cf5a70de4b"; + sha256 = "39a5ba631830703ea011383447135063db6d182794487dda9b8c1f515bb70b0f"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; From ff211a20e47dd03747ee9203ce8fccaf70c7f409 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0363/1183] python3Packages.zopfli: 0.1.7 -> 0.1.8 --- pkgs/development/python-modules/zopfli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix index a80b3155b8ce..a0f7785ef3a1 100644 --- a/pkgs/development/python-modules/zopfli/default.nix +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zopfli"; - version = "0.1.7"; + version = "0.1.8"; src = fetchPypi { inherit pname version; - sha256 = "512892714f0e3dcc9a77222cb509ed519f41ce2b92467e47a4b406a23b48561a"; + sha256 = "8b977dc07e3797907ab59e08096583bcd0b7e6c739849fbbeec09263f6356623"; extension = "zip"; }; From eb4be60694e9c1d0e606c7d70df5a5a6683067c6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 10:28:33 +0100 Subject: [PATCH 0364/1183] python3Packages.zstandard: 0.15.1 -> 0.15.2 --- pkgs/development/python-modules/zstandard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index fc5f8c3161ed..724a5d9d6794 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "zstandard"; - version = "0.15.1"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "cb7c6a6f7d62350b9f5539045da54422975630e34dd9069584cc776b9917115f"; + sha256 = "52de08355fd5cfb3ef4533891092bb96229d43c2069703d4aff04fdbedf9c92f"; }; propagatedBuildInputs = [ cffi ]; From 90d59427edd2a03cac9ce5054fc072bbafdde7d9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 11:54:12 +0100 Subject: [PATCH 0365/1183] python2Packages.setuptools-scm: keep 5.0.2 --- .../python-modules/setuptools_scm/2.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/setuptools_scm/2.nix diff --git a/pkgs/development/python-modules/setuptools_scm/2.nix b/pkgs/development/python-modules/setuptools_scm/2.nix new file mode 100644 index 000000000000..4cf6f16fedfb --- /dev/null +++ b/pkgs/development/python-modules/setuptools_scm/2.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchPypi, toml }: + +buildPythonPackage rec { + pname = "setuptools_scm"; + version = "5.0.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-g6DO3TRJ45RjB4EaTHudicS1/UZKL7XuzNCluxWK5cg="; + }; + + propagatedBuildInputs = [ toml ]; + + # Requires pytest, circular dependency + doCheck = false; + pythonImportsCheck = [ "setuptools_scm" ]; + + meta = with lib; { + homepage = "https://github.com/pypa/setuptools_scm/"; + description = "Handles managing your python package versions in scm metadata"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c4797e299bfd..9e76151e7b6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7617,7 +7617,10 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; setuptools-scm = self.setuptools_scm; # added 2021-01-04 - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + setuptools_scm = if isPy3k then + callPackage ../development/python-modules/setuptools_scm { } + else + callPackage ../development/python-modules/setuptools_scm/2.nix { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; From 91516e5e39bc5cf4292e2ad52af48ebc6c1983b6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 11:54:25 +0100 Subject: [PATCH 0366/1183] python2Packages.idna: keep 2.10 --- pkgs/development/python-modules/idna/2.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 ++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/idna/2.nix diff --git a/pkgs/development/python-modules/idna/2.nix b/pkgs/development/python-modules/idna/2.nix new file mode 100644 index 000000000000..613fde773a71 --- /dev/null +++ b/pkgs/development/python-modules/idna/2.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "idna"; + version = "2.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; + }; + + meta = { + homepage = "https://github.com/kjd/idna/"; + description = "Internationalized Domain Names in Applications (IDNA)"; + license = lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e76151e7b6e..80e9b27fc118 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3241,7 +3241,10 @@ in { identify = callPackage ../development/python-modules/identify { }; - idna = callPackage ../development/python-modules/idna { }; + idna = if isPy3k then + callPackage ../development/python-modules/idna { } + else + callPackage ../development/python-modules/idna/2.nix { }; idna-ssl = callPackage ../development/python-modules/idna-ssl { }; From 516a7f72a881c9dbd9d7711731195cb2a714143b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 11:54:42 +0100 Subject: [PATCH 0367/1183] python2Packages.chardet: keep 3.0.4 --- pkgs/development/python-modules/chardet/2.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/chardet/2.nix diff --git a/pkgs/development/python-modules/chardet/2.nix b/pkgs/development/python-modules/chardet/2.nix new file mode 100644 index 000000000000..65381d40268f --- /dev/null +++ b/pkgs/development/python-modules/chardet/2.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, pytest, pytestrunner, hypothesis }: + +buildPythonPackage rec { + pname = "chardet"; + version = "3.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bpalpia6r5x1kknbk11p1fzph56fmmnp405ds8icksd3knr5aw4"; + }; + + patches = [ + # Add pytest 4 support. See: https://github.com/chardet/chardet/pull/174 + (fetchpatch { + url = "https://github.com/chardet/chardet/commit/0561ddcedcd12ea1f98b7ddedb93686ed8a5ffa4.patch"; + sha256 = "1y1xhjf32rdhq9sfz58pghwv794f3w2f2qcn8p6hp4pc8jsdrn2q"; + }) + ]; + + checkInputs = [ pytest pytestrunner hypothesis ]; + + meta = with lib; { + homepage = "https://github.com/chardet/chardet"; + description = "Universal encoding detector"; + license = licenses.lgpl2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80e9b27fc118..be95234ecf1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1318,7 +1318,10 @@ in { characteristic = callPackage ../development/python-modules/characteristic { }; - chardet = callPackage ../development/python-modules/chardet { }; + chardet = if isPy3k then + callPackage ../development/python-modules/chardet { } + else + callPackage ../development/python-modules/chardet/2.nix { }; chart-studio = callPackage ../development/python-modules/chart-studio { }; From 3955326221aaae03621ad5836941fc6eb78e09ed Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 12:13:09 +0100 Subject: [PATCH 0368/1183] python2Packages.pytestrunner: keep 5.2 --- .../python-modules/pytestrunner/2.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/pytestrunner/2.nix diff --git a/pkgs/development/python-modules/pytestrunner/2.nix b/pkgs/development/python-modules/pytestrunner/2.nix new file mode 100644 index 000000000000..d6203276b827 --- /dev/null +++ b/pkgs/development/python-modules/pytestrunner/2.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi, setuptools_scm, pytest }: + +buildPythonPackage rec { + pname = "pytest-runner"; + version = "5.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "96c7e73ead7b93e388c5d614770d2bae6526efd997757d3543fe17b557a0942b"; + }; + + nativeBuildInputs = [ setuptools_scm pytest ]; + + postPatch = '' + rm pytest.ini + ''; + + checkPhase = '' + py.test tests + ''; + + # Fixture not found + doCheck = false; + + meta = with lib; { + description = "Invoke py.test as distutils command with dependency resolution"; + homepage = "https://github.com/pytest-dev/pytest-runner"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index be95234ecf1c..5267d8104f83 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6591,7 +6591,10 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + pytestrunner = if isPy3k then + callPackage ../development/python-modules/pytestrunner { } + else + callPackage ../development/python-modules/pytestrunner/2.nix { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; From 4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 12:12:48 +0100 Subject: [PATCH 0369/1183] python2Packages: separate extension --- pkgs/development/interpreters/python/default.nix | 5 ++++- pkgs/top-level/python2-packages.nix | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/top-level/python2-packages.nix diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index dcccaf1f2b7b..07d52a532fb4 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -69,12 +69,15 @@ with pkgs; recursivePthLoader ; }; + optionalExtensions = cond: as: if cond then as else []; + python2Extension = import ../../../top-level/python2-packages.nix; + extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); in lib.makeScopeWithSplicing pkgs.splicePackages pkgs.newScope otherSplices keep - (lib.extends overrides pythonPackagesFun)) + (lib.extends extensions pythonPackagesFun)) { overrides = packageOverrides; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix new file mode 100644 index 000000000000..7934861f097b --- /dev/null +++ b/pkgs/top-level/python2-packages.nix @@ -0,0 +1,7 @@ +# Extension with Python 2 packages that is overlayed on top +# of the Python 3 packages set. This way, Python 2+3 compatible +# packages can still be used. + +self: super: { + +} From 187d0371ab3220ee40da1f616e4c48d85ac28986 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:10:59 +0100 Subject: [PATCH 0370/1183] python2Packages: move python 2 calls into python2-packages.nix --- pkgs/top-level/python-packages.nix | 451 +++++++--------------------- pkgs/top-level/python2-packages.nix | 231 +++++++++++++- 2 files changed, 334 insertions(+), 348 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5267d8104f83..34cd496c1cc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -96,15 +96,18 @@ let }; }); - disabledIf = x: drv: - if x then throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}" else drv; + disabled = drv: throw "${removePythonPrefix (drv.pname or drv.name)} not supported for interpreter ${python.executable}"; + + disabledIf = x: drv: if x then disabled drv else drv; in { + inherit pkgs; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi; - inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; + inherit hasPythonModule requiredPythonModules makePythonPath disabled disabledIf; inherit toPythonModule toPythonApplication; inherit buildSetupcfg; @@ -435,8 +438,6 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); - application = callPackage ../development/python-modules/application { }; applicationinsights = callPackage ../development/python-modules/applicationinsights { }; @@ -520,10 +521,7 @@ in { astral = callPackage ../development/python-modules/astral { }; - astroid = if isPy3k then - callPackage ../development/python-modules/astroid { } - else - callPackage ../development/python-modules/astroid/1.6.nix { }; + astroid = callPackage ../development/python-modules/astroid { }; astropy = callPackage ../development/python-modules/astropy { }; @@ -1129,8 +1127,6 @@ in { browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; @@ -1200,15 +1196,9 @@ in { inherit (self) python numpy boost; }); - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi { } - else - callPackage ../development/python-modules/cairocffi/0_9.nix { }; + cairocffi = callPackage ../development/python-modules/cairocffi { }; - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg { } - else - callPackage ../development/python-modules/cairosvg/1_x.nix { }; + cairosvg = callPackage ../development/python-modules/cairosvg { }; caldav = callPackage ../development/python-modules/caldav { }; @@ -1318,10 +1308,7 @@ in { characteristic = callPackage ../development/python-modules/characteristic { }; - chardet = if isPy3k then - callPackage ../development/python-modules/chardet { } - else - callPackage ../development/python-modules/chardet/2.nix { }; + chardet = callPackage ../development/python-modules/chardet { }; chart-studio = callPackage ../development/python-modules/chart-studio { }; @@ -1333,10 +1320,7 @@ in { cheroot = callPackage ../development/python-modules/cheroot { }; - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; + cherrypy = callPackage ../development/python-modules/cherrypy { }; chevron = callPackage ../development/python-modules/chevron { }; @@ -2002,10 +1986,7 @@ in { dnslib = callPackage ../development/python-modules/dnslib { }; - dnspython = if isPy3k then - callPackage ../development/python-modules/dnspython { } - else - self.dnspython_1; + dnspython = callPackage ../development/python-modules/dnspython { }; dnspython_1 = callPackage ../development/python-modules/dnspython/1.nix { }; @@ -2021,7 +2002,7 @@ in { docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); + docker-py = callPackage ../development/python-modules/docker-py { }; dockerspawner = callPackage ../development/python-modules/dockerspawner { }; @@ -2089,10 +2070,7 @@ in { dugong = callPackage ../development/python-modules/dugong { }; - dulwich = if isPy3k then - callPackage ../development/python-modules/dulwich { } - else - callPackage ../development/python-modules/dulwich/0_19.nix { }; + dulwich = callPackage ../development/python-modules/dulwich { }; dwdwfsapi = callPackage ../development/python-modules/dwdwfsapi { }; @@ -2313,10 +2291,7 @@ in { fasttext = callPackage ../development/python-modules/fasttext { }; - faulthandler = if !isPy3k then - callPackage ../development/python-modules/faulthandler { } - else - throw "faulthandler is built into ${python.executable}"; + faulthandler = throw "faulthandler is built into ${python.executable}"; favicon = callPackage ../development/python-modules/favicon { }; @@ -2332,10 +2307,7 @@ in { inherit (pkgs) glibcLocales; }; - feedparser = if isPy3k then - callPackage ../development/python-modules/feedparser { } - else - callPackage ../development/python-modules/feedparser/5.nix { }; + feedparser = callPackage ../development/python-modules/feedparser { }; fenics = callPackage ../development/libraries/science/math/fenics { pytest = self.pytest_4; @@ -2519,10 +2491,10 @@ in { folium = callPackage ../development/python-modules/folium { }; - fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override { + fontforge = toPythonModule (pkgs.fontforge.override { withPython = true; inherit python; - })); + }); fontmath = callPackage ../development/python-modules/fontmath { }; @@ -2606,11 +2578,6 @@ in { fx2 = callPackage ../development/python-modules/fx2 { }; - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); # gaia isn't supported with python3 and it's not available from pypi - galario = toPythonModule (pkgs.galario.override { enablePython = true; pythonPackages = self; @@ -2637,10 +2604,10 @@ in { ge25519 = callPackage ../development/python-modules/ge25519 { }; - geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override { + geant4 = toPythonModule (pkgs.geant4.override { enablePython = true; python3 = python; - })); + }); geeknote = callPackage ../development/python-modules/geeknote { }; @@ -2674,10 +2641,7 @@ in { geopandas = callPackage ../development/python-modules/geopandas { }; - geopy = if isPy3k then - callPackage ../development/python-modules/geopy { } - else - callPackage ../development/python-modules/geopy/2.nix { }; + geopy = callPackage ../development/python-modules/geopy { }; getmac = callPackage ../development/python-modules/getmac { }; @@ -2750,18 +2714,7 @@ in { google-api-core = callPackage ../development/python-modules/google-api-core { }; - google-api-python-client = - let google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then - google-api-python-client - else # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google-api-python-client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + google-api-python-client = callPackage ../development/python-modules/google-api-python-client { }; googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; @@ -3006,11 +2959,6 @@ in { gviz-api = callPackage ../development/python-modules/gviz-api {}; - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); - gym = callPackage ../development/python-modules/gym { }; gyp = callPackage ../development/python-modules/gyp { }; @@ -3131,10 +3079,7 @@ in { hstspreload = callPackage ../development/python-modules/hstspreload { }; - html2text = if isPy3k then - callPackage ../development/python-modules/html2text { } - else - callPackage ../development/python-modules/html2text/2018.nix { }; + html2text = callPackage ../development/python-modules/html2text { }; html5lib = callPackage ../development/python-modules/html5lib { }; @@ -3162,10 +3107,7 @@ in { http-parser = callPackage ../development/python-modules/http-parser { }; - httpretty = if isPy3k then - callPackage ../development/python-modules/httpretty { } - else - callPackage ../development/python-modules/httpretty/0.nix { }; + httpretty = callPackage ../development/python-modules/httpretty { }; httpserver = callPackage ../development/python-modules/httpserver { }; @@ -3216,7 +3158,7 @@ in { hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; - hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; + hypothesis = callPackage ../development/python-modules/hypothesis { }; hypothesmith = callPackage ../development/python-modules/hypothesmith { }; @@ -3244,10 +3186,7 @@ in { identify = callPackage ../development/python-modules/identify { }; - idna = if isPy3k then - callPackage ../development/python-modules/idna { } - else - callPackage ../development/python-modules/idna/2.nix { }; + idna = callPackage ../development/python-modules/idna { }; idna-ssl = callPackage ../development/python-modules/idna-ssl { }; @@ -3263,7 +3202,7 @@ in { ijson = callPackage ../development/python-modules/ijson { }; - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + imagecodecs-lite = callPackage ../development/python-modules/imagecodecs-lite { }; imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; @@ -3420,11 +3359,7 @@ in { isodate = callPackage ../development/python-modules/isodate { }; - isort = if isPy3k then - callPackage ../development/python-modules/isort { } - else - callPackage ../development/python-modules/isort/4.nix { - }; + isort = callPackage ../development/python-modules/isort { }; isoweek = callPackage ../development/python-modules/isoweek { }; @@ -3586,15 +3521,9 @@ in { jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - jupyter_client = if isPy3k then - callPackage ../development/python-modules/jupyter_client { } - else - callPackage ../development/python-modules/jupyter_client/5.nix { }; + jupyter_client = callPackage ../development/python-modules/jupyter_client { }; - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; + jupyter_console = callPackage ../development/python-modules/jupyter_console { }; jupyter_core = callPackage ../development/python-modules/jupyter_core { }; @@ -3672,10 +3601,7 @@ in { inherit (pkgs) kerberos; }; - keyring = if isPy3k then - callPackage ../development/python-modules/keyring { } - else - callPackage ../development/python-modules/keyring/2.nix { }; + keyring = callPackage ../development/python-modules/keyring { }; keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; @@ -3685,9 +3611,9 @@ in { inherit (pkgs) keyutils; }; - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + kicad = toPythonModule (pkgs.kicad.override { python3 = python; - }).src); + }).src; kinparse = callPackage ../development/python-modules/kinparse { }; @@ -3699,10 +3625,7 @@ in { kivy-garden = callPackage ../development/python-modules/kivy-garden { }; - kiwisolver = if isPy3k then - callPackage ../development/python-modules/kiwisolver { } - else - callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + kiwisolver = callPackage ../development/python-modules/kiwisolver { }; klaus = callPackage ../development/python-modules/klaus { }; @@ -3825,10 +3748,10 @@ in { pythonSupport = true; }); - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + libgpiod = toPythonModule (pkgs.libgpiod.override { enablePython = true; python3 = python; - })); + }); libgpuarray = callPackage ../development/python-modules/libgpuarray { clblas = pkgs.clblas.override { boost = self.boost; }; @@ -3861,16 +3784,6 @@ in { inherit (pkgs) libsodium; }; - libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { - pythonSupport = true; - inherit python; - })).py; - - libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { - enablePython = true; - inherit python; - })).py; - libpurecool = callPackage ../development/python-modules/libpurecool { }; libredwg = toPythonModule (pkgs.libredwg.override { @@ -3931,14 +3844,9 @@ in { inherit (pkgs) libversion; }; - libvirt = if isPy3k then - (callPackage ../development/python-modules/libvirt { + libvirt = callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt; - }) - else - (callPackage ../development/python-modules/libvirt/5.9.0.nix { - libvirt = pkgs.libvirt_5_9_0; - }); + }; libxml2 = (toPythonModule (pkgs.libxml2.override { pythonSupport = true; @@ -4145,10 +4053,7 @@ in { markdown2 = callPackage ../development/python-modules/markdown2 { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; + markdown = callPackage ../development/python-modules/markdown { }; markdown-it-py = callPackage ../development/python-modules/markdown-it-py { }; @@ -4178,12 +4083,7 @@ in { mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - matplotlib = let - path = if isPy3k then - ../development/python-modules/matplotlib/default.nix - else - ../development/python-modules/matplotlib/2.nix; - in callPackage path { + matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; @@ -4231,9 +4131,9 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { + mercurial = toPythonModule (pkgs.mercurial.override { python3Packages = self; - })); + }); mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -4245,10 +4145,10 @@ in { meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + meson = toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. setupHook = null; - }))); + })); mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; @@ -4342,7 +4242,7 @@ in { monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + monosat = (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); @@ -4351,10 +4251,7 @@ in { monty = callPackage ../development/python-modules/monty { }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else - callPackage ../development/python-modules/more-itertools { }; + more-itertools = callPackage ../development/python-modules/more-itertools { }; moretools = callPackage ../development/python-modules/moretools { }; @@ -4537,10 +4434,7 @@ in { nbdime = callPackage ../development/python-modules/nbdime { }; - nbformat = if isPy3k then - callPackage ../development/python-modules/nbformat { } - else - callPackage ../development/python-modules/nbformat/2.nix { }; + nbformat = callPackage ../development/python-modules/nbformat { }; nbmerge = callPackage ../development/python-modules/nbmerge { }; @@ -4576,10 +4470,7 @@ in { netifaces = callPackage ../development/python-modules/netifaces { }; - networkx = if isPy3k then - callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; + networkx = callPackage ../development/python-modules/networkx { }; neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; @@ -4682,10 +4573,7 @@ in { nosexcover = callPackage ../development/python-modules/nosexcover { }; - notebook = if isPy3k then - callPackage ../development/python-modules/notebook { } - else - callPackage ../development/python-modules/notebook/2.nix { }; + notebook = callPackage ../development/python-modules/notebook { }; notedown = callPackage ../development/python-modules/notedown { }; @@ -4806,17 +4694,9 @@ in { pythonPackages = self; }); - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); - openidc-client = callPackage ../development/python-modules/openidc-client { }; - openpyxl = if pythonAtLeast "3.6" then - callPackage ../development/python-modules/openpyxl { } - else - callPackage ../development/python-modules/openpyxl/2.nix { }; + openpyxl = callPackage ../development/python-modules/openpyxl { }; openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; @@ -4832,14 +4712,11 @@ in { openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + openwrt-luci-rpc = callPackage ../development/python-modules/openwrt-luci-rpc { }; openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix { } - else - callPackage ../development/python-modules/opt-einsum { }; + opt-einsum = callPackage ../development/python-modules/opt-einsum { }; optuna = callPackage ../development/python-modules/optuna { }; @@ -4881,9 +4758,7 @@ in { packageurl-python = callPackage ../development/python-modules/packageurl-python { }; - packaging = if isPy3k - then callPackage ../development/python-modules/packaging { } - else callPackage ../development/python-modules/packaging/2.nix { }; + packaging = callPackage ../development/python-modules/packaging { }; packet-python = callPackage ../development/python-modules/packet-python { }; @@ -4904,10 +4779,7 @@ in { pamqp = callPackage ../development/python-modules/pamqp { }; - pandas = if isPy3k then - callPackage ../development/python-modules/pandas { } - else - callPackage ../development/python-modules/pandas/2.nix { }; + pandas = callPackage ../development/python-modules/pandas { }; pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; @@ -4987,10 +4859,7 @@ in { pathos = callPackage ../development/python-modules/pathos { }; - pathpy = if isPy3k then - callPackage ../development/python-modules/path.py { } - else - callPackage ../development/python-modules/path.py/2.nix { }; + pathpy = callPackage ../development/python-modules/path.py { }; pathspec = callPackage ../development/python-modules/pathspec { }; @@ -5144,10 +5013,7 @@ in { pint = callPackage ../development/python-modules/pint { }; - pip = if isPy3k then - callPackage ../development/python-modules/pip { } - else - callPackage ../development/python-modules/pip/20.nix { }; + pip = callPackage ../development/python-modules/pip { }; pipdate = callPackage ../development/python-modules/pipdate { }; @@ -5276,7 +5142,7 @@ in { poster3 = callPackage ../development/python-modules/poster3 { }; - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + postorius = callPackage ../servers/mail/mailman/postorius.nix { }; potr = callPackage ../development/python-modules/potr { }; @@ -5304,10 +5170,7 @@ in { prawcore = callPackage ../development/python-modules/prawcore { }; - praw = if isPy3k then - callPackage ../development/python-modules/praw { } - else - callPackage ../development/python-modules/praw/6.3.nix { }; + praw = callPackage ../development/python-modules/praw { }; precis-i18n = callPackage ../development/python-modules/precis-i18n { }; @@ -5323,10 +5186,7 @@ in { pretend = callPackage ../development/python-modules/pretend { }; - prettytable = if isPy3k then - callPackage ../development/python-modules/prettytable { } - else - callPackage ../development/python-modules/prettytable/1.nix { }; + prettytable = callPackage ../development/python-modules/prettytable { }; primer3 = callPackage ../development/python-modules/primer3 { }; @@ -5360,12 +5220,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prompt_toolkit = let - filename = if isPy3k then - ../development/python-modules/prompt_toolkit - else - ../development/python-modules/prompt_toolkit/1.nix; - in callPackage filename { }; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit { }; property-manager = callPackage ../development/python-modules/property-manager { }; @@ -5550,7 +5405,7 @@ in { py = callPackage ../development/python-modules/py { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { }); + pycangjie = callPackage ../development/python-modules/pycangjie { }; pycapnp = callPackage ../development/python-modules/pycapnp { }; @@ -5647,15 +5502,9 @@ in { pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - pydns = let - py3 = callPackage ../development/python-modules/py3dns { }; - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; + pydns = callPackage ../development/python-modules/py3dns { }; - pydocstyle = if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; + pydocstyle = callPackage ../development/python-modules/pydocstyle { }; pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; @@ -5703,8 +5552,6 @@ in { pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); - pyext = callPackage ../development/python-modules/pyext { }; pyface = callPackage ../development/python-modules/pyface { }; @@ -5773,10 +5620,7 @@ in { pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; - pygments = if isPy3k then - callPackage ../development/python-modules/Pygments { } - else - callPackage ../development/python-modules/Pygments/2_5.nix { }; + pygments = callPackage ../development/python-modules/Pygments { }; pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; @@ -5786,14 +5630,9 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; - pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson; - } - else - callPackage ../development/python-modules/pygobject/3.36.nix { - inherit (pkgs) meson; - }; + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { + inherit (pkgs) meson; + }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5819,10 +5658,7 @@ in { pygtrie = callPackage ../development/python-modules/pygtrie { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; pyhaversion = callPackage ../development/python-modules/pyhaversion { }; @@ -5894,10 +5730,7 @@ in { pylev = callPackage ../development/python-modules/pylev { }; - pylibacl = if isPy3k then - callPackage ../development/python-modules/pylibacl { } - else - callPackage ../development/python-modules/pylibacl/0.5.nix { }; + pylibacl = callPackage ../development/python-modules/pylibacl { }; pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; @@ -5919,10 +5752,7 @@ in { pylint-flask = callPackage ../development/python-modules/pylint-flask { }; - pylint = if isPy3k then - callPackage ../development/python-modules/pylint { } - else - callPackage ../development/python-modules/pylint/1.9.nix { }; + pylint = callPackage ../development/python-modules/pylint { }; pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; @@ -6422,8 +6252,7 @@ in { pytesseract = callPackage ../development/python-modules/pytesseract { }; - # pytest>=6 is too new for most packages - pytest = if isPy3k then self.pytest_6 else self.pytest_4; + pytest = self.pytest_6; pytest_4 = callPackage ../development/python-modules/pytest/4.nix { @@ -6547,10 +6376,7 @@ in { pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; + pytest-mock = callPackage ../development/python-modules/pytest-mock { }; pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; @@ -6591,10 +6417,7 @@ in { pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; pytest-runner = self.pytestrunner; # added 2021-01-04 - pytestrunner = if isPy3k then - callPackage ../development/python-modules/pytestrunner { } - else - callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; pytest-sanic = callPackage ../development/python-modules/pytest-sanic { sanic = self.sanic.override { doCheck = false; }; @@ -7023,16 +6846,7 @@ in { pywizlight = callPackage ../development/python-modules/pywizlight { }; - pyxattr = let - pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { - version = "0.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; - }; - }); - in if isPy3k then pyxattr' else pyxattr_2; + pyxattr = callPackage ../development/python-modules/pyxattr { }; pyworld = callPackage ../development/python-modules/pyworld { }; @@ -7046,8 +6860,6 @@ in { pyxl3 = callPackage ../development/python-modules/pyxl3 { }; - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); - pyxnat = callPackage ../development/python-modules/pyxnat { }; pyyaml = callPackage ../development/python-modules/pyyaml { }; @@ -7287,8 +7099,6 @@ in { rfcat = callPackage ../development/python-modules/rfcat { }; - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); - rich = callPackage ../development/python-modules/rich { }; rig = callPackage ../development/python-modules/rig { }; @@ -7299,9 +7109,9 @@ in { rising = callPackage ../development/python-modules/rising { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + rivet = toPythonModule (pkgs.rivet.override { python3 = python; - })); + }); rjsmin = callPackage ../development/python-modules/rjsmin { }; @@ -7363,25 +7173,19 @@ in { rply = callPackage ../development/python-modules/rply { }; - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { + rpm = toPythonModule (pkgs.rpm.override { inherit python; - })); + }); rpmfluff = callPackage ../development/python-modules/rpmfluff { }; - rpy2 = if isPy3k then - callPackage ../development/python-modules/rpy2 { } - else - callPackage ../development/python-modules/rpy2/2.nix { }; + rpy2 = callPackage ../development/python-modules/rpy2 { }; rpyc = callPackage ../development/python-modules/rpyc { }; rq = callPackage ../development/python-modules/rq { }; - rsa = if isPy3k then - callPackage ../development/python-modules/rsa { } - else - callPackage ../development/python-modules/rsa/4_0.nix { }; + rsa = callPackage ../development/python-modules/rsa { }; rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; @@ -7483,11 +7287,9 @@ in { scikitimage = callPackage ../development/python-modules/scikit-image { }; - scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; - in if isPy3k then - callPackage ../development/python-modules/scikitlearn args - else - callPackage ../development/python-modules/scikitlearn/0.20.nix args; + scikitlearn = callPackage ../development/python-modules/scikitlearn { + inherit (pkgs) gfortran glibcLocales; + }; scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; @@ -7515,16 +7317,7 @@ in { disabled = !isPy3k; }); - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; + scipy = callPackage ../development/python-modules/scipy { }; scour = callPackage ../development/python-modules/scour { }; @@ -7548,10 +7341,7 @@ in { sdnotify = callPackage ../development/python-modules/sdnotify { }; - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + seaborn = callPackage ../development/python-modules/seaborn { }; seabreeze = callPackage ../development/python-modules/seabreeze { }; @@ -7561,10 +7351,7 @@ in { inherit (pkgs) secp256k1; }; - secretstorage = if isPy3k then - callPackage ../development/python-modules/secretstorage { } - else - callPackage ../development/python-modules/secretstorage/2.nix { }; + secretstorage = callPackage ../development/python-modules/secretstorage { }; secure = callPackage ../development/python-modules/secure { }; @@ -7600,7 +7387,7 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override { pythonPackages = self; pythonSupport = true; })); @@ -7626,10 +7413,7 @@ in { setuptools-rust = callPackage ../development/python-modules/setuptools-rust { }; setuptools-scm = self.setuptools_scm; # added 2021-01-04 - setuptools_scm = if isPy3k then - callPackage ../development/python-modules/setuptools_scm { } - else - callPackage ../development/python-modules/setuptools_scm/2.nix { }; + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; @@ -7843,10 +7627,7 @@ in { soundfile = callPackage ../development/python-modules/soundfile { }; - soupsieve = if isPy3k then - callPackage ../development/python-modules/soupsieve { } - else - callPackage ../development/python-modules/soupsieve/1.nix { }; + soupsieve = callPackage ../development/python-modules/soupsieve { }; spacy = callPackage ../development/python-modules/spacy { }; @@ -7912,15 +7693,9 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } - else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } - else - callPackage ../development/python-modules/sphinx/2.nix { }; + sphinx = callPackage ../development/python-modules/sphinx { }; sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; @@ -8118,10 +7893,7 @@ in { inherit (pkgs) symengine; }; - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } - else - callPackage ../development/python-modules/sympy/1_5.nix { }; + sympy = callPackage ../development/python-modules/sympy { }; systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; @@ -8131,10 +7903,7 @@ in { tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - tables = if isPy3k then - callPackage ../development/python-modules/tables { } - else - callPackage ../development/python-modules/tables/3.5.nix { }; + tables = callPackage ../development/python-modules/tables { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -8353,9 +8122,9 @@ in { toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + tokenizers = toPythonModule (callPackage ../development/python-modules/tokenizers { }); - tokenize-rt = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenize-rt { })); + tokenize-rt = toPythonModule (callPackage ../development/python-modules/tokenize-rt { }); tokenlib = callPackage ../development/python-modules/tokenlib { }; @@ -8365,10 +8134,7 @@ in { tomlkit = callPackage ../development/python-modules/tomlkit { }; - toolz = if isPy3k then - callPackage ../development/python-modules/toolz { } - else - callPackage ../development/python-modules/toolz/2.nix { }; + toolz = callPackage ../development/python-modules/toolz { }; toonapi = callPackage ../development/python-modules/toonapi { }; @@ -8380,10 +8146,7 @@ in { torchvision = callPackage ../development/python-modules/torchvision { }; - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; + tornado = callPackage ../development/python-modules/tornado { }; # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; @@ -8407,10 +8170,7 @@ in { trackpy = callPackage ../development/python-modules/trackpy { }; - traitlets = if pythonOlder "3.7" then - callPackage ../development/python-modules/traitlets/4.nix { } - else - callPackage ../development/python-modules/traitlets { }; + traitlets = callPackage ../development/python-modules/traitlets { }; traits = callPackage ../development/python-modules/traits { }; @@ -8635,12 +8395,9 @@ in { urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - urllib3 = if isPy3k then - callPackage ../development/python-modules/urllib3 { - pytestCheckHook = self.pytestCheckHook_6_1; - } - else - callPackage ../development/python-modules/urllib3/2.nix { }; + urllib3 = callPackage ../development/python-modules/urllib3 { + pytestCheckHook = self.pytestCheckHook_6_1; + }; urwid = callPackage ../development/python-modules/urwid { }; @@ -8968,7 +8725,7 @@ in { xdot = callPackage ../development/python-modules/xdot { }; - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + xenomapper = callPackage ../applications/science/biology/xenomapper { }; xgboost = callPackage ../development/python-modules/xgboost { inherit (pkgs) xgboost; @@ -9113,9 +8870,9 @@ in { zdaemon = callPackage ../development/python-modules/zdaemon { }; - zeek = disabledIf (!isPy3k) (toPythonModule (pkgs.zeek.override { + zeek = toPythonModule (pkgs.zeek.override { python3 = python; - })).py; + }).py; zeep = callPackage ../development/python-modules/zeep { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7934861f097b..b8c9b9920ee2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -2,6 +2,235 @@ # of the Python 3 packages set. This way, Python 2+3 compatible # packages can still be used. -self: super: { +self: super: + +with self; with super; { + + appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + + astroid = callPackage ../development/python-modules/astroid/1.6.nix { }; + + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; + + cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; + + cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { }; + + chardet = callPackage ../development/python-modules/chardet/2.nix { }; + + cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { }; + + dnspython = super.dnspython_1; + + docker-py = disabled super.docker-py; + + dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { }; + + faulthandler = callPackage ../development/python-modules/faulthandler { }; + + feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + + fontforge = disabled super.fontforge; + + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi + + geant4 = disabled super.geant4; + + geopy = callPackage ../development/python-modules/geopy/2.nix { }; + + # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google-api-python-client = super.google-api-python-client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); + + gwyddion = toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + }); + + html2text = callPackage ../development/python-modules/html2text/2018.nix { }; + + httpretty = callPackage ../development/python-modules/httpretty/0.nix { }; + + hypothesis = super.hypothesis_4; + + idna = callPackage ../development/python-modules/idna/2.nix { }; + + imagecodecs-lite = disabled super.imagecodecs-lite; + + isort = callPackage ../development/python-modules/isort/4.nix { }; + + jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { }; + + jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { }; + + keyring = callPackage ../development/python-modules/keyring/2.nix { }; + + kicad = disabled super.kicad; + + kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + + libgpiod = disabled super.libgpiod; + + libnl-python = toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + }).py; + + libplist = toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + }).py; + + libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix { + libvirt = pkgs.libvirt_5_9_0; + }; + + markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; + + matplotlib = callPackage ../development/python-modules/matplotlib/2.nix { + stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }; + + mercurial = disabled super.mercurial; + + meson = disabled super.meson; + + monosat = disabled super.monosat; + + more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; + + nbformat = callPackage ../development/python-modules/nbformat/2.nix { }; + + networkx = callPackage ../development/python-modules/networkx/2.2.nix { }; + + notebook = callPackage ../development/python-modules/notebook/2.nix { }; + + opencv = toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + }); + + openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { }; + + openwrt-luci-rpc = disabled super.openwrt-luci-rpc; + + opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { }; + + packaging = callPackage ../development/python-modules/packaging/2.nix { }; + + pandas = callPackage ../development/python-modules/pandas/2.nix { }; + + pathpy = callPackage ../development/python-modules/path.py/2.nix { }; + + pip = callPackage ../development/python-modules/pip/20.nix { }; + + postorius = disabled super.postorius; + + praw = callPackage ../development/python-modules/praw/6.3.nix { }; + + prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; + + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + + pycangjie = disabled pycangjie; + + pydns = callPackage ../development/python-modules/pydns { }; + + pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { }; + + pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { }); + + pygments = callPackage ../development/python-modules/Pygments/2_5.nix { }; + + pygobject3 = callPackage ../development/python-modules/pygobject/3.36.nix { + inherit (pkgs) meson; + }; + + pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + + pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; + + pylint = callPackage ../development/python-modules/pylint/1.9.nix { }; + + pytest = pytest_4; + + pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; + + pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + + pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec { + version = "0.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "b525843f6b51036198b3b87c4773a5093d6dec57d60c18a1f269dd7059aa16e3"; + }; + }); + + pyxml = callPackage ../development/python-modules/pyxml { }; + + rhpl = callPackage ../development/python-modules/rhpl { }; + + rivet = disabled super.rivet; + + rpm = disabled super.rpm; + + rpy2 = callPackage ../development/python-modules/rpy2/2.nix { }; + + rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; + + scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { + inherit (pkgs) gfortran glibcLocales; + }; + + scipy = super.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + + seaborn = callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + + secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { }; + + sequoia = disabled super.sequoia; + + setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { }; + + soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { }; + + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; + + sphinx = callPackage ../development/python-modules/sphinx/2.nix { }; + + sympy = callPackage ../development/python-modules/sympy/1_5.nix { }; + + tables = callPackage ../development/python-modules/tables/3.5.nix { }; + + tokenizers = disabled super.tokenizers; + + tokenize-rt = disabled super.tokenize-rt; + + toolz = callPackage ../development/python-modules/toolz/2.nix { }; + + tornado = callPackage ../development/python-modules/tornado/5.nix { }; + + traitlets = callPackage ../development/python-modules/traitlets/4.nix { }; + + urllib3 = callPackage ../development/python-modules/urllib3/2.nix { }; + + xenomapper = disabled super.xenomapper; + + zeek = disablede super.zeek; } From 608235d50b8a04e3f830627d0ed80b41bf7572e5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:16:16 +0100 Subject: [PATCH 0371/1183] python3Packages.greenlet: disable tests --- pkgs/development/python-modules/greenlet/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 58fcad440047..846c3d24ef51 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -18,10 +18,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; - # see https://github.com/python-greenlet/greenlet/issues/85 - preCheck = '' - rm tests/test_leaks.py - ''; + # No tests in archive + doCheck = false; meta = { homepage = "https://pypi.python.org/pypi/greenlet"; From eee4b322f8f045b168a743bfd75efe8ab4e3495d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:18:40 +0100 Subject: [PATCH 0372/1183] python3Packages.mpmath: add missing dep --- pkgs/development/python-modules/mpmath/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/mpmath/default.nix b/pkgs/development/python-modules/mpmath/default.nix index b7d3c2f7ff62..59ebfc7091e3 100644 --- a/pkgs/development/python-modules/mpmath/default.nix +++ b/pkgs/development/python-modules/mpmath/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, setuptools-scm }: buildPythonPackage rec { @@ -12,6 +13,10 @@ buildPythonPackage rec { sha256 = "79ffb45cf9f4b101a807595bcb3e72e0396202e0b1d25d689134b48c4216a81a"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + # error: invalid command 'test' doCheck = false; From 9fd8ec2368b42c77cad9466b8e69df12d81846ac Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:21:58 +0100 Subject: [PATCH 0373/1183] python3Packages.xlrd: disable tests --- pkgs/development/python-modules/xlrd/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index 9730338a0c27..bc88880f30a3 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { @@ -13,11 +13,12 @@ buildPythonPackage rec { sha256 = "f72f148f54442c6b056bf931dbc34f986fd0c3b0b6b5a58d013c9aef274d0c88"; }; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - checkPhase = '' - py.test -k "not test_tilde_path_expansion" - ''; + # No tests in archive + doCheck = false; meta = with lib; { homepage = "http://www.python-excel.org/"; From 0e5ab73b0ea9e2b0e2397ab92cb750a59a709545 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:29:11 +0100 Subject: [PATCH 0374/1183] python3Packages.lazy-object-proxy: remove upper constraint --- .../python-modules/lazy-object-proxy/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index c6e479a21b9e..9eaae90f46ed 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , setuptools_scm }: @@ -14,13 +14,19 @@ buildPythonPackage rec { sha256 = "489000d368377571c6f982fba6497f2aa13c6d1facc40660963da62f5c379726"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ + setuptools_scm + ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test tests + postPatch = '' + substituteInPlace pyproject.toml --replace ",<6.0" "" + substituteInPlace setup.cfg --replace ",<6.0" "" ''; + checkInputs = [ + pytestCheckHook + ]; + # Broken tests. Seem to be fixed upstream according to Travis. doCheck = false; From a81f999437a1de67d04191ecbf914c358b039089 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:40:27 +0100 Subject: [PATCH 0375/1183] pythonPackages: inherit stdenv as well --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 34cd496c1cc8..a4bd74f3cff5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -102,7 +102,7 @@ let in { - inherit pkgs; + inherit pkgs stdenv; inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; From b8f2632dbcffa2de4ebe3eab819eec9d6e528356 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 13:43:30 +0100 Subject: [PATCH 0376/1183] python2Packages.arrow: keep 0.17.0 --- pkgs/development/python-modules/arrow/2.nix | 40 +++++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/arrow/2.nix diff --git a/pkgs/development/python-modules/arrow/2.nix b/pkgs/development/python-modules/arrow/2.nix new file mode 100644 index 000000000000..d87f1ede3ccd --- /dev/null +++ b/pkgs/development/python-modules/arrow/2.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, nose, chai, simplejson, backports_functools_lru_cache +, python-dateutil, pytz, pytest-mock, sphinx, dateparser, pytestcov +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "arrow"; + version = "0.17.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; + }; + + propagatedBuildInputs = [ python-dateutil ] + ++ lib.optionals isPy27 [ backports_functools_lru_cache ]; + + checkInputs = [ + dateparser + pytestCheckHook + pytestcov + pytest-mock + pytz + simplejson + sphinx + ]; + + # ParserError: Could not parse timezone expression "America/Nuuk" + disabledTests = [ + "test_parse_tz_name_zzz" + ]; + + meta = with lib; { + description = "Python library for date manipulation"; + homepage = "https://github.com/crsmithdev/arrow"; + license = licenses.asl20; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index b8c9b9920ee2..b3c662895203 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -8,6 +8,8 @@ with self; with super; { appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + arrow = callPackage ../development/python-modules/arrow/2.nix { }; + astroid = callPackage ../development/python-modules/astroid/1.6.nix { }; browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; From 99d360177d8ead9eb3931657e20d1b5d8466cae9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 14:00:13 +0100 Subject: [PATCH 0377/1183] python3Packages.gitdb: allow never version smmap Let's hope nothing breaks --- pkgs/development/python-modules/gitdb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 5c3bd4ac43fc..1ad0b320da84 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -17,6 +17,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ smmap ]; + postPatch = '' + substituteInPlace setup.py --replace ",<4" "" + ''; + # Bunch of tests fail because they need an actual git repo doCheck = false; From b8d3b7faf6677930b040e7eefa1a7c93c174388b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 14:03:49 +0100 Subject: [PATCH 0378/1183] pythonPackages.singledispatch: fix build --- pkgs/development/python-modules/singledispatch/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index a43add15ac72..0a9b2353bf1b 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , six +, setuptools-scm +, toml }: buildPythonPackage rec { @@ -13,6 +15,11 @@ buildPythonPackage rec { sha256 = "58b46ce1cc4d43af0aac3ac9a047bdb0f44e05f0b2fa2eec755863331700c865"; }; + nativeBuildInputs = [ + setuptools-scm + toml + ]; + propagatedBuildInputs = [ six ]; # pypi singledispatch tarbal does not contain tests From 8b88b9714bc74140abca73098f574d72c1ff109a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 14:04:05 +0100 Subject: [PATCH 0379/1183] python3Packages.fasteners: fix build --- .../python-modules/fasteners/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 32dc93773fde..9a40b1f99fe7 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -3,6 +3,8 @@ , fetchPypi , six , monotonic +, diskcache +, more-itertools , testtools , isPy3k , nose @@ -18,9 +20,19 @@ buildPythonPackage rec { sha256 = "c995d8c26b017c5d6a6de9ad29a0f9cdd57de61ae1113d28fac26622b06a0933"; }; - propagatedBuildInputs = [ six monotonic ]; + propagatedBuildInputs = [ + six + monotonic + ]; - checkInputs = [ testtools nose ] ++ lib.optionals (!isPy3k) [ futures ]; + checkInputs = [ + diskcache + more-itertools + testtools + nose + ] ++ lib.optionals (!isPy3k) [ + futures + ]; checkPhase = '' nosetests From 0ff83e6020c7a31b101a1acadb48f4a06b5077a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Mar 2021 22:41:48 +0100 Subject: [PATCH 0380/1183] python3Packages.importlib-metadata: 1.7.0 -> 3.7.2 --- .../python-modules/importlib-metadata/2.nix | 39 +++++++++++++++++++ .../importlib-metadata/default.nix | 31 ++++++--------- pkgs/top-level/python2-packages.nix | 2 + 3 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/importlib-metadata/2.nix diff --git a/pkgs/development/python-modules/importlib-metadata/2.nix b/pkgs/development/python-modules/importlib-metadata/2.nix new file mode 100644 index 000000000000..71dcd950db2c --- /dev/null +++ b/pkgs/development/python-modules/importlib-metadata/2.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +, zipp +, pathlib2 +, contextlib2 +, configparser +, isPy3k +, importlib-resources +, packaging +}: + +buildPythonPackage rec { + pname = "importlib-metadata"; + version = "2.1.1"; + + src = fetchPypi { + pname = "importlib_metadata"; + inherit version; + sha256 = "1pdmsmwagimn0lsl4x7sg3skcr2fvzqpv2pjd1rh7yrm5gzrxpmq"; + }; + + nativeBuildInputs = [ setuptools-scm ]; + + propagatedBuildInputs = [ zipp ] + ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + + # Cyclic dependencies + doCheck = false; + + pythonImportsCheck = [ "importlib_metadata" ]; + + meta = with lib; { + description = "Read metadata from Python packages"; + homepage = "https://importlib-metadata.readthedocs.io/"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index edab68aa18a3..bdc1c2ec10d2 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -1,42 +1,35 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm +, pythonOlder +, setuptools-scm +, toml , zipp -, pathlib2 -, contextlib2 -, configparser -, isPy3k -, importlib-resources -, packaging }: buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.7.0"; + version = "3.7.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "10vz0ydrzspdhdbxrzwr9vhs693hzh4ff71lnqsifvdzvf66bfwh"; + sha256 = "1pmci5r6hgl3vj558mawclfq2d4aq584nsjvc1fqvyb921hgzm8q"; }; - nativeBuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ zipp ] - ++ lib.optionals (!isPy3k) [ pathlib2 contextlib2 configparser ]; + propagatedBuildInputs = [ toml zipp ]; - doCheck = false; # Cyclic dependencies. - - # removing test_main.py - it requires 'pyflakefs' - # and adding `pyflakefs` to `checkInputs` causes infinite recursion. - preCheck = '' - rm importlib_metadata/tests/test_main.py - ''; + # Cyclic dependencies due to pyflakefs + doCheck = false; + pythonImportsCheck = [ "importlib_metadata" ]; meta = with lib; { description = "Read metadata from Python packages"; homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index b3c662895203..df19f516552f 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -67,6 +67,8 @@ with self; with super; { imagecodecs-lite = disabled super.imagecodecs-lite; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + isort = callPackage ../development/python-modules/isort/4.nix { }; jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { }; From 26d5131fc8a5fe87146f9805f503c041d2fba7e8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 14:25:32 +0100 Subject: [PATCH 0381/1183] python3Packages.importlib-metadata: 3.7.2 -> 3.7.3 --- .../development/python-modules/importlib-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index bdc1c2ec10d2..95f1ccc0bfc5 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "3.7.2"; + version = "3.7.3"; disabled = pythonOlder "3.6"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "1pmci5r6hgl3vj558mawclfq2d4aq584nsjvc1fqvyb921hgzm8q"; + sha256 = "742add720a20d0467df2f444ae41704000f50e1234f46174b51f9c6031a1bd71"; }; nativeBuildInputs = [ setuptools-scm ]; From ce3f8f594ff104da459c2080a4c6df7f3494df3e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 14:48:36 +0100 Subject: [PATCH 0382/1183] python2Packages.pyroma: keep 2.6.1 --- pkgs/development/python-modules/pyroma/2.nix | 26 ++++++++++++++++++++ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/pyroma/2.nix diff --git a/pkgs/development/python-modules/pyroma/2.nix b/pkgs/development/python-modules/pyroma/2.nix new file mode 100644 index 000000000000..9fee5ec56c0e --- /dev/null +++ b/pkgs/development/python-modules/pyroma/2.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi +, docutils, pygments, setuptools +}: + +buildPythonPackage rec { + pname = "pyroma"; + version = "2.6.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "2527423e3a24ccd56951f3ce1b0ebbcc4fa0518c82fca882e696c78726ab9c2f"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pygments < 2.6" "pygments" + ''; + + propagatedBuildInputs = [ docutils pygments setuptools ]; + + meta = with lib; { + description = "Test your project's packaging friendliness"; + homepage = "https://github.com/regebro/pyroma"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index df19f516552f..262c363e30df 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -165,6 +165,8 @@ with self; with super; { pylint = callPackage ../development/python-modules/pylint/1.9.nix { }; + pyroma = callPackage ../development/python-modules/pyroma/2.nix { }; + pytest = pytest_4; pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; From c12ef05bda5bf3d31918ee97d717cd3221926e8c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 15:43:26 +0100 Subject: [PATCH 0383/1183] sage: keep cypari2 at 2.1.1 --- pkgs/applications/science/math/sage/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 8ef1f5189e5b..b985d56bb27d 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -11,6 +11,14 @@ let python3 = pkgs.python3.override { packageOverrides = self: super: { + cypari2 = super.cypari2.overridePythonAttrs (oldAttrs: rec { + version = "2.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; + }; + }); + # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; From a31eaddb60bacd13147909d6cd5746da308daadc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 16:00:59 +0100 Subject: [PATCH 0384/1183] python3Packages.requests: handle idna 3 --- pkgs/development/python-modules/requests/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 5589ec683af4..72feafc771e8 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -20,6 +20,11 @@ buildPythonPackage rec { sha256 = "sha256-J5c91KkEpPE7JjoZyGbBO5KjntHJZGVfAl8/jT11uAQ="; }; + postPatch = '' + # Use latest idna + substituteInPlace setup.py --replace ",<3" "" + ''; + propagatedBuildInputs = [ certifi chardet From 0ece8a56bddd89d1d4474b73d4f2a41b6cdfcfaa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 16:01:22 +0100 Subject: [PATCH 0385/1183] python3Packages.flit-core: 2.3.0 -> 3.2.0 --- pkgs/development/python-modules/flit-core/default.nix | 10 ++++++++-- pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flit-core/default.nix b/pkgs/development/python-modules/flit-core/default.nix index 53a1e0651f36..a4c6b99b07f4 100644 --- a/pkgs/development/python-modules/flit-core/default.nix +++ b/pkgs/development/python-modules/flit-core/default.nix @@ -3,12 +3,13 @@ , flit , isPy3k , toml +, pytestCheckHook +, testpath }: buildPythonPackage rec { pname = "flit-core"; - version = "2.3.0"; - disabled = !isPy3k; + version = "3.2.0"; format = "pyproject"; inherit (flit) src patches; @@ -21,6 +22,11 @@ buildPythonPackage rec { toml ]; + checkInputs = [ + pytestCheckHook + testpath + ]; + passthru.tests = { inherit flit; }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 262c363e30df..0d1673123af7 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -32,6 +32,8 @@ with self; with super; { feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + flit-core = disabled super.flit-core; + fontforge = disabled super.fontforge; gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { From faca29912913a4dafcf381952a5fed5f29002482 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 16:01:34 +0100 Subject: [PATCH 0386/1183] python3Packages.flit: 3.0.0 -> 3.2.0 --- pkgs/development/python-modules/flit/default.nix | 14 ++------------ pkgs/top-level/python2-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index c63fd1edeaf9..38369dfd4d2f 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -21,30 +21,20 @@ buildPythonPackage rec { pname = "flit"; - version = "3.0.0"; - disabled = !isPy3k; + version = "3.2.0"; format = "pyproject"; src = fetchFromGitHub { owner = "takluyver"; repo = "flit"; rev = version; - sha256 = "zk6mozS3Q9U43PQe/DxgwwsBRJ6Qwb+rSUVGXHijD+g="; + sha256 = "sha256-zN+/oAyXBo6Ho7n/xhOQ2mjtPGKA1anCvl3sVf7t+Do="; }; nativeBuildInputs = [ flit-core ]; - # Use toml instead of pytoml - # Resolves infinite recursion since packaging started using flit. - patches = [ - (fetchpatch { - url = "https://github.com/takluyver/flit/commit/b81b1da55ef0f2768413669725d2874fcb0c29fb.patch"; - sha256 = "11oNaYsm00/j2046V9C0idpSeG7TpY3JtLuxX3ZL/OI="; - }) - ]; - propagatedBuildInputs = [ docutils requests diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 0d1673123af7..ac1d891412c2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -32,6 +32,8 @@ with self; with super; { feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + flit = disabled super.flit; + flit-core = disabled super.flit-core; fontforge = disabled super.fontforge; From 1e89d4cccdfa3e5857ee250c418fd8c0702ac1e9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 24 Mar 2021 17:45:56 +0100 Subject: [PATCH 0387/1183] pythonPackages: move python 2 only expressions to python2-packages.nix --- .../python-modules/aiodns/default.nix | 4 +- .../python-modules/aioeventlet/default.nix | 2 +- .../python-modules/autobahn/default.nix | 3 +- .../azure-cosmosdb-table/default.nix | 2 +- .../azure-datalake-store/default.nix | 2 +- .../azure-servicebus/default.nix | 2 +- .../azure-storage-blob/default.nix | 2 +- .../azure-storage-file-share/default.nix | 2 +- .../azure-storage-file/default.nix | 2 +- .../python-modules/azure-storage/default.nix | 2 +- .../python-modules/beaker/default.nix | 4 +- .../python-modules/bitmath/default.nix | 2 +- .../python-modules/bokeh/default.nix | 2 +- .../python-modules/boto3/default.nix | 2 +- .../cassandra-driver/default.nix | 2 +- .../click-threading/default.nix | 2 +- .../confluent-kafka/default.nix | 2 +- .../django-pipeline/default.nix | 2 +- .../python-modules/docplex/default.nix | 2 +- .../python-modules/fasteners/default.nix | 2 +- .../development/python-modules/fs/default.nix | 2 +- .../python-modules/goocalendar/default.nix | 1 - .../python-modules/grpcio/default.nix | 4 +- .../python-modules/imageio/default.nix | 2 +- .../python-modules/ipyparallel/default.nix | 2 +- .../python-modules/livestreamer/default.nix | 4 +- .../python-modules/msrest/default.nix | 4 +- .../python-modules/opentracing/default.nix | 2 +- .../python-modules/papermill/default.nix | 2 +- .../python-modules/path.py/default.nix | 5 +- .../python-modules/protobuf/default.nix | 2 +- .../python-modules/pyee/default.nix | 18 +- .../python-modules/pynvim/default.nix | 2 +- .../pytest-services/default.nix | 2 +- .../python-jsonrpc-server/default.nix | 2 +- .../python-language-server/default.nix | 2 +- .../python-modules/ruamel_yaml/default.nix | 4 +- .../ruamel_yaml_clib/default.nix | 2 +- .../python-modules/s3transfer/default.nix | 2 +- .../python-modules/sqlalchemy/default.nix | 2 +- .../python-modules/tenacity/default.nix | 2 +- .../python-modules/tifffile/default.nix | 6 +- pkgs/development/python-modules/tornado/4.nix | 2 +- pkgs/development/python-modules/tornado/5.nix | 2 +- .../python-modules/trustme/default.nix | 2 +- .../python-modules/uproot3/default.nix | 2 +- .../python-modules/weboob/default.nix | 2 +- pkgs/tools/misc/xflux/gui.nix | 2 +- pkgs/top-level/python-packages.nix | 483 ++---------------- pkgs/top-level/python2-packages.nix | 390 ++++++++++++++ 50 files changed, 498 insertions(+), 506 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 1adc6f815244..0a91efe7dde4 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, isPy27, isPyPy, python, pycares, typing, trollius }: +, isPy27, isPyPy, python, pycares, typing +, trollius ? null +}: buildPythonPackage rec { pname = "aiodns"; diff --git a/pkgs/development/python-modules/aioeventlet/default.nix b/pkgs/development/python-modules/aioeventlet/default.nix index 0d6796706cbd..ef0166e5d624 100644 --- a/pkgs/development/python-modules/aioeventlet/default.nix +++ b/pkgs/development/python-modules/aioeventlet/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , eventlet -, trollius +, trollius ? null , mock , python }: diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index f21a82e7aadc..386d4766bbfa 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, isPy3k, - six, txaio, twisted, zope_interface, cffi, trollius, futures, + six, txaio, twisted, zope_interface, cffi, + trollius ? null, futures ? null, mock, pytest, cryptography, pynacl }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix index 5c580ccd3e2f..8d92e1559d59 100644 --- a/pkgs/development/python-modules/azure-cosmosdb-table/default.nix +++ b/pkgs/development/python-modules/azure-cosmosdb-table/default.nix @@ -5,7 +5,7 @@ , azure-common , azure-storage-common , azure-cosmosdb-nspkg -, futures +, futures ? null , isPy3k }: diff --git a/pkgs/development/python-modules/azure-datalake-store/default.nix b/pkgs/development/python-modules/azure-datalake-store/default.nix index 0e97752ae578..f2c57d76623d 100644 --- a/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -4,7 +4,7 @@ , requests , adal , azure-common -, futures +, futures ? null , pathlib2 , isPy3k }: diff --git a/pkgs/development/python-modules/azure-servicebus/default.nix b/pkgs/development/python-modules/azure-servicebus/default.nix index b0c0a9e96cb9..d885166daa91 100644 --- a/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/pkgs/development/python-modules/azure-servicebus/default.nix @@ -5,7 +5,7 @@ , azure-common , azure-core , msrestazure -, futures +, futures ? null , isPy3k }: diff --git a/pkgs/development/python-modules/azure-storage-blob/default.nix b/pkgs/development/python-modules/azure-storage-blob/default.nix index 7367e9604b9a..bbcf84ef6acd 100644 --- a/pkgs/development/python-modules/azure-storage-blob/default.nix +++ b/pkgs/development/python-modules/azure-storage-blob/default.nix @@ -6,7 +6,7 @@ , azure-storage-common , msrest , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix index c6413f191fce..fc98e4207e8b 100644 --- a/pkgs/development/python-modules/azure-storage-file-share/default.nix +++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix @@ -7,7 +7,7 @@ , azure-core , cryptography , msrest -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage-file/default.nix b/pkgs/development/python-modules/azure-storage-file/default.nix index 088b5260e65b..8ce1d572e8e0 100644 --- a/pkgs/development/python-modules/azure-storage-file/default.nix +++ b/pkgs/development/python-modules/azure-storage-file/default.nix @@ -4,7 +4,7 @@ , azure-common , azure-storage-common , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index e2037bb7d21f..258a5ebabb2c 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -3,7 +3,7 @@ , fetchPypi , python , azure-common -, futures +, futures ? null , dateutil , requests , isPy3k diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index a429ab682f76..60823b4c077b 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -15,8 +15,8 @@ , cryptography , isPy27 , isPy3k -, funcsigs -, pycryptopp +, funcsigs ? null +, pycryptopp ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 5643ea29bc2a..66a42858650c 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231, progressbar33, mock }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, progressbar231 ? null, progressbar33, mock }: buildPythonPackage rec { pname = "bitmath"; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 67d5088bf7df..3e605af19b9b 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchPypi -, futures +, futures ? null , isPy27 , isPyPy , jinja2 diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index bf5604e6d981..f00ddff86be1 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -4,7 +4,7 @@ , botocore , jmespath , s3transfer -, futures +, futures ? null , docutils , nose , mock diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 55468ba0fdf7..16479302221b 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder , cython , eventlet -, futures +, futures ? null , iana-etc , geomet , libev diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 6943a3dcfd15..1579a6a6a893 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -4,7 +4,7 @@ , pytest , click , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 589753cd1cb5..d07930b5e54b 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: +{ lib, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro ? null, futures ? null, enum34 ? null }: buildPythonPackage rec { version = "1.6.0"; diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index 3276f7a065c7..92aefe4a408b 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy3k -, django, futures, mock, jinja2, jsmin, slimit }: +, django, futures ? null, mock ? null, jinja2, jsmin, slimit }: buildPythonPackage rec { pname = "django-pipeline"; diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index 54af81d5d8b0..0d2b355b38a1 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, futures +, futures ? null , docloud , requests }: diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 9a40b1f99fe7..1cf4c6b30d43 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -8,7 +8,7 @@ , testtools , isPy3k , nose -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index aa6831441d89..5158a553bfb8 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -5,7 +5,7 @@ , six , appdirs , scandir -, backports_os +, backports_os ? null , typing , pytz , enum34 diff --git a/pkgs/development/python-modules/goocalendar/default.nix b/pkgs/development/python-modules/goocalendar/default.nix index b0eea600384e..6c371496ffaf 100644 --- a/pkgs/development/python-modules/goocalendar/default.nix +++ b/pkgs/development/python-modules/goocalendar/default.nix @@ -4,7 +4,6 @@ , pkg-config , gtk3 , gobject-introspection -, pygtk , pygobject3 , goocanvas2 , isPy3k diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 0fe6b9343eb3..dadb9b527620 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -3,8 +3,8 @@ , grpc , six , protobuf -, enum34 -, futures +, enum34 ? null +, futures ? null , isPy27 , pkg-config , cython diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 67920dc7b7d8..2b334fd121ce 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -10,7 +10,7 @@ , numpy , isPy3k , ffmpeg_3 -, futures +, futures ? null , enum34 }: diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 297b87d5745b..2c5692bf26a9 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -11,7 +11,7 @@ , ipykernel , tornado , isPy3k -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index 98878c90640f..b77cf430717c 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -4,8 +4,8 @@ , isPyPy , pycrypto , requests -, singledispatch -, futures +, singledispatch ? null +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index acdcf69e301d..6eb6e49cddda 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -6,14 +6,14 @@ , requests_oauthlib , isodate , certifi -, enum34 +, enum34 ? null , typing , aiohttp , aiodns , pytest , httpretty , mock -, futures +, futures ? null , trio }: diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 8e4ece43fd7b..381b0d76b144 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , isPy27 -, futures +, futures ? null , gevent , mock , pytest diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index 2ef394745964..9af09d569466 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -14,7 +14,7 @@ , requests , entrypoints , tenacity -, futures +, futures ? null , black , backports_tempfile , isPy27 diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 56e856cff9af..5a0322edf657 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -6,9 +6,7 @@ , pytest-flake8 , glibcLocales , packaging -, isPy27 , isPy38 -, backports_os , importlib-metadata , fetchpatch }: @@ -26,8 +24,7 @@ buildPythonPackage rec { buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ importlib-metadata - ] ++ lib.optional isPy27 backports_os - ; + ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 60c6f333275b..e3e66294a8f5 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -5,7 +5,7 @@ , buildPythonPackage , isPy37 , protobuf -, google-apputils +, google-apputils ? null , six , pyext , libcxx diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index 7e388b93971b..833b83b39136 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,4 +1,20 @@ -{ buildPythonPackage, fetchPypi, lib, vcversioner, pytestrunner, mock, pytest, pytest-asyncio, pytest-trio, twisted, zipp, pyparsing, pyhamcrest, futures, attrs, isPy27 }: +{ buildPythonPackage +, fetchPypi +, lib +, vcversioner +, pytestrunner +, mock +, pytest +, pytest-asyncio +, pytest-trio +, twisted +, zipp ? null +, pyparsing ? null +, pyhamcrest +, futures ? null +, attrs ? null +, isPy27 +}: buildPythonPackage rec { pname = "pyee"; diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix index 379edc7bd45f..b2b65680fab0 100644 --- a/pkgs/development/python-modules/pynvim/default.nix +++ b/pkgs/development/python-modules/pynvim/default.nix @@ -4,7 +4,7 @@ , nose , msgpack , greenlet -, trollius +, trollius ? null , pythonOlder , isPyPy , pytestrunner diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 7ab175a893c8..70caefea8953 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -6,7 +6,7 @@ , psutil , pytest , setuptools_scm -, subprocess32 +, subprocess32 ? null , toml , zc_lockfile }: diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index 53dab817eb27..e641a943f865 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder , pytestCheckHook, mock, pytestcov, coverage -, future, futures, ujson, isPy38 +, future, futures ? null, ujson, isPy38 }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index e221f5b1efc1..69fbaa78067e 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder, isPy27 -, backports_functools_lru_cache, configparser, futures, future, jedi, pluggy, python-jsonrpc-server, flake8 +, backports_functools_lru_cache ? null, configparser ? null, futures ? null, future, jedi, pluggy, python-jsonrpc-server, flake8 , pytestCheckHook, mock, pytestcov, coverage, setuptools, ujson, flaky , # Allow building a limited set of providers, e.g. ["pycodestyle"]. providers ? ["*"] diff --git a/pkgs/development/python-modules/ruamel_yaml/default.nix b/pkgs/development/python-modules/ruamel_yaml/default.nix index 7a7d8356cabb..1eaf86d69c05 100644 --- a/pkgs/development/python-modules/ruamel_yaml/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml/default.nix @@ -2,8 +2,8 @@ , buildPythonPackage , fetchPypi , ruamel_base -, ruamel_ordereddict -, ruamel_yaml_clib +, ruamel_ordereddict ? null +, ruamel_yaml_clib ? null , isPy3k , isPyPy }: diff --git a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix index 8304f5d7dadc..c403239d5525 100644 --- a/pkgs/development/python-modules/ruamel_yaml_clib/default.nix +++ b/pkgs/development/python-modules/ruamel_yaml_clib/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchhg , ruamel_base -, ruamel_ordereddict +, ruamel_ordereddict ? null , isPy3k }: diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 0246b3730444..0ef7378fbf67 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -9,7 +9,7 @@ , wheel , unittest2 , botocore -, futures +, futures ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 6f5fb5578665..5964e382084f 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchPypi, buildPythonPackage, isPy3k, isPy35, fetchpatch , mock -, pysqlite +, pysqlite ? null , pytestCheckHook , pytest_xdist }: diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index e23567ab0691..c1c0abcec241 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27, isPy3k -, pbr, six, futures, monotonic, typing, setuptools_scm +, pbr, six, futures ? null, monotonic ? null, typing ? null, setuptools_scm , pytest, sphinx, tornado, typeguard }: diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 14a62d2a5aed..70b815c4ec92 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -5,9 +5,9 @@ , isPy3k , numpy , imagecodecs-lite -, enum34 -, futures -, pathlib +, enum34 ? null +, futures ? null +, pathlib ? null , pytest }: diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index 6d889a09d25e..03c1b6ab0808 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -6,7 +6,7 @@ , backports_ssl_match_hostname , certifi , singledispatch -, futures +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index da270331978d..74ca668de490 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -6,7 +6,7 @@ , backports_ssl_match_hostname , certifi , singledispatch -, futures +, futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index d98d99aaaad7..f835509fe9b6 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPy3k , cryptography -, futures +, futures ? null , pytest , pyopenssl , service-identity diff --git a/pkgs/development/python-modules/uproot3/default.nix b/pkgs/development/python-modules/uproot3/default.nix index c69237734277..e5b3903eefa7 100644 --- a/pkgs/development/python-modules/uproot3/default.nix +++ b/pkgs/development/python-modules/uproot3/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, buildPythonPackage, isPy27 -, awkward0, backports_lzma, cachetools, lz4, pandas +, awkward0, backports_lzma ? null, cachetools, lz4, pandas , pytestCheckHook, pkgconfig, mock , numpy, requests, uproot3-methods, xxhash, zstandard }: diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index 861cb38389a8..3ce15a3fdcea 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -3,7 +3,7 @@ , cssselect , dateutil , feedparser -, futures +, futures ? null , gdata , gnupg , google-api-python-client diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 16379820653b..9acd4c442a7b 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook , xflux, librsvg, gtk3, gobject-introspection, pango, gdk-pixbuf, atk -, pexpect, pyGtkGlade, pygobject3, pyxdg, libappindicator-gtk3 +, pexpect, pygobject3, pyxdg, libappindicator-gtk3 }: buildPythonApplication rec { pname = "xflux-gui"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a4bd74f3cff5..dd580c653eab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -157,10 +157,7 @@ in { recursivePthLoader = callPackage ../development/python-modules/recursive-pth-loader { }; - setuptools = if isPy27 then - callPackage ../development/python-modules/setuptools/44.0.nix { } - else - callPackage ../development/python-modules/setuptools { }; + setuptools = callPackage ../development/python-modules/setuptools { }; aadict = callPackage ../development/python-modules/aadict { }; @@ -214,8 +211,6 @@ in { affine = callPackage ../development/python-modules/affine { }; - affinity = callPackage ../development/python-modules/affinity { }; - agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; @@ -412,10 +407,6 @@ in { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { - inherit (pkgs) antlr4; - }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { inherit (pkgs) antlr4; }; @@ -438,8 +429,6 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; - application = callPackage ../development/python-modules/application { }; - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { }; @@ -498,10 +487,7 @@ in { asdf = callPackage ../development/python-modules/asdf { }; - ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + ase = callPackage ../development/python-modules/ase { }; asgi-csrf = callPackage ../development/python-modules/asgi-csrf { }; @@ -899,10 +885,6 @@ in { backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; - - backports_os = callPackage ../development/python-modules/backports_os { }; - backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; @@ -953,10 +935,7 @@ in { bcdoc = callPackage ../development/python-modules/bcdoc { }; - bcrypt = if pythonOlder "3.6" then - callPackage ../development/python-modules/bcrypt/3_1.nix { } - else - callPackage ../development/python-modules/bcrypt { }; + bcrypt = callPackage ../development/python-modules/bcrypt { }; beaker = callPackage ../development/python-modules/beaker { }; @@ -1014,10 +993,6 @@ in { bitbox02 = callPackage ../development/python-modules/bitbox02 { }; - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; @@ -1054,8 +1029,6 @@ in { blist = callPackage ../development/python-modules/blist { }; - blivet = callPackage ../development/python-modules/blivet { }; - blockchain = callPackage ../development/python-modules/blockchain { }; blockdiag = callPackage ../development/python-modules/blockdiag { }; @@ -1097,8 +1070,6 @@ in { bottleneck = callPackage ../development/python-modules/bottleneck { }; - box2d = callPackage ../development/python-modules/box2d { }; - bpython = callPackage ../development/python-modules/bpython { }; bracex = callPackage ../development/python-modules/bracex { }; @@ -1246,10 +1217,6 @@ in { cchardet = callPackage ../development/python-modules/cchardet { }; - CDDB = callPackage ../development/python-modules/cddb { }; - - cdecimal = callPackage ../development/python-modules/cdecimal { }; - celery = callPackage ../development/python-modules/celery { }; cement = callPackage ../development/python-modules/cement { }; @@ -1316,8 +1283,6 @@ in { cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - cheetah = callPackage ../development/python-modules/cheetah { }; - cheroot = callPackage ../development/python-modules/cheroot { }; cherrypy = callPackage ../development/python-modules/cherrypy { }; @@ -1338,8 +1303,6 @@ in { citeproc-py = callPackage ../development/python-modules/citeproc-py { }; - cjson = callPackage ../development/python-modules/cjson { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; class-registry = callPackage ../development/python-modules/class-registry { }; @@ -1352,8 +1315,6 @@ in { clf = callPackage ../development/python-modules/clf { }; - cliapp = callPackage ../development/python-modules/cliapp { }; - click = callPackage ../development/python-modules/click { }; clickclick = callPackage ../development/python-modules/clickclick { }; @@ -1398,8 +1359,6 @@ in { clldutils = callPackage ../development/python-modules/clldutils { }; - closure-linter = callPackage ../development/python-modules/closure-linter { }; - cloudflare = callPackage ../development/python-modules/cloudflare { }; cloudpickle = callPackage ../development/python-modules/cloudpickle { }; @@ -1416,8 +1375,6 @@ in { cmdline = callPackage ../development/python-modules/cmdline { }; - cmdtest = callPackage ../development/python-modules/cmdtest { }; - cmigemo = callPackage ../development/python-modules/cmigemo { inherit (pkgs) cmigemo; }; @@ -1440,8 +1397,6 @@ in { cogapp = callPackage ../development/python-modules/cogapp { }; - coilmq = callPackage ../development/python-modules/coilmq { }; - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; colander = callPackage ../development/python-modules/colander { }; @@ -1480,10 +1435,7 @@ in { configobj = callPackage ../development/python-modules/configobj { }; - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } - else - callPackage ../development/python-modules/configparser { }; + configparser = callPackage ../development/python-modules/configparser { }; configshell = callPackage ../development/python-modules/configshell { }; @@ -1497,10 +1449,7 @@ in { constantly = callPackage ../development/python-modules/constantly { }; - construct = if isPy27 then - callPackage ../development/python-modules/construct/2.10.54.nix { } - else - callPackage ../development/python-modules/construct { }; + construct = callPackage ../development/python-modules/construct { }; consul = callPackage ../development/python-modules/consul { }; @@ -1510,10 +1459,7 @@ in { contextvars = callPackage ../development/python-modules/contextvars { }; - convertdate = if isPy27 then - callPackage ../development/python-modules/convertdate/2.2.x.nix { } - else - callPackage ../development/python-modules/convertdate { }; + convertdate = callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -1569,15 +1515,9 @@ in { cryptacular = callPackage ../development/python-modules/cryptacular { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/3.3.nix { } - else - callPackage ../development/python-modules/cryptography { }; + cryptography = callPackage ../development/python-modules/cryptography { }; - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-3.3.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; + cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors.nix { }; crytic-compile = callPackage ../development/python-modules/crytic-compile { }; @@ -1644,8 +1584,6 @@ in { daphne = callPackage ../development/python-modules/daphne { }; - darcsver = callPackage ../development/python-modules/darcsver { }; - dash = callPackage ../development/python-modules/dash { }; dash-core-components = callPackage ../development/python-modules/dash-core-components { }; @@ -1702,10 +1640,7 @@ in { datatable = callPackage ../development/python-modules/datatable { }; - dateparser = if isPy27 then - callPackage ../development/python-modules/dateparser/0.x.nix { } - else - callPackage ../development/python-modules/dateparser { }; + dateparser = callPackage ../development/python-modules/dateparser { }; datrie = callPackage ../development/python-modules/datrie { }; @@ -1769,8 +1704,6 @@ in { descartes = callPackage ../development/python-modules/descartes { }; - deskcon = callPackage ../development/python-modules/deskcon { }; - desktop-notifier = callPackage ../development/python-modules/desktop-notifier { }; detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 @@ -1869,8 +1802,6 @@ in { django_environ = callPackage ../development/python-modules/django_environ { }; - django_evolution = callPackage ../development/python-modules/django_evolution { }; - django_extensions = callPackage ../development/python-modules/django-extensions { }; django-filter = callPackage ../development/python-modules/django-filter { }; @@ -2058,8 +1989,6 @@ in { ds4drv = callPackage ../development/python-modules/ds4drv { }; - dtopt = callPackage ../development/python-modules/dtopt { }; - duckdb = callPackage ../development/python-modules/duckdb { inherit (pkgs) duckdb; }; @@ -2157,8 +2086,6 @@ in { enum34 = callPackage ../development/python-modules/enum34 { }; - enum = callPackage ../development/python-modules/enum { }; - enum-compat = callPackage ../development/python-modules/enum-compat { }; envisage = callPackage ../development/python-modules/envisage { }; @@ -2201,8 +2128,6 @@ in { eventlet = callPackage ../development/python-modules/eventlet { }; - eventlib = callPackage ../development/python-modules/eventlib { }; - events = callPackage ../development/python-modules/events { }; evernote = callPackage ../development/python-modules/evernote { }; @@ -2297,8 +2222,6 @@ in { fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - fdint = callPackage ../development/python-modules/fdint { }; - fe25519 = callPackage ../development/python-modules/fe25519 { }; feedgen = callPackage ../development/python-modules/feedgen { }; @@ -2403,8 +2326,6 @@ in { flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - flask-limiter = callPackage ../development/python-modules/flask-limiter { }; flask_login = callPackage ../development/python-modules/flask-login { }; @@ -2481,8 +2402,6 @@ in { flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - flup = callPackage ../development/python-modules/flup { }; - flux-led = callPackage ../development/python-modules/flux-led { }; fn = callPackage ../development/python-modules/fn { }; @@ -2529,10 +2448,7 @@ in { freetype-py = callPackage ../development/python-modules/freetype-py { }; - freezegun = if isPy27 then - callPackage ../development/python-modules/freezegun/0.3.nix { } - else - callPackage ../development/python-modules/freezegun { }; + freezegun = callPackage ../development/python-modules/freezegun { }; fritzconnection = callPackage ../development/python-modules/fritzconnection { }; @@ -2548,8 +2464,6 @@ in { ftputil = callPackage ../development/python-modules/ftputil { }; - fudge = callPackage ../development/python-modules/fudge { }; - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; funcsigs = callPackage ../development/python-modules/funcsigs { }; @@ -2570,8 +2484,6 @@ in { future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - futures = callPackage ../development/python-modules/futures { }; - fuzzyfinder = callPackage ../development/python-modules/fuzzyfinder { }; fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; @@ -2585,23 +2497,19 @@ in { gast = callPackage ../development/python-modules/gast { }; - gateone = callPackage ../development/python-modules/gateone { }; - gcovr = callPackage ../development/python-modules/gcovr { }; gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); gdata = callPackage ../development/python-modules/gdata { }; - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + gdcm = toPythonModule (pkgs.gdcm.override { inherit (self) python; enablePython = true; - })); + }); gdown = callPackage ../development/python-modules/gdown { }; - gdrivefs = callPackage ../development/python-modules/gdrivefs { }; - ge25519 = callPackage ../development/python-modules/ge25519 { }; geant4 = toPythonModule (pkgs.geant4.override { @@ -2706,8 +2614,6 @@ in { gnureadline = callPackage ../development/python-modules/gnureadline { }; - gnutls = callPackage ../development/python-modules/gnutls { }; - goobook = callPackage ../development/python-modules/goobook { }; goocalendar = callPackage ../development/python-modules/goocalendar { }; @@ -2718,8 +2624,6 @@ in { googleapis-common-protos = callPackage ../development/python-modules/googleapis-common-protos { }; - google-apputils = callPackage ../development/python-modules/google-apputils { }; - google-auth = callPackage ../development/python-modules/google-auth { }; google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; @@ -2895,11 +2799,6 @@ in { gremlinpython = callPackage ../development/python-modules/gremlinpython { }; - grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); - grip = callPackage ../development/python-modules/grip { }; grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; @@ -2910,10 +2809,7 @@ in { grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; + gsd = callPackage ../development/python-modules/gsd { }; gspread = callPackage ../development/python-modules/gspread { }; @@ -2939,10 +2835,7 @@ in { gumath = callPackage ../development/python-modules/gumath { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + gunicorn = callPackage ../development/python-modules/gunicorn { }; guppy3 = callPackage ../development/python-modules/guppy3 { }; @@ -3025,12 +2918,8 @@ in { hg-evolve = callPackage ../development/python-modules/hg-evolve { }; - hg-git = callPackage ../development/python-modules/hg-git { }; - hglib = callPackage ../development/python-modules/hglib { }; - hgsvn = callPackage ../development/python-modules/hgsvn { }; - hickle = callPackage ../development/python-modules/hickle { }; hidapi = callPackage ../development/python-modules/hidapi { @@ -3075,8 +2964,6 @@ in { hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - hstspreload = callPackage ../development/python-modules/hstspreload { }; html2text = callPackage ../development/python-modules/html2text { }; @@ -3113,8 +3000,6 @@ in { httpsig = callPackage ../development/python-modules/httpsig { }; - http_signature = callPackage ../development/python-modules/http_signature { }; - httptools = callPackage ../development/python-modules/httptools { }; httpx = callPackage ../development/python-modules/httpx { }; @@ -3222,10 +3107,7 @@ in { imap-tools = callPackage ../development/python-modules/imap-tools { }; - imbalanced-learn = if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn { }; imdbpy = callPackage ../development/python-modules/imdbpy { }; @@ -3299,8 +3181,6 @@ in { iowait = callPackage ../development/python-modules/iowait { }; - ipaddr = callPackage ../development/python-modules/ipaddr { }; - ipaddress = callPackage ../development/python-modules/ipaddress { }; ipdb = callPackage ../development/python-modules/ipdb { }; @@ -3315,10 +3195,7 @@ in { ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } - else - callPackage ../development/python-modules/ipykernel { }; + ipykernel = callPackage ../development/python-modules/ipykernel { }; ipympl = callPackage ../development/python-modules/ipympl { }; @@ -3326,9 +3203,7 @@ in { ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else if isPy36 then + ipython = if isPy36 then callPackage ../development/python-modules/ipython/7.16.nix { } else callPackage ../development/python-modules/ipython { }; @@ -3383,19 +3258,13 @@ in { jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } - else - callPackage ../development/python-modules/jaraco_functools { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; - jaraco_stream = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + jaraco_stream = callPackage ../development/python-modules/jaraco_stream { }; jaraco_text = callPackage ../development/python-modules/jaraco_text { }; @@ -3497,8 +3366,6 @@ in { jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; @@ -3640,12 +3507,8 @@ in { knack = callPackage ../development/python-modules/knack { }; - koji = callPackage ../development/python-modules/koji { }; - kombu = callPackage ../development/python-modules/kombu { }; - konfig = callPackage ../development/python-modules/konfig { }; - korean-lunar-calendar = callPackage ../development/python-modules/korean-lunar-calendar { }; kubernetes = callPackage ../development/python-modules/kubernetes { }; @@ -3662,12 +3525,8 @@ in { langdetect = callPackage ../development/python-modules/langdetect { }; - larch = callPackage ../development/python-modules/larch { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; - Lasagne = callPackage ../development/python-modules/lasagne { }; - latexcodec = callPackage ../development/python-modules/latexcodec { }; launchpadlib = callPackage ../development/python-modules/launchpadlib { }; @@ -3700,8 +3559,6 @@ in { leather = callPackage ../development/python-modules/leather { }; - le = callPackage ../development/python-modules/le { }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; ledgerblue = callPackage ../development/python-modules/ledgerblue { }; @@ -3734,10 +3591,7 @@ in { inherit (pkgs) libasyncns; }; - libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + libcloud = callPackage ../development/python-modules/libcloud { }; libcst = callPackage ../development/python-modules/libcst { }; @@ -3831,10 +3685,7 @@ in { libtmux = callPackage ../development/python-modules/libtmux { }; - libtorrent-rasterbar = if isPy27 then - (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python - else - (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; + libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar.override { inherit python; })).python; libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; @@ -3861,8 +3712,6 @@ in { license-expression = callPackage ../development/python-modules/license-expression { }; - lightblue = callPackage ../development/python-modules/lightblue { }; - lightgbm = callPackage ../development/python-modules/lightgbm { }; lightning = callPackage ../development/python-modules/lightning { }; @@ -3889,9 +3738,9 @@ in { liquidctl = callPackage ../development/python-modules/liquidctl { }; - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + lirc = toPythonModule (pkgs.lirc.override { python3 = python; - })); + }); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -3949,10 +3798,6 @@ in { loo-py = callPackage ../development/python-modules/loo-py { }; - lpod = callPackage ../development/python-modules/lpod { }; - - lsi = callPackage ../development/python-modules/lsi { }; - lsassy = callPackage ../development/python-modules/lsassy { }; ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; @@ -3961,8 +3806,6 @@ in { lupa = callPackage ../development/python-modules/lupa { }; - lxc = callPackage ../development/python-modules/lxc { }; - lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; @@ -4039,16 +3882,6 @@ in { mapbox = callPackage ../development/python-modules/mapbox { }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; - - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; - - marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - - marisa = callPackage ../development/python-modules/marisa { - inherit (pkgs) marisa; - }; - marisa-trie = callPackage ../development/python-modules/marisa-trie { }; markdown2 = callPackage ../development/python-modules/markdown2 { }; @@ -4125,8 +3958,6 @@ in { meld3 = callPackage ../development/python-modules/meld3 { }; - meliae = callPackage ../development/python-modules/meliae { }; - memcached = callPackage ../development/python-modules/memcached { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; @@ -4152,8 +3983,6 @@ in { mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - metaphone = callPackage ../development/python-modules/metaphone { }; - metar = callPackage ../development/python-modules/metar { }; mezzanine = callPackage ../development/python-modules/mezzanine { }; @@ -4214,10 +4043,7 @@ in { mocket = callPackage ../development/python-modules/mocket { }; - mock = if pythonOlder "3.6" then - callPackage ../development/python-modules/mock/2.nix { } - else - callPackage ../development/python-modules/mock { }; + mock = callPackage ../development/python-modules/mock { }; mockito = callPackage ../development/python-modules/mockito { }; @@ -4233,9 +4059,6 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; - mongodict = callPackage ../development/python-modules/mongodict { }; mongoengine = callPackage ../development/python-modules/mongoengine { }; @@ -4267,38 +4090,8 @@ in { mox = callPackage ../development/python-modules/mox { }; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; - - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; - - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; - - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; - - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; - - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; - - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; - - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; - - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; - - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; - - mozsvc = callPackage ../development/python-modules/mozsvc { }; - - mozterm = callPackage ../development/python-modules/mozterm { }; - - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; - - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; - mpd2 = callPackage ../development/python-modules/mpd2 { }; - mpd = callPackage ../development/python-modules/mpd { }; - mpi4py = callPackage ../development/python-modules/mpi4py { }; mplfinance = callPackage ../development/python-modules/mplfinance { }; @@ -4313,8 +4106,6 @@ in { mpyq = callPackage ../development/python-modules/mpyq { }; - mrbob = callPackage ../development/python-modules/mrbob { }; - msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; @@ -4331,8 +4122,6 @@ in { msrest = callPackage ../development/python-modules/msrest { }; - msrplib = callPackage ../development/python-modules/msrplib { }; - mt-940 = callPackage ../development/python-modules/mt-940 { }; mullvad-api = callPackage ../development/python-modules/mullvad-api { }; @@ -4361,23 +4150,12 @@ in { mutag = callPackage ../development/python-modules/mutag { }; - mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + mutagen = callPackage ../development/python-modules/mutagen { }; mutatormath = callPackage ../development/python-modules/mutatormath { }; - muttils = callPackage ../development/python-modules/muttils { }; - mwclient = callPackage ../development/python-modules/mwclient { }; - mwlib = callPackage ../development/python-modules/mwlib { }; - - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - mwoauth = callPackage ../development/python-modules/mwoauth { }; mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; @@ -4402,8 +4180,6 @@ in { nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - namebench = callPackage ../development/python-modules/namebench { }; - namedlist = callPackage ../development/python-modules/namedlist { }; nameparser = callPackage ../development/python-modules/nameparser { }; @@ -4478,8 +4254,6 @@ in { neuronpy = callPackage ../development/python-modules/neuronpy { }; - nevow = callPackage ../development/python-modules/nevow { }; - nghttp2 = (toPythonModule (pkgs.nghttp2.override { inherit (self) python cython setuptools; inherit (pkgs) ncurses; @@ -4512,11 +4286,6 @@ in { inherit (pkgs) nix; }; - # This is used for NixOps to make sure we won't break it with the next major version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; - - nixpart = callPackage ../tools/filesystems/nixpart { }; - nixpkgs = callPackage ../development/python-modules/nixpkgs { }; nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; @@ -4555,14 +4324,10 @@ in { nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - nose-focus = callPackage ../development/python-modules/nose-focus { }; - nose-timer = callPackage ../development/python-modules/nose-timer { }; nosejs = callPackage ../development/python-modules/nosejs { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; - nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; nose_progressive = callPackage ../development/python-modules/nose_progressive { }; @@ -4579,8 +4344,6 @@ in { notify2 = callPackage ../development/python-modules/notify2 { }; - notify = callPackage ../development/python-modules/notify { }; - notify-py = callPackage ../development/python-modules/notify-py { }; notmuch = callPackage ../development/python-modules/notmuch { @@ -4617,10 +4380,7 @@ in { numpydoc = callPackage ../development/python-modules/numpydoc { }; - numpy = if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; + numpy = callPackage ../development/python-modules/numpy { }; numpy-stl = callPackage ../development/python-modules/numpy-stl { }; @@ -4630,8 +4390,6 @@ in { nwdiag = callPackage ../development/python-modules/nwdiag { }; - nxt-python = callPackage ../development/python-modules/nxt-python { }; - oath = callPackage ../development/python-modules/oath { }; oauth2 = callPackage ../development/python-modules/oauth2 { }; @@ -4642,10 +4400,7 @@ in { oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + oauthlib = callPackage ../development/python-modules/oauthlib { }; obfsproxy = callPackage ../development/python-modules/obfsproxy { }; @@ -4766,8 +4521,6 @@ in { pagelabels = callPackage ../development/python-modules/pagelabels { }; - pagerduty = callPackage ../development/python-modules/pagerduty { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; palettable = callPackage ../development/python-modules/palettable { }; @@ -4843,8 +4596,6 @@ in { pastel = callPackage ../development/python-modules/pastel { }; - pasteScript = callPackage ../development/python-modules/pastescript { }; - patator = callPackage ../development/python-modules/patator { }; patch = callPackage ../development/python-modules/patch { }; @@ -4991,16 +4742,10 @@ in { pillowfight = callPackage ../development/python-modules/pillowfight { }; - pillow = if isPy27 then - callPackage ../development/python-modules/pillow/6.nix { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - } - else - callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11 libxcb; - }; + pillow = callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11 libxcb; + }; pillow-simd = callPackage ../development/python-modules/pillow-simd { inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; @@ -5194,8 +4939,6 @@ in { prison = callPackage ../development/python-modules/prison { }; - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5204,8 +4947,6 @@ in { proglog = callPackage ../development/python-modules/proglog { }; - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; progressbar33 = callPackage ../development/python-modules/progressbar33 { }; @@ -5337,8 +5078,6 @@ in { pyalmond = callPackage ../development/python-modules/pyalmond { }; - pyamf = callPackage ../development/python-modules/pyamf { }; - pyamg = callPackage ../development/python-modules/pyamg { }; pyaml = callPackage ../development/python-modules/pyaml { }; @@ -5383,8 +5122,6 @@ in { pyblock = callPackage ../development/python-modules/pyblock { }; - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; - pybluez = callPackage ../development/python-modules/pybluez { }; pybotvac = callPackage ../development/python-modules/pybotvac { }; @@ -5411,12 +5148,8 @@ in { pycaption = callPackage ../development/python-modules/pycaption { }; - pycarddav = callPackage ../development/python-modules/pycarddav { }; - pycares = callPackage ../development/python-modules/pycares { }; - pycassa = callPackage ../development/python-modules/pycassa { }; - pycategories = callPackage ../development/python-modules/pycategories { }; pycdio = callPackage ../development/python-modules/pycdio { }; @@ -5467,8 +5200,6 @@ in { pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; - pycryptopp = callPackage ../development/python-modules/pycryptopp { }; - pyct = callPackage ../development/python-modules/pyct { }; pycuda = callPackage ../development/python-modules/pycuda { @@ -5478,8 +5209,6 @@ in { pycups = callPackage ../development/python-modules/pycups { }; - pycurl2 = callPackage ../development/python-modules/pycurl2 { }; - pycurl = callPackage ../development/python-modules/pycurl { }; pycxx = callPackage ../development/python-modules/pycxx { }; @@ -5520,8 +5249,6 @@ in { pydy = callPackage ../development/python-modules/pydy { }; - pyechonest = callPackage ../development/python-modules/pyechonest { }; - pyedimax = callPackage ../development/python-modules/pyedimax { }; pyee = callPackage ../development/python-modules/pyee { }; @@ -5544,8 +5271,6 @@ in { pyexcel = callPackage ../development/python-modules/pyexcel { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; - pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; @@ -5648,14 +5373,6 @@ in { pygtail = callPackage ../development/python-modules/pygtail { }; - pygtk = callPackage ../development/python-modules/pygtk { }; - - pyGtkGlade = self.pygtk.override { - inherit (pkgs.gnome2) libglade; - }; - - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; - pygtrie = callPackage ../development/python-modules/pygtrie { }; pyhamcrest = callPackage ../development/python-modules/pyhamcrest { }; @@ -5706,8 +5423,6 @@ in { pykerberos = callPackage ../development/python-modules/pykerberos { }; - pykickstart = callPackage ../development/python-modules/pykickstart { }; - pykira = callPackage ../development/python-modules/pykira { }; pykka = callPackage ../development/python-modules/pykka { }; @@ -5882,11 +5597,6 @@ in { pynzb = callPackage ../development/python-modules/pynzb { }; - pyobjc = if stdenv.isDarwin then - callPackage ../development/python-modules/pyobjc { } - else - throw "pyobjc can only be built on Mac OS"; - pyocr = callPackage ../development/python-modules/pyocr { tesseract = pkgs.tesseract4; }; @@ -5944,8 +5654,6 @@ in { pypdf2 = callPackage ../development/python-modules/pypdf2 { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; pyperclip = callPackage ../development/python-modules/pyperclip { }; @@ -5962,8 +5670,6 @@ in { pyplatec = callPackage ../development/python-modules/pyplatec { }; - pypoppler = callPackage ../development/python-modules/pypoppler { }; - pyppeteer = callPackage ../development/python-modules/pyppeteer { }; pyprind = callPackage ../development/python-modules/pyprind { }; @@ -6054,8 +5760,6 @@ in { pyregion = callPackage ../development/python-modules/pyregion { }; - pyreport = callPackage ../development/python-modules/pyreport { }; - pyres = callPackage ../development/python-modules/pyres { }; pyrisco = callPackage ../development/python-modules/pyrisco { }; @@ -6202,8 +5906,6 @@ in { inherit (pkgs) sqlcipher; }; - pysqlite = callPackage ../development/python-modules/pysqlite { }; - pysqueezebox = callPackage ../development/python-modules/pysqueezebox { }; pysrim = callPackage ../development/python-modules/pysrim { }; @@ -6224,8 +5926,6 @@ in { py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pysvn = callPackage ../development/python-modules/pysvn { inherit (pkgs) bash subversion apr aprutil expat neon openssl; }; @@ -6460,17 +6160,12 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; pytest-xdist = self.pytest_xdist; # added 2021-01-04 - pytest_xdist = if isPy27 then - callPackage ../development/python-modules/pytest-xdist/1.nix { } - else - callPackage ../development/python-modules/pytest-xdist { }; + pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - python3-openid = callPackage ../development/python-modules/python3-openid { }; python-awair = callPackage ../development/python-modules/python-awair { }; @@ -6547,8 +6242,6 @@ in { inherit (pkgs) igraph; }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - pythonix = callPackage ../development/python-modules/pythonix { meson = pkgs.meson.override { python3 = self.python; }; }; @@ -6583,8 +6276,6 @@ in { python_magic = callPackage ../development/python-modules/python-magic { }; - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; @@ -6626,8 +6317,6 @@ in { python_openzwave = callPackage ../development/python-modules/python_openzwave { }; - python-otr = callPackage ../development/python-modules/python-otr { }; - python-packer = callPackage ../development/python-modules/python-packer { }; python-pam = callPackage ../development/python-modules/python-pam { @@ -6673,12 +6362,8 @@ in { python-sql = callPackage ../development/python-modules/python-sql { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - python-sybase = callPackage ../development/python-modules/sybase { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; python-toolbox = callPackage ../development/python-modules/python-toolbox { }; @@ -6786,8 +6471,6 @@ in { inherit (pkgs) libusb1; }; - pyutil = callPackage ../development/python-modules/pyutil { }; - pyutilib = callPackage ../development/python-modules/pyutilib { }; pyuv = callPackage ../development/python-modules/pyuv { }; @@ -6832,8 +6515,6 @@ in { inherit (pkgs) libxml2; }; - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - pywebpush = callPackage ../development/python-modules/pywebpush { }; pywebview = callPackage ../development/python-modules/pywebview { }; @@ -6892,8 +6573,6 @@ in { qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; - qrcode = callPackage ../development/python-modules/qrcode { }; qreactor = callPackage ../development/python-modules/qreactor { }; @@ -6906,8 +6585,6 @@ in { qscintilla = self.qscintilla-qt4; - qserve = callPackage ../development/python-modules/qserve { }; - qtawesome = callPackage ../development/python-modules/qtawesome { }; qtconsole = callPackage ../development/python-modules/qtconsole { }; @@ -7013,8 +6690,6 @@ in { relatorio = callPackage ../development/python-modules/relatorio { }; - remotecv = callPackage ../development/python-modules/remotecv { }; - rencode = callPackage ../development/python-modules/rencode { }; repeated_test = callPackage ../development/python-modules/repeated_test { }; @@ -7135,8 +6810,6 @@ in { robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; - robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; @@ -7169,8 +6842,6 @@ in { rpdb = callPackage ../development/python-modules/rpdb { }; - rpkg = callPackage ../development/python-modules/rpkg { }; - rply = callPackage ../development/python-modules/rply { }; rpm = toPythonModule (pkgs.rpm.override { @@ -7198,9 +6869,6 @@ in { ruamel-base = self.ruamel_base; ruamel_base = callPackage ../development/python-modules/ruamel_base { }; - ruamel-ordereddict = self.ruamel_ordereddict; - ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; - ruamel-yaml = self.ruamel_yaml; ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; @@ -7211,8 +6879,6 @@ in { ruffus = callPackage ../development/python-modules/ruffus { }; - runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - runway-python = callPackage ../development/python-modules/runway-python { }; rx = callPackage ../development/python-modules/rx { }; @@ -7253,8 +6919,6 @@ in { samsungtvws = callPackage ../development/python-modules/samsungtvws { }; - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; sanic = callPackage ../development/python-modules/sanic { }; @@ -7365,8 +7029,6 @@ in { selenium = callPackage ../development/python-modules/selenium { }; - semantic = callPackage ../development/python-modules/semantic { }; - semantic-version = callPackage ../development/python-modules/semantic-version { }; semver = callPackage ../development/python-modules/semver { }; @@ -7398,14 +7060,10 @@ in { serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; - service-identity = callPackage ../development/python-modules/service_identity { }; setproctitle = callPackage ../development/python-modules/setproctitle { }; - setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; @@ -7465,8 +7123,6 @@ in { simanneal = callPackage ../development/python-modules/simanneal { }; - simpleai = callPackage ../development/python-modules/simpleai { }; - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; simplebayes = callPackage ../development/python-modules/simplebayes { }; @@ -7483,8 +7139,6 @@ in { simplekml = callPackage ../development/python-modules/simplekml { }; - simpleparse = callPackage ../development/python-modules/simpleparse { }; - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; @@ -7501,8 +7155,6 @@ in { sip_5 = callPackage ../development/python-modules/sip/5.x.nix { }; - sipsimple = callPackage ../development/python-modules/sipsimple { }; - six = callPackage ../development/python-modules/six { }; skein = callPackage ../development/python-modules/skein { @@ -7539,12 +7191,8 @@ in { slob = callPackage ../development/python-modules/slob { }; - slowaes = callPackage ../development/python-modules/slowaes { }; - sly = callPackage ../development/python-modules/sly { }; - smartdc = callPackage ../development/python-modules/smartdc { }; - smart_open = callPackage ../development/python-modules/smart_open { }; smartypants = callPackage ../development/python-modules/smartypants { }; @@ -7583,8 +7231,6 @@ in { snscrape = callPackage ../development/python-modules/snscrape { }; - snug = callPackage ../development/python-modules/snug { }; - snuggs = callPackage ../development/python-modules/snuggs { }; soapysdr = toPythonModule (pkgs.soapysdr.override { @@ -7635,8 +7281,6 @@ in { spake2 = callPackage ../development/python-modules/spake2 { }; - spambayes = callPackage ../development/python-modules/spambayes { }; - spark_parser = callPackage ../development/python-modules/spark_parser { }; SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; @@ -7739,8 +7383,6 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; @@ -7755,8 +7397,6 @@ in { sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - squaremap = callPackage ../development/python-modules/squaremap { }; - srp = callPackage ../development/python-modules/srp { }; srptools = callPackage ../development/python-modules/srptools { }; @@ -7805,8 +7445,6 @@ in { stm32loader = callPackage ../development/python-modules/stm32loader { }; - stompclient = callPackage ../development/python-modules/stompclient { }; - strategies = callPackage ../development/python-modules/strategies { }; stravalib = callPackage ../development/python-modules/stravalib { }; @@ -7841,16 +7479,10 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subliminal = callPackage ../development/python-modules/subliminal { }; - - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; - suds = callPackage ../development/python-modules/suds { }; - suds-jurko = callPackage ../development/python-modules/suds-jurko { }; sumo = callPackage ../development/python-modules/sumo { }; @@ -7915,8 +7547,6 @@ in { tahoma-api = callPackage ../development/python-modules/tahoma-api { }; - tarman = callPackage ../development/python-modules/tarman { }; - tasklib = callPackage ../development/python-modules/tasklib { }; taskw = callPackage ../development/python-modules/taskw { }; @@ -8068,8 +7698,6 @@ in { thrift = callPackage ../development/python-modules/thrift { }; - thumbor = callPackage ../development/python-modules/thumbor { }; - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let @@ -8116,8 +7744,6 @@ in { tmb = callPackage ../development/python-modules/tmb { }; - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - todoist = callPackage ../development/python-modules/todoist { }; toggl-cli = callPackage ../development/python-modules/toggl-cli { }; @@ -8128,8 +7754,6 @@ in { tokenlib = callPackage ../development/python-modules/tokenlib { }; - tokenserver = callPackage ../development/python-modules/tokenserver { }; - toml = callPackage ../development/python-modules/toml { }; tomlkit = callPackage ../development/python-modules/tomlkit { }; @@ -8206,20 +7830,14 @@ in { pytestCheckHook = self.pytestCheckHook_6_1; }; - trollius = callPackage ../development/python-modules/trollius { }; - trueskill = callPackage ../development/python-modules/trueskill { }; trustme = callPackage ../development/python-modules/trustme { }; trytond = callPackage ../development/python-modules/trytond { }; - ttystatus = callPackage ../development/python-modules/ttystatus { }; - tunigo = callPackage ../development/python-modules/tunigo { }; - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - tubeup = callPackage ../development/python-modules/tubeup { }; tumpa = callPackage ../development/python-modules/tumpa { }; @@ -8316,10 +7934,7 @@ in { ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; - ujson = if isPy27 then - callPackage ../development/python-modules/ujson/2.nix { } - else - callPackage ../development/python-modules/ujson { }; + ujson = callPackage ../development/python-modules/ujson { }; ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; @@ -8327,8 +7942,6 @@ in { umap-learn = callPackage ../development/python-modules/umap-learn { }; - umemcache = callPackage ../development/python-modules/umemcache { }; - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; uncertainties = callPackage ../development/python-modules/uncertainties { }; @@ -8435,10 +8048,7 @@ in { varint = callPackage ../development/python-modules/varint { }; - vcrpy = if isPy27 then - callPackage ../development/python-modules/vcrpy/3.nix { } - else - callPackage ../development/python-modules/vcrpy { }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; vcver = callPackage ../development/python-modules/vcver { }; @@ -8642,8 +8252,6 @@ in { worldengine = callPackage ../development/python-modules/worldengine { }; - wptserve = callPackage ../development/python-modules/wptserve { }; - wrapio = callPackage ../development/python-modules/wrapio { }; wrapt = callPackage ../development/python-modules/wrapt { }; @@ -8656,8 +8264,6 @@ in { wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - wsgitools = callPackage ../development/python-modules/wsgitools { }; WSME = callPackage ../development/python-modules/WSME { }; @@ -8675,10 +8281,6 @@ in { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - }; - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { inherit (pkgs.darwin.apple_sdk.frameworks) AudioToolbox Carbon Cocoa CoreFoundation IOKit OpenGL; wxGTK = pkgs.wxGTK30.override { @@ -8694,8 +8296,6 @@ in { }; }; - wxPython = self.wxPython30; - x11_hash = callPackage ../development/python-modules/x11_hash { }; x256 = callPackage ../development/python-modules/x256 { }; @@ -8715,8 +8315,6 @@ in { xboxapi = callPackage ../development/python-modules/xboxapi { }; - xcaplib = callPackage ../development/python-modules/xcaplib { }; - xcffib = callPackage ../development/python-modules/xcffib { }; xdg = callPackage ../development/python-modules/xdg { }; @@ -8821,8 +8419,6 @@ in { yeelight = callPackage ../development/python-modules/yeelight { }; - yenc = callPackage ../development/python-modules/yenc { }; - yfinance = callPackage ../development/python-modules/yfinance { }; yoda = toPythonModule (pkgs.yoda.override { inherit python; }); @@ -8840,8 +8436,6 @@ in { inherit (pkgs) jq; }; - yt = callPackage ../development/python-modules/yt { }; - ytmusicapi = callPackage ../development/python-modules/ytmusicapi { }; yubico-client = callPackage ../development/python-modules/yubico-client { }; @@ -8856,8 +8450,6 @@ in { zarr = callPackage ../development/python-modules/zarr { }; - zbase32 = callPackage ../development/python-modules/zbase32 { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix @@ -8888,8 +8480,6 @@ in { zetup = callPackage ../development/python-modules/zetup { }; - zfec = callPackage ../development/python-modules/zfec { }; - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; zict = callPackage ../development/python-modules/zict { }; @@ -8910,10 +8500,7 @@ in { zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; + zipp = callPackage ../development/python-modules/zipp { }; zipstream = callPackage ../development/python-modules/zipstream { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index ac1d891412c2..fddf65eaae08 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -6,38 +6,116 @@ self: super: with self; with super; { + affinity = callPackage ../development/python-modules/affinity { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { + inherit (pkgs) antlr4; + }; + appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + application = callPackage ../development/python-modules/application { }; + arrow = callPackage ../development/python-modules/arrow/2.nix { }; + ase = callPackage ../development/python-modules/ase/3.17.nix { }; + astroid = callPackage ../development/python-modules/astroid/1.6.nix { }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + + backports_os = callPackage ../development/python-modules/backports_os { }; + + bcrypt = callPackage ../development/python-modules/bcrypt/3_1.nix { }; + + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + + blivet = callPackage ../development/python-modules/blivet { }; + + box2d = callPackage ../development/python-modules/box2d { }; + browsermob-proxy = callPackage ../development/python-modules/browsermob-proxy { }; cairocffi = callPackage ../development/python-modules/cairocffi/0_9.nix { }; cairosvg = callPackage ../development/python-modules/cairosvg/1_x.nix { }; + CDDB = callPackage ../development/python-modules/cddb { }; + + cdecimal = callPackage ../development/python-modules/cdecimal { }; + chardet = callPackage ../development/python-modules/chardet/2.nix { }; + cheetah = callPackage ../development/python-modules/cheetah { }; + cherrypi = callPackage ../development/python-modules/cherrypy/17.nix { }; + cjson = callPackage ../development/python-modules/cjson { }; + + cliapp = callPackage ../development/python-modules/cliapp { }; + + closure-linter = callPackage ../development/python-modules/closure-linter { }; + + cmdtest = callPackage ../development/python-modules/cmdtest { }; + + coilmq = callPackage ../development/python-modules/coilmq { }; + + configparser = callPackage ../development/python-modules/configparser/4.nix { }; + + construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; + + convertdata = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; + + cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; + + cryptography_vectors = callPackage ../development/python-modules/cryptography/vectors-3.3.nix { }; + + darcsver = callPackage ../development/python-modules/darcsver { }; + + dateparser = callPackage ../development/python-modules/dateparser/0.x.nix { }; + + deskcon = callPackage ../development/python-modules/deskcon { }; + + django_evolution = callPackage ../development/python-modules/django_evolution { }; + dnspython = super.dnspython_1; docker-py = disabled super.docker-py; + dtopt = callPackage ../development/python-modules/dtopt { }; + dulwich = callPackage ../development/python-modules/dulwich/0_19.nix { }; + enum = callPackage ../development/python-modules/enum { }; + + eventlib = callPackage ../development/python-modules/eventlib { }; + faulthandler = callPackage ../development/python-modules/faulthandler { }; + fdint = callPackage ../development/python-modules/fdint { }; + feedparser = callPackage ../development/python-modules/feedparser/5.nix { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + flit = disabled super.flit; flit-core = disabled super.flit-core; + flup = callPackage ../development/python-modules/flup { }; + fontforge = disabled super.fontforge; + freezegun = callPackage ../development/python-modules/freezegun/0.3.nix { }; + + fudge = callPackage ../development/python-modules/fudge { }; + + futures = callPackage ../development/python-modules/futures { }; + + gdcm = disabled super.gdcm; + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { pythonPackages = self; pythonSupport = true; @@ -56,35 +134,86 @@ with self; with super; { }; }); + gateone = callPackage ../development/python-modules/gateone { }; + + gdrivefs = callPackage ../development/python-modules/gdrivefs { }; + + gsd = callPackage ../development/python-modules/gsd/1.7.nix { }; + + gnutls = callPackage ../development/python-modules/gnutls { }; + + google-apputils = callPackage ../development/python-modules/google-apputils { }; + + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); + + gunicorn = callPackage ../development/python-modules/gunicorn/19.nix { }; + gwyddion = toPythonModule (pkgs.gwyddion.override { pythonSupport = true; pythonPackages = self; }); + hg-git = callPackage ../development/python-modules/hg-git { }; + + hgsvn = callPackage ../development/python-modules/hgsvn { }; + + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + html2text = callPackage ../development/python-modules/html2text/2018.nix { }; httpretty = callPackage ../development/python-modules/httpretty/0.nix { }; + http_signature = callPackage ../development/python-modules/http_signature { }; + hypothesis = super.hypothesis_4; idna = callPackage ../development/python-modules/idna/2.nix { }; imagecodecs-lite = disabled super.imagecodecs-lite; + imbalanced-learn = callPackage ../development/python-modules/imbalanced-learn/0.4.nix { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata/2.nix { }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; + + ipykernel = callPackage ../development/python-modules/ipykernel/4.nix { }; + + ipython = callPackage ../development/python-modules/ipython/5.nix { }; + isort = callPackage ../development/python-modules/isort/4.nix { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools/2.nix { }; + + jaraco_stream = callPackage ../development/python-modules/jaraco_stream/2.nix { }; + + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + jupyter_client = callPackage ../development/python-modules/jupyter_client/5.nix { }; jupyter_console = callPackage ../development/python-modules/jupyter_console/5.nix { }; keyring = callPackage ../development/python-modules/keyring/2.nix { }; + koji = callPackage ../development/python-modules/koji { }; + + konfig = callPackage ../development/python-modules/konfig { }; + kicad = disabled super.kicad; kiwisolver = callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + larch = callPackage ../development/python-modules/larch { }; + + Lasagne = callPackage ../development/python-modules/lasagne { }; + + le = callPackage ../development/python-modules/le { }; + + libcloud = callPackage ../development/python-modules/libcloud/2.nix { }; + libgpiod = disabled super.libgpiod; libnl-python = toPythonModule (pkgs.libnl.override { @@ -97,10 +226,32 @@ with self; with super; { inherit python; }).py; + libtorrent-rasterbar = (toPythonModule (pkgs.libtorrent-rasterbar-1_2_x.override { inherit python; })).python; + libvirt = callPackage ../development/python-modules/libvirt/5.9.0.nix { libvirt = pkgs.libvirt_5_9_0; }; + lightblue = callPackage ../development/python-modules/lightblue { }; + + lirc = disabled super.lirc; + + lpod = callPackage ../development/python-modules/lpod { }; + + lsi = callPackage ../development/python-modules/lsi { }; + + lxc = callPackage ../development/python-modules/lxc { }; + + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; + + marisa = callPackage ../development/python-modules/marisa { + inherit (pkgs) marisa; + }; + + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; + markdown = callPackage ../development/python-modules/markdown/3_1.nix { }; matplotlib = callPackage ../development/python-modules/matplotlib/2.nix { @@ -108,20 +259,94 @@ with self; with super; { inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; + meliae = callPackage ../development/python-modules/meliae { }; + mercurial = disabled super.mercurial; meson = disabled super.meson; + metaphone = callPackage ../development/python-modules/metaphone { }; + + mock = callPackage ../development/python-modules/mock/2.nix { }; + + # Needed here because moinmoin is loaded as a Python library. + moinmoin = callPackage ../development/python-modules/moinmoin { }; + monosat = disabled super.monosat; more-itertools = callPackage ../development/python-modules/more-itertools/2.7.nix { }; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; + + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; + + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; + + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; + + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; + + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; + + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; + + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; + + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; + + mozterm = callPackage ../development/python-modules/mozterm { }; + + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; + + mozsvc = callPackage ../development/python-modules/mozsvc { }; + + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; + + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; + + mpd = callPackage ../development/python-modules/mpd { }; + + mrbob = callPackage ../development/python-modules/mrbob { }; + + msrplib = callPackage ../development/python-modules/msrplib { }; + + mwlib = callPackage ../development/python-modules/mwlib { }; + + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + + mutagen = callPackage ../development/python-modules/mutagen/1.43.nix { }; + + muttils = callPackage ../development/python-modules/muttils { }; + + namebench = callPackage ../development/python-modules/namebench { }; + nbformat = callPackage ../development/python-modules/nbformat/2.nix { }; networkx = callPackage ../development/python-modules/networkx/2.2.nix { }; + nevow = callPackage ../development/python-modules/nevow { }; + + # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; + + nixpart = callPackage ../tools/filesystems/nixpart { }; + + nose-focus = callPackage ../development/python-modules/nose-focus { }; + + nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; + notebook = callPackage ../development/python-modules/notebook/2.nix { }; + notify = callPackage ../development/python-modules/notify { }; + + numpy = callPackage ../development/python-modules/numpy/1.16.nix { }; + + nxt-python = callPackage ../development/python-modules/nxt-python { }; + + oauthlib = callPackage ../development/python-modules/oauthlib/3.1.nix { }; + opencv = toPythonModule (pkgs.opencv.override { enablePython = true; pythonPackages = self; @@ -135,10 +360,19 @@ with self; with super; { packaging = callPackage ../development/python-modules/packaging/2.nix { }; + pagerduty = callPackage ../development/python-modules/pagerduty { }; + pandas = callPackage ../development/python-modules/pandas/2.nix { }; + pasteScript = callPackage ../development/python-modules/pastescript { }; + pathpy = callPackage ../development/python-modules/path.py/2.nix { }; + pillow = callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; + pip = callPackage ../development/python-modules/pip/20.nix { }; postorius = disabled super.postorius; @@ -147,14 +381,34 @@ with self; with super; { prettytable = callPackage ../development/python-modules/prettytable/1.nix { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + prompt_toolkit = callPackage ../development/python-modules/prompt_toolkit/1.nix { }; + pyamf = callPackage ../development/python-modules/pyamf { }; + + pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pycangjie = disabled pycangjie; + pycarddav = callPackage ../development/python-modules/pycarddav { }; + + pycassa = callPackage ../development/python-modules/pycassa { }; + + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + + pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + pydns = callPackage ../development/python-modules/pydns { }; pydocstyle = callPackage ../development/python-modules/pydocstyle/2.nix { }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; + + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + pyexiv2 = toPythonModule (callPackage ../development/python-modules/pyexiv2 { }); pygments = callPackage ../development/python-modules/Pygments/2_5.nix { }; @@ -163,20 +417,61 @@ with self; with super; { inherit (pkgs) meson; }; + pygtk = callPackage ../development/python-modules/pygtk { }; + + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; + + pyGtkGlade = self.pygtk.override { + inherit (pkgs.gnome2) libglade; + }; + pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; + pykickstart = callPackage ../development/python-modules/pykickstart { }; + pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; pylint = callPackage ../development/python-modules/pylint/1.9.nix { }; + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; + + pyPdf = callPackage ../development/python-modules/pypdf { }; + + pypoppler = callPackage ../development/python-modules/pypoppler { }; + + pyreport = callPackage ../development/python-modules/pyreport { }; + pyroma = callPackage ../development/python-modules/pyroma/2.nix { }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; + + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pytest = pytest_4; pytest-mock = callPackage ../development/python-modules/pytest-mock/2.nix { }; pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + python-otr = callPackage ../development/python-modules/python-otr { }; + + python_statsd = callPackage ../development/python-modules/python_statsd { }; + + python-sybase = callPackage ../development/python-modules/sybase { }; + + python_xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + + pyutil = callPackage ../development/python-modules/pyutil { }; + pyxattr = super.pyxattr.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; src = oldAttrs.src.override { @@ -185,18 +480,37 @@ with self; with super; { }; }); + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + pyxml = callPackage ../development/python-modules/pyxml { }; + qpid-python = callPackage ../development/python-modules/qpid-python { }; + + qserve = callPackage ../development/python-modules/qserve { }; + + remotecv = callPackage ../development/python-modules/remotecv { }; + rhpl = callPackage ../development/python-modules/rhpl { }; rivet = disabled super.rivet; + robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; + + ruamel-ordereddict = self.ruamel_ordereddict; + ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; + rpm = disabled super.rpm; + rpkg = callPackage ../development/python-modules/rpkg { }; + rpy2 = callPackage ../development/python-modules/rpy2/2.nix { }; rsa = callPackage ../development/python-modules/rsa/4_0.nix { }; + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { inherit (pkgs) gfortran glibcLocales; }; @@ -213,34 +527,110 @@ with self; with super; { secretstorage = callPackage ../development/python-modules/secretstorage/2.nix { }; + semantic = callPackage ../development/python-modules/semantic { }; + + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; + sequoia = disabled super.sequoia; + setuptools = callPackage ../development/python-modules/setuptools/44.0.nix { }; + setuptools_scm = callPackage ../development/python-modules/setuptools_scm/2.nix { }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + + simpleai = callPackage ../development/python-modules/simpleai { }; + + simpleparse = callPackage ../development/python-modules/simpleparse { }; + + sipsimple = callPackage ../development/python-modules/sipsimple { }; + + slowaes = callPackage ../development/python-modules/slowaes { }; + + smartdc = callPackage ../development/python-modules/smartdc { }; + + snug = callPackage ../development/python-modules/snug { }; + soupsieve = callPackage ../development/python-modules/soupsieve/1.nix { }; + spambayes = callPackage ../development/python-modules/spambayes { }; + sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; sphinx = callPackage ../development/python-modules/sphinx/2.nix { }; + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + + squaremap = callPackage ../development/python-modules/squaremap { }; + + stompclient = callPackage ../development/python-modules/stompclient { }; + + subliminal = callPackage ../development/python-modules/subliminal { }; + + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; + + suds = callPackage ../development/python-modules/suds { }; + sympy = callPackage ../development/python-modules/sympy/1_5.nix { }; tables = callPackage ../development/python-modules/tables/3.5.nix { }; + tarman = callPackage ../development/python-modules/tarman { }; + + thumbor = callPackage ../development/python-modules/thumbor { }; + + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + tokenizers = disabled super.tokenizers; tokenize-rt = disabled super.tokenize-rt; + tokenserver = callPackage ../development/python-modules/tokenserver { }; + toolz = callPackage ../development/python-modules/toolz/2.nix { }; tornado = callPackage ../development/python-modules/tornado/5.nix { }; traitlets = callPackage ../development/python-modules/traitlets/4.nix { }; + trollius = callPackage ../development/python-modules/trollius { }; + + ttystatus = callPackage ../development/python-modules/ttystatus { }; + + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + + ujson = callPackage ../development/python-modules/ujson/2.nix { }; + + umemcache = callPackage ../development/python-modules/umemcache { }; + urllib3 = callPackage ../development/python-modules/urllib3/2.nix { }; + wptserve = callPackage ../development/python-modules/wptserve { }; + + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + }; + + wxPython = self.wxPython30; + + vcrpy = callPackage ../development/python-modules/vcrpy/3.nix { }; + + xcaplib = callPackage ../development/python-modules/xcaplib { }; + xenomapper = disabled super.xenomapper; + yenc = callPackage ../development/python-modules/yenc { }; + + yt = callPackage ../development/python-modules/yt { }; + zeek = disablede super.zeek; + zbase32 = callPackage ../development/python-modules/zbase32 { }; + + zfec = callPackage ../development/python-modules/zfec { }; + + zipp = callPackage ../development/python-modules/zipp/1.nix { }; + } From 30338a36bf12cfd01f162b9b49e956e739823d06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Mar 2021 17:39:10 +0100 Subject: [PATCH 0388/1183] python3Packages.idna: enable tests --- pkgs/development/python-modules/idna/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 14b366b8eb5a..9bb639f95d5e 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { @@ -12,6 +13,8 @@ buildPythonPackage rec { sha256 = "c5b02147e01ea9920e6b0a3f1f7bb833612d507592c837a6c49552768f4054e1"; }; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/kjd/idna/"; description = "Internationalized Domain Names in Applications (IDNA)"; From 3de1bde19a422ab84b004120bda87c910400a088 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 24 Mar 2021 17:39:23 +0100 Subject: [PATCH 0389/1183] python27Packages.idna: enable tests --- pkgs/development/python-modules/idna/2.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/idna/2.nix b/pkgs/development/python-modules/idna/2.nix index 613fde773a71..9a1c1dc271f1 100644 --- a/pkgs/development/python-modules/idna/2.nix +++ b/pkgs/development/python-modules/idna/2.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook }: buildPythonPackage rec { @@ -12,6 +13,8 @@ buildPythonPackage rec { sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; }; + checkInputs = [ pytestCheckHook ]; + meta = { homepage = "https://github.com/kjd/idna/"; description = "Internationalized Domain Names in Applications (IDNA)"; From b657712094425433e98334527dc5dcea649b9fa9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:20:43 -0700 Subject: [PATCH 0390/1183] python3{6,7}.importlib-metadata: fix build --- .../python-modules/importlib-metadata/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 95f1ccc0bfc5..4149de3f43ae 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -3,6 +3,7 @@ , fetchPypi , pythonOlder , setuptools-scm +, typing-extensions , toml , zipp }: @@ -20,7 +21,12 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ toml zipp ]; + propagatedBuildInputs = [ + toml + zipp + ] ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; # Cyclic dependencies due to pyflakefs doCheck = false; From 7b5a2dd9c7f0aacce923269b423770102ca8839b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:37:18 -0700 Subject: [PATCH 0391/1183] python3Packages.aws-xray-sdk: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/aws-xray-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 313dd4241d5c..0e1c272b3c86 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "abf5b90f740e1f402e23414c9670e59cb9772e235e271fef2bce62b9100cbc77"; + sha256 = "697c9068e84dd5d2c1456def3fd0865f226046b5db4db56d738050e425960adf"; }; propagatedBuildInputs = [ From 55fd0229aa3349d6089fddd41b81130f8f9b77a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:37:18 -0700 Subject: [PATCH 0392/1183] python3Packages.pyflakes: 2.3.0 -> 2.3.1 --- pkgs/development/python-modules/pyflakes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index a613101832de..1f098ed781c8 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyflakes"; - version = "2.3.0"; + version = "2.3.1"; src = fetchPypi { inherit pname version; - sha256 = "e59fd8e750e588358f1b8885e5a4751203a0516e0ee6d34811089ac294c8806f"; + sha256 = "f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"; }; checkInputs = [ unittest2 ]; From 7c7d3ac2167242680779ab2dbd7e16b9ef79e890 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:37:18 -0700 Subject: [PATCH 0393/1183] python3Packages.pyperf: 2.1.0 -> 2.2.0 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index fcd326a52ca4..f4239fb92252 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "1257d673d89fdcdbaec8077afeb365e7a94739c1b263572b09403cac25708ad3"; + sha256 = "498bb4d1fe21350c2b7c1aa8bb3eae9c9979358d0b66327954bc66839fcba8b6"; }; checkInputs = [ nose psutil ] ++ From df22f873f02ebe307c5d944f54c244c05ff79040 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:37:18 -0700 Subject: [PATCH 0394/1183] python3Packages.pysma: 0.4 -> 0.4.1 --- pkgs/development/python-modules/pysma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix index 5cc86e909f00..39941242f1d9 100644 --- a/pkgs/development/python-modules/pysma/default.nix +++ b/pkgs/development/python-modules/pysma/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pysma"; - version = "0.4"; + version = "0.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-BOVALVFb/p2q3A4NkvgtwmL5fNvwMCk0hb1L5MRWzHY="; + sha256 = "da4bed38aba52fa097694bda15c7fd80ca698d9352e71a63bc29092d635de54d"; }; propagatedBuildInputs = [ From 75be1caa9590f718b751856f89d04cf59808c260 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:37:18 -0700 Subject: [PATCH 0395/1183] python3Packages.yfinance: 0.1.55 -> 0.1.56 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index 7ae56cacbb68..bceac92d79ed 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.1.55"; + version = "0.1.56"; # GitHub source releases aren't tagged src = fetchPypi { inherit pname version; - sha256 = "65d39bccf16bef35f6a08bf0df33650c0515b5ce8ea3c53924601f5fe00590cb"; + sha256 = "a6d4c7b939fdd48d983556501f5b387e20aaef86afc8e6ba6f91a49a7e22d2dd"; }; propagatedBuildInputs = [ From c69b23a54ad51839512252bc16af6f4277509af9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:46 -0700 Subject: [PATCH 0396/1183] python3Packages.aws-lambda-builders: 1.1.0 -> 1.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 804ad078acb7..30059fe5a937 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aws-lambda-builders"; - version = "1.1.0"; + version = "1.3.0"; # No tests available in PyPI tarball src = fetchFromGitHub { owner = "awslabs"; repo = "aws-lambda-builders"; rev = "v${version}"; - sha256 = "1r4939m5k1nj6l9bv972z4fkmkl0z5f5r29bq7588yk113kkqr0c"; + sha256 = "1cfacp0a5qsaf3crcybslhbfwm1mqfyafj71dlvnidzx7b9bm60v"; }; # Package is not compatible with Python 3.5 From 04d918395fddc8f1c08cb71a119a6dc7d900c71b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:46 -0700 Subject: [PATCH 0397/1183] python3Packages.binwalk: 2.2.0 -> 27 --- pkgs/development/python-modules/binwalk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index b9120d412cb0..433c02ddbe4e 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -23,13 +23,13 @@ buildPythonPackage rec { pname = "binwalk"; - version = "2.2.0"; + version = "27"; src = fetchFromGitHub { owner = "ReFirmLabs"; repo = "binwalk"; - rev = "v${version}"; - sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; + rev = "python${version}"; + sha256 = "03kqhs3j9czdc2pnr1v8iszwx254ljpvrmmj0j5ls0ssjrfxacyx"; }; propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools lzma pycrypto ] From 945823eef1d707b0b6d0add9c0e9846ce015d5a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:46 -0700 Subject: [PATCH 0398/1183] python3Packages.brotli: 1.0.7 -> 1.0.9 --- pkgs/development/python-modules/brotli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 0da53ab5ca22..40e583c4a78a 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "brotli"; - version = "1.0.7"; + version = "1.0.9"; # PyPI doesn't contain tests so let's use GitHub src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; + sha256 = "0xyp85h12sknl4pxg1x8lgx8simzhdv73h4a8c1m7gyslsny386g"; }; dontConfigure = true; From 7d3678cc8c4b88ecddf164ff4e1df7b16445e6fc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:47 -0700 Subject: [PATCH 0399/1183] python3Packages.cfn-lint: 0.42.0 -> 0.48.0 --- pkgs/development/python-modules/cfn-lint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index f55042c58d23..5e8634f9fc6b 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.42.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = "cfn-python-lint"; rev = "v${version}"; - sha256 = "0cqpq7pxpslpd7am6mp6nmwhsb2p2a5lq3hjjxi8imv3wv7zql98"; + sha256 = "03j5w9cyvpbxh634jd2dhkgfs3c2hmgqh77w664855lgy2ph9zll"; }; postPatch = '' From d2c4043ad89d7f091293e853e3383986b105d255 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:47 -0700 Subject: [PATCH 0400/1183] python3Packages.chart-studio: 1.1.0 -> 4.14.3 --- pkgs/development/python-modules/chart-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix index 6679f13b1196..e059725cad24 100644 --- a/pkgs/development/python-modules/chart-studio/default.nix +++ b/pkgs/development/python-modules/chart-studio/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "chart-studio"; - version = "1.1.0"; + version = "4.14.3"; # chart-studio was split from plotly src = fetchFromGitHub { owner = "plotly"; repo = "plotly.py"; - rev = "${pname}-v${version}"; - sha256 = "1q3j3ih5k0jhr8ilwffkfxp1nifpnjnx7862bzhxfg4d386hfg4i"; + rev = "v${version}"; + sha256 = "1yrrcn9032r3l8y2cc1wvpydg4rkqvgkpyv1s7znby5mrxa1rjma"; }; sourceRoot = "source/packages/python/chart-studio"; From 1cfcb6a8568cb5525f5c7d30abfffffce125deec Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:47 -0700 Subject: [PATCH 0401/1183] python3Packages.cocotb: 1.4.0 -> 1.5.1 --- pkgs/development/python-modules/cocotb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index ec5cbe827768..b63432383832 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0fv0mg8zh40ffq0q39s195y6hvjrzihpx0i3f7ba5881syw3x7p4"; + sha256 = "02bw2i03vd4rcvdk10qdjl2lbvvy81cn9qpr8vzq8cm9h45689mv"; }; propagatedBuildInputs = [ From 5a30f422e8343600e57859895018ad30a82150ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:47 -0700 Subject: [PATCH 0402/1183] python3Packages.construct: 2.10.56 -> 2.10.63 --- pkgs/development/python-modules/construct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 8d0c83ca9e8e..6b52af604041 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "construct"; - version = "2.10.56"; + version = "2.10.63"; disabled = pythonOlder "3.6"; @@ -13,7 +13,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1j4mqwyxkbdcsnnk5bbdcljv855w4fglaqc94q1xdzm8kgjxk4mr"; + sha256 = "0dnj815qdxrn0q6bpwsmkca2jy02gjy6d3amqg4y6gha1kc1mymv"; }; checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; From 47bc84d097feb49de2e6f9d575325f732ade9534 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:48 -0700 Subject: [PATCH 0403/1183] python3Packages.exchangelib: 3.2.1 -> 4.1.0 --- pkgs/development/python-modules/exchangelib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index 706e4d8137fe..0cccedd54a91 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "exchangelib"; - version = "3.2.1"; + version = "4.1.0"; disabled = pythonOlder "3.5"; # tests are not present in the PyPI version @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "ecederstrand"; repo = pname; rev = "v${version}"; - sha256 = "1sh780q2iwdm3bnlnfdacracf0n7jhbv0g39cdx65v3d510zp4jv"; + sha256 = "0lkhjiz78x00d5gzn455660f31f8y4fcrqcn6rh0m41r1ar5im17"; }; checkInputs = [ psutil requests-mock pyyaml From 5b2abc87e710f5d1b5785aecb38911f82122c420 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:48 -0700 Subject: [PATCH 0404/1183] python3Packages.flask-mongoengine: 0.9.5 -> 1.0.0 --- pkgs/development/python-modules/flask-mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index ad4353312369..e26cac70b3ca 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "flask-mongoengine"; - version = "0.9.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "05hfddf1dm594wnjyqhj0zmjfsf1kpmx1frjwhypgzx4hf62qcmr"; + sha256 = "10g9b13ls2msnhv8j44gslrfxa2ppqz2y1xjn2a4gg4m9mdjv8b2"; }; propagatedBuildInputs = [ From 35895d3a70ccea7e4a3f84aff539f6743160d433 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:49 -0700 Subject: [PATCH 0405/1183] python3Packages.gsd: 1.9.3 -> 2.4.1 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 8eefb1f4318b..cba42a2c00d7 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -4,7 +4,7 @@ }: buildPythonPackage rec { - version = "1.9.3"; + version = "2.4.1"; pname = "gsd"; disabled = isPy27; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "v${version}"; - sha256 = "07hw29r2inyp493dia4fx3ysfr1wxi2jb3n9cmwdi0l54s2ahqvf"; + sha256 = "02zxfmqw7a5kz8qjdph9a9961mbkd4haxwwa28yjkxs5hzs5x3c8"; }; propagatedBuildInputs = [ numpy ]; From 2285f92bc55308296a03f310f438b3be1f86435e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:49 -0700 Subject: [PATCH 0406/1183] python3Packages.gssapi: 1.6.10 -> 1.6.12 --- pkgs/development/python-modules/gssapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gssapi/default.nix b/pkgs/development/python-modules/gssapi/default.nix index c8149a5fed8a..38da1e75ad6f 100644 --- a/pkgs/development/python-modules/gssapi/default.nix +++ b/pkgs/development/python-modules/gssapi/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "gssapi"; - version = "1.6.10"; + version = "1.6.12"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pythongssapi"; repo = "python-${pname}"; rev = "v${version}"; - sha256 = "11w8z9ik6zzv3pw3319mz91cgbfkgx0mffxbapqnhilzij2jad4q"; + sha256 = "0r6w52vji1095n3wgzjz9ddaqsvsf3f4gal0rv5i62hpqwlbzkn7"; }; # It's used to locate headers From abd15fed80a24a38a021cccbcb4266c2bca9ea6e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:49 -0700 Subject: [PATCH 0407/1183] python3Packages.habanero: 0.6.0 -> 0.7.4 --- pkgs/development/python-modules/habanero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index a7ec358ffd7b..cf3f80d7ed41 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "habanero"; - version = "0.6.0"; + version = "0.7.4"; # Install from Pypi is failing because of a missing file (Changelog.rst) src = fetchFromGitHub { owner = "sckott"; repo = pname; rev = "v${version}"; - sha256 = "1l2cgl6iiq8jff2w2pib6w8dwaj8344crhwsni2zzq0p44dwi13d"; + sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; }; propagatedBuildInputs = [ requests ]; From 1fe16b6e4d54f4fd3446952a42571f049e7c21ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0408/1183] python3Packages.hyppo: 0.1.3 -> 0.2.1 --- pkgs/development/python-modules/hyppo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hyppo/default.nix b/pkgs/development/python-modules/hyppo/default.nix index 5b2869e10d19..86b43465fb64 100644 --- a/pkgs/development/python-modules/hyppo/default.nix +++ b/pkgs/development/python-modules/hyppo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "hyppo"; - version = "0.1.3"; + version = "0.2.1"; disabled = isPy27; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "neurodata"; repo = pname; rev = "v${version}"; - sha256 = "0qdnb1l4hz4dgwhapz1fp9sb2vxxvr8h2ngsbvyf50h3kapcn19r"; + sha256 = "0izjc68rb6sr3x55c3zzraakzspgzh80qykfax9zj868zypfm365"; }; propagatedBuildInputs = [ From 4e4c9087a962bfadc30dea070ea342b3ef499528 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0409/1183] python3Packages.ignite: 0.4.2 -> 0.4.4.post1 --- pkgs/development/python-modules/ignite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 307c25e724ee..71bed73f9d7b 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.2"; + version = "0.4.4.post1"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "v${version}"; - sha256 = "00vcmhnp14s54g386izgaxzrdr2nqv3pz9nvpyiwrn33zawr308z"; + sha256 = "1a7vs4dzm5lmyck50ygi3j2d2wd6nxr5x91dpx0rmf97i6lywpyb"; }; checkInputs = [ pytestCheckHook matplotlib mock pytest_xdist ]; From fad55df81e46df01e4c22436cfee0da18acf3874 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0410/1183] python3Packages.ipfsapi: 0.4.2.post1 -> 0.7.0 --- pkgs/development/python-modules/ipfsapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index c97eafb6054c..32bc8c58599f 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -8,14 +8,14 @@ buildPythonPackage { pname = "ipfsapi"; - version = "0.4.2.post1"; + version = "0.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ipfs"; repo = "py-ipfs-api"; - rev = "0c485544a114f580c65e2ffbb5782efbf7fd9f61"; - sha256 = "1v7f77cv95yv0v80gisdh71mj7jcq41xcfip6bqm57zfdbsa0xpn"; + rev = version; + sha256 = "02yx7x9pdnfcav4vqd6ygqcisd3483b0zbx2j4brb4gxixk2hlyj"; }; propagatedBuildInputs = [ six requests ]; From 065d955955b770982d726cbed55f3fca699174be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0411/1183] python3Packages.javaproperties: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/javaproperties/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index a9acf380da10..93c4252d0dd6 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.0"; pname = "javaproperties"; src = fetchFromGitHub { owner = "jwodder"; repo = pname; rev = "v${version}"; - sha256 = "14dlzwr4gxlbgjy012i4pqs2rn2rmp21w8n1k1wwjkf26mcvrq5s"; + sha256 = "0n6dz6rnpq8wdwqyxqwv0q7vrl26vfmvvysdjvy557fck1q2l0kf"; }; propagatedBuildInputs = [ six ]; From ad1ff68caec4b02c56c887b4fca6dc78c345a0fa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0412/1183] python3Packages.keepkey: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/keepkey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index 6b4568cd748d..cd51661bde05 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "keepkey"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = "keepkey"; repo = "python-keepkey"; rev = "v${version}"; - sha256 = "1v0ns26ykskn0dpbvz9g6lz4q740qmahvddj3pc3rfbjvg43p3vh"; + sha256 = "0yi27wzb4q371y4bywi4hz37h4x63wjsyaa2mbx0rgc8xl2wm6yz"; }; propagatedBuildInputs = [ protobuf hidapi trezor ]; From 6252070c893444ce01d45c6449b18b06780d54f6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:50 -0700 Subject: [PATCH 0413/1183] python3Packages.libgpuarray: 0.7.5 -> 0.7.6 --- pkgs/development/python-modules/libgpuarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libgpuarray/default.nix b/pkgs/development/python-modules/libgpuarray/default.nix index 567ad2cf4892..d061356490cb 100644 --- a/pkgs/development/python-modules/libgpuarray/default.nix +++ b/pkgs/development/python-modules/libgpuarray/default.nix @@ -17,13 +17,13 @@ assert cudaSupport -> nvidia_x11 != null buildPythonPackage rec { pname = "libgpuarray"; - version = "0.7.5"; + version = "0.7.6"; src = fetchFromGitHub { owner = "Theano"; repo = "libgpuarray"; rev = "v${version}"; - sha256 = "0zkdwjq3k6ciiyf8y5w663fbsnmzhgy27yvpxfhkpxazw9vg3l5v"; + sha256 = "0ksil18c9ign4xrv5k323flhvdy6wdxh8szdd3nivv31jc3zsdri"; }; # requires a GPU From 64cfd2e15423abba93000b8503917ca239684838 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0414/1183] python3Packages.liquidctl: 1.4.2 -> 1.5.1 --- pkgs/development/python-modules/liquidctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/liquidctl/default.nix b/pkgs/development/python-modules/liquidctl/default.nix index 97d80fbbbda7..ecf5990e74bc 100644 --- a/pkgs/development/python-modules/liquidctl/default.nix +++ b/pkgs/development/python-modules/liquidctl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "liquidctl"; - version = "1.4.2"; + version = "1.5.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1h5kqpvlx7xppd2wli986lkslqkcrlz1wixv7fvrppzjc2nfz5d4"; + sha256 = "1l6cvm8vs2gkmg4qwg5m5vqjql1gah2vd9vs7pcj2v5hf0cm5v9x"; }; propagatedBuildInputs = [ From b35215a5a147db186b618aa0892efda16f3ae724 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0415/1183] python3Packages.mail-parser: 3.12.0 -> 3.15.0 --- pkgs/development/python-modules/mail-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 94b575f3f468..219a9066dc74 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "mail-parser"; - version = "3.12.0"; + version = "3.15.0"; # no tests in PyPI tarball src = fetchFromGitHub { owner = "SpamScope"; repo = pname; rev = "v${version}"; - sha256 = "0p851jlly6bzcs70kd1lcjwmg4scwh1icymfc0f2y6rkh4kfsdhk"; + sha256 = "0da2qr4p8jnjw6jdhbagm6slfcjnjyyjkszwfcfqvcywh1zm1sdw"; }; LC_ALL = "en_US.utf-8"; From 339a1dac9b0ac916417bae5626a8fb8957f97386 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0416/1183] python3Packages.markdown-it-py: 0.5.6 -> 0.6.2 --- pkgs/development/python-modules/markdown-it-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/markdown-it-py/default.nix b/pkgs/development/python-modules/markdown-it-py/default.nix index 2d915762fca2..c7a8a3e17f3e 100644 --- a/pkgs/development/python-modules/markdown-it-py/default.nix +++ b/pkgs/development/python-modules/markdown-it-py/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "markdown-it-py"; - version = "0.5.6"; + version = "0.6.2"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "executablebooks"; repo = "markdown-it-py"; rev = "v${version}"; - sha256 = "1m9g8xvd7jiz80x9hl8bw9x0ppndqq5nlcn5y8bjxnfj5s31vpbi"; + sha256 = "1g9p8pdnvjya436lii63r5gjajhmbhmyh9ngbjqf9dqny05nagz1"; }; propagatedBuildInputs = [ attrs ]; From fb18eb092e17908ace71a7f3030b963bf420ab42 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0417/1183] python3Packages.mne-python: 0.21.2 -> 0.22.0 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index 84babe171897..bed191c39e32 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "mne-python"; - version = "0.21.2"; + version = "0.22.0"; disabled = isPy27; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mne-tools"; repo = pname; rev = "v${version}"; - sha256 = "18nfdbkffmxzkkbp3d4w8r2kfi0sxip3hy997d3mx6dy74jc7nmg"; + sha256 = "1s9pshrl40gkcsdwf4qdga3hjfmdbrvbgjcz0cfx3kl796x3im11"; }; propagatedBuildInputs = [ numpy scipy ]; From 5194d48d5022117ee865b9aac5fbd6365daba552 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0418/1183] python3Packages.mongoengine: 0.22.0 -> 0.23.0 --- pkgs/development/python-modules/mongoengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index c8969d9e2d4d..06f2c210415c 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mongoengine"; - version = "0.22.0"; + version = "0.23.0"; disabled = isPy27; src = fetchFromGitHub { owner = "MongoEngine"; repo = pname; rev = "v${version}"; - sha256 = "14n9rl8w3i1fq96f3jzsg7gy331d7fmrapva6m38ih53rnf38bdf"; + sha256 = "0mzh5pv0n81ms046yxb9rzql8bpbsf26jv6dihmhi0ds4yqkw836"; }; propagatedBuildInputs = [ From 70c8de496b0469fbd58d66430be1b93e63fa00a7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0419/1183] python3Packages.monty: 3.0.2 -> 2021.3.3 --- pkgs/development/python-modules/monty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 77448d0e15fe..a2398ce750dd 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "monty"; - version = "3.0.2"; + version = "2021.3.3"; disabled = isPy27; # uses type annotations # No tests in Pypi @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "materialsvirtuallab"; repo = pname; rev = "v${version}"; - sha256 = "1wxqxp0j7i6czdpr2r1imgmy3qbgn2l7d4za2h1lg3hllvx6jra1"; + sha256 = "1nbv0ys0fv70rgzskkk8gsfr9dsmm7ykim5wv36li840zsj83b1l"; }; checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; From a95ee664a0c2ab807c4c7e516011fd54e37faae2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:51 -0700 Subject: [PATCH 0420/1183] python3Packages.optuna: 0.19.0 -> 2.6.0 --- pkgs/development/python-modules/optuna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index aa61b18291d6..78694618f73e 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -30,14 +30,14 @@ buildPythonPackage rec { pname = "optuna"; - version = "0.19.0"; + version = "2.6.0"; disabled = isPy27; src = fetchFromGitHub { owner = "optuna"; repo = pname; rev = "v${version}"; - sha256 = "179x2lsckpmkrkkdnvvbzky86g1ba882z677qwbayhsc835wbp0y"; + sha256 = "11mskhb7i55i04cy0vkxi7kpaifbz8zc2m8x9s5y6yyyjinvly36"; }; checkInputs = [ From 1db505d311386a2aba7af77769c40893d4397300 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0421/1183] python3Packages.pc-ble-driver-py: 0.14.2 -> 0.15.0 --- .../development/python-modules/pc-ble-driver-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix index bd6432db534f..058fb8638830 100644 --- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix +++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "pc-ble-driver-py"; - version = "0.14.2"; + version = "0.15.0"; disabled = pythonOlder "3.6" || pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "NordicSemiconductor"; repo = "pc-ble-driver-py"; - rev = "v${version}"; - sha256 = "1zbi3v4jmgq1a3ml34dq48y1hinw2008vwqn30l09r5vqvdgnj8m"; + rev = version; + sha256 = "1ckbsq9dwca8hpx9frf9xd80b4z4kn9j7jx94hza9bwzrh26x5ji"; }; # doCheck tries to write to the global python directory to install things From c00478086333a6327792152752d3a704eaf405e9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0422/1183] python3Packages.perfplot: 0.8.4 -> 0.8.10 --- pkgs/development/python-modules/perfplot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 371eff249c2d..70af6cc9c8ae 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.8.4"; + version = "0.8.10"; disabled = isPy27; src = fetchFromGitHub { owner = "nschloe"; repo = "perfplot"; rev = "v${version}"; - sha256 = "0avb0inx8qh8ss3j460v3z6mmn863hswa3bl19vkh475ndsjwmp0"; + sha256 = "17xx33fk95fpkd8h2whblpwfls9vyqbv7anq34kpigjy8zxfi2qk"; }; format = "pyproject"; From 3394dab44c57719446bd7cfa1560d626dd937ccc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0423/1183] python3Packages.pre-commit-hooks: 3.3.0 -> 3.4.0 --- pkgs/development/python-modules/pre-commit-hooks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix index f5fe7ff96b84..f664d9c6d25e 100644 --- a/pkgs/development/python-modules/pre-commit-hooks/default.nix +++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pre-commit-hooks"; - version = "3.3.0"; + version = "3.4.0"; disabled = isPy27; # fetchPypi does not provide tests @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pre-commit"; repo = pname; rev = "v${version}"; - sha256 = "1sppwcqsbr9gv2cpjslngcbggsxvdr84zgrin94yjr40jgkjzdpq"; + sha256 = "1aqkmprdc2lhds9c59pkkf2js65j63197flanaggk7cm8k0kz7zs"; }; propagatedBuildInputs = [ toml ruamel_yaml ]; From 6004c04e8f103224ea8c3600039cca81fe84a68b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0424/1183] python3Packages.pubnub: 4.8.0 -> 5.1.0 --- pkgs/development/python-modules/pubnub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 8c9c0ea004ca..8914b9884c23 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "pubnub"; - version = "4.8.0"; + version = "5.1.0"; src = fetchFromGitHub { owner = pname; repo = "python"; rev = "v${version}"; - sha256 = "16wjal95042kh5fxhvji0rwmw892pacqcnyms520mw15wcwilqir"; + sha256 = "0f6r439bfz58ddikqj5cx56vv7gxrpja9rcdg0j1mlng8ry581f3"; }; propagatedBuildInputs = [ From c706b938e9a90da01c38092f791761bccfc43c74 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0425/1183] python3Packages.pybind11: 2.6.1 -> 2.6.2 --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 3fd934938601..0ae0b26e12db 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "pybind11"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "pybind"; repo = pname; rev = "v${version}"; - sha256 = "TXljeRFonQwEmlIGMnTHwdfPsd9cMOVn5/1zb3tYBfI="; + sha256 = "1lsacpawl2gb5qlh0cawj9swsyfbwhzhwiv6553a7lsigdbadqpy"; }; nativeBuildInputs = [ cmake ]; From e6f8a89c3417f00f20569a8557dcc82563838523 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:52 -0700 Subject: [PATCH 0426/1183] python3Packages.pycairo: 1.18.2 -> 1.20.0 --- pkgs/development/python-modules/pycairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 24e0f9792d7a..1188b499302d 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.18.2"; + version = "1.20.0"; format = "other"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; + sha256 = "0ifw4wjbml512w9kqj80y9gfqa7fkgfa1zkvi478k5krghjgk3lr"; }; nativeBuildInputs = [ From a7fe3abd6657f6fa40b1a9628751ef2f10627e0a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:53 -0700 Subject: [PATCH 0427/1183] python3Packages.pycm: 2.5 -> 3.1 --- pkgs/development/python-modules/pycm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index 8e0a9e3b152e..b750bd30b0a4 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycm"; - version = "2.5"; + version = "3.1"; disabled = !isPy3k; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "sepandhaghighi"; repo = pname; rev = "v${version}"; - sha256 = "0zfv20hd7zq95sflsivjk47b0sm7q76w7fv2i2mafn83ficzx0p0"; + sha256 = "1aspd3vkjasb4wxs9czwjw42fmd4027wsmm4vlj09yp7sl57gary"; }; # remove a trivial dependency on the author's `art` Python ASCII art library From d796fd05013fe788aca6fac6bc1382273155cdaf Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:53 -0700 Subject: [PATCH 0428/1183] python3Packages.pydantic: 1.8 -> 1.8.1 --- pkgs/development/python-modules/pydantic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic/default.nix b/pkgs/development/python-modules/pydantic/default.nix index d3c6e37bbe4b..11879159b4fd 100644 --- a/pkgs/development/python-modules/pydantic/default.nix +++ b/pkgs/development/python-modules/pydantic/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydantic"; - version = "1.8"; + version = "1.8.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "samuelcolvin"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+HfnM/IrFlUyQJdiOYyaJUNenh8dLtd8CUJWSbn6hwQ="; + sha256 = "1zvcmx3927fgx37gdhi8g8igvrkri1v78rn3118p4wssqhgfwa6n"; }; propagatedBuildInputs = [ From 1eb96e75c8f4fd1229eab5253422031d834c5728 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:53 -0700 Subject: [PATCH 0429/1183] python3Packages.pydub: 0.24.1 -> 0.25.1 --- pkgs/development/python-modules/pydub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydub/default.nix b/pkgs/development/python-modules/pydub/default.nix index 884df63ce036..6b67814a2220 100644 --- a/pkgs/development/python-modules/pydub/default.nix +++ b/pkgs/development/python-modules/pydub/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pydub"; - version = "0.24.1"; + version = "0.25.1"; # pypi version doesn't include required data files for tests src = fetchFromGitHub { owner = "jiaaro"; repo = pname; rev = "v${version}"; - sha256 = "1pv4n54kkjpbjlvwh9b6a7zyq1ylg0fjmd2q4ws9nc2a6mrcivhc"; + sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m"; }; From 626b13a94f4d30254c18e8513d7fad7dc1565fd6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:53 -0700 Subject: [PATCH 0430/1183] python3Packages.pyflume: 0.6.2 -> 0.6.4 --- pkgs/development/python-modules/pyflume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index a1d36670a396..36980ddbadfe 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.6.2"; + version = "0.6.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ChrisMandich"; repo = "PyFlume"; rev = "v${version}"; - sha256 = "0i181c8722j831bjlcjwv5ccy20hl8zzlv7bfp8w0976gdmv4iz8"; + sha256 = "1dm560hh6fl1waiwsq8m31apmvvwhc3y95bfdb7449bs8k96dmxq"; }; propagatedBuildInputs = [ From 3e25d1f8cbf3c41fcbe6a9e340029c1ced6a69cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:53 -0700 Subject: [PATCH 0431/1183] python3Packages.pygccxml: 1.9.1 -> 2.1.0 --- pkgs/development/python-modules/pygccxml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index 7e06b27a23f6..7d7bc459b624 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -2,13 +2,13 @@ llvmPackages }: buildPythonPackage rec { pname = "pygccxml"; - version = "1.9.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "gccxml"; repo = "pygccxml"; rev = "v${version}"; - sha256 = "02ip03s0vmp7czzflbvf7qnybibfrd0rzqbc5zfmq3zmpnck3hvm"; + sha256 = "1vsxnfzz6qhiv8ac98qgk6w3s4j1jp661qy48gc9plcg2r952453"; }; buildInputs = [ castxml llvmPackages.libcxxStdenv]; From 778dc7e4f955c68eb80209e3fb75536782b223d3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0432/1183] python3Packages.pygmt: 0.2.0 -> 0.3.1 --- pkgs/development/python-modules/pygmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix index 318706edd930..130be6d44c36 100644 --- a/pkgs/development/python-modules/pygmt/default.nix +++ b/pkgs/development/python-modules/pygmt/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pygmt"; - version = "0.2.0"; + version = "0.3.1"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "GenericMappingTools"; repo = "pygmt"; rev = "v${version}"; - sha256 = "1yx1n6mxfmwg69ls5560nm6d3jxyghv27981iplz7m7990bbp468"; + sha256 = "0v57n3by9dwckjfmrgf1km4y3gwzj2gk0s9ly64hlaf05zihqnvc"; }; postPatch = '' From 723351dd3f82f0bc05b966546005f430720a0584 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0433/1183] python3Packages.pylatexenc: 2.8 -> 2.9 --- pkgs/development/python-modules/pylatexenc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index e53472c6ead3..08b3a5c5223b 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0m9vrbh1gmbgq6dqm7xzklar3accadw0pn896rqsdi5jbgd3w0mh"; + sha256 = "1kzfyhdpm3cw3g4mgd12nj0cs1kgqjr22yxr7vkawljaid4ail5z"; }; pythonImportsCheck = [ "pylatexenc" ]; From d01e18f93f9d7a0d4568ff7f940b1316e91df0ce Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0434/1183] python3Packages.pylint-django: 2.3.0 -> 2.4.2 --- pkgs/development/python-modules/pylint-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylint-django/default.nix b/pkgs/development/python-modules/pylint-django/default.nix index c5dfbd48fe12..54b2f65ad975 100644 --- a/pkgs/development/python-modules/pylint-django/default.nix +++ b/pkgs/development/python-modules/pylint-django/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "pylint-django"; - version = "2.3.0"; + version = "2.4.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "PyCQA"; repo = pname; rev = "v${version}"; - sha256 = "1088waraiigi2bnlighn7bvnvqmpx5fbw70c8jd8sh25mj38wgly"; + sha256 = "0535y4sdi521a9s7di8ld0i8aav0afbxmx0956v6sjpyqmqdm6hr"; }; propagatedBuildInputs = [ From 3cfb6884cad980960edbf229ca92a1defa4fc2ba Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0435/1183] python3Packages.pymodbus: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/pymodbus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 76f2e9a9338b..72f2f3ec14f3 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "riptideio"; repo = pname; rev = "v${version}"; - sha256 = "0x0dv02shcc2yxxm9kvcbhip111sna74dvcfssxdzzy967vnq76v"; + sha256 = "1ri4sy5axs4a1wg1qffp0k2z5v309612y8mfbxnb06fizqdkbclf"; }; # Twisted asynchronous version is not supported due to a missing dependency From 44ac7bd4efe5f1134520fbe1dafe9ae73d232ddc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0436/1183] python3Packages.pynetdicom: 1.5.5 -> 1.5.6 --- pkgs/development/python-modules/pynetdicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix index 77308a1966be..cfa9c9b13532 100644 --- a/pkgs/development/python-modules/pynetdicom/default.nix +++ b/pkgs/development/python-modules/pynetdicom/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pynetdicom"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; rev = "v${version}"; - sha256 = "0zjpscxdhlcv99py7jx5r6dw32nzbcr49isrzkdr6g3zwyxwzbfm"; + sha256 = "09v0bp9zgwbs4zwcncvfccrna5rnihkhs3l4qy0f1lq8gnzjg365"; }; propagatedBuildInputs = [ From 41a0dcba708ab93da50e4c912d22c3b47864966d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:54 -0700 Subject: [PATCH 0437/1183] python3Packages.pyparted: 3.11.4 -> 3.11.7 --- pkgs/development/python-modules/pyparted/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyparted/default.nix b/pkgs/development/python-modules/pyparted/default.nix index 16a894546e49..ee34f91b57e2 100644 --- a/pkgs/development/python-modules/pyparted/default.nix +++ b/pkgs/development/python-modules/pyparted/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pyparted"; - version = "3.11.4"; + version = "3.11.7"; disabled = isPyPy; src = fetchFromGitHub { repo = pname; owner = "dcantrell"; rev = "v${version}"; - sha256 = "0wd0xhv1y1zw7djzcnimj8irif3mg0shbhgz0jn5yi914is88h6n"; + sha256 = "01193fmkss9icjvqpw85szpk8ld1pnha7p9kqm7mpwk6rc6gi2m3"; }; postPatch = '' From 34c044192ddcfd0f109d49ae03b5bb45d0206c18 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0438/1183] python3Packages.pytest-ansible: 2.1.1 -> 2.2.3 --- pkgs/development/python-modules/pytest-ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 25d5aa30543a..10b9b0ec4822 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pytest-ansible"; - version = "2.1.1"; + version = "2.2.3"; src = fetchFromGitHub { owner = "ansible"; repo = "pytest-ansible"; rev = "v${version}"; - sha256 = "0v97sqk3q2vkmwnjlnncz8ss8086x9jg3cz0g2nzlngs4ql1gdb0"; + sha256 = "0vh2f34qxs8qfv15hf1q7li2iqjiydjsb4c86i2ma1b7vhi73j57"; }; patchPhase = '' From cf6bcd8fc4cba87bd36fd1c18fefaf6ae60dad3b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0439/1183] python3Packages.pytest-helpers-namespace: 2019.1.8 -> 2021.3.24 --- .../python-modules/pytest-helpers-namespace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix index c634aa00718e..43ef2a1339f7 100644 --- a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pytest-helpers-namespace"; - version = "2019.1.8"; + version = "2021.3.24"; src = fetchFromGitHub { owner = "saltstack"; repo = pname; - rev = "v${version}"; - sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + rev = version; + sha256 = "0ikwiwp9ycgg7px78nxdkqvg7j97krb6vzqlb8fq8fvbwrj4q4v2"; }; buildInputs = [ pytest ]; From 086bca1b1540e56b3b65c231741539e14999c3d0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0440/1183] python3Packages.python-frontmatter: 0.5.0 -> 1.0.0 --- .../development/python-modules/python-frontmatter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 6c6806f043ce..9afa43bf3932 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "python-frontmatter"; - version = "0.5.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "eyeseast"; repo = pname; rev = "v${version}"; - sha256 = "1iki3rcbg7zs93m3mgqzncybqgdcch25qpwy84iz96qq8pipfs6g"; + sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx"; }; propagatedBuildInputs = with python3Packages; [ From ac15a6d2b2447de4ef11848b71ff2dea6a355c9c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0441/1183] python3Packages.python-lz4: 2.1.10 -> 3.1.3 --- pkgs/development/python-modules/python-lz4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index e9317d3f7c67..b851ed6b826f 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-lz4"; - version = "2.1.10"; + version = "3.1.3"; # get full repository inorder to run tests src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02cadqfdmw4vc94px18dh4hcybpsa2lr6jz6j5phwc0jjaavh3wr"; + sha256 = "009c4rbyj4cjb8fznccfpr5wrzdmi56wq990yjh22n0z2qqylmkf"; }; nativeBuildInputs = [ setuptools_scm pkgconfig pytestrunner ]; From 75b3912c47145d63b8412ffbeaaf6125f376f8f7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0442/1183] python3Packages.python-snap7: 0.11 -> 1.0 --- pkgs/development/python-modules/python-snap7/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-snap7/default.nix b/pkgs/development/python-modules/python-snap7/default.nix index 06e1185e3430..05d804bc6770 100644 --- a/pkgs/development/python-modules/python-snap7/default.nix +++ b/pkgs/development/python-modules/python-snap7/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "python-snap7"; - version = "0.11"; + version = "1.0"; src = fetchFromGitHub { owner = "gijzelaerr"; repo = "python-snap7"; - rev = "899a94c6eeca76fb9b18afd5056e5003646d7f94"; - sha256 = "169zd1nxq86nmi6132vxl1f6wxm9w3waihq2wn14kkmld1vkmvfd"; + rev = version; + sha256 = "103drdwf4v3yqvd7sscxx154mmmshb6x19v9yqmkj2lj76m0619s"; }; propagatedBuildInputs = [ setuptools six ]; From a2793a4edccb7c7d665854056abbfbb4f61f32cb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0443/1183] python3Packages.pytorch-metric-learning: 0.9.95 -> 0.9.97 --- .../python-modules/pytorch-metric-learning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytorch-metric-learning/default.nix b/pkgs/development/python-modules/pytorch-metric-learning/default.nix index 0430ab37a682..285602bce4a8 100644 --- a/pkgs/development/python-modules/pytorch-metric-learning/default.nix +++ b/pkgs/development/python-modules/pytorch-metric-learning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pytorch-metric-learning"; - version = "0.9.95"; + version = "0.9.97"; disabled = isPy27; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "KevinMusgrave"; repo = pname; rev = "v${version}"; - sha256 = "1msvs1j3n47762ahm21bnkk2qqabxw8diiyi7s420x4zg24mr23g"; + sha256 = "1hipby54swwpfw50wlxzgbphzqkk1fbs5x44smz4rrngqpsp3g67"; }; propagatedBuildInputs = [ From 2bd3c3b6208911da3e60d3eebbea4f1147fd5acb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0444/1183] python3Packages.qds_sdk: 1.15.2 -> 1.16.1 --- pkgs/development/python-modules/qds_sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qds_sdk/default.nix b/pkgs/development/python-modules/qds_sdk/default.nix index 56b3f36c367c..af5df9c347eb 100644 --- a/pkgs/development/python-modules/qds_sdk/default.nix +++ b/pkgs/development/python-modules/qds_sdk/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "qds_sdk"; - version = "1.15.2"; + version = "1.16.1"; # pypi does not contain tests, using github sources instead src = fetchFromGitHub { owner = "qubole"; repo = "qds-sdk-py"; rev = "V${version}"; - sha256 = "0xxg9s0y6fz7vb1kab4q93q7ryi71z8x6q9qspm6s506yr3mc67l"; + sha256 = "05c7g63rcvvi4fgkcfsxh2a6hwlffbs18dhki222s5rpc49wi8zi"; }; propagatedBuildInputs = [ From 41b0e97e706637e8e3b95980c2f9d09aeeeec35a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0445/1183] python3Packages.rich: 9.10.0 -> 9.13.0 --- pkgs/development/python-modules/rich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 64739b3c65c6..52bef42f270f 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "rich"; - version = "9.10.0"; + version = "9.13.0"; # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "1m1rswg16r4pxv7504nk7lpyxrwf16xw4w55rs3jisryx14ccic6"; + sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; }; format = "pyproject"; From 0b50a85af453f5d824afa25e70722d6349cad578 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0446/1183] python3Packages.robotframework-seleniumlibrary: 3.3.1 -> 5.1.3 --- .../python-modules/robotframework-seleniumlibrary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index fbb8cb034a51..ed2ba7155c7e 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, python, robotframework, selenium, mockito, robotstatuschecker, approvaltests }: buildPythonPackage rec { - version = "3.3.1"; + version = "5.1.3"; pname = "robotframework-seleniumlibrary"; # no tests included in PyPI tarball @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "SeleniumLibrary"; rev = "v${version}"; - sha256 = "0dabc5dwx0pwsyiy74d7wj97k72yl28a17sasjzrdq819pyc3dvq"; + sha256 = "1djlrbrgd7v15xk5w90xk7iy98cr1p2g57k614gvbd298dmnf2wd"; }; propagatedBuildInputs = [ robotframework selenium ]; From 37183d288c3ca078d3803625f82ebc97d7220eb8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:55 -0700 Subject: [PATCH 0447/1183] python3Packages.rq: 1.5.2 -> 1.7.0 --- pkgs/development/python-modules/rq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 8ec05aae9d52..71381e5cf242 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.5.2"; + version = "1.7.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va"; + sha256 = "1i7cbcrzqx52immwy8h5ps7x46sqfk9r2lgwjf01nv9mkc3ab8cj"; }; # test require a running redis rerver, which is something we can't do yet From 52cbed8a85ea81e29ef0e79c67c789a7f34d3875 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0448/1183] python3Packages.seabreeze: 0.6.0 -> 1.3.0 --- pkgs/development/python-modules/seabreeze/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index f4a4955a7392..7580647f5a12 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "seabreeze"; - version = "0.6.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ap--"; repo = "python-seabreeze"; - rev = "python-seabreeze-v${version}"; - sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8"; + rev = "v${version}"; + sha256 = "1lna3w1vsci35dhyi7qjvbb99gxvzk23k195c7by7kkrps844q1j"; }; postInstall = '' From 4c499baf7283491154ea5486e388ebb286ce9d9f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0449/1183] python3Packages.shap: 0.36.0 -> 0.39.0 --- pkgs/development/python-modules/shap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shap/default.nix b/pkgs/development/python-modules/shap/default.nix index abc68709caa4..5600f4a6aa0f 100644 --- a/pkgs/development/python-modules/shap/default.nix +++ b/pkgs/development/python-modules/shap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "shap"; - version = "0.36.0"; + version = "0.39.0"; disabled = isPy27; src = fetchFromGitHub { owner = "slundberg"; repo = pname; rev = "v${version}"; - sha256 = "1wxnxvbz6avzzfqjfbcqd4v879hvpq4021v31fhdpccr2q317rr9"; + sha256 = "065c40k6g8sy6ynzk4k8k7iddl18g2b6kb9kg4m6g7npclmn5wvp"; }; propagatedBuildInputs = [ From d3737ad038ebb4085c5c5fff528920215f635466 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0450/1183] python3Packages.signedjson: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/signedjson/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 2f47113408e8..10de67ba0ef2 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "signedjson"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "matrix-org"; repo = "python-${pname}"; - rev = "refs/tags/v${version}"; - sha256 = "18s388hm3babnvakbbgfqk0jzq25nnznvhygywd3azp9b4yzmd5c"; + rev = "v${version}"; + sha256 = "0y5c9v4vx9hqpnca892gc9b4xgs4gp5xk6l1wma5ciz8zswp9yfs"; }; propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; From 412f76d0fd79b29adca216e67f6b620fd33b2939 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0451/1183] python3Packages.simple-salesforce: 0.74.3 -> 1.11.0 --- pkgs/development/python-modules/simple-salesforce/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 3b6803aa5de2..cd89c1c8aae8 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "0.74.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1n960xgrnmv20l31nm0im7pb4nfa83bmx4x4clqrh2jkpzq3ric0"; + sha256 = "16c34xnqa1xkdfjbxx0q584zb6aqci2z6j4211hmzjqs74ddvysm"; }; propagatedBuildInputs = [ From ff34d69f53cac098f466c98e1701433e6ad9574f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0452/1183] python3Packages.sshpubkeys: 3.1.0 -> 3.3.1 --- pkgs/development/python-modules/sshpubkeys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index 6e250cf85f2f..955eb905ac29 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -4,14 +4,14 @@ }: buildPythonPackage rec { - version = "3.1.0"; + version = "3.3.1"; pname = "sshpubkeys"; src = fetchFromGitHub { owner = "ojarva"; repo = "python-${pname}"; - rev = "v${version}"; - sha256 = "1h4gwmcfn84kkqh83km1vfz8sc5kr2g4gzgzmr8gz704jmqiv7nq"; + rev = version; + sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4"; }; propagatedBuildInputs = [ cryptography ecdsa ]; From ad8d116ca104eeed25ba04d19411855f6c3fb92d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0453/1183] python3Packages.stumpy: 1.4 -> 1.8.0 --- pkgs/development/python-modules/stumpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 3ace2e925cbb..3be5ffad1c8d 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "v${version}"; - sha256 = "0s2s3y855jjwdb7p55zx8lknplz58ghpw547yzmqisacr968b67w"; + sha256 = "0s7pamn39ymm1lp9z28isbdrd6ix98y9i4lfdk3ii95wvd3y50my"; }; propagatedBuildInputs = [ From 0d5accdd2f447f3867298d96b66d7d7b1e2f48f0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0454/1183] python3Packages.sumo: 1.0.9 -> 2.2.1 --- pkgs/development/python-modules/sumo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sumo/default.nix b/pkgs/development/python-modules/sumo/default.nix index e1b3d8c705eb..9ba073df9228 100644 --- a/pkgs/development/python-modules/sumo/default.nix +++ b/pkgs/development/python-modules/sumo/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "sumo"; - version = "1.0.9"; + version = "2.2.1"; # No tests in Pypi tarball src = fetchFromGitHub { owner = "SMTG-UCL"; repo = "sumo"; rev = "v${version}"; - sha256 = "1zw86qp9ycw2k0anw6pzvwgd3zds0z2cwy0s663zhiv9mnb5hx1n"; + sha256 = "0r88f5w33h9b0mv7shlqc4przwvas5ycgndvl91wqjnm3b2s3ix0"; }; propagatedBuildInputs = [ numpy scipy spglib pymatgen h5py matplotlib seekpath phonopy ]; From 2c64e42b18749702f62b54ac39f20f62c7d8568b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:56 -0700 Subject: [PATCH 0455/1183] python3Packages.symengine: 0.6.1 -> 0.7.0.post3 --- pkgs/development/python-modules/symengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index f225dd431e58..831583c1324c 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "symengine"; - version = "0.6.1"; + version = "0.7.0.post3"; src = fetchFromGitHub { owner = "symengine"; repo = "symengine.py"; rev = "v${version}"; - sha256 = "13fy25qxn4xwzlr2w35v6jhlpd70lv9r6srv4dizc4brj63hnw50"; + sha256 = "1hpwnnv6f7f2wj33zaaj3i2r0d0qj0jwm3fd4ayicj0rvqya50rx"; }; postConfigure = '' From dba25fa2514d44b5e9c51d19bb3989b19380a9d9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:57 -0700 Subject: [PATCH 0456/1183] python3Packages.tensorboardx: 2.0 -> 2.1 --- pkgs/development/python-modules/tensorboardx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index a95f8e029285..00ea276845dd 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -4,13 +4,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; rev = "v${version}"; - sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7"; + sha256 = "1palz91y0b39pcmwg6wdmqfal38hai99dd6r88i3imqxdbmjghih"; }; checkInputs = [ From 96f27c1bb89cfc837932604ef5df1bed2876aafc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:57 -0700 Subject: [PATCH 0457/1183] python3Packages.tinydb: 4.1.1 -> 4.4.0 --- pkgs/development/python-modules/tinydb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index b267fa82854d..892b9a3f76fe 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tinydb"; - version = "4.1.1"; + version = "4.4.0"; disabled = pythonOlder "3.5"; format = "pyproject"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "msiemens"; repo = pname; rev = "v${version}"; - sha256 = "09cwdmpj91c6q7jympip1lrcd3idbm9cqblgvmrh0v1vy1iv2ki7"; + sha256 = "1z5gnffizgbyhh20jy63bkkjh20ih8d62kcfhiaqa6rvnnffqmnw"; }; nativeBuildInputs = [ poetry ]; From 1ab8ce938d11a2be097fa0e21683f43d253dc211 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:57 -0700 Subject: [PATCH 0458/1183] python3Packages.torchvision: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/torchvision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 357592151820..8f3cb085b65d 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "torchvision"; - version = "0.8.2"; + version = "0.9.0"; src = fetchFromGitHub { owner = "pytorch"; repo = "vision"; rev = "v${version}"; - sha256 = "0yhpbq7linrk2qp5jxsvlgkmwa5bn38s9kcswy4jzvmx1fjbkpq0"; + sha256 = "0rw186nki7q8igk481p2mvx4n763i3kpn663yp3dibkimddpnf9k"; }; nativeBuildInputs = [ libpng ninja which ]; From 381a38ed2ec54bf2b7d2c6906778cbc520dc083b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:41:57 -0700 Subject: [PATCH 0459/1183] python3Packages.xmlschema: 1.4.1 -> 1.5.3 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index e31054e74c13..58d50d7b6cf3 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -5,14 +5,14 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.5.3"; pname = "xmlschema"; src = fetchFromGitHub { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "1yd7whf74z8bw99gldxlnrs8bjnjzald29b5cf2ka0i144sxbvad"; + sha256 = "0pv8zdz03wjnjwrgjr5pc3q69h7zh51h0iwgwxwl65qi1r6ydk54"; }; propagatedBuildInputs = [ elementpath ]; From 884592c3bb3d4eb8851fe28a312498db51ef1990 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 10:52:55 -0700 Subject: [PATCH 0460/1183] python3Packages.javaproperties: fix build --- pkgs/development/python-modules/javaproperties/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/javaproperties/default.nix b/pkgs/development/python-modules/javaproperties/default.nix index 93c4252d0dd6..dd3c027bca20 100644 --- a/pkgs/development/python-modules/javaproperties/default.nix +++ b/pkgs/development/python-modules/javaproperties/default.nix @@ -7,6 +7,7 @@ buildPythonPackage rec { version = "0.8.0"; pname = "javaproperties"; + format = "pyproject"; src = fetchFromGitHub { owner = "jwodder"; From d069d54e94aea1d0deed973ade46f7a52ffddaa6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 11:10:38 -0700 Subject: [PATCH 0461/1183] python3Packages.brotli: fix tests --- pkgs/development/python-modules/brotli/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index 40e583c4a78a..1edc62317a64 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -9,7 +9,9 @@ buildPythonPackage rec { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "0xyp85h12sknl4pxg1x8lgx8simzhdv73h4a8c1m7gyslsny386g"; + sha256 = "1rdp9rx197q467ixp53g4cgc3jbsdaxr62pz0a8ayv2lvm944azh"; + # for some reason, the test data isn't captured in releases, force a git checkout + deepClone = true; }; dontConfigure = true; From b31c95b2ee31b55107b5897b0ff4446ab0c156b5 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 11:16:05 -0700 Subject: [PATCH 0462/1183] python3Packages.Fabric: fix build --- pkgs/development/python-modules/Fabric/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index 146c78a5616b..2e70d3aa121e 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -16,6 +16,12 @@ buildPythonPackage rec { sha256 = "47f184b070272796fd2f9f0436799e18f2ccba4ee8ee587796fca192acd46cd2"; }; + # only relevant to python < 3.4 + postPatch = '' + substituteInPlace setup.py \ + --replace ', "pathlib2"' ' ' + ''; + propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; From 4835808d40fe67c03626af530ae7dec4edc70965 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 12:04:52 -0700 Subject: [PATCH 0463/1183] python3Packages.construct: fix build and tests --- pkgs/development/python-modules/construct/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 6b52af604041..3a3a3d327189 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , six, pytestCheckHook, pytest-benchmark, numpy, arrow, ruamel_yaml +, lz4, cloudpickle }: buildPythonPackage rec { @@ -16,7 +17,12 @@ buildPythonPackage rec { sha256 = "0dnj815qdxrn0q6bpwsmkca2jy02gjy6d3amqg4y6gha1kc1mymv"; }; - checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml ]; + # not an explicit dependency, but it's imported by an entrypoint + propagatedBuildInputs = [ + lz4 + ]; + + checkInputs = [ pytestCheckHook pytest-benchmark numpy arrow ruamel_yaml cloudpickle ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; From d0a5a05377f18bbd769b945bcde1777ffe980e8e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 12:05:24 -0700 Subject: [PATCH 0464/1183] python3Packages.jupyter-packaging: fix src and build --- .../jupyter-packaging/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index 3a65fb7620b1..60077e5bcf07 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -1,9 +1,11 @@ { lib , buildPythonPackage , fetchPypi +, deprecation , pythonOlder , packaging , pytestCheckHook +, tomlkit }: buildPythonPackage rec { @@ -12,11 +14,12 @@ buildPythonPackage rec { disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "jupyter_packaging"; + inherit version; sha256 = "276c9f884286695f6ab57a017f4bb9dd4df4f5e232b783050d2aa55b6b9ed650"; }; - propagatedBuildInputs = [ packaging ]; + propagatedBuildInputs = [ deprecation packaging tomlkit ]; checkInputs = [ pytestCheckHook ]; @@ -24,8 +27,16 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; - # disable tests depending on network connection - disabledTests = [ "test_develop" "test_install" ]; + disabledTests = [ + # disable tests depending on network connection + "test_develop" + "test_install" + # Avoid unmainted "mocker" fixture library, and calls to dependent "build" module + "test_build" + "test_npm_build" + "test_create_cmdclass" + "test_ensure_with_skip_npm" + ]; pythonImportsCheck = [ "jupyter_packaging" ]; From 29696c3dbdbd02ff5f903929ae0b7a496fa35e18 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 12:11:40 -0700 Subject: [PATCH 0465/1183] python3Packages.keyring: fix build --- pkgs/development/python-modules/keyring/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index df538a40c958..ed224ec09038 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 , dbus-python , entrypoints , importlib-metadata @@ -26,9 +26,8 @@ buildPythonPackage rec { checkInputs = [ pytest pytest-flake8 ]; - propagatedBuildInputs = [ dbus-python entrypoints ] - ++ lib.optional stdenv.isLinux secretstorage - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ dbus-python entrypoints importlib-metadata ] + ++ lib.optional stdenv.isLinux secretstorage; # checks try to access a darwin path on linux doCheck = false; From 8d45a968d094d2f0a2ffcd44297531c3360585af Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 12:25:07 -0700 Subject: [PATCH 0466/1183] azure-cli: fix build --- pkgs/tools/admin/azure-cli/python-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index e81815b065cc..5c3382392921 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -427,6 +427,15 @@ let }; }); + pyjwt = super.pyjwt.overridePythonAttrs(oldAttrs: rec { + version = "1.7.1"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; + }; + }); knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.8.0rc2"; From 5869be510301d2ffef7621c03e27897a026bee56 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 13:10:39 -0700 Subject: [PATCH 0467/1183] python3Packages.poetry: 1.1.14 -> 1.1.15, fix build --- pkgs/development/python-modules/poetry/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 1519187d174b..29c9698ec288 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = isPy27; @@ -32,13 +32,14 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; + sha256 = "sha256-DgIDtwL7R/oipcU7BMt31+ImgiQ9/9noNVNdpm+OZi8="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace 'importlib-metadata = {version = "^1.6.0", python = "<3.8"}' \ - 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' + 'importlib-metadata = {version = ">=1.6,<2", python = "<3.8"}' \ + --replace 'version = "^21.2.0"' 'version = ">=21.2"' ''; nativeBuildInputs = [ intreehooks ]; From 43769c051c90cffb1eb7a3f7d4c7da52df332fc9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 13:27:31 -0700 Subject: [PATCH 0468/1183] python3Packages.pytest: fix tests --- pkgs/development/python-modules/pytest/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 579cfe1271f3..4c6d76833ed3 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -56,9 +56,12 @@ buildPythonPackage rec { ''; # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 + # test_missing_required_plugins will emit deprecation warning which is treated as error checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + $out/bin/py.test -x testing/ \ + --ignore=testing/test_junitxml.py \ + -k "not test_collect_pyargs_with_testpaths and not test_missing_required_plugins" # tests leave behind unreproducible pytest binaries in the output directory, remove: find $out/lib -name "*-pytest-${version}.pyc" -delete From c57d51f1abf82b694b22529aaef24001706576ee Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:21:53 +0100 Subject: [PATCH 0469/1183] python3Packages.jaraco_itertools: remove patch No longer applies and we don't test anymore anyway. --- ...t-run-flake8-checks-during-the-build.patch | 27 ------------------- .../jaraco_itertools/default.nix | 4 --- 2 files changed, 31 deletions(-) delete mode 100644 pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch diff --git a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch b/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch deleted file mode 100644 index 2dcf7d648626..000000000000 --- a/pkgs/development/python-modules/jaraco_itertools/0001-Don-t-run-flake8-checks-during-the-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From fd56b0d85393d684bd3bf99f33d8638da884282f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Thu, 25 Jun 2020 09:52:11 +0100 -Subject: [PATCH] disable flake8/black8/coverage from tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim ---- - pytest.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pytest.ini b/pytest.ini -index 5027d34..4e2a2d2 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,5 +1,5 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 --black --cov -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS ALLOW_BYTES - filterwarnings= --- -2.27.0 - diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 0ece2527a875..91bb83fdb5a4 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -15,10 +15,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; - patches = [ - ./0001-Don-t-run-flake8-checks-during-the-build.patch - ]; - propagatedBuildInputs = [ inflect more-itertools six ]; checkInputs = [ pytest ]; From 3904d4d477619a40205a306c5e200b2bcbb91804 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:23:40 +0100 Subject: [PATCH 0470/1183] python2Packages.typing: we no longer need it for Python 3 --- pkgs/development/python-modules/aiodns/default.nix | 2 +- .../python-modules/aiohttp-cors/default.nix | 2 +- pkgs/development/python-modules/altair/default.nix | 2 +- pkgs/development/python-modules/build/default.nix | 2 +- pkgs/development/python-modules/can/default.nix | 2 +- .../python-modules/canmatrix/default.nix | 2 +- pkgs/development/python-modules/chalice/default.nix | 2 +- .../python-modules/class-registry/default.nix | 2 +- pkgs/development/python-modules/clikit/default.nix | 2 +- .../python-modules/connexion/default.nix | 2 +- .../development/python-modules/curtsies/default.nix | 2 +- pkgs/development/python-modules/datadog/default.nix | 2 +- .../python-modules/django-extensions/default.nix | 2 +- .../development/python-modules/eth-hash/default.nix | 13 ++++++++++--- pkgs/development/python-modules/flake8/default.nix | 2 +- pkgs/development/python-modules/fs/default.nix | 4 ++-- .../development/python-modules/gentools/default.nix | 2 +- .../python-modules/hyperlink/default.nix | 2 +- .../python-modules/importlib-resources/default.nix | 4 ++-- .../python-modules/poetry-core/default.nix | 2 +- pkgs/development/python-modules/sphinx/default.nix | 2 +- pkgs/development/python-modules/tomlkit/default.nix | 2 +- pkgs/development/python-modules/typing/default.nix | 5 ++++- pkgs/top-level/python-packages.nix | 2 +- pkgs/top-level/python2-packages.nix | 2 ++ 25 files changed, 40 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index 0a91efe7dde4..05e17ec12f43 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, isPy27, isPyPy, python, pycares, typing +, isPy27, isPyPy, python, pycares, typing ? null , trollius ? null }: diff --git a/pkgs/development/python-modules/aiohttp-cors/default.nix b/pkgs/development/python-modules/aiohttp-cors/default.nix index 00198cd27cff..fc5dc87f4ef2 100644 --- a/pkgs/development/python-modules/aiohttp-cors/default.nix +++ b/pkgs/development/python-modules/aiohttp-cors/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, typing, aiohttp +, typing ? null, aiohttp }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 99ee559da6b9..6e686d9fc907 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -12,7 +12,7 @@ , six , sphinx , toolz -, typing +, typing ? null , vega_datasets }: diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index b5dce09d516f..639dc53babf2 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -12,7 +12,7 @@ , pytestCheckHook , pythonOlder , toml -, typing +, typing ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index ea49c9b4a777..255a100ec688 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -5,7 +5,7 @@ , isPy27 , aenum , wrapt -, typing +, typing ? null , pyserial , nose , mock diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 8ffacc1a99de..d36f6805cc3f 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -7,7 +7,7 @@ , click , future , pathlib2 -, typing +, typing ? null , lxml , xlwt , xlrd diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 54ca6e35dc03..e99f321df37f 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -15,7 +15,7 @@ , pyyaml , setuptools , six -, typing +, typing ? null , watchdog , wheel }: diff --git a/pkgs/development/python-modules/class-registry/default.nix b/pkgs/development/python-modules/class-registry/default.nix index 93c41cadea6e..3faf07966d09 100644 --- a/pkgs/development/python-modules/class-registry/default.nix +++ b/pkgs/development/python-modules/class-registry/default.nix @@ -4,7 +4,7 @@ lib, nose, six, - typing, + typing ? null, isPy27, }: diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 7b07b0945919..1f6be754be19 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , isPy27, pythonAtLeast -, pylev, pastel, typing, enum34, crashtest }: +, pylev, pastel, typing ? null, enum34 ? null, crashtest }: buildPythonPackage rec { pname = "clikit"; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 6b212be3bb7b..25925f56069a 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -26,7 +26,7 @@ , six , swagger-ui-bundle , testfixtures -, typing +, typing ? null , ujson }: diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index 62f1435df30e..dc32bcdf74c9 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: +{ lib, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing ? null}: buildPythonPackage rec { pname = "curtsies"; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 9d81e9f72eae..270a5b4e9d86 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,7 +4,7 @@ , pythonOlder , decorator , requests -, typing +, typing ? null , configparser , click , freezegun diff --git a/pkgs/development/python-modules/django-extensions/default.nix b/pkgs/development/python-modules/django-extensions/default.nix index 9bd72965cf8b..3e7a1163b96f 100644 --- a/pkgs/development/python-modules/django-extensions/default.nix +++ b/pkgs/development/python-modules/django-extensions/default.nix @@ -11,7 +11,7 @@ , shortuuid , six , tox -, typing +, typing ? null , vobject , werkzeug }: diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 26264444eeec..0f3f5f1a6452 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -1,5 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto, - pycryptodome }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, pytest, pysha3, pycrypto +, pycryptodome +, eth-utils +}: buildPythonPackage rec { pname = "eth-hash"; @@ -12,7 +14,12 @@ buildPythonPackage rec { checkInputs = [ pytest ]; - propagatedBuildInputs = [ pysha3 pycrypto pycryptodome ]; + propagatedBuildInputs = [ + eth-utils + pysha3 + pycrypto + pycryptodome + ]; # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index cf2ce36028ed..7c81967d070e 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , mock, pytest, pytestrunner -, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing, importlib-metadata +, configparser, enum34, mccabe, pycodestyle, pyflakes, functools32, typing ? null, importlib-metadata }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index 5158a553bfb8..c14b169bea95 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -4,9 +4,9 @@ , fetchPypi , six , appdirs -, scandir +, scandir ? null , backports_os ? null -, typing +, typing ? null , pytz , enum34 , pyftpdlib diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 129eaae340a1..14e1fc1c6098 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchFromGitHub, pytest -, typing, funcsigs, pythonOlder +, typing ? null, funcsigs ? null, pythonOlder }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 6cb69a14e723..ad56de86782b 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }: +{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing ? null }: buildPythonPackage rec { pname = "hyperlink"; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 7820342084f1..cd8fec1e54e0 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -4,8 +4,8 @@ , setuptools_scm , toml , importlib-metadata -, typing -, singledispatch +, typing ? null +, singledispatch ? null , pythonOlder , python }: diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 80c4b5acfe8c..cc1724024add 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -7,7 +7,7 @@ , pytest-mock , pytestCheckHook , tomlkit -, typing +, typing ? null , virtualenv }: diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 9ce0015cdf86..1c5cc29f4146 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -26,7 +26,7 @@ , sphinxcontrib-qthelp , sphinxcontrib-serializinghtml , sphinxcontrib-websupport -, typing +, typing ? null , setuptools , packaging }: diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 27f952386f12..cabe2ebcd5e3 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 -, enum34, functools32, typing +, enum34, functools32, typing ? null }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index 0d5c2119921a..823ee2af29e0 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python }: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy3k, isPyPy, python +, pythonAtLeast }: let testDir = if isPy3k then "src" else "python2"; @@ -12,6 +13,8 @@ in buildPythonPackage rec { sha256 = "1187fb9c82fd670d10aa07bbb6cfcfe4bdda42d6fab8d5134f04e8c4d0b71cc9"; }; + disabled = pythonAtLeast "3.5"; + # Error for Python3.6: ImportError: cannot import name 'ann_module' # See https://github.com/python/typing/pull/280 # Also, don't bother on PyPy: AssertionError: TypeError not raised diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd580c653eab..634ba5a64f04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7906,7 +7906,7 @@ in { typesystem = callPackage ../development/python-modules/typesystem { }; - typing = callPackage ../development/python-modules/typing { }; + typing = null; typing-extensions = callPackage ../development/python-modules/typing-extensions { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index fddf65eaae08..7538c485dc1c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -599,6 +599,8 @@ with self; with super; { TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + typing = callPackage ../development/python-modules/typing { }; + ujson = callPackage ../development/python-modules/ujson/2.nix { }; umemcache = callPackage ../development/python-modules/umemcache { }; From c3ee8aaddfd7e26e62eb6eab631f2ffcd82dc1a7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:32:05 +0100 Subject: [PATCH 0471/1183] python3Packages.ipfsapi: fix eval --- pkgs/development/python-modules/ipfsapi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ipfsapi/default.nix b/pkgs/development/python-modules/ipfsapi/default.nix index 32bc8c58599f..94af30c11ea9 100644 --- a/pkgs/development/python-modules/ipfsapi/default.nix +++ b/pkgs/development/python-modules/ipfsapi/default.nix @@ -6,7 +6,7 @@ , requests }: -buildPythonPackage { +buildPythonPackage rec { pname = "ipfsapi"; version = "0.7.0"; disabled = isPy27; From 24896293e40cecb2f22cc4db0a13c41697745049 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:34:54 +0100 Subject: [PATCH 0472/1183] python2Packages.scandir: python 2 only --- pkgs/development/python-modules/graphite-web/default.nix | 6 +++--- pkgs/development/python-modules/pathlib2/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 -- pkgs/top-level/python2-packages.nix | 2 ++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index 81260110f929..d2d6a78436ac 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , django , memcached , txamqp @@ -9,7 +11,6 @@ , cairocffi , whisper , whitenoise -, scandir , urllib3 , six }: @@ -38,7 +39,6 @@ buildPythonPackage rec { cairocffi whisper whitenoise - scandir urllib3 six ]; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index 6e04f2e7a030..b21536060d3a 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,9 +3,9 @@ , fetchPypi , six , pythonOlder -, scandir +, scandir ? null , glibcLocales -, mock +, mock ? null }: buildPythonPackage rec { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 634ba5a64f04..3c697925b7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6931,8 +6931,6 @@ in { scales = callPackage ../development/python-modules/scales { }; - scandir = callPackage ../development/python-modules/scandir { }; - scapy = callPackage ../development/python-modules/scapy { }; schedule = callPackage ../development/python-modules/schedule { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7538c485dc1c..4d22811757be 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -511,6 +511,8 @@ with self; with super; { sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + scandir = callPackage ../development/python-modules/scandir { }; + scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix { inherit (pkgs) gfortran glibcLocales; }; From 959d1a4424db94fc4bf89622a14d084ae21ba37a Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:39:12 +0100 Subject: [PATCH 0473/1183] python2Packages.singledispatch: python 2 only --- pkgs/development/python-modules/nltk/default.nix | 2 +- pkgs/development/python-modules/pecan/default.nix | 2 +- pkgs/development/python-modules/pgpy/default.nix | 2 +- pkgs/development/python-modules/tornado/4.nix | 8 ++++---- pkgs/development/python-modules/tornado/5.nix | 8 ++++---- pkgs/development/python-modules/variants/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- pkgs/top-level/python2-packages.nix | 2 ++ 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index 298b32ed8b8e..c87a935a306d 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -1,4 +1,4 @@ -{ fetchPypi, buildPythonPackage, lib, six, singledispatch, isPy3k +{ fetchPypi, buildPythonPackage, lib, six, singledispatch ? null, isPy3k , click , joblib , regex diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix index 50b62503ff87..d19fc1011347 100644 --- a/pkgs/development/python-modules/pecan/default.nix +++ b/pkgs/development/python-modules/pecan/default.nix @@ -5,7 +5,7 @@ # Python deps , logutils , Mako -, singledispatch +, singledispatch ? null , six , webtest # Test Inputs diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 2c527d87d186..b3fde72baec3 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -1,5 +1,5 @@ { lib, isPy3k, fetchFromGitHub, buildPythonPackage -, six, enum34, pyasn1, cryptography, singledispatch +, six, enum34, pyasn1, cryptography, singledispatch ? null , fetchPypi, pytestCheckHook }: buildPythonPackage rec { diff --git a/pkgs/development/python-modules/tornado/4.nix b/pkgs/development/python-modules/tornado/4.nix index 03c1b6ab0808..da86c7037b92 100644 --- a/pkgs/development/python-modules/tornado/4.nix +++ b/pkgs/development/python-modules/tornado/4.nix @@ -2,10 +2,10 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch +, backports_abc ? null +, backports_ssl_match_hostname ? null +, certifi ? null +, singledispatch ? null , futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/tornado/5.nix b/pkgs/development/python-modules/tornado/5.nix index 74ca668de490..2905f89dc0cc 100644 --- a/pkgs/development/python-modules/tornado/5.nix +++ b/pkgs/development/python-modules/tornado/5.nix @@ -2,10 +2,10 @@ , python , buildPythonPackage , fetchPypi -, backports_abc -, backports_ssl_match_hostname -, certifi -, singledispatch +, backports_abc ? null +, backports_ssl_match_hostname ? null +, certifi ? null +, singledispatch ? null , futures ? null , isPy27 }: diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix index 11c50646700d..3a45230720e2 100644 --- a/pkgs/development/python-modules/variants/default.nix +++ b/pkgs/development/python-modules/variants/default.nix @@ -3,7 +3,7 @@ , fetchPypi , pytestrunner , setuptools_scm -, singledispatch +, singledispatch ? null , pytest , lib }: diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c697925b7d2..76b379f86a08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7145,8 +7145,6 @@ in { simpy = callPackage ../development/python-modules/simpy { }; - singledispatch = callPackage ../development/python-modules/singledispatch { }; - signify = callPackage ../development/python-modules/signify { }; sip = callPackage ../development/python-modules/sip { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 4d22811757be..c72d5263af96 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -545,6 +545,8 @@ with self; with super; { simpleparse = callPackage ../development/python-modules/simpleparse { }; + singledispatch = callPackage ../development/python-modules/singledispatch { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; slowaes = callPackage ../development/python-modules/slowaes { }; From e003bf330ebccdbdd197c399179ca3185340c9a3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 08:45:55 +0100 Subject: [PATCH 0474/1183] python3Packages.bleachbit: fix eval --- pkgs/applications/misc/bleachbit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 952d1fe16db6..4b78cda35648 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -7,6 +7,7 @@ , glib , gtk3 , libnotify +, scandir ? null }: python3Packages.buildPythonApplication rec { From f81c4edcd6c61239e20511ee8867af4b77b158cd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 09:04:38 +0100 Subject: [PATCH 0475/1183] python2Packages.pytest-xdist: fix attribute name and alias --- pkgs/top-level/python-packages.nix | 4 ++-- pkgs/top-level/python2-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 76b379f86a08..e77f22d8b330 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6159,8 +6159,8 @@ in { pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pytest-xdist = self.pytest_xdist; # added 2021-01-04 - pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; + pytest_xdist = self.pytest-xdist; # added 2021-01-04 + pytest-xdist = callPackage ../development/python-modules/pytest-xdist { }; pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index c72d5263af96..7fedf700d11e 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -456,14 +456,15 @@ with self; with super; { pytestrunner = callPackage ../development/python-modules/pytestrunner/2.nix { }; + pytest_xdist = self.pytest-xdist; # added 2021-01-04 + pytest-xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; + python-otr = callPackage ../development/python-modules/python-otr { }; python_statsd = callPackage ../development/python-modules/python_statsd { }; python-sybase = callPackage ../development/python-modules/sybase { }; - python_xdist = callPackage ../development/python-modules/pytest-xdist/1.nix { }; - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; From 7b5b57f283e756b92b3613db95845aaeb071d9f2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 09:06:30 +0100 Subject: [PATCH 0476/1183] python2Packages.convertdate: fix attribute name --- pkgs/top-level/python2-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7fedf700d11e..9240c8f67b20 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -66,7 +66,7 @@ with self; with super; { construct = callPackage ../development/python-modules/construct/2.10.54.nix { }; - convertdata = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; + convertdate = callPackage ../development/python-modules/convertdate/2.2.x.nix { }; cryptography = callPackage ../development/python-modules/cryptography/3.3.nix { }; From 302e6a75128760a13527bc07b18f70ebc2f60c56 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 09:11:39 +0100 Subject: [PATCH 0477/1183] gcalcli: fix eval --- pkgs/applications/misc/gcalcli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index e19e89ec6c0b..392e2c312f7d 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { dateutil gflags httplib2 parsedatetime six vobject google-api-python-client oauth2client uritemplate libnotify - ] ++ lib.optional (!isPy3k) futures; + ]; # There are no tests as of 4.0.0a4 doCheck = false; From 09147517eadf930fa4e99945e7912e4817f460ff Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 25 Mar 2021 09:21:05 +0100 Subject: [PATCH 0478/1183] buildPythonPackage: avoid recursion Sometimes an infinite recursion error shows up. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 175454ea0559..e9c769821d6f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -104,11 +104,13 @@ else let inherit (python) stdenv; + name_ = name; + self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ "disabled" "checkPhase" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format" ]) // { - name = namePrefix + name; + name = namePrefix + name_; nativeBuildInputs = [ python From 2cb255c7ad84869827c409e526a09a27916e89e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 10 Mar 2021 13:51:41 +0100 Subject: [PATCH 0479/1183] python3.pkgs.keyring: 23.0.0 -> 23.0.1 --- .../python-modules/keyring/default.nix | 43 ++++++++++--------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index ed224ec09038..e7340561cdc5 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,42 +1,45 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 -, dbus-python -, entrypoints +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +, setuptools-scm , importlib-metadata -, pytest -, pytest-flake8 +, dbus-python +, jeepney , secretstorage -, setuptools_scm -, toml +, pytestCheckHook }: buildPythonPackage rec { pname = "keyring"; - version = "23.0.0"; - disabled = isPy27; + version = "23.0.1"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "237ff44888ba9b3918a7dcb55c8f1db909c95b6f071bfb46c6918f33f453a68a"; + sha256 = "045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8"; }; nativeBuildInputs = [ - setuptools_scm - toml + setuptools-scm ]; - checkInputs = [ pytest pytest-flake8 ]; + checkInputs = [ + pytestCheckHook + ]; - propagatedBuildInputs = [ dbus-python entrypoints importlib-metadata ] - ++ lib.optional stdenv.isLinux secretstorage; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ] ++ lib.optionals stdenv.isLinux [ + dbus-python + jeepney + secretstorage + ]; - # checks try to access a darwin path on linux - doCheck = false; + pythonImportsCheck = [ "keyring" ]; meta = with lib; { description = "Store and access your passwords safely"; - homepage = "https://pypi.python.org/pypi/keyring"; - license = licenses.psfl; - maintainers = with maintainers; [ lovek323 ]; + homepage = "https://github.com/jaraco/keyring"; + license = licenses.mit; + maintainers = with maintainers; [ lovek323 dotlambda ]; platforms = platforms.unix; }; } From 45e6b6019e79673d2e334957af6ba6f0fcc5eacf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Mar 2021 01:22:40 +0100 Subject: [PATCH 0480/1183] python3Packages.pywebpush: fix build Updates dependencies and migrates test from nosetests to pytest. --- .../python-modules/pywebpush/default.nix | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index 9fe3dc935bb6..a89e0b3789cf 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -1,6 +1,16 @@ -{ lib, fetchPypi, buildPythonPackage -, coverage, flake8, mock, nose -, http-ece, py-vapid, requests }: +{ lib +, fetchPypi +, buildPythonPackage +, cryptography +, http-ece +, py-vapid +, requests +, six +, coverage +, flake8 +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "pywebpush"; @@ -12,11 +22,18 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - http-ece py-vapid requests + cryptography + http-ece + py-vapid + requests + six ]; checkInputs = [ - coverage flake8 mock nose + coverage + flake8 + mock + pytestCheckHook ]; meta = with lib; { From b7ce919853fe016c3f41f84ca3b232d474d04ea0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Mar 2021 01:28:18 +0100 Subject: [PATCH 0481/1183] python3Packages.josepy: fix test run and drop unused dependency --- pkgs/development/python-modules/josepy/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 4bab64bf7f7e..c46e937194dc 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -1,9 +1,9 @@ -{ lib, fetchPypi, buildPythonPackage -# buildInputs -, six -, setuptools -, pyopenssl +{ lib +, fetchPypi +, buildPythonPackage , cryptography +, pyopenssl +, setuptools , mock , pytestCheckHook }: @@ -20,12 +20,12 @@ buildPythonPackage rec { postPatch = '' # remove coverage flags sed -i '/addopts/d' pytest.ini + sed -i '/flake8-ignore/d' pytest.ini ''; propagatedBuildInputs = [ pyopenssl cryptography - six setuptools ]; From e7436d2c9f0feff20fe566c07691b7ce7c047580 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Mar 2021 01:32:18 +0100 Subject: [PATCH 0482/1183] python3Packages.pymazda: fix build The pycryptodome dependency was replaced by cryptography. Sadly the git repository is out of date. --- pkgs/development/python-modules/pymazda/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 4f6986b0c1b5..4d0dbeaed3b9 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -2,7 +2,7 @@ , aiohttp , buildPythonPackage , fetchPypi -, pycryptodome +, cryptography , pythonOlder }: @@ -16,7 +16,10 @@ buildPythonPackage rec { sha256 = "174c58e6e78081af3105524074ae26e62be683389e495ab85a30e2adbf7ba365"; }; - propagatedBuildInputs = [ aiohttp pycryptodome ]; + propagatedBuildInputs = [ + aiohttp + cryptography + ]; # Project has no tests doCheck = false; From 4e9c5151b9932d6b6035e9a0e5b9bad637531f35 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Mar 2021 01:46:32 +0100 Subject: [PATCH 0483/1183] python3Packages.python-smarttub: pin pyjwt at 1.7.1 Upstream does not yet support pyjwt>=2.0 and this package is only used in the home-assistant context, which also pins 1.7.1. https://github.com/mdz/python-smarttub/issues/10 --- .../python-modules/python-smarttub/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index 3e5889b93560..ec71448fe1d7 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -11,6 +11,17 @@ , pythonOlder }: +let + # https://github.com/mdz/python-smarttub/issues/10 + pyjwt' = pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; + }; + }); +in + buildPythonPackage rec { pname = "python-smarttub"; version = "0.0.19"; @@ -26,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp inflection - pyjwt + pyjwt' python-dateutil ]; From 53198a47d14a8bd75a6d0bec8ffbc6b5f479812a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 27 Mar 2021 02:25:31 +0100 Subject: [PATCH 0484/1183] home-assistant: pin pyjwt==1.7.1, pykmtronic==0.0.3 --- pkgs/servers/home-assistant/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 88dde650e5af..07d50d6a64f9 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -43,6 +43,14 @@ let }); }) + # Pinned due to API changes in pyjwt>=2.0 + (mkOverride "pyjwt" "1.7.1" + "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd") + + # Pinned due to API changes in pykmtronic>=0.2.0 + (mkOverride "pykmtronic" "0.0.3" + "sha256-8bxn27DU1XUQUxQFJklEge29DHx1DMu7pJG4hVE1jDU=") + # Pinned due to bug in ring-doorbell 0.7.0 # https://github.com/tchellomello/python-ring-doorbell/issues/240 (mkOverride "ring-doorbell" "0.6.2" From 9004e0dac3a45d0085281219198ae638108182d5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 17:37:37 +0200 Subject: [PATCH 0485/1183] python3Packages.eth-hash: break circular dependency --- pkgs/development/python-modules/eth-hash/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index 0f3f5f1a6452..da57aa50e07c 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -15,12 +15,16 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ - eth-utils pysha3 pycrypto pycryptodome ]; + pipInstallFlags = [ + # Circular dependency on eth-utils + "--no-dependencies" + ]; + # setuptools-markdown uses pypandoc which is broken at the moment preConfigure = '' substituteInPlace setup.py --replace \'setuptools-markdown\' "" From 314394fb0914aba11ab419314c34fd63f36e0ccd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 17:37:21 +0200 Subject: [PATCH 0486/1183] python3Packages.eth-utils: 1.9.5 -> 1.10.0 --- pkgs/development/python-modules/eth-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 9c67f0816e37..172647f0da70 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "1.9.5"; + version = "1.10.0"; # Tests are missing from the PyPI source tarball so let's use GitHub # https://github.com/ethereum/eth-utils/issues/130 @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1h3xlw74zdf6cfvqf9193lx05bpdm05pmy9ap1g7q2kx0j2b6352"; + sha256 = "sha256-sq3H4HmUFUipqVYleZxWLG1gBsQEoNwcZAXiKckacek="; }; checkInputs = [ pytestCheckHook hypothesis ]; From 95d4d48e570086ba22a961163b9c622011dac287 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 3 Apr 2021 18:08:26 +0200 Subject: [PATCH 0487/1183] calibre-web: don't require singledispatch which is a Python 2 only package. --- pkgs/servers/calibre-web/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix index f24a1f32f884..53db5f7ed0b9 100644 --- a/pkgs/servers/calibre-web/default.nix +++ b/pkgs/servers/calibre-web/default.nix @@ -53,7 +53,6 @@ python3.pkgs.buildPythonApplication rec { iso-639 pypdf2 requests - singledispatch sqlalchemy tornado unidecode From a55da781d756cf64a9995ac3e603eb77a6901bba Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Apr 2021 10:59:46 +0200 Subject: [PATCH 0488/1183] quodlibet: remove pyobjc as dependency because its python 2 only and quodlibet uses python3 --- pkgs/applications/audio/quodlibet/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 571097ad4786..2110a0deb242 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -30,7 +30,6 @@ python3.pkgs.buildPythonApplication rec { ++ optionals withDbusPython [ dbus-python ] ++ optionals withPyInotify [ pyinotify ] ++ optionals withMusicBrainzNgs [ musicbrainzngs ] - ++ optionals stdenv.isDarwin [ pyobjc ] ++ optionals withPahoMqtt [ paho-mqtt ]; LC_ALL = "en_US.UTF-8"; From d9fd85f9fb883f75e2000785116f2480a40a687f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 4 Apr 2021 13:15:04 +0200 Subject: [PATCH 0489/1183] Revert "python3Packages.python-smarttub: pin pyjwt at 1.7.1" Overriding within the package set is not allowed. Doing so makes it possible one ends up with multiple versions of a package, something Python cannot handle. This reverts commit 4e9c5151b9932d6b6035e9a0e5b9bad637531f35. --- .../python-modules/python-smarttub/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix index ec71448fe1d7..80fad0856ee1 100644 --- a/pkgs/development/python-modules/python-smarttub/default.nix +++ b/pkgs/development/python-modules/python-smarttub/default.nix @@ -11,17 +11,6 @@ , pythonOlder }: -let - # https://github.com/mdz/python-smarttub/issues/10 - pyjwt' = pyjwt.overridePythonAttrs (oldAttrs: rec { - version = "1.7.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96"; - }; - }); -in - buildPythonPackage rec { pname = "python-smarttub"; version = "0.0.19"; @@ -37,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp inflection - pyjwt' + pyjwt python-dateutil ]; @@ -54,5 +43,6 @@ buildPythonPackage rec { homepage = "https://github.com/mdz/python-smarttub"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + broken = pyjwt.version != "1.7.1"; }; } From 5f24024de6f6405bb9ae9fc4c960b3fba84613b9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 1 Apr 2021 17:30:29 +0000 Subject: [PATCH 0490/1183] linux: enable Xen everywhere it can be I don't think there's any reason to have a seperate kernel variant because of this, with all the maintenance burden that imposes. Debian and Fedora both enable all these options on their normal kernels. Alias the Linux Xen attributes, so this change should be seemless for people who were using the Xen kernels up to now. All the Xen options are marked as optional anyway, so it should be fine to try to enable them on non-x86 platforms as well. Fixes: https://github.com/NixOS/nixpkgs/issues/115182 --- pkgs/os-specific/linux/kernel/common-config.nix | 13 ++++--------- pkgs/top-level/aliases.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 9 --------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 008205f5b151..488aa30c54a1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -12,7 +12,7 @@ # Configuration { lib, stdenv, version -, features ? { grsecurity = false; xen_dom0 = false; } +, features ? { grsecurity = false; } }: with lib; @@ -547,13 +547,8 @@ let VBOXGUEST = option no; DRM_VBOXVIDEO = option no; - } // optionalAttrs (stdenv.isx86_64 || stdenv.isi686) ({ - XEN = option yes; - - # XXX: why isn't this in the xen-dom0 conditional section below? - XEN_DOM0 = option yes; - - } // optionalAttrs features.xen_dom0 { + XEN = option yes; + XEN_DOM0 = option yes; PCI_XEN = option yes; HVC_XEN = option yes; HVC_XEN_FRONTEND = option yes; @@ -572,7 +567,7 @@ let XEN_SELFBALLOONING = option yes; XEN_STUB = option yes; XEN_TMEM = option yes; - }); + }; media = { MEDIA_DIGITAL_TV_SUPPORT = yes; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index f91dcbac1327..50553d009cb8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -386,6 +386,12 @@ mapAliases ({ linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + # added 2021-04-04 + linuxPackages_xen_dom0 = linuxPackages; + linuxPackages_latest_xen_dom0 = linuxPackages_latest; + linuxPackages_xen_dom0_hardened = linuxPackages_hardened; + linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; + linux-steam-integration = throw "linux-steam-integration has been removed, as the upstream project has been abandoned"; # added 2020-05-22 loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lprof = throw "lprof has been removed as it's unmaintained upstream and broken in nixpkgs since a while ago"; # added 2021-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2acf350d14f5..bc728f124509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20034,11 +20034,6 @@ in # Build a kernel with bcachefs module linuxPackages_testing_bcachefs = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing_bcachefs); - # Build a kernel for Xen dom0 - linuxPackages_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); - - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); - # Hardened Linux hardenedLinuxPackagesFor = kernel': overrides: let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates: @@ -20062,10 +20057,6 @@ in linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { }); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux { features.xen_dom0=true; }); - - linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest { features.xen_dom0=true; }); - # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_hardkernel_4_14); linuxPackages_hardkernel_latest = linuxPackages_hardkernel_4_14; From 04af447ba9f384d5238812e9b1eee55defda82f9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 4 Apr 2021 17:33:25 +0200 Subject: [PATCH 0491/1183] python3Packages.pytest: 6.2.2 -> 6.2.3 https://github.com/pytest-dev/pytest/releases/tag/6.2.3 --- pkgs/development/python-modules/pytest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 4c6d76833ed3..07e4a44ccd3e 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -19,12 +19,12 @@ buildPythonPackage rec { pname = "pytest"; - version = "6.2.2"; + version = "6.2.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-nR7fnn0LhNcuo9vN/SKzX7VDpejypgCS3VeJNr9j1/k="; + sha256 = "0d5nx7xqr9khagbvg6ac2cjjvcxrvvjp0chwim4z7w2ddsj3h4k7"; }; nativeBuildInputs = [ setuptools-scm ]; From 9af3213d26ac5e5acb140782e1635af991af7ed6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 4 Apr 2021 21:37:05 +0000 Subject: [PATCH 0492/1183] libfabric: 1.12.0 -> 1.12.1 --- pkgs/os-specific/linux/libfabric/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 0bc1ed123dcc..9a1e44f6af99 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.12.0"; + version = "1.12.1"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OFp6nEW5D8vjglqLRbEgKryb2/KFuJD8Zn6rkpcuPh0="; + sha256 = "sha256-J2PoDwjPWYpagX4M2k9E1xitBzgRUZzwX9Gf00H+Tdc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ] ; From b86327ef9320d385999b65a81ce7146f2aa3ce58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 30 Mar 2021 10:10:39 +0200 Subject: [PATCH 0493/1183] pythonPackages.pandas: skip hanging/crashing test --- pkgs/development/python-modules/pandas/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index 7fd551e192c9..df44b4998058 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -110,6 +110,13 @@ buildPythonPackage rec { "test_clipboard" ]; + disabledTestPaths = [ + # some test in this file either crashes python or hangs for hours + # TODO: figure out why and how to fix it + "tests/io/pytables/test_pytables_missing.py" + "tests/io/pytables/test_store.py" + ]; + # Tests have relative paths, and need to reference compiled C extensions # so change directory where `import .test` is able to be resolved preCheck = '' From fffbc7ac554794a8f68377dd3177ab1302819382 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 24 Mar 2021 12:06:34 -0700 Subject: [PATCH 0494/1183] python3Packages.jupyterlab-widgets: init at 1.0.0 --- .../jupyterlab-widgets/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/jupyterlab-widgets/default.nix diff --git a/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/pkgs/development/python-modules/jupyterlab-widgets/default.nix new file mode 100644 index 000000000000..c4589ce1b933 --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-widgets/default.nix @@ -0,0 +1,30 @@ +{ lib, buildPythonPackage, fetchPypi +, jupyter-packaging +}: + +buildPythonPackage rec { + pname = "jupyterlab-widgets"; + version = "1.0.0"; + + src = fetchPypi { + pname = "jupyterlab_widgets"; + inherit version; + sha256 = "0y7vhhas3qndiypcpcfnhrj9n92v2w4hdc86nn620s9h9nl2j6jw"; + }; + + nativeBuildInputs = [ + jupyter-packaging + ]; + + # has no tests + doCheck = false; + + pythonImportsCheck = [ "jupyterlab_widgets" ]; + + meta = with lib; { + description = "Jupyter Widgets JupyterLab Extension"; + homepage = "https://github.com/jupyter-widgets/ipywidgets"; + license = licenses.bsd3; + maintainers = with maintainers; [ jonringer SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42e8892e2c97..19f0c25fbd29 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3414,6 +3414,8 @@ in { jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + jupyterlab-widgets = callPackage ../development/python-modules/jupyterlab-widgets { }; + jupyter-packaging = callPackage ../development/python-modules/jupyter-packaging { }; jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { From 57db8706688c23768a86369e7e894347ed7674b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Apr 2021 23:49:13 +0200 Subject: [PATCH 0495/1183] pythonPackages.jupyter-packaging: 0.8.0 -> 0.8.2 Required for jupyterlab-widgets or it crashes at install time. --- pkgs/development/python-modules/jupyter-packaging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-packaging/default.nix b/pkgs/development/python-modules/jupyter-packaging/default.nix index 60077e5bcf07..da45616dfadf 100644 --- a/pkgs/development/python-modules/jupyter-packaging/default.nix +++ b/pkgs/development/python-modules/jupyter-packaging/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "jupyter-packaging"; - version = "0.8.0"; + version = "0.8.2"; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "jupyter_packaging"; inherit version; - sha256 = "276c9f884286695f6ab57a017f4bb9dd4df4f5e232b783050d2aa55b6b9ed650"; + sha256 = "sha256-ddzJDcFyY5Iida4QvpACh0FRBIy95IQHCEF5HQl5QbI="; }; propagatedBuildInputs = [ deprecation packaging tomlkit ]; From 28aa864133d56fd714fca5331419bb5a69f80a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 4 Apr 2021 23:49:33 +0200 Subject: [PATCH 0496/1183] pythonPackages.ipywidgets: fix depedencies after python mass update --- pkgs/development/python-modules/ipywidgets/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index eb6bf597d40b..a0087131b1af 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -7,6 +7,7 @@ , mock , ipython , ipykernel +, jupyterlab-widgets , traitlets , notebook , widgetsnbextension @@ -28,6 +29,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ipython ipykernel + jupyterlab-widgets traitlets notebook widgetsnbextension From 3e6464e1593646179a1d72f1eca6648513bdb359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 03:44:29 +0200 Subject: [PATCH 0497/1183] Revert "pythonPackages.pandas: skip hanging/crashing test" This reverts commit b86327ef9320d385999b65a81ce7146f2aa3ce58. This is a temporary hack which can't be merged into master at some point because the package is actually broken. The real issue will likely be fixed in #118454. --- pkgs/development/python-modules/pandas/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index df44b4998058..7fd551e192c9 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -110,13 +110,6 @@ buildPythonPackage rec { "test_clipboard" ]; - disabledTestPaths = [ - # some test in this file either crashes python or hangs for hours - # TODO: figure out why and how to fix it - "tests/io/pytables/test_pytables_missing.py" - "tests/io/pytables/test_store.py" - ]; - # Tests have relative paths, and need to reference compiled C extensions # so change directory where `import .test` is able to be resolved preCheck = '' From f310134deca455fe21d96e85993f1e6c86a0304e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 5 Apr 2021 10:54:26 +0200 Subject: [PATCH 0498/1183] python39: 3.9.3 -> 3.9.4 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 07d52a532fb4..d74e017d8307 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -176,10 +176,10 @@ in { sourceVersion = { major = "3"; minor = "9"; - patch = "3"; + patch = "4"; suffix = ""; }; - sha256 = "MIEQOcZeBMFPxpjkI5R+Rk+TFuaftEYQvThEYEa7grU="; + sha256 = "Sw5mRKdvjfhkriSsUApRu/aL0Jj2oXPifTthzcqaoTQ="; inherit (darwin) configd; inherit passthruFun; }; From 25208eeaba9e009a8248d1f720d1d5cc130dd05a Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 4 Apr 2021 14:55:56 +0000 Subject: [PATCH 0499/1183] linux: remove xen_dom0 feature entirely Xen is now enabled unconditionally on kernels that support it, so the xen_dom0 feature doesn't do anything. The isXen attribute will now produce a deprecation warning and unconditionally return true. Passing in a custom value for isXen is no longer supported. --- nixos/modules/virtualisation/xen-dom0.nix | 3 --- pkgs/os-specific/linux/kernel/generic.nix | 5 ++--- pkgs/os-specific/linux/kernel/manual-config.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 5b57ca860da2..b649d64be3ca 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -161,9 +161,6 @@ in environment.systemPackages = [ cfg.package ]; - # Make sure Domain 0 gets the required configuration - #boot.kernelPackages = pkgs.boot.kernelPackages.override { features={xen_dom0=true;}; }; - boot.kernelModules = [ "xen-evtchn" "xen-gntdev" "xen-gntalloc" "xen-blkback" "xen-netback" "xen-pciback" "evtchn" "gntdev" "netbk" "blkbk" "xen-scsibk" diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index ac9d6fbb2b59..4518b5a336bb 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -46,7 +46,6 @@ stdenv.hostPlatform != stdenv.buildPlatform , extraMeta ? {} -, isXen ? features.xen_dom0 or false , isZen ? false , isLibre ? false , isHardened ? false @@ -74,7 +73,6 @@ let needsCifsUtils = true; netfilterRPFilter = true; grsecurity = false; - xen_dom0 = false; ia32Emulation = true; } // features) kernelPatches; @@ -178,7 +176,8 @@ let passthru = { features = kernelFeatures; - inherit commonStructuredConfig isXen isZen isHardened isLibre; + inherit commonStructuredConfig isZen isHardened isLibre; + isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; passthru = kernel.passthru // (removeAttrs passthru [ "passthru" ]); diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 2fc63322f5b5..e45b21ff35fb 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -37,7 +37,6 @@ in { extraMeta ? {}, # for module compatibility - isXen ? features.xen_dom0 or false, isZen ? false, isLibre ? false, isHardened ? false, @@ -94,7 +93,8 @@ let passthru = { inherit version modDirVersion config kernelPatches configfile moduleBuildDependencies stdenv; - inherit isXen isZen isHardened isLibre; + inherit isZen isHardened isLibre; + isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; kernelOlder = lib.versionOlder version; kernelAtLeast = lib.versionAtLeast version; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ca19cb30c05..4fab58b566b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19777,7 +19777,7 @@ in inherit (kernel) stdenv; # in particular, use the same compiler by default # to help determine module compatibility - inherit (kernel) isXen isZen isHardened isLibre; + inherit (kernel) isZen isHardened isLibre; inherit (kernel) kernelOlder kernelAtLeast; # Obsolete aliases (these packages do not depend on the kernel). From 6602e309e19538ab5dfbce1f7f6aaaa0d5219600 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 5 Apr 2021 15:33:29 +0200 Subject: [PATCH 0500/1183] libxkbcommon: 1.1.0 -> 1.2.0 (#118589) --- .../libraries/libxkbcommon/default.nix | 9 +++------ .../libxkbcommon/fix-cross-compilation.patch | 20 ------------------- 2 files changed, 3 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index fbf3117fa357..4e0c4033cb45 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,19 +8,16 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "0in2fq2x4yhyjmcn9n5n43zsawsdh12d4sm6l57934kgb75gqb21"; + sha256 = "16is71cgqnvpl55y9kh1zb7r2gx2f3a1abljm7drjp90nbr7imlg"; }; - patches = [ - ./fix-cross-compilation.patch - ]; - outputs = [ "out" "dev" "doc" ]; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ] ++ lib.optional withWaylandSupport wayland; buildInputs = [ xkeyboard_config libxcb libxml2 ] diff --git a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch b/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch deleted file mode 100644 index 55730554a90f..000000000000 --- a/pkgs/development/libraries/libxkbcommon/fix-cross-compilation.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/meson.build b/meson.build -index 47c436f..536c60b 100644 ---- a/meson.build -+++ b/meson.build -@@ -440,13 +440,12 @@ if build_tools - if get_option('enable-wayland') - wayland_client_dep = dependency('wayland-client', version: '>=1.2.0', required: false) - wayland_protocols_dep = dependency('wayland-protocols', version: '>=1.12', required: false) -- wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true) -- if not wayland_client_dep.found() or not wayland_protocols_dep.found() or not wayland_scanner_dep.found() -+ if not wayland_client_dep.found() or not wayland_protocols_dep.found() - error('''The Wayland xkbcli programs require wayland-client >= 1.2.0, wayland-protocols >= 1.7 which were not found. - You can disable the Wayland xkbcli programs with -Denable-wayland=false.''') - endif - -- wayland_scanner = find_program(wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner')) -+ wayland_scanner = find_program('wayland-scanner', native: true) - wayland_scanner_code_gen = generator( - wayland_scanner, - output: '@BASENAME@-protocol.c', From 87c1a24c477a3665d40831d2c537c7e6d3f54cad Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 5 Apr 2021 20:37:17 +0200 Subject: [PATCH 0501/1183] libzip: install man-pages and add optionas for three optional dependencies (#118464) Co-authored-by: Sandro --- pkgs/development/libraries/libzip/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index ddefa16c2c1d..a3f7f3ef5f6f 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -4,6 +4,13 @@ , fetchurl , perl , zlib +, groff +, withBzip2 ? false +, bzip2 +, withLZMA ? false +, xz +, withOpenssl ? false +, openssl }: stdenv.mkDerivation rec { @@ -11,7 +18,7 @@ stdenv.mkDerivation rec { version = "1.7.3"; src = fetchurl { - url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; + url = "https://libzip.org/download/${pname}-${version}.tar.gz"; sha256 = "1k5rihiz7m1ahhjzcbq759hb9crzqkgw78pkxga118y5a32pc8hf"; }; @@ -23,10 +30,13 @@ stdenv.mkDerivation rec { }) ]; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ cmake perl ]; + nativeBuildInputs = [ cmake perl groff ]; propagatedBuildInputs = [ zlib ]; + buildInputs = lib.optionals withLZMA [ xz ] + ++ lib.optionals withBzip2 [ bzip2 ] + ++ lib.optionals withOpenssl [ openssl ]; preCheck = '' # regress/runtest is a generated file @@ -34,9 +44,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://www.nih.at/libzip"; + homepage = "https://libzip.org/"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; platforms = platforms.unix; + changelog = "https://github.com/nih-at/libzip/blob/v${version}/NEWS.md"; }; } From f40b3249f1219e782875a74ab81cf482dc5e4a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 5 Apr 2021 23:48:11 +0200 Subject: [PATCH 0502/1183] mailcap: 2.1.48 -> 2.1.52 --- pkgs/data/misc/mailcap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/mailcap/default.nix b/pkgs/data/misc/mailcap/default.nix index 725d4ded0eba..56d10e5b350e 100644 --- a/pkgs/data/misc/mailcap/default.nix +++ b/pkgs/data/misc/mailcap/default.nix @@ -1,23 +1,23 @@ { lib, fetchzip }: let - version = "2.1.48"; + version = "2.1.52"; in fetchzip { name = "mailcap-${version}"; url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz"; - sha256 = "08d0avz8971hkggd60dk9yyd14izz24yag3prpfafbvm670jlmqg"; + sha256 = "sha256-2GRNg3zoMPMaOk2zoAx5sVIzjbQhnYJuaO8nrzWujVc="; postFetch = '' tar -xavf $downloadedFile --strip-components=1 substituteInPlace mailcap --replace "/usr/bin/" "" - gzip mailcap.4 + gzip mailcap.5 sh generate-nginx-mimetypes.sh < mime.types > nginx-mime.types install -D -m0644 nginx-mime.types $out/etc/nginx/mime.types install -D -m0644 -t $out/etc mailcap mime.types - install -D -m0644 -t $out/share/man/man4 mailcap.4.gz + install -D -m0644 -t $out/share/man/man5 mailcap.5.gz ''; meta = with lib; { From a10183d3ecdb391a867c8b8da21ca07ae3d6e5cf Mon Sep 17 00:00:00 2001 From: Thomas Bereknyei Date: Mon, 5 Apr 2021 00:21:11 -0400 Subject: [PATCH 0503/1183] ruby: reproducible Generated Makefile's were nested deeper than the existing rm would be able to remove. --- pkgs/development/ruby-modules/gem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 20667988548c..c8dba5142082 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -217,8 +217,8 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // { # looks like useless files which break build repeatability and consume space pushd $out/${ruby.gemPath} - rm -fv doc/*/*/created.rid || true - rm -fv {gems/*/ext/*,extensions/*/*/*}/{Makefile,mkmf.log,gem_make.out} || true + find doc/ -iname created.rid -delete -print + find gems/*/ext/ extensions/ \( -iname Makefile -o -iname mkmf.log -o -iname gem_make.out \) -delete -print ${if keepGemCache then "" else "rm -fvr cache"} popd From 52cd3538ff0214f0416455322cec299d2a43a436 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 5 Apr 2021 10:01:58 +0000 Subject: [PATCH 0504/1183] linux: remove remnants of grsecurity Nixpkgs hasn't supported grsecurity kernels since 2017, so unless anybody is manually enabling the grsecurity feature to make these small kernel tweaks this is dead code. This means we don't actually support any "features" in the kernel common-config any more, but I've left the argument there because it's conceivable we could have some again in future. --- pkgs/os-specific/linux/anbox/kmod.nix | 2 +- pkgs/os-specific/linux/kernel/common-config.nix | 10 +++++----- pkgs/os-specific/linux/kernel/generic.nix | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index f62e6ee6aa53..1ed6d9c5f723 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; - broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity or false); + broken = (versionOlder kernel.version "4.4"); maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 488aa30c54a1..213f344add1e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -12,7 +12,7 @@ # Configuration { lib, stdenv, version -, features ? { grsecurity = false; } +, features ? {} }: with lib; @@ -42,7 +42,7 @@ let TIMER_STATS = whenOlder "4.11" yes; DEBUG_NX_TEST = whenOlder "4.11" no; DEBUG_STACK_USAGE = no; - DEBUG_STACKOVERFLOW = mkIf (!features.grsecurity) (option no); + DEBUG_STACKOVERFLOW = option no; RCU_TORTURE_TEST = no; SCHEDSTATS = no; DETECT_HUNG_TASK = yes; @@ -443,7 +443,7 @@ let SECURITY_SELINUX_BOOTPARAM_VALUE = whenOlder "5.1" (freeform "0"); # Disable SELinux by default # Prevent processes from ptracing non-children processes SECURITY_YAMA = option yes; - DEVKMEM = mkIf (!features.grsecurity) no; # Disable /dev/kmem + DEVKMEM = no; # Disable /dev/kmem USER_NS = yes; # Support for user namespaces @@ -523,7 +523,7 @@ let virtualisation = { PARAVIRT = option yes; - HYPERVISOR_GUEST = mkIf (!features.grsecurity) yes; + HYPERVISOR_GUEST = yes; PARAVIRT_SPINLOCKS = option yes; KVM_APIC_ARCHITECTURE = whenOlder "4.8" yes; @@ -531,7 +531,7 @@ let KVM_COMPAT = { optional = true; tristate = whenBetween "4.0" "4.12" "y"; }; KVM_DEVICE_ASSIGNMENT = { optional = true; tristate = whenBetween "3.10" "4.12" "y"; }; KVM_GENERIC_DIRTYLOG_READ_PROTECT = whenAtLeast "4.0" yes; - KVM_GUEST = mkIf (!features.grsecurity) yes; + KVM_GUEST = yes; KVM_MMIO = yes; KVM_VFIO = yes; KSM = yes; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 4518b5a336bb..1c289d860027 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -72,7 +72,6 @@ let efiBootStub = true; needsCifsUtils = true; netfilterRPFilter = true; - grsecurity = false; ia32Emulation = true; } // features) kernelPatches; From 7d01c1e6d59792838ca9f15c4a6ce17e504db02f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 5 Apr 2021 13:04:24 +0200 Subject: [PATCH 0505/1183] fontforge-fonttools: Install all tools Since CMake port, the contrib files are not installed. Let's use a Debian patch to install them. --- pkgs/tools/misc/fontforge/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ffee232172c0..89bd0f0491ee 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib +{ stdenv, fetchpatch, fetchFromGitHub, lib , cmake, perl, uthash, pkg-config, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, cairo, pango , readline, woff2, zeromq, libuninameslist @@ -23,6 +23,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-Rl/5lbXaPgIndANaD0IakaDus6T53FjiBb45FIuGrvc="; }; + patches = [ + # Allow installing contrib files (e.g. extras and tools). + # Taken from https://salsa.debian.org/fonts-team/fontforge/-/blob/master/debian/patches/0001-add-extra-cmake-install-rules.patch + (fetchpatch { + url = "https://salsa.debian.org/fonts-team/fontforge/raw/76bffe6ccf8ab20a0c81476a80a87ad245e2fd1c/debian/patches/0001-add-extra-cmake-install-rules.patch"; + sha256 = "u3D9od2xLECNEHhZ+8dkuv9818tPkdP6y/Tvd9CADJg="; + }) + ]; + # use $SOURCE_DATE_EPOCH instead of non-deterministic timestamps postPatch = '' find . -type f -name '*.c' -exec sed -r -i 's#\btime\(&(.+)\)#if (getenv("SOURCE_DATE_EPOCH")) \1=atol(getenv("SOURCE_DATE_EPOCH")); else &#g' {} \; From c2da1d7b53b14f98712cecaf3b7e920655d06487 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Tue, 9 Mar 2021 13:15:07 -0500 Subject: [PATCH 0506/1183] nixos: iscsi/target: init module Co-authored-by: Graham Christensen --- nixos/modules/module-list.nix | 1 + .../services/networking/iscsi/target.nix | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 nixos/modules/services/networking/iscsi/target.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index eaf046b160f1..e4dc87bb17d9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -691,6 +691,7 @@ ./services/networking/iodine.nix ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix + ./services/networking/iscsi/target.nix ./services/networking/iwd.nix ./services/networking/jicofo.nix ./services/networking/jitsi-videobridge.nix diff --git a/nixos/modules/services/networking/iscsi/target.nix b/nixos/modules/services/networking/iscsi/target.nix new file mode 100644 index 000000000000..8a10e7d346ae --- /dev/null +++ b/nixos/modules/services/networking/iscsi/target.nix @@ -0,0 +1,53 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.target; +in +{ + ###### interface + options = { + services.target = with types; { + enable = mkEnableOption "the kernel's LIO iscsi target"; + + config = mkOption { + type = attrs; + default = {}; + description = '' + Content of /etc/target/saveconfig.json + This file is normally read and written by targetcli + ''; + }; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + environment.etc."target/saveconfig.json" = { + text = builtins.toJSON cfg.config; + mode = "0600"; + }; + + environment.systemPackages = with pkgs; [ targetcli ]; + + boot.kernelModules = [ "configfs" "target_core_mod" "iscsi_target_mod" ]; + + systemd.services.iscsi-target = { + enable = true; + after = [ "network.target" "local-fs.target" ]; + requires = [ "sys-kernel-config.mount" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.python3.pkgs.rtslib}/bin/targetctl restore"; + ExecStop = "${pkgs.python3.pkgs.rtslib}/bin/targetctl clear"; + RemainAfterExit = "yes"; + }; + }; + + systemd.tmpfiles.rules = [ + "d /etc/target 0700 root root - -" + ]; + }; +} From 39b5040a4b2da961984dbeafd96c5747260243ba Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 18 Oct 2020 19:51:47 +0200 Subject: [PATCH 0507/1183] nixos/iscsi/initiator: init Co-authored-by: Graham Christensen --- nixos/modules/module-list.nix | 1 + .../services/networking/iscsi/initiator.nix | 84 +++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 nixos/modules/services/networking/iscsi/initiator.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e4dc87bb17d9..dccd19b8d3fd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -691,6 +691,7 @@ ./services/networking/iodine.nix ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix + ./services/networking/iscsi/initiator.nix ./services/networking/iscsi/target.nix ./services/networking/iwd.nix ./services/networking/jicofo.nix diff --git a/nixos/modules/services/networking/iscsi/initiator.nix b/nixos/modules/services/networking/iscsi/initiator.nix new file mode 100644 index 000000000000..cbc919a2f76c --- /dev/null +++ b/nixos/modules/services/networking/iscsi/initiator.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: with lib; +let + cfg = config.services.openiscsi; +in +{ + options.services.openiscsi = with types; { + enable = mkEnableOption "the openiscsi iscsi daemon"; + enableAutoLoginOut = mkEnableOption '' + automatic login and logout of all automatic targets. + You probably do not want this. + ''; + discoverPortal = mkOption { + type = nullOr str; + default = null; + description = "Portal to discover targets on"; + }; + name = mkOption { + type = str; + description = "Name of this iscsi initiator"; + example = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; + }; + package = mkOption { + type = package; + description = "openiscsi package to use"; + default = pkgs.openiscsi; + defaultText = "pkgs.openiscsi"; + }; + + extraConfig = mkOption { + type = str; + default = ""; + description = "Lines to append to default iscsid.conf"; + }; + + extraConfigFile = mkOption { + description = '' + Append an additional file's contents to /etc/iscsid.conf. Use a non-store path + and store passwords in this file. + ''; + default = null; + type = nullOr str; + }; + }; + + config = mkIf cfg.enable { + environment.etc."iscsi/iscsid.conf.fragment".source = pkgs.runCommand "iscsid.conf" {} '' + cat "${cfg.package}/etc/iscsi/iscsid.conf" > $out + cat << 'EOF' >> $out + ${cfg.extraConfig} + ${optionalString cfg.enableAutoLoginOut "node.startup = automatic"} + EOF + ''; + environment.etc."iscsi/initiatorname.iscsi".text = "InitiatorName=${cfg.name}"; + + system.activationScripts.iscsid = let + extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' + if [ -f "${cfg.extraConfigFile}" ]; then + printf "\n# The following is from ${cfg.extraConfigFile}:\n" + cat "${cfg.extraConfigFile}" + else + echo "Warning: services.openiscsi.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 + fi + ''; + in '' + ( + cat ${config.environment.etc."iscsi/iscsid.conf.fragment".source} + ${extraCfgDumper} + ) > /etc/iscsi/iscsid.conf + ''; + + systemd.packages = [ cfg.package ]; + + systemd.services."iscsid".wantedBy = [ "multi-user.target" ]; + systemd.sockets."iscsid".wantedBy = [ "sockets.target" ]; + + systemd.services."iscsi" = mkIf cfg.enableAutoLoginOut { + wantedBy = [ "remote-fs.target" ]; + serviceConfig.ExecStartPre = mkIf (cfg.discoverPortal != null) "${cfg.package}/bin/iscsiadm --mode discoverydb --type sendtargets --portal ${escapeShellArg cfg.discoverPortal} --discover"; + }; + + environment.systemPackages = [ cfg.package ]; + boot.kernelModules = [ "iscsi_tcp" ]; + }; +} From 47598c476ad8d567f70ec37e7e628ccc599d3490 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 18 Oct 2020 19:52:18 +0200 Subject: [PATCH 0508/1183] nixos/iscsi/root-initiator: init Co-authored-by: Graham Christensen --- nixos/modules/module-list.nix | 1 + .../networking/iscsi/root-initiator.nix | 181 ++++++++++++++++++ 2 files changed, 182 insertions(+) create mode 100644 nixos/modules/services/networking/iscsi/root-initiator.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dccd19b8d3fd..2a7681200483 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -692,6 +692,7 @@ ./services/networking/iperf3.nix ./services/networking/ircd-hybrid/default.nix ./services/networking/iscsi/initiator.nix + ./services/networking/iscsi/root-initiator.nix ./services/networking/iscsi/target.nix ./services/networking/iwd.nix ./services/networking/jicofo.nix diff --git a/nixos/modules/services/networking/iscsi/root-initiator.nix b/nixos/modules/services/networking/iscsi/root-initiator.nix new file mode 100644 index 000000000000..3274878c4fae --- /dev/null +++ b/nixos/modules/services/networking/iscsi/root-initiator.nix @@ -0,0 +1,181 @@ +{ config, lib, pkgs, ... }: with lib; +let + cfg = config.boot.iscsi-initiator; +in +{ + # If you're booting entirely off another machine you may want to add + # this snippet to always boot the latest "system" version. It is not + # enabled by default in case you have an initrd on a local disk: + # + # boot.initrd.postMountCommands = '' + # ln -sfn /nix/var/nix/profiles/system/init /mnt-root/init + # stage2Init=/init + # ''; + # + # Note: Theoretically you might want to connect to multiple portals and + # log in to multiple targets, however the authors of this module so far + # don't have the need or expertise to reasonably implement it. Also, + # consider carefully before making your boot chain depend on multiple + # machines to be up. + options.boot.iscsi-initiator = with types; { + name = mkOption { + description = '' + Name of the iSCSI initiator to boot from. Note, booting from iscsi + requires networkd based networking. + ''; + default = null; + example = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; + type = nullOr str; + }; + + discoverPortal = mkOption { + description = '' + iSCSI portal to boot from. + ''; + default = null; + example = "192.168.1.1:3260"; + type = nullOr str; + }; + + target = mkOption { + description = '' + Name of the iSCSI target to boot from. + ''; + default = null; + example = "iqn.2020-08.org.linux-iscsi.targethost:example"; + type = nullOr str; + }; + + logLevel = mkOption { + description = '' + Higher numbers elicits more logs. + ''; + default = 1; + example = 8; + type = int; + }; + + loginAll = mkOption { + description = '' + Do not log into a specific target on the portal, but to all that we discover. + This overrides setting target. + ''; + type = bool; + default = false; + }; + + extraConfig = mkOption { + description = "Extra lines to append to /etc/iscsid.conf"; + default = null; + type = nullOr lines; + }; + + extraConfigFile = mkOption { + description = '' + Append an additional file's contents to `/etc/iscsid.conf`. Use a non-store path + and store passwords in this file. Note: the file specified here must be available + in the initrd, see: `boot.initrd.secrets`. + ''; + default = null; + type = nullOr str; + }; + }; + + config = mkIf (cfg.name != null) { + # The "scripted" networking configuration (ie: non-networkd) + # doesn't properly order the start and stop of the interfaces, and the + # network interfaces are torn down before unmounting disks. Since this + # module is specifically for very-early-boot network mounts, we need + # the network to stay on. + # + # We could probably fix the scripted options to properly order, but I'm + # not inclined to invest that time today. Hopefully this gets users far + # enough along and they can just use networkd. + networking.useNetworkd = true; + networking.useDHCP = false; # Required to set useNetworkd = true + + boot.initrd = { + network.enable = true; + + # By default, the stage-1 disables the network and resets the interfaces + # on startup. Since our startup disks are on the network, we can't let + # the network not work. + network.flushBeforeStage2 = false; + + kernelModules = [ "iscsi_tcp" ]; + + extraUtilsCommands = '' + copy_bin_and_libs ${pkgs.openiscsi}/bin/iscsid + copy_bin_and_libs ${pkgs.openiscsi}/bin/iscsiadm + ${optionalString (!config.boot.initrd.network.ssh.enable) "cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib"} + + mkdir -p $out/etc/iscsi + cp ${config.environment.etc.hosts.source} $out/etc/hosts + cp ${pkgs.openiscsi}/etc/iscsi/iscsid.conf $out/etc/iscsi/iscsid.fragment.conf + chmod +w $out/etc/iscsi/iscsid.fragment.conf + cat << 'EOF' >> $out/etc/iscsi/iscsid.fragment.conf + ${optionalString (cfg.extraConfig != null) cfg.extraConfig} + EOF + ''; + + extraUtilsCommandsTest = '' + $out/bin/iscsiadm --version + ''; + + preLVMCommands = let + extraCfgDumper = optionalString (cfg.extraConfigFile != null) '' + if [ -f "${cfg.extraConfigFile}" ]; then + printf "\n# The following is from ${cfg.extraConfigFile}:\n" + cat "${cfg.extraConfigFile}" + else + echo "Warning: boot.iscsi-initiator.extraConfigFile ${cfg.extraConfigFile} does not exist!" >&2 + fi + ''; + in '' + ${optionalString (!config.boot.initrd.network.ssh.enable) '' + # stolen from initrd-ssh.nix + echo 'root:x:0:0:root:/root:/bin/ash' > /etc/passwd + echo 'passwd: files' > /etc/nsswitch.conf + ''} + + cp -f $extraUtils/etc/hosts /etc/hosts + + mkdir -p /etc/iscsi /run/lock/iscsi + echo "InitiatorName=${cfg.name}" > /etc/iscsi/initiatorname.iscsi + + ( + cat "$extraUtils/etc/iscsi/iscsid.fragment.conf" + printf "\n" + ${optionalString cfg.loginAll ''echo "node.startup = automatic"''} + ${extraCfgDumper} + ) > /etc/iscsi/iscsid.conf + + iscsid --foreground --no-pid-file --debug ${toString cfg.logLevel} & + iscsiadm --mode discoverydb \ + --type sendtargets \ + --discover \ + --portal ${escapeShellArg cfg.discoverPortal} \ + --debug ${toString cfg.logLevel} + + ${if cfg.loginAll then '' + iscsiadm --mode node --loginall all + '' else '' + iscsiadm --mode node --targetname ${escapeShellArg cfg.target} --login + ''} + pkill -9 iscsid + ''; + }; + + services.openiscsi = { + enable = true; + inherit (cfg) name; + }; + + assertions = [ + { + assertion = cfg.loginAll -> cfg.target == null; + message = "iSCSI target name is set while login on all portals is enabled."; + } + ]; + }; +} From d48e871ec0ef73f19f88dec4f49978279f71de72 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 18 Oct 2020 19:55:42 +0200 Subject: [PATCH 0509/1183] nixosTests.iscsi-root: init Co-authored-by: Graham Christensen --- nixos/tests/all-tests.nix | 1 + nixos/tests/iscsi-root.nix | 161 +++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 nixos/tests/iscsi-root.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 62188ddf9e8d..6c8a21785b66 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -183,6 +183,7 @@ in iodine = handleTest ./iodine.nix {}; ipfs = handleTest ./ipfs.nix {}; ipv6 = handleTest ./ipv6.nix {}; + iscsi-root = handleTest ./iscsi-root.nix {}; jackett = handleTest ./jackett.nix {}; jellyfin = handleTest ./jellyfin.nix {}; jenkins = handleTest ./jenkins.nix {}; diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix new file mode 100644 index 000000000000..bda51d2c2e42 --- /dev/null +++ b/nixos/tests/iscsi-root.nix @@ -0,0 +1,161 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + let + initiatorName = "iqn.2020-08.org.linux-iscsi.initiatorhost:example"; + targetName = "iqn.2003-01.org.linux-iscsi.target.x8664:sn.acf8fd9c23af"; + in + { + name = "iscsi"; + meta = { + maintainers = pkgs.lib.teams.deshaw.members + ++ (with pkgs.lib.maintainers; [ ajs124 ]); + }; + + nodes = { + target = { config, pkgs, lib, ... }: { + services.target = { + enable = true; + config = { + fabric_modules = []; + storage_objects = [ + { + dev = "/dev/vdb"; + name = "test"; + plugin = "block"; + write_back = true; + wwn = "92b17c3f-6b40-4168-b082-ceeb7b495522"; + } + ]; + targets = [ + { + fabric = "iscsi"; + tpgs = [ + { + enable = true; + attributes = { + authentication = 0; + generate_node_acls = 1; + }; + luns = [ + { + alias = "94dfe06967"; + alua_tg_pt_gp_name = "default_tg_pt_gp"; + index = 0; + storage_object = "/backstores/block/test"; + } + ]; + node_acls = [ + { + mapped_luns = [ + { + alias = "d42f5bdf8a"; + index = 0; + tpg_lun = 0; + write_protect = false; + } + ]; + node_wwn = initiatorName; + } + ]; + portals = [ + { + ip_address = "0.0.0.0"; + iser = false; + offload = false; + port = 3260; + } + ]; + tag = 1; + } + ]; + wwn = targetName; + } + ]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 3260 ]; + networking.firewall.allowedUDPPorts = [ 3260 ]; + + virtualisation.memorySize = 2048; + virtualisation.emptyDiskImages = [ 2048 ]; + }; + + initiatorAuto = { nodes, config, pkgs, ... }: { + services.openiscsi = { + enable = true; + enableAutoLoginOut = true; + discoverPortal = "target"; + name = initiatorName; + }; + + environment.systemPackages = with pkgs; [ + xfsprogs + ]; + + system.extraDependencies = [ nodes.initiatorRootDisk.config.system.build.toplevel ]; + + nix.binaryCaches = lib.mkForce []; + nix.extraOptions = '' + hashed-mirrors = + connect-timeout = 1 + ''; + }; + + initiatorRootDisk = { config, pkgs, modulesPath, lib, ... }: { + boot.loader.grub.enable = false; + boot.kernelParams = lib.mkOverride 5 ( + [ + "boot.shell_on_fail" + "console=tty1" + "ip=${config.networking.primaryIPAddress}:::255.255.255.0::ens9:none" + ] + ); + + # defaults to true, puts some code in the initrd that tries to mount an overlayfs on /nix/store + virtualisation.writableStore = false; + + fileSystems = lib.mkOverride 5 { + "/" = { + fsType = "xfs"; + device = "/dev/sda"; + options = [ "_netdev" ]; + }; + }; + + boot.iscsi-initiator = { + discoverPortal = "target"; + name = initiatorName; + target = targetName; + }; + }; + }; + + testScript = { nodes, ... }: '' + target.start() + target.wait_for_unit("iscsi-target.service") + + initiatorAuto.start() + + initiatorAuto.wait_for_unit("iscsid.service") + initiatorAuto.wait_for_unit("iscsi.service") + initiatorAuto.get_unit_info("iscsi") + + initiatorAuto.succeed("set -x; while ! test -e /dev/sda; do sleep 1; done") + + initiatorAuto.succeed("mkfs.xfs /dev/sda") + initiatorAuto.succeed("mkdir /mnt && mount /dev/sda /mnt") + initiatorAuto.succeed( + "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.config.system.build.toplevel}" + ) + initiatorAuto.succeed("umount /mnt && rmdir /mnt") + initiatorAuto.shutdown() + + initiatorRootDisk.start() + initiatorRootDisk.wait_for_unit("multi-user.target") + initiatorRootDisk.wait_for_unit("iscsid") + initiatorRootDisk.succeed("touch test") + initiatorRootDisk.shutdown() + ''; + } +) From 596e5eed55cbb4c368a89253976eef2e324aa725 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 4 Apr 2021 18:46:44 +0200 Subject: [PATCH 0510/1183] pythonPackages.backports-entry-points-selectable: init at 1.0.3 --- .../default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/backports-entry-points-selectable/default.nix diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix new file mode 100644 index 000000000000..a14d1fa920da --- /dev/null +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "backports.entry-points-selectable"; + version = "1.0.3"; + + src = fetchPypi { + inherit version; + # pypi project name and tarball name differ + pname = builtins.replaceStrings [ "-" ] [ "_" ] pname; + sha256 = "f30bcd19c5e2728ac93821d2b6ae0a325597e0ca12324fd91a39fa80e1cd0dd8"; + }; + + format = "pyproject"; + + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Compatibility shim providing selectable entry points for older implementations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/jaraco/backports.entry_points_selectable"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f460f07a0fc5..681497fc92da 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -896,6 +896,8 @@ in { backports-datetime-fromisoformat = callPackage ../development/python-modules/backports-datetime-fromisoformat { }; + backports-entry-points-selectable = callPackage ../development/python-modules/backports-entry-points-selectable { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; backports_lzma = callPackage ../development/python-modules/backports_lzma { }; From 563366d673d2537396de708e003d407383997141 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 4 Apr 2021 18:47:02 +0200 Subject: [PATCH 0511/1183] pythonPackages.pytest-randomly: 3.5.0 -> 3.6.0 * clean up some erroneously propagated dependencies * use pytestCheckHook, clarify specific test settings --- .../pytest-randomly/default.nix | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix index be8d675fc1ea..f8e240ca57e4 100644 --- a/pkgs/development/python-modules/pytest-randomly/default.nix +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -1,26 +1,35 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27 -, factory_boy, faker, numpy -, pytest, pytest_xdist +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, factory_boy, faker, numpy, backports-entry-points-selectable +, pytestCheckHook, pytest_xdist }: buildPythonPackage rec { pname = "pytest-randomly"; - version = "3.5.0"; + version = "3.6.0"; - disabled = isPy27; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "440cec143fd9b0adeb072006c71e0294402a2bc2ccd08079c2341087ba4cf2d1"; + # fetch from GitHub as pypi tarball doesn't include tests + src = fetchFromGitHub { + repo = pname; + owner = "pytest-dev"; + rev = version; + sha256 = "17s7gx8b7sl7mp77f5dxzwbb32qliz9awrp6xz58bhjqp7pcsa5h"; }; - propagatedBuildInputs = [ numpy factory_boy faker ]; + propagatedBuildInputs = [ + backports-entry-points-selectable + ]; - checkInputs = [ pytest pytest_xdist ]; - - # test warnings are fixed on an unreleased version: - # https://github.com/pytest-dev/pytest-randomly/pull/281 - checkPhase = "pytest -p no:randomly"; + checkInputs = [ + pytestCheckHook + pytest_xdist + numpy + factory_boy + faker + ]; + # needs special invocation, copied from tox.ini + pytestFlagsArray = [ "-p" "no:randomly" ]; meta = with lib; { description = "Pytest plugin to randomly order tests and control random.seed"; From 3d7c1202df37383279bdfe8f8f9cd373d19ea467 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Apr 2021 04:20:00 +0000 Subject: [PATCH 0512/1183] ruby_2_6: 2.6.6 -> 2.6.7 https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-6-7-released/ --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index b13c50f18d2e..06cb517316ee 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -249,10 +249,10 @@ let in { ruby_2_6 = generic { - version = rubyVersion "2" "6" "6" ""; + version = rubyVersion "2" "6" "7" ""; sha256 = { - src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn"; - git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50"; + src = "17m9qxalwhk95dw1qhgxbvr3kkcxs3h86yirfg5mwj35gy5pw8p4"; + git = "08gvknanwdfsaj3lmcv1bdqjf9lldphzi7gmlv3cfa8ligx2vbap"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 3abba61bc246..523526208076 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,7 +1,7 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.6.6" = ops useRailsExpress [ + "2.6.7" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" From 83612c3f9837e199453559580db10b1584a86afe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 7 Apr 2021 04:20:00 +0000 Subject: [PATCH 0513/1183] ruby_2_7: 2.7.2 -> 2.7.3 https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-7-3-released/ --- pkgs/development/interpreters/ruby/default.nix | 6 +++--- pkgs/development/interpreters/ruby/patchsets.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 06cb517316ee..337411f6c28a 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -257,10 +257,10 @@ in { }; ruby_2_7 = generic { - version = rubyVersion "2" "7" "2" ""; + version = rubyVersion "2" "7" "3" ""; sha256 = { - src = "1m63461mxi3fg4y3bspbgmb0ckbbb1ldgf9xi0piwkpfsk80cmvf"; - git = "0kbgznf1yprfp9645k31ra5f4757b7fichzi0hdg6nxkj90853s0"; + src = "0f2kwn98n9h9hy1fd547s7d0a7ga8jjm4nh294bwiwnq65gaj9c9"; + git = "0vxg9w4dgpw2ig5snxmkahvzdp2yh71w8qm49g35d5hqdsql7yrx"; }; }; diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 523526208076..2a26af52a407 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -6,7 +6,7 @@ "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.7.2" = ops useRailsExpress [ + "2.7.3" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" From 3042bf4a91daf110ea2070d95b3408ced0684a01 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 25 Mar 2021 21:02:01 -0500 Subject: [PATCH 0514/1183] kdeFrameworks: 5.79 -> 5.80 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 3ce0ca063ca1..05506b19385c 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.79/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.80/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 871c15d6c1a3..91d53f4df87c 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/attica-5.79.0.tar.xz"; - sha256 = "1p6rcpfq3ifz8c8ws5k085mzg7fya2dpv7ryd6iqwi083ys49wla"; - name = "attica-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/attica-5.80.0.tar.xz"; + sha256 = "0wffjjrk6rka25kgfq05j9fzxawysimpzi8jj3sw3kfz05mqdap3"; + name = "attica-5.80.0.tar.xz"; }; }; baloo = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/baloo-5.79.0.tar.xz"; - sha256 = "0l7z7260pjw6gmcnzp0v57dsypl2yxnm8dxfcdiln8gw2fisryc0"; - name = "baloo-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/baloo-5.80.0.tar.xz"; + sha256 = "0wdm03x1zm31nivf04qxih6gg18c97diff7ddaqqbz8c7jlhppzc"; + name = "baloo-5.80.0.tar.xz"; }; }; bluez-qt = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/bluez-qt-5.79.0.tar.xz"; - sha256 = "0snips4ak77zpz6x9bzr5lmal712lz64xns1bwlz80svzcikznpj"; - name = "bluez-qt-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/bluez-qt-5.80.0.tar.xz"; + sha256 = "08g56gnh0gkh7n92wqama9lbqk6pfdby9xbh8f2vgmnkzy07zrwn"; + name = "bluez-qt-5.80.0.tar.xz"; }; }; breeze-icons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/breeze-icons-5.79.0.tar.xz"; - sha256 = "06sd7grh7r6wnx8p8mhp7vfhsg3bnyafy94fj6jz6gg9m0308cn6"; - name = "breeze-icons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/breeze-icons-5.80.0.tar.xz"; + sha256 = "11353lgy2fh1d2fgbhg20fapsjzrpsxlf5zilrfkw8y0my690rm2"; + name = "breeze-icons-5.80.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/extra-cmake-modules-5.79.0.tar.xz"; - sha256 = "1n5yd3ggz5pq4qs7f86aqvzvfmxx2khsn1i1m67xhrn5k7dh55mj"; - name = "extra-cmake-modules-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/extra-cmake-modules-5.80.0.tar.xz"; + sha256 = "0r3gr6qrgljiq7bsks54xc68x9pf7i2gm9pgjq5kslw5ys0gsw13"; + name = "extra-cmake-modules-5.80.0.tar.xz"; }; }; frameworkintegration = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/frameworkintegration-5.79.0.tar.xz"; - sha256 = "0c0i8hqqvi65bh1ghb6ql1a8vqihxck6xhpki4g0ryipilvqmj21"; - name = "frameworkintegration-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/frameworkintegration-5.80.0.tar.xz"; + sha256 = "0sk9p4wk4hsr5sg0z24rc7fxrsdbxcpm5fw66v30lhncrlf9c7c7"; + name = "frameworkintegration-5.80.0.tar.xz"; }; }; kactivities = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kactivities-5.79.0.tar.xz"; - sha256 = "0d3ds43iqqlbii9xwp7f20nz338xqmq70a4v84zb5ks1mnhkz47l"; - name = "kactivities-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kactivities-5.80.0.tar.xz"; + sha256 = "14im60ig074axryhgz3qw1zjqhfai1gg0hq88spabvz22r5f340s"; + name = "kactivities-5.80.0.tar.xz"; }; }; kactivities-stats = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kactivities-stats-5.79.0.tar.xz"; - sha256 = "0s5r8891flkmrwga15ihqrmj4i12khxwp97kaa84j4mqva6zdx93"; - name = "kactivities-stats-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kactivities-stats-5.80.0.tar.xz"; + sha256 = "1w3khp8p2a1v85s5hay3s0nznjsajaavrjx4iw2cxssxnzlvg2fn"; + name = "kactivities-stats-5.80.0.tar.xz"; }; }; kapidox = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kapidox-5.79.0.tar.xz"; - sha256 = "0qk4ksxdaiphlpd51mgwdddxq5vq8n55dd80s2a5q93jkcywhli7"; - name = "kapidox-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kapidox-5.80.0.tar.xz"; + sha256 = "010jigqkw3rs04irf942cwgd9wvi7j9b5lisdcrc3w65a19q053z"; + name = "kapidox-5.80.0.tar.xz"; }; }; karchive = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/karchive-5.79.0.tar.xz"; - sha256 = "01qf46k7gp11fh53afcpmbfx0w5bi0k8jflb2db8nss7ri3bzlhc"; - name = "karchive-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/karchive-5.80.0.tar.xz"; + sha256 = "1xaxbhbx562ybd9rqna1bh3bpbyxh02c9x9xyisw84akiibqvq7w"; + name = "karchive-5.80.0.tar.xz"; }; }; kauth = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kauth-5.79.0.tar.xz"; - sha256 = "18bqfn47iyhf1zfkw3mgdxz154f9gqbkn41c3ca94qjm91mb40da"; - name = "kauth-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kauth-5.80.0.tar.xz"; + sha256 = "1pcnk34b912hhhpx606ajvz9hcz6xr37g7bl002zkar9fzh7vw16"; + name = "kauth-5.80.0.tar.xz"; }; }; kbookmarks = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kbookmarks-5.79.0.tar.xz"; - sha256 = "109rjikqxv7mbhv22p41rbfz43510y6k7p0ahggynv0x5y5xzkqd"; - name = "kbookmarks-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kbookmarks-5.80.0.tar.xz"; + sha256 = "11imylvhw3pc46qiqz72q8rwa9igvgvd9gdchiivcrg4494k502q"; + name = "kbookmarks-5.80.0.tar.xz"; }; }; kcalendarcore = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcalendarcore-5.79.0.tar.xz"; - sha256 = "19vc1ji0jlk899rmr6i53l51diadn67mh6z6j787bp29jlcmnciv"; - name = "kcalendarcore-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcalendarcore-5.80.0.tar.xz"; + sha256 = "1z8js2b5zb862ngwsdd2hwi6wqhkvkhsx5akbn7f1gmjs0pfrkg5"; + name = "kcalendarcore-5.80.0.tar.xz"; }; }; kcmutils = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcmutils-5.79.0.tar.xz"; - sha256 = "1wry88rikj7mz460m3c7gr6fwcdpdlx9jrxna2ikybnk9aw8dlkk"; - name = "kcmutils-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcmutils-5.80.0.tar.xz"; + sha256 = "0ncyffl60wv5awbfazknqpysaji11xxrpicabfl0mzmwcnlb34wc"; + name = "kcmutils-5.80.0.tar.xz"; }; }; kcodecs = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcodecs-5.79.0.tar.xz"; - sha256 = "1ab4dz6nvmd6fzsl7wbrvjlz0c0fk0bjb0jcklrj205pkhiaf7y8"; - name = "kcodecs-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcodecs-5.80.0.tar.xz"; + sha256 = "06l8c3jwx5z43cyv7vl6yfs91a7zmy0j089x826nn2a7jr678mjg"; + name = "kcodecs-5.80.0.tar.xz"; }; }; kcompletion = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcompletion-5.79.0.tar.xz"; - sha256 = "1znp6h4pggkl1hcbbw47vjkgmpc1rj6mx01p05x0ad143mwqpzwv"; - name = "kcompletion-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcompletion-5.80.0.tar.xz"; + sha256 = "14v0d1w01lric532vks9akh7v7z7nf9hgpf866qyhmb236k52hpg"; + name = "kcompletion-5.80.0.tar.xz"; }; }; kconfig = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kconfig-5.79.0.tar.xz"; - sha256 = "02jirbphrg6dyxd444ghzhy053s85pq4lgpppca3nmvzr2572j7r"; - name = "kconfig-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kconfig-5.80.0.tar.xz"; + sha256 = "1chrvpfr72bdgv6fdgrkbfbiz76jgvzsncxsc6gjvkvcdag48016"; + name = "kconfig-5.80.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kconfigwidgets-5.79.0.tar.xz"; - sha256 = "1lrh2dis3invj9vclpa1mca8hrks1b82c5hkf0g0lilg69lir83y"; - name = "kconfigwidgets-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kconfigwidgets-5.80.0.tar.xz"; + sha256 = "12rc3l91h2snkxni70brdp8f21g19c0gabpxy7ssv614ci0fz7j7"; + name = "kconfigwidgets-5.80.0.tar.xz"; }; }; kcontacts = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcontacts-5.79.0.tar.xz"; - sha256 = "0jflvfkyd7llv54dxyd1a4h1l4xgrqggxadiqv0c6ijn4dvlsmy9"; - name = "kcontacts-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcontacts-5.80.0.tar.xz"; + sha256 = "173vpxncdr9mwpksizflvipsf18pnwn500b2xzpkaaz5w84vk1yk"; + name = "kcontacts-5.80.0.tar.xz"; }; }; kcoreaddons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcoreaddons-5.79.0.tar.xz"; - sha256 = "0n9nh4vkk19crp30dac3x9mzgzl4kv38jw6dcg4fwfp77gcin8kg"; - name = "kcoreaddons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcoreaddons-5.80.0.tar.xz"; + sha256 = "1l9ydyvbmn2ih07jsy12snxavss7cyxyig0n65sz6gwbcxqr5qzc"; + name = "kcoreaddons-5.80.0.tar.xz"; }; }; kcrash = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kcrash-5.79.0.tar.xz"; - sha256 = "0w74d0j1ckbcd8q8lc57g3y7g50v222mgsvli77ql29imzx79apc"; - name = "kcrash-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kcrash-5.80.0.tar.xz"; + sha256 = "1c2b8i9qay0mdr0i16jp2167vb18r792dd88nz0in77lzccfk8v4"; + name = "kcrash-5.80.0.tar.xz"; }; }; kdav = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdav-5.79.0.tar.xz"; - sha256 = "1573qan4xz8k33zfghwdmlr7pgbd4sfj0pshwv6bkx78kprd3xfl"; - name = "kdav-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdav-5.80.0.tar.xz"; + sha256 = "1cab4pppqyfqm53dhp5lm4ghijbhym77ndb0pr6crvi70kz4s101"; + name = "kdav-5.80.0.tar.xz"; }; }; kdbusaddons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdbusaddons-5.79.0.tar.xz"; - sha256 = "17sklakn9nsrjajb3nwg8ibhx64c4m86pr6ln567rdr6cahcaw90"; - name = "kdbusaddons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdbusaddons-5.80.0.tar.xz"; + sha256 = "1w0vpjzi37z8jaq97p9bxjdl8x4288idm4vvpzxs8lc9hwcl74hl"; + name = "kdbusaddons-5.80.0.tar.xz"; }; }; kdeclarative = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdeclarative-5.79.0.tar.xz"; - sha256 = "05b1apviqy3dn2isqxf0bxj86r9q40pjlcqq8y15s36d6ykijyzh"; - name = "kdeclarative-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdeclarative-5.80.0.tar.xz"; + sha256 = "0gcx6pqyc0izw2cdvdcscxxl4wvksb74kjiq5zimjd2z8wrblmdz"; + name = "kdeclarative-5.80.0.tar.xz"; }; }; kded = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kded-5.79.0.tar.xz"; - sha256 = "1gyb864rqbdi64mjc165fhcvnsw06z2zi8dg728428nzmw0dysbm"; - name = "kded-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kded-5.80.0.tar.xz"; + sha256 = "0skk3zf3b6rlbvdq0fyd8swfrx3fqmppqxrglh6n5imcv5jxwms1"; + name = "kded-5.80.0.tar.xz"; }; }; kdelibs4support = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kdelibs4support-5.79.0.tar.xz"; - sha256 = "049l0mlf71xan8ls4hkp8s6lrnhn2i22jcnki1d5wci01dgffhm5"; - name = "kdelibs4support-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kdelibs4support-5.80.0.tar.xz"; + sha256 = "01bd188iss14qmzm55dmsgdcs9wnwbdj0kh371achp9zqg55iqj3"; + name = "kdelibs4support-5.80.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kdesignerplugin-5.79.0.tar.xz"; - sha256 = "1jgqr76sx6d3jmqc350k49lqym5jkixnl3dq66430pvlrfv47w2n"; - name = "kdesignerplugin-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kdesignerplugin-5.80.0.tar.xz"; + sha256 = "1d79qg3y7ndrh6yd9sygyz5yd5ig6gp8k71mw96xijdhlf5nxqs3"; + name = "kdesignerplugin-5.80.0.tar.xz"; }; }; kdesu = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdesu-5.79.0.tar.xz"; - sha256 = "1hlz5pr72qk64gwp30qx92jhlszri5qjsisvl4cxs01ylnrqy0c1"; - name = "kdesu-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdesu-5.80.0.tar.xz"; + sha256 = "1ksad8wcnjcrb8h73klrs2601482a32x3ycpr17k9fsi8mkylicd"; + name = "kdesu-5.80.0.tar.xz"; }; }; kdewebkit = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kdewebkit-5.79.0.tar.xz"; - sha256 = "0d81p49n2ryig9xp5id1dx4rpjjd2spl78m0xlq6rczyk7yf73pz"; - name = "kdewebkit-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kdewebkit-5.80.0.tar.xz"; + sha256 = "11q6x9w2majzh6wva4b824dxrpz53xpb3vfsi65pwh199fhfyzci"; + name = "kdewebkit-5.80.0.tar.xz"; }; }; kdnssd = { - version = "5.79.1"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdnssd-5.79.1.tar.xz"; - sha256 = "160qyll887wblrw0lhax749lzwhlp92sckj4g259955p8gnsw5lp"; - name = "kdnssd-5.79.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdnssd-5.80.0.tar.xz"; + sha256 = "0k8lk3h65ar07l54cmxhpakz1why9vbm5wg58nh16x69dkdhr8dg"; + name = "kdnssd-5.80.0.tar.xz"; }; }; kdoctools = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kdoctools-5.79.0.tar.xz"; - sha256 = "03bvj3grjw6a56shdy8c3mdp11pwmc72ccp3ia00bz310ahpphzb"; - name = "kdoctools-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kdoctools-5.80.0.tar.xz"; + sha256 = "10xcq0pk1sqw293f2kw52sjj6dgphv17fdax4w0yy1hjch711bhy"; + name = "kdoctools-5.80.0.tar.xz"; }; }; kemoticons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kemoticons-5.79.0.tar.xz"; - sha256 = "04x1yfdcyvx3x4aqha69rsaa78j4iw6qam3hp5a4di0yf653mphp"; - name = "kemoticons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kemoticons-5.80.0.tar.xz"; + sha256 = "0jg5z6dbfprkypj35prlixgc93x65nn7zcw2fmxcqvshrnqzz2hb"; + name = "kemoticons-5.80.0.tar.xz"; }; }; kfilemetadata = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kfilemetadata-5.79.0.tar.xz"; - sha256 = "0yxjapq88pfcma82mc9gz03x1bb81xl6xzrinr6jgz09206ra395"; - name = "kfilemetadata-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kfilemetadata-5.80.0.tar.xz"; + sha256 = "02k0yyksyl5nn373l25m6ybxhpdyrz8g0mr16zmk12pdxh24vkbm"; + name = "kfilemetadata-5.80.0.tar.xz"; }; }; kglobalaccel = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kglobalaccel-5.79.0.tar.xz"; - sha256 = "0qqxvv3m7b44makgdcsxdhzamm4ahm1pn94rn6cpsrqsyci8axy8"; - name = "kglobalaccel-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kglobalaccel-5.80.0.tar.xz"; + sha256 = "015x173b57vdd16mmd4asz6l6bxw94k1hbkxr09v5cb463cspw1n"; + name = "kglobalaccel-5.80.0.tar.xz"; }; }; kguiaddons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kguiaddons-5.79.0.tar.xz"; - sha256 = "118wiy3pbmbazfivmh0w2g5l10qcp10b34r3d02pj7rs2a74h05w"; - name = "kguiaddons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kguiaddons-5.80.0.tar.xz"; + sha256 = "1iadzp794q9qhs1kcvfp2g2w6rv2ifqcb3n8sv460fhv4qrg4qz5"; + name = "kguiaddons-5.80.0.tar.xz"; }; }; kholidays = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kholidays-5.79.0.tar.xz"; - sha256 = "1lbbq6y1xkffh9qma7hr5hi712kl85kv51gij0mj69ssv1iq2a8n"; - name = "kholidays-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kholidays-5.80.0.tar.xz"; + sha256 = "1knmsz1rzhz5a56q9s0i4747633dq9bhs4j8j6rnk49ccl5hz72z"; + name = "kholidays-5.80.0.tar.xz"; }; }; khtml = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/khtml-5.79.0.tar.xz"; - sha256 = "1916kpb3kr0d7lbf0b65lrwkxnlgickm7vrmlc3qwlmf3fyqvkhy"; - name = "khtml-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/khtml-5.80.0.tar.xz"; + sha256 = "188j1ssw9qlylqgj06iy2r2jbibzshxcxh9qbn1bgz6d2dq2c6mx"; + name = "khtml-5.80.0.tar.xz"; }; }; ki18n = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/ki18n-5.79.0.tar.xz"; - sha256 = "12sa7ycxc7m7nrsm6x7f822c8p586hy0syny5ya8vpmhwk1j3gik"; - name = "ki18n-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/ki18n-5.80.0.tar.xz"; + sha256 = "0yksjrcq5zip17kq1r97z2145qzzz6k48vz71y6195f7wvbpjfl8"; + name = "ki18n-5.80.0.tar.xz"; }; }; kiconthemes = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kiconthemes-5.79.0.tar.xz"; - sha256 = "0bbs8q0dpz4qyxsd1qk5jxazn600m5j2axzccxyrr21r9plbs4nx"; - name = "kiconthemes-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kiconthemes-5.80.0.tar.xz"; + sha256 = "133nv4zgqg6pkkvh1nyqcra847vgn3ai6w0xvynbgrmq7wvdrwlj"; + name = "kiconthemes-5.80.0.tar.xz"; }; }; kidletime = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kidletime-5.79.0.tar.xz"; - sha256 = "0pp2ii4cvxygz40ai0b3rpqdjgpq4nya2hrms9c3yxb5hizrrrak"; - name = "kidletime-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kidletime-5.80.0.tar.xz"; + sha256 = "1yjjhpkql8s7b4ddzirpyq5p0yicpsbkgbq15257k60xs66qgf83"; + name = "kidletime-5.80.0.tar.xz"; }; }; kimageformats = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kimageformats-5.79.0.tar.xz"; - sha256 = "09ffc44vzcin2ikyhm0awba7ag7pbnam4cilvfr3lwnj022y7j7c"; - name = "kimageformats-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kimageformats-5.80.0.tar.xz"; + sha256 = "0q3i6jkx6kahgdzfycygki50f22zjbspx3f9ibg2ak74hcan8r8x"; + name = "kimageformats-5.80.0.tar.xz"; }; }; kinit = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kinit-5.79.0.tar.xz"; - sha256 = "0ppri3gaiwawydjfw8ji6accrpwc8ms0sb1s5pn59wqiyv52f5rv"; - name = "kinit-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kinit-5.80.0.tar.xz"; + sha256 = "101lvky2j6bxk3q36040kczchc21d5rb664ddxd89pl2n0f6s9fz"; + name = "kinit-5.80.0.tar.xz"; }; }; kio = { - version = "5.79.0"; + version = "5.80.1"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kio-5.79.0.tar.xz"; - sha256 = "1ri5dv8lc4ywc7jknlszri812y91mgggjx5z5qfkv971njm6fz3n"; - name = "kio-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kio-5.80.1.tar.xz"; + sha256 = "0a2srmj8w80f2m8s359747xx0wg2gf8nd75ysv9f9y92l1hwwwfr"; + name = "kio-5.80.1.tar.xz"; }; }; kirigami2 = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kirigami2-5.79.0.tar.xz"; - sha256 = "01rb678qz1avzi7393wylwnc13ndzx2pgqnz3bd0zki0pjfrrlzp"; - name = "kirigami2-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kirigami2-5.80.0.tar.xz"; + sha256 = "0wljcyr0g4i5nsc6szy9yd976l180lxfjjzhz24py7czlrpzg3i2"; + name = "kirigami2-5.80.0.tar.xz"; }; }; kitemmodels = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kitemmodels-5.79.0.tar.xz"; - sha256 = "1g9xa0h3kq0m5v1yvwgr8f6lrq8n2x1qzqqjbbbbyg8ayavv4abs"; - name = "kitemmodels-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kitemmodels-5.80.0.tar.xz"; + sha256 = "1bvghm4accgf273aacjng86rxiazmk05pbrnqkldda9958dqv54k"; + name = "kitemmodels-5.80.0.tar.xz"; }; }; kitemviews = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kitemviews-5.79.0.tar.xz"; - sha256 = "0p21hyxhain2mr19lzfml23ilpgqwr2i27p1qg39jnwyb74jw0nl"; - name = "kitemviews-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kitemviews-5.80.0.tar.xz"; + sha256 = "1j9m4qcmy83dj3k3v4y4skl5lgb8n3z4x9pa1f0rjpwwg4qsa0lp"; + name = "kitemviews-5.80.0.tar.xz"; }; }; kjobwidgets = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kjobwidgets-5.79.0.tar.xz"; - sha256 = "059a58hp0npip07w7idjrl5sjjgl4i3bdqzv1k22hlvzdsyibggr"; - name = "kjobwidgets-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kjobwidgets-5.80.0.tar.xz"; + sha256 = "1yy5n9jnj1sdh51n3n1bqzmaml44799kiqdpp3b7mq55fmj9najp"; + name = "kjobwidgets-5.80.0.tar.xz"; }; }; kjs = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kjs-5.79.0.tar.xz"; - sha256 = "1v51xjmwxi1x85b4hlj8m12zxl5w0d160kjjbrrxqfn64i4302ga"; - name = "kjs-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kjs-5.80.0.tar.xz"; + sha256 = "1v3jiywzzi20c0pd67pgnwwnz0vg209a0wzzdhrpiz5v7qgji1ij"; + name = "kjs-5.80.0.tar.xz"; }; }; kjsembed = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kjsembed-5.79.0.tar.xz"; - sha256 = "18kjq5mim7b1a5mlhkwpwvnszjqxilhi4laqladh97wkmvsr85py"; - name = "kjsembed-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kjsembed-5.80.0.tar.xz"; + sha256 = "083gp9ks7yha90vnk0z4bkb9i4rphz90di8m8z19xgn575a6li57"; + name = "kjsembed-5.80.0.tar.xz"; }; }; kmediaplayer = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kmediaplayer-5.79.0.tar.xz"; - sha256 = "1lgrcib9acbzgs1kv44bqfisrayiir2r1iygrrncp117fj9cqx8b"; - name = "kmediaplayer-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kmediaplayer-5.80.0.tar.xz"; + sha256 = "0a16rzyjy7j5pn66ahpj3kxpp5c2zmjxg3cmrm14gcm6gzysv56b"; + name = "kmediaplayer-5.80.0.tar.xz"; }; }; knewstuff = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/knewstuff-5.79.0.tar.xz"; - sha256 = "0bsg0r0s12ck2cafkvnmjldr32ykivcpqjs1zfzqqbvy5w05a81y"; - name = "knewstuff-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/knewstuff-5.80.0.tar.xz"; + sha256 = "0pbk4j823zs2xikgdhaxqilb5b6f0a8k8hylq1vyhkwlzvvp9s6z"; + name = "knewstuff-5.80.0.tar.xz"; }; }; knotifications = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/knotifications-5.79.0.tar.xz"; - sha256 = "11g4xsa0z9680k4blxb1axn874p6s2vd5p9h376ln3blhjmy17hj"; - name = "knotifications-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/knotifications-5.80.0.tar.xz"; + sha256 = "1sfn61vhdqg3mxfvb802wx0l0k59b312fbh6w9bqv0b8z0a9jz2s"; + name = "knotifications-5.80.0.tar.xz"; }; }; knotifyconfig = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/knotifyconfig-5.79.0.tar.xz"; - sha256 = "0c6d95bf8876czjd39cla7pd3li8sm684h04f77czf6sh1mil49d"; - name = "knotifyconfig-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/knotifyconfig-5.80.0.tar.xz"; + sha256 = "0b41ppif2qp7lkqmb7nv1r68hvavdl1lcgs4w50v2c0k4fflwizx"; + name = "knotifyconfig-5.80.0.tar.xz"; }; }; kpackage = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kpackage-5.79.0.tar.xz"; - sha256 = "1xkkw4lk9hx2irni5d2k7873bffgd2w41qvvp25d786dz612fy27"; - name = "kpackage-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kpackage-5.80.0.tar.xz"; + sha256 = "104qwyai3ivdw0jqgn6m59bajy07snas51rp75xgvb65hpllv2ch"; + name = "kpackage-5.80.0.tar.xz"; }; }; kparts = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kparts-5.79.0.tar.xz"; - sha256 = "0d9dsgf6q44gqril6h9w5jfsavk0m5gclbmjdxjkcvrz3xfbjhd9"; - name = "kparts-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kparts-5.80.0.tar.xz"; + sha256 = "1fkfjazr7bwh5nniylh403qp0g4bgiv01ckv4djf46gjf7qn9d4y"; + name = "kparts-5.80.0.tar.xz"; }; }; kpeople = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kpeople-5.79.0.tar.xz"; - sha256 = "0dj8hcjl0r673j7m2k83mxy2787jfi9pz6cvmfqfczbzpw20ycf4"; - name = "kpeople-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kpeople-5.80.0.tar.xz"; + sha256 = "1cn9jqiah3j0qi7sg1j9c10yq97pcisvxhm9jjzzzxna39zz16cw"; + name = "kpeople-5.80.0.tar.xz"; }; }; kplotting = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kplotting-5.79.0.tar.xz"; - sha256 = "0lawpg7i36wppm95jxhhc7ghc88kb1s34px6w8p7n6cm2gxkhwn6"; - name = "kplotting-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kplotting-5.80.0.tar.xz"; + sha256 = "073icgz0cgg7wis3rf1hlsmxklp9vk8swgihfdlks1jds90s4nxw"; + name = "kplotting-5.80.0.tar.xz"; }; }; kpty = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kpty-5.79.0.tar.xz"; - sha256 = "1qd09r17nmsnqxggmsdw0j6l0620f11ya6mx7bc9zs2y08mgvjka"; - name = "kpty-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kpty-5.80.0.tar.xz"; + sha256 = "13blnrzni3n9p3xnn2kyd6g2hlpvvg0aqagknk64kchbvdkd5l4k"; + name = "kpty-5.80.0.tar.xz"; }; }; kquickcharts = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kquickcharts-5.79.0.tar.xz"; - sha256 = "1p9a3mq7xxyavzmgjmz47vrv0hm1h9g8fsligi3r3n5az7klra6f"; - name = "kquickcharts-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kquickcharts-5.80.0.tar.xz"; + sha256 = "0kf72i9pkifcwg9njn296fw4d9gy3rc43g17128axj6a5jrd4bln"; + name = "kquickcharts-5.80.0.tar.xz"; }; }; kross = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kross-5.79.0.tar.xz"; - sha256 = "00hpyxcn2fwaz32gggqjcmx4blbcdxj3yvhldnmmkmi3k0r68dfc"; - name = "kross-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kross-5.80.0.tar.xz"; + sha256 = "06dyqmhxbr9ykca1bskkgxmsd86jpxnk4adygcw1j84xsl6jiki9"; + name = "kross-5.80.0.tar.xz"; }; }; krunner = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/krunner-5.79.0.tar.xz"; - sha256 = "0v7faai6ar06cw7gikhccsa92aii085dk81g4xpyskmxlpvrraci"; - name = "krunner-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/krunner-5.80.0.tar.xz"; + sha256 = "0bid6h0wmvmxfz664hmfhs4zp35mlk3n1p553rspfs55wh2f9xpw"; + name = "krunner-5.80.0.tar.xz"; }; }; kservice = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kservice-5.79.0.tar.xz"; - sha256 = "1drzj4s1zbh5pffnh3r1wjsk7g1vr0np2h28mlfm4hy3bywxzrnp"; - name = "kservice-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kservice-5.80.0.tar.xz"; + sha256 = "06bk46l3qg7dh57zsg9vwx8vq31ikjmbmy4nqn65mq786yiz4s78"; + name = "kservice-5.80.0.tar.xz"; }; }; ktexteditor = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/ktexteditor-5.79.0.tar.xz"; - sha256 = "1csms6cl8pp9slzwzdgsxhah1b218maakkxmiqk0ngx2sf4lbfc3"; - name = "ktexteditor-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/ktexteditor-5.80.0.tar.xz"; + sha256 = "0g073m18bpzhxdwzhqcyclsclwi91cqsjqq3fjz1hy56ird6b0d0"; + name = "ktexteditor-5.80.0.tar.xz"; }; }; ktextwidgets = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/ktextwidgets-5.79.0.tar.xz"; - sha256 = "1bnhq4jpybckdlw5518n2hbfilbpadafvchnxigg9p7671pkp85l"; - name = "ktextwidgets-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/ktextwidgets-5.80.0.tar.xz"; + sha256 = "1292knr3wblbk5j3qfzr1lqyiaa09pkhvkmh3jnlb0jvhc8xvmg8"; + name = "ktextwidgets-5.80.0.tar.xz"; }; }; kunitconversion = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kunitconversion-5.79.0.tar.xz"; - sha256 = "19snm2mvvbs2aqpq7k9b3g1fbg40kpmbjmqn38g6m065mpw3372l"; - name = "kunitconversion-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kunitconversion-5.80.0.tar.xz"; + sha256 = "1hckj3k3jjsc4y89zvi5l9h6px6ns9kdqjrfkxbax459wha55b4l"; + name = "kunitconversion-5.80.0.tar.xz"; }; }; kwallet = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kwallet-5.79.0.tar.xz"; - sha256 = "1qickn20ry8qccirdc7rvdf40dxgb13y4n0wi80qz87xzmps3f3p"; - name = "kwallet-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kwallet-5.80.0.tar.xz"; + sha256 = "1pwrxhjxxdx7hl4456dk4x8z36ddw932cv08010fmz9m4w0yvjg1"; + name = "kwallet-5.80.0.tar.xz"; }; }; kwayland = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kwayland-5.79.0.tar.xz"; - sha256 = "14grhcav772zfdjmwnjms819by2djm8dnv71cj4ps45iq0gba6ck"; - name = "kwayland-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kwayland-5.80.0.tar.xz"; + sha256 = "1avr7ckyhw158wi5mlknzkcphn8vlf8dpb96gyizvsvg8b4gffs0"; + name = "kwayland-5.80.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kwidgetsaddons-5.79.0.tar.xz"; - sha256 = "0jpfwxa397cvqr1q92b2nva7wy2ngv08kz5l94xrz0wzkagxfixc"; - name = "kwidgetsaddons-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kwidgetsaddons-5.80.0.tar.xz"; + sha256 = "1wgwl08cxwzcd0nikvp2ph2dbj5fij6a5l65p9amvi6ladbgv6qs"; + name = "kwidgetsaddons-5.80.0.tar.xz"; }; }; kwindowsystem = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kwindowsystem-5.79.0.tar.xz"; - sha256 = "15pi2vnvdchj9f3yp1p7hqxmnwd606a6fwq4h7li4pvb4w3gibmq"; - name = "kwindowsystem-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kwindowsystem-5.80.0.tar.xz"; + sha256 = "1ch44w27ilh994if3icskyqg6nhnbd5j430jxfj6fzfia9vvclmk"; + name = "kwindowsystem-5.80.0.tar.xz"; }; }; kxmlgui = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/kxmlgui-5.79.0.tar.xz"; - sha256 = "1j8fb5i1v7pqs5as1h43nc0s2pm3i9cwks2h5388yld325ysx0v9"; - name = "kxmlgui-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/kxmlgui-5.80.0.tar.xz"; + sha256 = "17dpcv2igkg1pk238bd396mn83nqp325sscx7qsf8cbj15dp7bw1"; + name = "kxmlgui-5.80.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/portingAids/kxmlrpcclient-5.79.0.tar.xz"; - sha256 = "1cwvglsfv5m3mb5bjl7rfas1samyw703qjfiz1pf6vxgmpxdcr4a"; - name = "kxmlrpcclient-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/portingAids/kxmlrpcclient-5.80.0.tar.xz"; + sha256 = "0aas26kjxsbgrrrazjvsvjqdr9993v2hyxci62mfpi7xsp5js4h4"; + name = "kxmlrpcclient-5.80.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/modemmanager-qt-5.79.0.tar.xz"; - sha256 = "0xfbchyaaqxjj66zb19k4vxi9azijf0llbql6fzxln687s3z65wd"; - name = "modemmanager-qt-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/modemmanager-qt-5.80.0.tar.xz"; + sha256 = "1q14hx2228xhlggw14r9mhmnn2q3qvy3nc9hq5ynb9mwldns6nl6"; + name = "modemmanager-qt-5.80.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/networkmanager-qt-5.79.0.tar.xz"; - sha256 = "04iaqa2q73zvscx300bah6mnl79dai9yrmq11d1vyil99af36m6s"; - name = "networkmanager-qt-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/networkmanager-qt-5.80.0.tar.xz"; + sha256 = "1wdzn2n4m7nz6skjc37p70zaq42ighk5f1wg1hjx3yf3rlpprnp0"; + name = "networkmanager-qt-5.80.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/oxygen-icons5-5.79.0.tar.xz"; - sha256 = "1j6l9r4l82gp5qcpn3xw4dzfbhsawbpk8mypnfckk73x1bjcaqss"; - name = "oxygen-icons5-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/oxygen-icons5-5.80.0.tar.xz"; + sha256 = "0kmq993vd6011qny949z13lli4qymprk616kl1628dazniapka9m"; + name = "oxygen-icons5-5.80.0.tar.xz"; }; }; plasma-framework = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/plasma-framework-5.79.0.tar.xz"; - sha256 = "15hbfqdyas27kj6rd24n6d80r1dcsiiv0zgjkp12x8dnjyd3vz4x"; - name = "plasma-framework-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/plasma-framework-5.80.0.tar.xz"; + sha256 = "1nckb1801fy64hvm127r5fz14vgw81szw7w7miilqh6651v0zbyk"; + name = "plasma-framework-5.80.0.tar.xz"; }; }; prison = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/prison-5.79.0.tar.xz"; - sha256 = "1rn66n67g914w1klgsirqff62qv4p2l64ahzsxnbixfwy1dwlpa2"; - name = "prison-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/prison-5.80.0.tar.xz"; + sha256 = "1fcsvww08f7ihxq6x84jd2klp29m8hrbzp7rxqi7x9ghxxgysbpz"; + name = "prison-5.80.0.tar.xz"; }; }; purpose = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/purpose-5.79.0.tar.xz"; - sha256 = "1mlph5mzwfqwlkvm3df3in3r3airnx4hxhy0p56ri3k3m9k2rqpz"; - name = "purpose-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/purpose-5.80.0.tar.xz"; + sha256 = "107xmhbjcw5mk068484gwqrzl2gkgy495737f4vj5q22m9rpal5d"; + name = "purpose-5.80.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/qqc2-desktop-style-5.79.0.tar.xz"; - sha256 = "1cykbdbzxkblwp0dmgc4r3csml9l81zhfsqcjamfai6srl10vbij"; - name = "qqc2-desktop-style-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/qqc2-desktop-style-5.80.0.tar.xz"; + sha256 = "14dy7n6m9vdq6v7h3r0w71vw86yxyza40wyxp0hhj44nb63fvczg"; + name = "qqc2-desktop-style-5.80.0.tar.xz"; }; }; solid = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/solid-5.79.0.tar.xz"; - sha256 = "033ss326q450phf918a5py3z6ajnjj6f1nws8ngp05zi028nkhrl"; - name = "solid-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/solid-5.80.0.tar.xz"; + sha256 = "023zk7la6ycd7h2j62z7b409w94sq2r9k0c020ywry6psjydqkx5"; + name = "solid-5.80.0.tar.xz"; }; }; sonnet = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/sonnet-5.79.0.tar.xz"; - sha256 = "09b1rb88ck50g67nmki06ixxsfnz3x3jd0f334qaz147h2jklvyq"; - name = "sonnet-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/sonnet-5.80.0.tar.xz"; + sha256 = "13kqdfy6bgmqjfw82d2zh0bq4r53awa1f1cbshci6inwdslyvlmh"; + name = "sonnet-5.80.0.tar.xz"; }; }; syndication = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/syndication-5.79.0.tar.xz"; - sha256 = "1jyz0c67zscgspvisn43wrdgk4pxs4i3r9pyknm8nvxwiff2p1ji"; - name = "syndication-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/syndication-5.80.0.tar.xz"; + sha256 = "1j22yx2i2qxck6gy4jypjvmar4y93j5nmrmf7fkjx7z8hwxjgwhh"; + name = "syndication-5.80.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.79.1"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/syntax-highlighting-5.79.1.tar.xz"; - sha256 = "143ra8j0x1biijclnjhp6b69v04m65avp2nic9jzj9y5wjz5x0mj"; - name = "syntax-highlighting-5.79.1.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/syntax-highlighting-5.80.0.tar.xz"; + sha256 = "060jnfri24rzkryyvxadpr3yn5xn0856j01ba5l38w0khs8mix4i"; + name = "syntax-highlighting-5.80.0.tar.xz"; }; }; threadweaver = { - version = "5.79.0"; + version = "5.80.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.79/threadweaver-5.79.0.tar.xz"; - sha256 = "062r9nhggw3dlvgpb2l6fqyyzqv35a9lgvikh2pjdicx9r2s8z19"; - name = "threadweaver-5.79.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.80/threadweaver-5.80.0.tar.xz"; + sha256 = "1j5m8gfjpi9cajhja77lhkrl3shq618wpza1k27azvi7r6jj4dva"; + name = "threadweaver-5.80.0.tar.xz"; }; }; } From 336709abbfe162dfcfe4821b21d8f7f6de948203 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 25 Mar 2021 21:14:16 -0500 Subject: [PATCH 0515/1183] kdeApplications: 20.12.2 -> 20.12.3 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/srcs.nix | 1792 ++++++++++++++++---------------- 2 files changed, 897 insertions(+), 897 deletions(-) diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 861cd5f83561..5b61590003e5 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.2/src -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/release-service/20.12.3/src -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index c1def1bd613b..fc179789df20 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1795 +4,1795 @@ { akonadi = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-20.12.2.tar.xz"; - sha256 = "0659vgj8y77i0axdwwajaw6kxfa48j6s56nl6xhnv8686ss8plkw"; - name = "akonadi-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-20.12.3.tar.xz"; + sha256 = "0bcjyh1w8aaq7bp0df8zla7zvddig5ziz9avj82c6d453hfsq6dr"; + name = "akonadi-20.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-20.12.2.tar.xz"; - sha256 = "0vzv4yycb2nnz5ifsydv0k080wgnhjzim6lfd6qrh38mgxpb2hzw"; - name = "akonadi-calendar-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-calendar-20.12.3.tar.xz"; + sha256 = "057iz29y8dvxa26kf995akgy427c20d27i59gdfnl183wikmw9wk"; + name = "akonadi-calendar-20.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-calendar-tools-20.12.2.tar.xz"; - sha256 = "06bzha5h14x6m4xzbbz2h3s00v4pc2a8d716dav9bqi0pvvq3cj0"; - name = "akonadi-calendar-tools-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-calendar-tools-20.12.3.tar.xz"; + sha256 = "1fdcf6s1ij2l44zg7rha9hhha1k3m4xh0mgkyc836jkqy02jx3j6"; + name = "akonadi-calendar-tools-20.12.3.tar.xz"; }; }; akonadiconsole = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadiconsole-20.12.2.tar.xz"; - sha256 = "12fslhpxah99fzvg3a1g67n69mi4xvgz9ra787pdvzrs0lca9xa0"; - name = "akonadiconsole-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadiconsole-20.12.3.tar.xz"; + sha256 = "0skam7yl9m28m51yj0inzcxa5rbz5r4hz104b0ncg9hjjqi7qyfl"; + name = "akonadiconsole-20.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-contacts-20.12.2.tar.xz"; - sha256 = "05y1rpvq1shiqlgql56k052glsslawy742q4n2hs301xhg0izavz"; - name = "akonadi-contacts-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-contacts-20.12.3.tar.xz"; + sha256 = "1ql7rx3fj12iddsvjip17w3gqm4slcmy3id3b892xwlx4izz2dr4"; + name = "akonadi-contacts-20.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-import-wizard-20.12.2.tar.xz"; - sha256 = "1gqjr5k6kkxi77vq0f6mc5mr31qvjsiicj6sxwpbm0c34vydfzym"; - name = "akonadi-import-wizard-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-import-wizard-20.12.3.tar.xz"; + sha256 = "080dyygqwc4m38vqkd4yvpy1xa4302a20gcbl5vi06as750qswgn"; + name = "akonadi-import-wizard-20.12.3.tar.xz"; }; }; akonadi-mime = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-mime-20.12.2.tar.xz"; - sha256 = "0zdgkny32zwa2r2yhi285f56jkj0ini6p3sv5hi7f43mi7r5m994"; - name = "akonadi-mime-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-mime-20.12.3.tar.xz"; + sha256 = "1dnxswwvgm3vj5l12xnv5c7jpmrx3180xpdpgj4xp4nmzvfrfpgl"; + name = "akonadi-mime-20.12.3.tar.xz"; }; }; akonadi-notes = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-notes-20.12.2.tar.xz"; - sha256 = "0rbg2vwk0a1zbfw5cmz0jx3yzap7j6yi7c0igq1fgg3an7sw4j2v"; - name = "akonadi-notes-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-notes-20.12.3.tar.xz"; + sha256 = "1fp5mif6w14snrndw2w4y66hsi14x7qyr9p343hdma4lmd65lic7"; + name = "akonadi-notes-20.12.3.tar.xz"; }; }; akonadi-search = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akonadi-search-20.12.2.tar.xz"; - sha256 = "0m7l7f26gj018d5pipbgmmxiqky98avpypxbydrms6afdglvi5ja"; - name = "akonadi-search-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akonadi-search-20.12.3.tar.xz"; + sha256 = "0bac20n5mbfvl5p5qyiy1dygv1lz0spvm37ah3bp4iz9k4maqp7q"; + name = "akonadi-search-20.12.3.tar.xz"; }; }; akregator = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/akregator-20.12.2.tar.xz"; - sha256 = "11y2mmf2svbxvqb1bjwzrivkq8w508fwg7513bzl62pbjqa8g3gk"; - name = "akregator-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/akregator-20.12.3.tar.xz"; + sha256 = "10friff769kq83b9nxx2wj16bgzjh9gblc9r20gvm1qw5vm4l58b"; + name = "akregator-20.12.3.tar.xz"; }; }; analitza = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/analitza-20.12.2.tar.xz"; - sha256 = "09qpqjyps9h8wc8dvbnj8iz2xc4naxjdicqxsbfwfly5wbf8xq6x"; - name = "analitza-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/analitza-20.12.3.tar.xz"; + sha256 = "187mnzdclqmn6d7yxxvy7xhcaasmgjz6mgk43dxn7rpn20lbx800"; + name = "analitza-20.12.3.tar.xz"; }; }; ark = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ark-20.12.2.tar.xz"; - sha256 = "1p8ylvk4g1x2mmfdprz911iivcvr4mciam427b6ygdrhqc7rbbqb"; - name = "ark-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ark-20.12.3.tar.xz"; + sha256 = "0fsv808a554cpka4pvhk829kldm2asnk8dyvr1wiidgpjpjxzwp4"; + name = "ark-20.12.3.tar.xz"; }; }; artikulate = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/artikulate-20.12.2.tar.xz"; - sha256 = "0s6vjhipb4i6bv9ff7nzm9gza8jghih9kf7f7ynq10109fk8gy6i"; - name = "artikulate-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/artikulate-20.12.3.tar.xz"; + sha256 = "1gnnfa0mwafh5msfy41n8fib1mfp713hdyfcqsmfpb04p5251grm"; + name = "artikulate-20.12.3.tar.xz"; }; }; audiocd-kio = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/audiocd-kio-20.12.2.tar.xz"; - sha256 = "0kd7yxl571pwrijwn78pigdclwqpmd50b5cj4lna481q78f91zsa"; - name = "audiocd-kio-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/audiocd-kio-20.12.3.tar.xz"; + sha256 = "06jg3q73hnr7wswqhffj5mncnpvrlmhh4c4k5302jp0c61i5pbv0"; + name = "audiocd-kio-20.12.3.tar.xz"; }; }; baloo-widgets = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/baloo-widgets-20.12.2.tar.xz"; - sha256 = "0w9jrx2mz1kyn2az6jx4kympl6zd950waz4zj97cjrcq2dg5a85g"; - name = "baloo-widgets-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/baloo-widgets-20.12.3.tar.xz"; + sha256 = "0cznzgzn8x9kgn9pjq3fybici88y4al18n0c5vv1h31vz59fqfqi"; + name = "baloo-widgets-20.12.3.tar.xz"; }; }; blinken = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/blinken-20.12.2.tar.xz"; - sha256 = "0a0nkmbx1bkqjs7cf5qqm877wqvzdx9cxm9395jfxcycn5pyfps9"; - name = "blinken-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/blinken-20.12.3.tar.xz"; + sha256 = "0vfvlrdan60dx1prd1m4vhakvz5ddi70gzagfjb5c0py9802qqgl"; + name = "blinken-20.12.3.tar.xz"; }; }; bomber = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/bomber-20.12.2.tar.xz"; - sha256 = "08lyj6rn9jhhwzpwh2c14v8jiwishi1wk19nm5wazy2iajbd88jv"; - name = "bomber-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/bomber-20.12.3.tar.xz"; + sha256 = "03d08j8wh989fsxb632fpbjg3zwqyv70jd8msjy4ajxl4039q9sp"; + name = "bomber-20.12.3.tar.xz"; }; }; bovo = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/bovo-20.12.2.tar.xz"; - sha256 = "05xx11rqqsxm084hfxnx1wzmr2wdpny3w608h8g5vby2jgdj47b7"; - name = "bovo-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/bovo-20.12.3.tar.xz"; + sha256 = "114rq2a7jr9f9957zfn2fgiylf4ymgx5534i8qw7h78gxnb5915v"; + name = "bovo-20.12.3.tar.xz"; }; }; calendarsupport = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/calendarsupport-20.12.2.tar.xz"; - sha256 = "0gz3p4az49430zwgmlqjcfzjlgnaf7cl1x0qaaxyl8il14ambrbd"; - name = "calendarsupport-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/calendarsupport-20.12.3.tar.xz"; + sha256 = "044d9aarq5agh42h88l5bjc6nfsrb5797zlq0wfyx6laxnw8yhdb"; + name = "calendarsupport-20.12.3.tar.xz"; }; }; cantor = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/cantor-20.12.2.tar.xz"; - sha256 = "1w513a06xshdw4fcn6wmliygpjsyvqcbmfjg2bdibpsnznmk4y4p"; - name = "cantor-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/cantor-20.12.3.tar.xz"; + sha256 = "0f6ad4mzn54bjc1q9yxana6j5hfdgr2d7gra27x5jfcn079qjijb"; + name = "cantor-20.12.3.tar.xz"; }; }; cervisia = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/cervisia-20.12.2.tar.xz"; - sha256 = "08m962r6wkvih1yfj22z3nyfx6r3ac9pcc7i7dxxdkfcxhqpprhb"; - name = "cervisia-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/cervisia-20.12.3.tar.xz"; + sha256 = "0802rws42a1ipw2m5r9k7plr7yhyicws8ryx75vivn41v4qanq15"; + name = "cervisia-20.12.3.tar.xz"; }; }; dolphin = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/dolphin-20.12.2.tar.xz"; - sha256 = "19mss2vs074xv5qc644y87f8v99mdndhhd7hclqgq6gckxcjzy2r"; - name = "dolphin-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/dolphin-20.12.3.tar.xz"; + sha256 = "1wx1z2bfcd8irhfbh2j4bhdl72afjwfbrh1ps8xzah14vqjvi54p"; + name = "dolphin-20.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/dolphin-plugins-20.12.2.tar.xz"; - sha256 = "0zjy429cqb6nspmiharvszjhpn662y23s9wbdqs04h2p6pi8raxn"; - name = "dolphin-plugins-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/dolphin-plugins-20.12.3.tar.xz"; + sha256 = "102ykanh4a0pdm0j6wns5jaq76f71y96dgymm2mbgwrfrydcmcpw"; + name = "dolphin-plugins-20.12.3.tar.xz"; }; }; dragon = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/dragon-20.12.2.tar.xz"; - sha256 = "0yssqbfgm92bls5cfy0xcqnqfqx00ns2i6rlwdlx38kfh0r47cag"; - name = "dragon-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/dragon-20.12.3.tar.xz"; + sha256 = "0aipkxyks1b7jdbxcb6i7l2kb6gahla07h4mls8fsmal4ha808ga"; + name = "dragon-20.12.3.tar.xz"; }; }; elisa = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/elisa-20.12.2.tar.xz"; - sha256 = "1sl55kynkwxaypdm6zjdk85yxxq9754xm6ybxm7qdafq691g9zjr"; - name = "elisa-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/elisa-20.12.3.tar.xz"; + sha256 = "0rcqwx68hb8cipbd9nd3sl922i63qaaphf6fnryhg7rinh2x75vs"; + name = "elisa-20.12.3.tar.xz"; }; }; eventviews = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/eventviews-20.12.2.tar.xz"; - sha256 = "1g4aqhh2b5s45m0qqp46wazcc7rzcp3mmds4q9x3isckqpijzp39"; - name = "eventviews-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/eventviews-20.12.3.tar.xz"; + sha256 = "0pkfhvrf423irvijqjk7a2px23zi053c57lqkp3cjag9z994wqkv"; + name = "eventviews-20.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ffmpegthumbs-20.12.2.tar.xz"; - sha256 = "0iw1g7x31jkbmniawvjwy8wk573rv05idk08q1vavxa5vixxqsbg"; - name = "ffmpegthumbs-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ffmpegthumbs-20.12.3.tar.xz"; + sha256 = "1cwn3rjqghbd2ivb268g68zibqyvvn1a07hcwa8bfjxw8y5cx890"; + name = "ffmpegthumbs-20.12.3.tar.xz"; }; }; filelight = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/filelight-20.12.2.tar.xz"; - sha256 = "0m38il0rz7zip9rxing4j5fppwyrjgv1d7n3vrp3x4wnmd08j46q"; - name = "filelight-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/filelight-20.12.3.tar.xz"; + sha256 = "0njapqiv2201bk57wl96ky8n78a31234vf2srcjs0nrdmbcp0si0"; + name = "filelight-20.12.3.tar.xz"; }; }; granatier = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/granatier-20.12.2.tar.xz"; - sha256 = "0gssfcqq1czh5l1dwi5lpj0f9bgv2jf0wma9i5j0aqrf9b086g7f"; - name = "granatier-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/granatier-20.12.3.tar.xz"; + sha256 = "1x2l9f9xwrqf06r2qcrlf8941k6kfqb69442cy1ss9jfl9axy3vl"; + name = "granatier-20.12.3.tar.xz"; }; }; grantlee-editor = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/grantlee-editor-20.12.2.tar.xz"; - sha256 = "0fbb9zia4kjc7rw4s27vsy6isvkx56k50gn6y1cyfl0gqy70v4cw"; - name = "grantlee-editor-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/grantlee-editor-20.12.3.tar.xz"; + sha256 = "1n6qi2pvhrhnzpq45757s75rslpzjgl60x7g5fv9cpfjk5knqzkc"; + name = "grantlee-editor-20.12.3.tar.xz"; }; }; grantleetheme = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/grantleetheme-20.12.2.tar.xz"; - sha256 = "1cv23ias36mp4zm84fk21f3f7nx3jz7xpiyz0nvz6xcsiww77762"; - name = "grantleetheme-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/grantleetheme-20.12.3.tar.xz"; + sha256 = "0z9s5bmy89k3gzczim2prvb5mnylzin93d4h4nz6j7p5sk8aqgg3"; + name = "grantleetheme-20.12.3.tar.xz"; }; }; gwenview = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/gwenview-20.12.2.tar.xz"; - sha256 = "0cr6jjnvin8jv6hnajxg6zlph5syg2zjrcwd784dlzv23hna9v5n"; - name = "gwenview-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/gwenview-20.12.3.tar.xz"; + sha256 = "18j13db432hhgz3kdrfcs555wy1fyjap8jha0aaw4w08bx8ll8v8"; + name = "gwenview-20.12.3.tar.xz"; }; }; incidenceeditor = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/incidenceeditor-20.12.2.tar.xz"; - sha256 = "1q48ydma2rcpn3dnf9p08mqfs481n5fhc9m5wl2cvm6as54sfmp8"; - name = "incidenceeditor-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/incidenceeditor-20.12.3.tar.xz"; + sha256 = "04yf0z6wsmb7zibfvv0pgyjzfacqa3drqqbc35d0hnvjzh39q1a4"; + name = "incidenceeditor-20.12.3.tar.xz"; }; }; itinerary = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/itinerary-20.12.2.tar.xz"; - sha256 = "1dkgsiqww9z6k0xbvn15w630jdhmxr1kkz5dcv1n9yl7bgj32s35"; - name = "itinerary-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/itinerary-20.12.3.tar.xz"; + sha256 = "0jpk9f11r563inbm7yrx0lwpb937b1ilgshc9i50fhaqqgii39rp"; + name = "itinerary-20.12.3.tar.xz"; }; }; juk = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/juk-20.12.2.tar.xz"; - sha256 = "1dc6n07hkd8as2q1i2l3jzqcijw3qd4ihx1205nzn7z256bby58n"; - name = "juk-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/juk-20.12.3.tar.xz"; + sha256 = "01sz8qnp71z34yyvgwhami5rybnlqy3r81ki21r45lvmlbd2i9l7"; + name = "juk-20.12.3.tar.xz"; }; }; k3b = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/k3b-20.12.2.tar.xz"; - sha256 = "0gqg8r2p6nksbdg4c8wqz57dj8d1cw7cmrgzc1l2pin4v3qdx94g"; - name = "k3b-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/k3b-20.12.3.tar.xz"; + sha256 = "132v5jcn7dmrbb69sllyv72d2d7vg9bpnpjzfmvirqa80x0x7s48"; + name = "k3b-20.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-integration-20.12.2.tar.xz"; - sha256 = "15py7fp6sajvx0c7zi7zhfx16sqn8kkkvglkvcq0b9kglswpvkfj"; - name = "kaccounts-integration-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kaccounts-integration-20.12.3.tar.xz"; + sha256 = "0md6jwi0295n2s8mkvc793a4sxfzf6fidwpnjal2dsxkzdr0nfcq"; + name = "kaccounts-integration-20.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kaccounts-providers-20.12.2.tar.xz"; - sha256 = "0205l3k3nzx6cnar90zrbgmabapyry4a991lqflkpxgdrkh0ajc0"; - name = "kaccounts-providers-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kaccounts-providers-20.12.3.tar.xz"; + sha256 = "05q6wzdbr1vm8g8qjssk0hnzrqkpq5qrrjwgqj8nkqgipzgclwdf"; + name = "kaccounts-providers-20.12.3.tar.xz"; }; }; kaddressbook = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kaddressbook-20.12.2.tar.xz"; - sha256 = "0xqsl7fav1vqq4iqy2m02s92rnr28pi1ak3sv0ra7q1gb89rhi0y"; - name = "kaddressbook-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kaddressbook-20.12.3.tar.xz"; + sha256 = "15fpcxlnf42wc2z942rrgydb21v30ml3633cvsscrbjc3vys9vc3"; + name = "kaddressbook-20.12.3.tar.xz"; }; }; kajongg = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kajongg-20.12.2.tar.xz"; - sha256 = "0vh6qb3d54nnxrxacq9fn7jq1hshhhnvw9ff0wgh214jlr0gnbqk"; - name = "kajongg-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kajongg-20.12.3.tar.xz"; + sha256 = "0h3kdvrp6y6ydhbmvwc8h1l0zh16jy519k5ragwkd9039cvyryxi"; + name = "kajongg-20.12.3.tar.xz"; }; }; kalarm = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kalarm-20.12.2.tar.xz"; - sha256 = "1lpg1viwn868hw0dd8zs11iafkhzlr3cydfplnh4ss6visga50kb"; - name = "kalarm-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kalarm-20.12.3.tar.xz"; + sha256 = "0pkr9vm5hvdwyqb2mpi1qq5cxv0fd8czlq2hq8kb4ghskwd2nm6z"; + name = "kalarm-20.12.3.tar.xz"; }; }; kalarmcal = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kalarmcal-20.12.2.tar.xz"; - sha256 = "17lll9671318dxhxpnjaih31xz5b971gw6kmrgz2ljq5nz1l027b"; - name = "kalarmcal-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kalarmcal-20.12.3.tar.xz"; + sha256 = "184qdpwwqnwlny0iil2vrw6x1al575mm6fx9iqbpg6hwz131nzhg"; + name = "kalarmcal-20.12.3.tar.xz"; }; }; kalgebra = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kalgebra-20.12.2.tar.xz"; - sha256 = "0dwvm4b0wpkd3i79q3xs2v3majwa56hgq8r4vv071a8ci8fn27bz"; - name = "kalgebra-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kalgebra-20.12.3.tar.xz"; + sha256 = "0bx7v28qgpyjxka3kxjas6n1r5rq88vq064qscgjrn25536bg6p9"; + name = "kalgebra-20.12.3.tar.xz"; }; }; kalzium = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kalzium-20.12.2.tar.xz"; - sha256 = "0jdg0akxmylbvh80cz31cycrdqvyafsv9j7hfpdhrizdy7vvqywg"; - name = "kalzium-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kalzium-20.12.3.tar.xz"; + sha256 = "1r7zvknc8kkx5kcs111ij6k6byj93xbg47bpi8wfh17i2fdrccw2"; + name = "kalzium-20.12.3.tar.xz"; }; }; kamera = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kamera-20.12.2.tar.xz"; - sha256 = "1licmi05g1qpfh88annqd89av77jsmhxnsidgkvf4ffczwd097l6"; - name = "kamera-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kamera-20.12.3.tar.xz"; + sha256 = "0g6i4a975n9sxcjvpihz3wmldivk65i6p175vq2nik46jq6kxnj6"; + name = "kamera-20.12.3.tar.xz"; }; }; kamoso = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kamoso-20.12.2.tar.xz"; - sha256 = "0ar19nlw2bxrbn4wky8ky3x5m70rf7fb0fviniblqcrggyymgmb9"; - name = "kamoso-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kamoso-20.12.3.tar.xz"; + sha256 = "0zmhfcdihb5gd0gvnx3gmsn85dl4h1a42672592qrv7mv9yfl8x4"; + name = "kamoso-20.12.3.tar.xz"; }; }; kanagram = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kanagram-20.12.2.tar.xz"; - sha256 = "00p2mpprbq9zi1zzscb4d0fdj2knnfkjxclf3q982jz4laxyqalf"; - name = "kanagram-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kanagram-20.12.3.tar.xz"; + sha256 = "0yzz8apm76vhfgbx72jjfrc8z090xp9l6lr318wla809bvk92kn5"; + name = "kanagram-20.12.3.tar.xz"; }; }; kapman = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kapman-20.12.2.tar.xz"; - sha256 = "1fs33p9g52k5nywpih7nns3mh0apfhnn174k9711vwnamr73ph6k"; - name = "kapman-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kapman-20.12.3.tar.xz"; + sha256 = "1734r0i37w8cbsmhmv6553l2prcg6l960j2j387x3lm6ynm8szl5"; + name = "kapman-20.12.3.tar.xz"; }; }; kapptemplate = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kapptemplate-20.12.2.tar.xz"; - sha256 = "19rnxw0q8w890ns237vpaapipm3zjz7n0rn9yzxa5cqaf30l7jv5"; - name = "kapptemplate-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kapptemplate-20.12.3.tar.xz"; + sha256 = "0587cwsjh9776zwb9dlqsn75bin5cv80yyixd9hqx86kqkxabw4c"; + name = "kapptemplate-20.12.3.tar.xz"; }; }; kate = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kate-20.12.2.tar.xz"; - sha256 = "1kdznizqh28parijpsi67jmb8mlx4gn7z4szlh5kjd1mv9rikvm7"; - name = "kate-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kate-20.12.3.tar.xz"; + sha256 = "1zfl53b3166ijr41bymlv0mvavjxv9sv5cf8xrpihn0rzs52vg41"; + name = "kate-20.12.3.tar.xz"; }; }; katomic = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/katomic-20.12.2.tar.xz"; - sha256 = "1sxh6x09is33b3zdgj3d6zn9z19qc25v4hskffmw5xivnwz9vzfl"; - name = "katomic-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/katomic-20.12.3.tar.xz"; + sha256 = "1qmby2cp1sz31hraxybcb60a6smaf8ksy3m8nzkk7kpr11mzss0q"; + name = "katomic-20.12.3.tar.xz"; }; }; kbackup = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kbackup-20.12.2.tar.xz"; - sha256 = "138x20p27a0yx4n6xamc660nk0zzrap7zhkkwpy9ayh07rgh1222"; - name = "kbackup-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kbackup-20.12.3.tar.xz"; + sha256 = "04qj9645r427ki2jbj5ij243y6svw24ilwz5pz2qp0dp95wndfql"; + name = "kbackup-20.12.3.tar.xz"; }; }; kblackbox = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kblackbox-20.12.2.tar.xz"; - sha256 = "1c6by0hi9bzs6j1y0qxrvz6ahdxhzivnw9hg4jndmhgbsqqix4q5"; - name = "kblackbox-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kblackbox-20.12.3.tar.xz"; + sha256 = "0z4w3f22d8dmvmv4jmbgk91ga0qbw54xmawkikks5b0xgqkwkls7"; + name = "kblackbox-20.12.3.tar.xz"; }; }; kblocks = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kblocks-20.12.2.tar.xz"; - sha256 = "06slcac3hvdmb5lymyqb1z8mn3r756xz2ghwdqz1d2mn3n2jd0bw"; - name = "kblocks-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kblocks-20.12.3.tar.xz"; + sha256 = "0rsxyyaz6gs4a8qz5gsl865ky8a25hl282m293zsyd66wsc0f3hv"; + name = "kblocks-20.12.3.tar.xz"; }; }; kbounce = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kbounce-20.12.2.tar.xz"; - sha256 = "19xvvxmbwpwkwsm0mxjnh92m352lkshsjgi8yrax1hdblymr60v1"; - name = "kbounce-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kbounce-20.12.3.tar.xz"; + sha256 = "0yyzr0zmsvfafrvy23vd4grdzpgc1w5ava0fb90x174mv0k2v55s"; + name = "kbounce-20.12.3.tar.xz"; }; }; kbreakout = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kbreakout-20.12.2.tar.xz"; - sha256 = "1n1vrj08j1drc1apikhgwdbmb5daypgnkw6yxhqc3xi2a3wglkqz"; - name = "kbreakout-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kbreakout-20.12.3.tar.xz"; + sha256 = "1djiixrwda25p2d8bvhkwn07v2gib35kwm94i1j5yxn0v68m86q1"; + name = "kbreakout-20.12.3.tar.xz"; }; }; kbruch = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kbruch-20.12.2.tar.xz"; - sha256 = "0hjwmzsdlpg8przlmpp0xsa19v7376bpjk5kwyajywhayzzw99xp"; - name = "kbruch-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kbruch-20.12.3.tar.xz"; + sha256 = "1g2ihgxx6fj98cibfla9rig1mpgivs0l0ipkg5v8ax9wy7cmrx82"; + name = "kbruch-20.12.3.tar.xz"; }; }; kcachegrind = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcachegrind-20.12.2.tar.xz"; - sha256 = "0ich4hxfmq909zkn06p8pgxpf7sg9ndq51b533h2clbq3m9qwy2w"; - name = "kcachegrind-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcachegrind-20.12.3.tar.xz"; + sha256 = "1sk9bxz6lx3kadfv862d52pm69fcvg160y84y3qj59b9ms2qpqcm"; + name = "kcachegrind-20.12.3.tar.xz"; }; }; kcalc = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcalc-20.12.2.tar.xz"; - sha256 = "0dv8519wnlfdp2d2ml2r5qx3gjh8g6im742vqqk7m1660ijgc8zx"; - name = "kcalc-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcalc-20.12.3.tar.xz"; + sha256 = "1plq0xfaq2wwhsqddiq5wssn3k3i9dxrr5p80zanzngqcwbql1jl"; + name = "kcalc-20.12.3.tar.xz"; }; }; kcalutils = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcalutils-20.12.2.tar.xz"; - sha256 = "1k4cr1iq945zs6c35f3s1w8kfm3kh7aybmk5py3lsz0zmlab36hc"; - name = "kcalutils-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcalutils-20.12.3.tar.xz"; + sha256 = "0as3900mcsdngrszd19928dfacm3qa7y1y2v65vf9mn0alz367qx"; + name = "kcalutils-20.12.3.tar.xz"; }; }; kcharselect = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcharselect-20.12.2.tar.xz"; - sha256 = "0fqf6bw98l499a144xk7hslxm6zdlpa0lcq0bgwnfsd0fs03wlp3"; - name = "kcharselect-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcharselect-20.12.3.tar.xz"; + sha256 = "1qz96clyh7wl7sb3hkpkij96a0s9zx9saxhvbwrkqjqdhnqai8c3"; + name = "kcharselect-20.12.3.tar.xz"; }; }; kcolorchooser = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcolorchooser-20.12.2.tar.xz"; - sha256 = "08y4qzr43nikgzli14yzj7w8vqzl905f0rwx0ri5247259jna3rk"; - name = "kcolorchooser-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcolorchooser-20.12.3.tar.xz"; + sha256 = "0aamaml734mcbja9j4m9grp0zsxvy8ivzia49l2pmq27ci23ygad"; + name = "kcolorchooser-20.12.3.tar.xz"; }; }; kcron = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kcron-20.12.2.tar.xz"; - sha256 = "025a647zl125568l8vqnljir110jbnkxd4921a892ip7pnhp0v95"; - name = "kcron-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kcron-20.12.3.tar.xz"; + sha256 = "0jn5mymzbifblg1sl4h9micql8baxmbpjclmlxp9r59m3vlpd0pf"; + name = "kcron-20.12.3.tar.xz"; }; }; kdebugsettings = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdebugsettings-20.12.2.tar.xz"; - sha256 = "1dzdvscklgbcfjalcc1mfh3vgiai2dvbsz00b4c96r8jxpm7bvcn"; - name = "kdebugsettings-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdebugsettings-20.12.3.tar.xz"; + sha256 = "1nsinb3psnvab0gc88hl374fr8f3iwxzi5ly9fg41f0z5a4hp9qv"; + name = "kdebugsettings-20.12.3.tar.xz"; }; }; kdeconnect-kde = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdeconnect-kde-20.12.2.tar.xz"; - sha256 = "0wcx1bn121b62pwdkf7k24sa03kgixvrbp5y5iy11im7kj5i3ji1"; - name = "kdeconnect-kde-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdeconnect-kde-20.12.3.tar.xz"; + sha256 = "1a08js0nrjzkfs46wydyz2ipivvgyc0hyyz4cxglhs5i97gab601"; + name = "kdeconnect-kde-20.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-scripts-20.12.2.tar.xz"; - sha256 = "03kqd01yhii2b6g4gsjg09vwmzv53vr5d7y3d4db13kgg0f1z352"; - name = "kde-dev-scripts-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kde-dev-scripts-20.12.3.tar.xz"; + sha256 = "1qng0232gzfzqlx5ri7lkkhri6wj9gci14xc62qqhklkmfdfx3nh"; + name = "kde-dev-scripts-20.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kde-dev-utils-20.12.2.tar.xz"; - sha256 = "105pp4yhgynn3gq0bi7q1vyy1qn8pcd0hgx17v674hf8afy4627r"; - name = "kde-dev-utils-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kde-dev-utils-20.12.3.tar.xz"; + sha256 = "09k9c0dk6gq3372zarmq7kfid7kn2s1vfdcrzal6wg57axfqs8d7"; + name = "kde-dev-utils-20.12.3.tar.xz"; }; }; kdeedu-data = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdeedu-data-20.12.2.tar.xz"; - sha256 = "04x8papz62m5kanrqpjddzijda761i4j8y4cmqpnxkg2jrwfqqls"; - name = "kdeedu-data-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdeedu-data-20.12.3.tar.xz"; + sha256 = "0cg62yvv39zgshqmfwl5p007b4za6x1nimfmn0hk8j9paas4ykkr"; + name = "kdeedu-data-20.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-mobipocket-20.12.2.tar.xz"; - sha256 = "02a4ivpvfziaa464l8c9ivydagcb912ld95isgvc5jl4g85lm166"; - name = "kdegraphics-mobipocket-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdegraphics-mobipocket-20.12.3.tar.xz"; + sha256 = "1zbizlk84idqxk0mr6zi86f3z4wrcc0k75s2s0xwfavjp5wvjj4l"; + name = "kdegraphics-mobipocket-20.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdegraphics-thumbnailers-20.12.2.tar.xz"; - sha256 = "1p47fvb6mdk23rx9jhm9x60sny9z6plgdjih5lzy9k3hvl0sl8zk"; - name = "kdegraphics-thumbnailers-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdegraphics-thumbnailers-20.12.3.tar.xz"; + sha256 = "0g3z6jai2v7pin23vk8xh66r9y8bw2768aykqhh5s507q0k8cnfx"; + name = "kdegraphics-thumbnailers-20.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdenetwork-filesharing-20.12.2.tar.xz"; - sha256 = "0y60az09hkhd1hvwa7h7c834dc0mfnd89f78v8m31il8g2xniziz"; - name = "kdenetwork-filesharing-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdenetwork-filesharing-20.12.3.tar.xz"; + sha256 = "1lg3431wgrswam1mgck1p2kfgrwk0pk02nzh7xxgvh78104npbb2"; + name = "kdenetwork-filesharing-20.12.3.tar.xz"; }; }; kdenlive = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdenlive-20.12.2.tar.xz"; - sha256 = "0gh1cjhakdl7hx236rsxiv62mafd2vvvpg5ndwlp0zfpsx7kzjrz"; - name = "kdenlive-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdenlive-20.12.3.tar.xz"; + sha256 = "11l5m19vbkjgvxcxh64ccwk33ws5sjpxr68d8459piggkdlr97wd"; + name = "kdenlive-20.12.3.tar.xz"; }; }; kdepim-addons = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdepim-addons-20.12.2.tar.xz"; - sha256 = "0zj22ggn98sqz3nnvzffhbv2cq672j885f2p8qla6swhyw91cq8n"; - name = "kdepim-addons-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdepim-addons-20.12.3.tar.xz"; + sha256 = "0wd64aby2yrg937m9sfyzby3gxhwp2n1h6ijxxz7h2wi5mw3aqdp"; + name = "kdepim-addons-20.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdepim-runtime-20.12.2.tar.xz"; - sha256 = "0p5c4l4xixcvpzx7mri2jxa3nwk4824lp5sy93sspf2nlgdv3zsn"; - name = "kdepim-runtime-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdepim-runtime-20.12.3.tar.xz"; + sha256 = "0lp3cvkbfqd0zn7gh0as1ksknzqwxpz70zbks70wzdf4i59k2sxv"; + name = "kdepim-runtime-20.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-kioslaves-20.12.2.tar.xz"; - sha256 = "1xgp3fi6nnygjw2p832ylmhsj70dm33c4rf3h79sc2dp7aihnapy"; - name = "kdesdk-kioslaves-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdesdk-kioslaves-20.12.3.tar.xz"; + sha256 = "0x48xzqg85rc639rrd7y43y1bvzyw189vydra13wbg063acx79n8"; + name = "kdesdk-kioslaves-20.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdesdk-thumbnailers-20.12.2.tar.xz"; - sha256 = "0jk2x2b8qwhfbf9hy8j0yslggn3zwp18q21ip299b4cpx1w72bgq"; - name = "kdesdk-thumbnailers-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdesdk-thumbnailers-20.12.3.tar.xz"; + sha256 = "1n49psav0528dzg7b8h79pwngzjh1if7n47y7y8f5dj3smnyi6mv"; + name = "kdesdk-thumbnailers-20.12.3.tar.xz"; }; }; kdf = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdf-20.12.2.tar.xz"; - sha256 = "0fx9b5njsmvzznrgz2r9xz8yh977v865zvsih60hdrz6gaflg1rx"; - name = "kdf-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdf-20.12.3.tar.xz"; + sha256 = "1qvjkfnagcyplkpx5v7vwfhs0xjll7g5jc0fvmkxqf38v2m5wb77"; + name = "kdf-20.12.3.tar.xz"; }; }; kdialog = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdialog-20.12.2.tar.xz"; - sha256 = "1v2yflxpqg2h2jgxql1mnk8c1v1n4ljard5bgh1dw898r7b8g2xd"; - name = "kdialog-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdialog-20.12.3.tar.xz"; + sha256 = "1ph26rks7yfjr28gvgyq77d8mnxxj0dxldd83lw94plhwlsnf7r3"; + name = "kdialog-20.12.3.tar.xz"; }; }; kdiamond = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kdiamond-20.12.2.tar.xz"; - sha256 = "17z1g2jxz26pqx5xjc5h7w5s2xy72p00ydnfhsv1bi1kfd79ry8k"; - name = "kdiamond-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kdiamond-20.12.3.tar.xz"; + sha256 = "1wljkv0hacahc6n1x40diycvd32qlw363yzf3qm2l3h55g1ynca7"; + name = "kdiamond-20.12.3.tar.xz"; }; }; keditbookmarks = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/keditbookmarks-20.12.2.tar.xz"; - sha256 = "0slma1vrm0cmr2v970ingbckqa3viw6jgfss0z7fpx4bilw65bd7"; - name = "keditbookmarks-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/keditbookmarks-20.12.3.tar.xz"; + sha256 = "0nfpdm672vs5h5ivxj6aaicj1b8nqcp7gw81jvjnq3nqk1k488v8"; + name = "keditbookmarks-20.12.3.tar.xz"; }; }; kfind = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kfind-20.12.2.tar.xz"; - sha256 = "0vfi5ipwncq7d4z1gbilw6kyyrn5d986wr3f2zhsyhpwmsh9ycnb"; - name = "kfind-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kfind-20.12.3.tar.xz"; + sha256 = "0rzilsw9y8cd4vmksl3jpddc0qc3y60yz7f6yk11n0hpszy0ixp6"; + name = "kfind-20.12.3.tar.xz"; }; }; kfloppy = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kfloppy-20.12.2.tar.xz"; - sha256 = "1sz6bgw54w8s4bdyyajy0zgxw5kcm45p0gizf7ghw33x5vxryg4g"; - name = "kfloppy-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kfloppy-20.12.3.tar.xz"; + sha256 = "00ff15fcgp1bgl4qin6md18p93wbpg3p230kgjk76qp8rmnwamg8"; + name = "kfloppy-20.12.3.tar.xz"; }; }; kfourinline = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kfourinline-20.12.2.tar.xz"; - sha256 = "1ld2srgmriab70j08nvqbaswjp2miljwd8rbpy2dyvzfprmci3xk"; - name = "kfourinline-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kfourinline-20.12.3.tar.xz"; + sha256 = "0rj1b60g7dng8yqw92lv9kk8fbnc7wwc9gbikkkjsrmw20hsl4jj"; + name = "kfourinline-20.12.3.tar.xz"; }; }; kgeography = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kgeography-20.12.2.tar.xz"; - sha256 = "0v1355y3fwzq63hq0wz9rskzncnlfdybmqcx23pk57jazsmv6ndi"; - name = "kgeography-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kgeography-20.12.3.tar.xz"; + sha256 = "0i9sg203rbkcjl5si8fprmz31m90i5gq7ckv6vrsnmf3y0f6324m"; + name = "kgeography-20.12.3.tar.xz"; }; }; kget = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kget-20.12.2.tar.xz"; - sha256 = "1xya4raai9jqqzb3kga3mrm7jznkaa0fr4sq8j28qd45bgx2385p"; - name = "kget-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kget-20.12.3.tar.xz"; + sha256 = "0kh2yv3fq6mdfqfiqiqd01l8rmr36pmcmjdqqaagsb16jprxivnl"; + name = "kget-20.12.3.tar.xz"; }; }; kgoldrunner = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kgoldrunner-20.12.2.tar.xz"; - sha256 = "1ai5hfhwlsiw6ywpmwg9q85hsn3ih44v7n3wj70fsrldh87cn9ps"; - name = "kgoldrunner-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kgoldrunner-20.12.3.tar.xz"; + sha256 = "01c2ia8hs8i92ayah3jlsrqb62mcfa0phmm8rjbpnv8ybkjba720"; + name = "kgoldrunner-20.12.3.tar.xz"; }; }; kgpg = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kgpg-20.12.2.tar.xz"; - sha256 = "1szg6fmmnxi94s5r2gxn4mlsiqahharyh05bisy5w7cl9w9c70xg"; - name = "kgpg-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kgpg-20.12.3.tar.xz"; + sha256 = "0z4xlgdhdagniabbzsvrpgzm2k3vwmk6li2wp9y719yj1jm23iyz"; + name = "kgpg-20.12.3.tar.xz"; }; }; khangman = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/khangman-20.12.2.tar.xz"; - sha256 = "1bhcdr2v6zgawn819vbqnvgrm52xymgjyr396qbx5mc0srz88bzk"; - name = "khangman-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/khangman-20.12.3.tar.xz"; + sha256 = "0alk18a95m5cl3zxf4y69i6vs1v027s5zwkbgrczznnxx2isv82r"; + name = "khangman-20.12.3.tar.xz"; }; }; khelpcenter = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/khelpcenter-20.12.2.tar.xz"; - sha256 = "1mxs0imw64av8dybh91xxy4mmdcikjkqv6apsw29pp3s29irxpdx"; - name = "khelpcenter-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/khelpcenter-20.12.3.tar.xz"; + sha256 = "0mixgxi4a56x1xgan4rz3f6bifm21rwnm193klsd15bkd29yfa8f"; + name = "khelpcenter-20.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kidentitymanagement-20.12.2.tar.xz"; - sha256 = "1vcpfcriinx0ywz3jz26810h2cqmlfvyyxd0mzh3jp7rl0kkasgj"; - name = "kidentitymanagement-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kidentitymanagement-20.12.3.tar.xz"; + sha256 = "161dj154r43gmw7768llanvmismf5fa141xblji6q40ss5aknsh3"; + name = "kidentitymanagement-20.12.3.tar.xz"; }; }; kig = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kig-20.12.2.tar.xz"; - sha256 = "08wvgykrhzf2j4qb0fz4irbyaxjp5ka7jmmjn8y27srz0x4zgkrz"; - name = "kig-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kig-20.12.3.tar.xz"; + sha256 = "1ncy071wlyinkzhalnhg23x6n01031m2sx5kzh8gllp023mn2cnf"; + name = "kig-20.12.3.tar.xz"; }; }; kigo = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kigo-20.12.2.tar.xz"; - sha256 = "1a4hv5g2wdpvf56zrr0rna6hdvm2cy6sz1jlhj7hf1lcx3lgfj9g"; - name = "kigo-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kigo-20.12.3.tar.xz"; + sha256 = "1s4ykxlr47gk6n44fnv390m619i0jnxbxs4vd3vv7f9hfl65k598"; + name = "kigo-20.12.3.tar.xz"; }; }; killbots = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/killbots-20.12.2.tar.xz"; - sha256 = "01lmkflndqmrzyrabmh5jqrk2zywcn5s82aag3m0wdqbyrqc5pas"; - name = "killbots-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/killbots-20.12.3.tar.xz"; + sha256 = "056slp4d9gk40i75gk42cvaq300zr228srqly2gap4879vqs04pa"; + name = "killbots-20.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kimagemapeditor-20.12.2.tar.xz"; - sha256 = "06awvhcjg8nd0wjcqqzccnlpci6cd35flvfs3k05czk70sgqzysq"; - name = "kimagemapeditor-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kimagemapeditor-20.12.3.tar.xz"; + sha256 = "15z2mygfhk4bq212f76x60zzia1339hw1jg5vf24q2xs26gppprr"; + name = "kimagemapeditor-20.12.3.tar.xz"; }; }; kimap = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kimap-20.12.2.tar.xz"; - sha256 = "14kjgn6b1qnfr3zsr3r73wf15n47qqx9vw5z11yv161andrr105d"; - name = "kimap-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kimap-20.12.3.tar.xz"; + sha256 = "080k4zyl7rlgzyfz6hsygv4wpw1hf08qnv4sbakpy3j8h6cbn79j"; + name = "kimap-20.12.3.tar.xz"; }; }; kio-extras = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kio-extras-20.12.2.tar.xz"; - sha256 = "1r2sw8i7lf0zyb5bvz4002vdi2bf9jv01735caiw9smxr1lgcz93"; - name = "kio-extras-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kio-extras-20.12.3.tar.xz"; + sha256 = "1qj1cxzlpwh47vx7n3lm86556a53i6x3nvj5xc51mkh8pkdr0nxs"; + name = "kio-extras-20.12.3.tar.xz"; }; }; kio-gdrive = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kio-gdrive-20.12.2.tar.xz"; - sha256 = "0rwwakhsn9bnmxxnr0620jyp00x7iqqsaz5nd2lmhyjkc4mqv2km"; - name = "kio-gdrive-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kio-gdrive-20.12.3.tar.xz"; + sha256 = "0w3vizdrjrikpgq137l5g0anvk0nb5wkr4m7pn0qma0sd03wqsa5"; + name = "kio-gdrive-20.12.3.tar.xz"; }; }; kipi-plugins = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kipi-plugins-20.12.2.tar.xz"; - sha256 = "120yi7kfqv74368c78s4gfg7fp2h32v1c3jic2lnsy5y3iad22l8"; - name = "kipi-plugins-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kipi-plugins-20.12.3.tar.xz"; + sha256 = "0wf0f6n1kpbcrlrfnmhkvcva4n86nav3lwfka29xwmk0brq35ghn"; + name = "kipi-plugins-20.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kirigami-gallery-20.12.2.tar.xz"; - sha256 = "039ddgrvw1l4jvc3yjs0c6fi8kss5ma8hs6cbs8xvw0cyi9604qw"; - name = "kirigami-gallery-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kirigami-gallery-20.12.3.tar.xz"; + sha256 = "0925n23wa69v69f0i3fafkaqsvn3sv41ili7c62110zx5n92qd3v"; + name = "kirigami-gallery-20.12.3.tar.xz"; }; }; kiriki = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kiriki-20.12.2.tar.xz"; - sha256 = "0bslysqnnxkjfyxv8vkfmvwjhlw2zdlghbngg21k1ljvgr2jfx6j"; - name = "kiriki-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kiriki-20.12.3.tar.xz"; + sha256 = "0xnwdvnblz8qpgngjmmn218nrjxhy6f6z6ispszirr39mxvqgdhd"; + name = "kiriki-20.12.3.tar.xz"; }; }; kiten = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kiten-20.12.2.tar.xz"; - sha256 = "18p4g9cqn25s2zjygwvi9s81ma0b8rhfj9z0i2kd415b2sxalk3y"; - name = "kiten-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kiten-20.12.3.tar.xz"; + sha256 = "0yjfdbrm5kijf5rh45ih8x3hxcj9y9d5bivpi2xqdnl8w6dq0hnq"; + name = "kiten-20.12.3.tar.xz"; }; }; kitinerary = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kitinerary-20.12.2.tar.xz"; - sha256 = "0z9jyj9wlda44qdncjnp6cyp7dwk89dl9nj68j5birmn83ykaawp"; - name = "kitinerary-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kitinerary-20.12.3.tar.xz"; + sha256 = "1p8s27clnvn87kmlvv00j9s50n82awb19cvh4kwm7h77f3aai7jm"; + name = "kitinerary-20.12.3.tar.xz"; }; }; kjumpingcube = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kjumpingcube-20.12.2.tar.xz"; - sha256 = "04qry2b82yk2k4v1pj8pvqi27my42k5ssmc5rpzkh0vq8pzwgkjh"; - name = "kjumpingcube-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kjumpingcube-20.12.3.tar.xz"; + sha256 = "0rr0972scdr0x5ba3gqdprhg0ipm75577bx79m1jhkbqrcsr9kvg"; + name = "kjumpingcube-20.12.3.tar.xz"; }; }; kldap = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kldap-20.12.2.tar.xz"; - sha256 = "1njgsxbqgz0grqagf695qv285x8slgnp4rg377jz1cnz597nzl6b"; - name = "kldap-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kldap-20.12.3.tar.xz"; + sha256 = "0lynv6101wqyi88rm34kwl4a4rdb59q69x918y4ggc4jzvgvq32c"; + name = "kldap-20.12.3.tar.xz"; }; }; kleopatra = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kleopatra-20.12.2.tar.xz"; - sha256 = "12ayl3gar9bi06v418sflr6fr5k86m8x2ls4laig1ymansbvnwlz"; - name = "kleopatra-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kleopatra-20.12.3.tar.xz"; + sha256 = "187agxw1s441qpskv8s74nvmsqmgh5z3mid85i8lvm5bqsdzjc5z"; + name = "kleopatra-20.12.3.tar.xz"; }; }; klettres = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/klettres-20.12.2.tar.xz"; - sha256 = "0ixykb36a7hgz89zxc8x7fp0di67vmalvpa9rivdff3lp7il87n3"; - name = "klettres-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/klettres-20.12.3.tar.xz"; + sha256 = "1zfbcciki2gz14b0mq7nv7pq90n2kf6dn33nkrwy086rmfm245dw"; + name = "klettres-20.12.3.tar.xz"; }; }; klickety = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/klickety-20.12.2.tar.xz"; - sha256 = "0dgv6bnz7aw95nxjqkhcanl06hpdx4g8qwkrvnfsiphjbldhfig7"; - name = "klickety-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/klickety-20.12.3.tar.xz"; + sha256 = "155qhsgslx9nw4fzm5x5c09i3vwkqbl5xxa1arcxjpwsashfri2q"; + name = "klickety-20.12.3.tar.xz"; }; }; klines = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/klines-20.12.2.tar.xz"; - sha256 = "14mrqfw7y5xcq237a6prfqy8pj34iz5mnfqs373p0jbvdqkc5843"; - name = "klines-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/klines-20.12.3.tar.xz"; + sha256 = "06syv5wxf2d9wqh5l7lwwjd0i3q8jqhimgb2ndyv2sp3p6zyx28n"; + name = "klines-20.12.3.tar.xz"; }; }; kmag = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmag-20.12.2.tar.xz"; - sha256 = "1vwn5n3c8kq3d3d7sssqpq8iz9g0af4xnvcvjqh4s7fcxmsr3ryv"; - name = "kmag-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmag-20.12.3.tar.xz"; + sha256 = "1p31i6hnhmmmx97bi1zb6c71zi1428gzf11sx66yhvfpj6vjx4rj"; + name = "kmag-20.12.3.tar.xz"; }; }; kmahjongg = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmahjongg-20.12.2.tar.xz"; - sha256 = "055nihkvfij6a71qn6lw3sbb74zz5r7cp2dghlkai9405ri4gdyc"; - name = "kmahjongg-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmahjongg-20.12.3.tar.xz"; + sha256 = "1kx6l03x68cvr78iqjc7byraw714pbynavzm4vr8spadqr1scmj2"; + name = "kmahjongg-20.12.3.tar.xz"; }; }; kmail = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmail-20.12.2.tar.xz"; - sha256 = "09idfdh04687jzh125jw2244ymaqhx6j3563m2cbf2spph0r1vqj"; - name = "kmail-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmail-20.12.3.tar.xz"; + sha256 = "192wqkvq062xaq42bwl9f1rn7bc60slb3c0ika3mn446mr04s7j1"; + name = "kmail-20.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmail-account-wizard-20.12.2.tar.xz"; - sha256 = "0a9pz1m3jabi21nrlcj0fqrj1hsgmarw91sxx5qvs74fp2b59368"; - name = "kmail-account-wizard-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmail-account-wizard-20.12.3.tar.xz"; + sha256 = "1djc4fl5nyvnz26kbpqav5qy6azcrl0vmfaphmh4msx01823w50n"; + name = "kmail-account-wizard-20.12.3.tar.xz"; }; }; kmailtransport = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmailtransport-20.12.2.tar.xz"; - sha256 = "11knn52fc5r637s1w3fzbkapjx6xs1n9v9933ji17zhry7c5rlzv"; - name = "kmailtransport-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmailtransport-20.12.3.tar.xz"; + sha256 = "1m2r30rlmfb41m6hqmbrrw6lf7im4xlsxpfqf2h8qiss9avxf66p"; + name = "kmailtransport-20.12.3.tar.xz"; }; }; kmbox = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmbox-20.12.2.tar.xz"; - sha256 = "0r76s03g4da2sds6y632gvg228gwsl7gs8ml9rf0fdjb8ymql1hl"; - name = "kmbox-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmbox-20.12.3.tar.xz"; + sha256 = "0cwhzppckk3lv5p8nwba1vw57hkpbpgk69wnax6ad5x6nkynri8f"; + name = "kmbox-20.12.3.tar.xz"; }; }; kmime = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmime-20.12.2.tar.xz"; - sha256 = "1jpfhsac2pji80cad0yab59lq7q7c1han0gajvwys1j15jyj11gi"; - name = "kmime-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmime-20.12.3.tar.xz"; + sha256 = "0va7xxr9bk27nalpr1959g7kbsbn4q974qhsnfvyac7qv0wnh7iq"; + name = "kmime-20.12.3.tar.xz"; }; }; kmines = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmines-20.12.2.tar.xz"; - sha256 = "0378cd1zh6w8slap4wry8m69l27nvi7j2dwz2vwkl76zh31q4pwi"; - name = "kmines-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmines-20.12.3.tar.xz"; + sha256 = "11g98f8q77a1zivpv46bahqzkxna15mxm9abc5nmbhhrfl3n2ljr"; + name = "kmines-20.12.3.tar.xz"; }; }; kmix = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmix-20.12.2.tar.xz"; - sha256 = "12kij1y2lbyx71bg32pwb9s9p928pyw44flz9bv2jrzkkf4zwfxk"; - name = "kmix-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmix-20.12.3.tar.xz"; + sha256 = "05za6km6lgkc79rk6iksbvfbc62110j6dlvsas2ld67cisar5y38"; + name = "kmix-20.12.3.tar.xz"; }; }; kmousetool = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmousetool-20.12.2.tar.xz"; - sha256 = "0ybrczxsmfrj43nr931ylbdgpqmcfx47ifbv2qjn72i8iggrv0cl"; - name = "kmousetool-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmousetool-20.12.3.tar.xz"; + sha256 = "0xsjwjm517j2pqc04fvam181yrhb6qsi4nyxzc9c7xwwqm1pw03a"; + name = "kmousetool-20.12.3.tar.xz"; }; }; kmouth = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmouth-20.12.2.tar.xz"; - sha256 = "1vq41r1vhr5iaxlb5dzpq3vwqk1rn1zxw3k4j7g2xq5xxmibj944"; - name = "kmouth-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmouth-20.12.3.tar.xz"; + sha256 = "152xgpq8mlwpaq82cff0llwpkw2jylwbpwfbish7glqghryzrgwh"; + name = "kmouth-20.12.3.tar.xz"; }; }; kmplot = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kmplot-20.12.2.tar.xz"; - sha256 = "0l6j68zg9xdrgglw7gnji0spjf7pcggym90cccw67jdn2wxc8g6q"; - name = "kmplot-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kmplot-20.12.3.tar.xz"; + sha256 = "1b70kfjp83dnslpb9732dsci3yq0iglr6ikbm6lsbf2qbxxshjl3"; + name = "kmplot-20.12.3.tar.xz"; }; }; knavalbattle = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/knavalbattle-20.12.2.tar.xz"; - sha256 = "0x47rzs7afqygcy45crc10ix4dsivnpmxis9r0w4lpzbq3qzd585"; - name = "knavalbattle-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/knavalbattle-20.12.3.tar.xz"; + sha256 = "1a7rja1zb06aa9brjlsd0jx3vxn3gmdq1fg0gzmmfg77mdmb3l6g"; + name = "knavalbattle-20.12.3.tar.xz"; }; }; knetwalk = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/knetwalk-20.12.2.tar.xz"; - sha256 = "11h7b5amm4bcng0h8hfcn1r1nkd82h0rl47wvnqczsgjqp2r9h6a"; - name = "knetwalk-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/knetwalk-20.12.3.tar.xz"; + sha256 = "1bnm1lfp0igav57ys5yqim2wky8xpkk52zy50k5l5p32sd7g2x59"; + name = "knetwalk-20.12.3.tar.xz"; }; }; knights = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/knights-20.12.2.tar.xz"; - sha256 = "1p5w61x4ldb5sp77l1c0v7aczi62xpvf1084316byhb5cqmxsqm9"; - name = "knights-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/knights-20.12.3.tar.xz"; + sha256 = "0z85xw91fqgrhz8kl1gshqy6n4ah14b5z1ajr0m0x817xy2ifys9"; + name = "knights-20.12.3.tar.xz"; }; }; knotes = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/knotes-20.12.2.tar.xz"; - sha256 = "11dvczl04lmzlhbmqp508bqrsrqqmmprp3nsvakmmidpgnvcm26l"; - name = "knotes-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/knotes-20.12.3.tar.xz"; + sha256 = "1n642jqwlg8nrmlm9xllbcdffwq3gy32pr6fp3k076x28kjg7mh6"; + name = "knotes-20.12.3.tar.xz"; }; }; kolf = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kolf-20.12.2.tar.xz"; - sha256 = "1jw22m7a2jdw9zmssiihwm35zpq7bg8zk0a68fh5nxbyv43q8fj5"; - name = "kolf-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kolf-20.12.3.tar.xz"; + sha256 = "1xxmw85gxs96djanx5q0vzz0h5ilckyz644vvxqillng6f54skbp"; + name = "kolf-20.12.3.tar.xz"; }; }; kollision = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kollision-20.12.2.tar.xz"; - sha256 = "0g0mf9p1pz9wahc92k9iw1vb8v64y1kj7zgiyzmil6qr1pjyzlgm"; - name = "kollision-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kollision-20.12.3.tar.xz"; + sha256 = "16bfbhb7dlfkwbald1vsbfffphpvzc3pglcjdc3wval8kqh9f7i0"; + name = "kollision-20.12.3.tar.xz"; }; }; kolourpaint = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kolourpaint-20.12.2.tar.xz"; - sha256 = "13pb09r9qrgwaii9x3a6qk3qgk288a821p4xgiwaiv9lcbjz56fn"; - name = "kolourpaint-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kolourpaint-20.12.3.tar.xz"; + sha256 = "0gp9pnagajhzy2f4cmvimvwr3sfk87w6zjwi264nk0cgd41pi51g"; + name = "kolourpaint-20.12.3.tar.xz"; }; }; kompare = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kompare-20.12.2.tar.xz"; - sha256 = "18n5sw52kwwmbgyb2q5lizpa57by8gmx665bj68wi2hvzdihmxmv"; - name = "kompare-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kompare-20.12.3.tar.xz"; + sha256 = "0zzvcxwr2vb48i8dj1r7m9841177zdci762f5ljk5wn8lbgysmvv"; + name = "kompare-20.12.3.tar.xz"; }; }; konqueror = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/konqueror-20.12.2.tar.xz"; - sha256 = "0zvr71yz2053y341b12zw92v0yk5whgivcr0iyz488lfw9wq0n4d"; - name = "konqueror-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/konqueror-20.12.3.tar.xz"; + sha256 = "1y6jpq1v5yxdhanyll3kgg9m5p0ri66cvsbg3vhiay377s992927"; + name = "konqueror-20.12.3.tar.xz"; }; }; konquest = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/konquest-20.12.2.tar.xz"; - sha256 = "0p4y7s37a3vchplpidlv4bc94gwnsm4k7sl4s2ra0prqga83yxbj"; - name = "konquest-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/konquest-20.12.3.tar.xz"; + sha256 = "11ygcif5z7nn8x599m4dk0a8kdriiqg177f7v05pf0fhd7x72968"; + name = "konquest-20.12.3.tar.xz"; }; }; konsole = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/konsole-20.12.2.tar.xz"; - sha256 = "0wq8xbppg4fla8x669rvkz4mrpbpaplr0ysdvnc4djbwnzabs6zw"; - name = "konsole-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/konsole-20.12.3.tar.xz"; + sha256 = "138kvndy7xjjmac2wy2lsqi5pckba6nwbfgsdd91fbmfqkyl5k94"; + name = "konsole-20.12.3.tar.xz"; }; }; kontact = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kontact-20.12.2.tar.xz"; - sha256 = "05pvrbsbrz39znim2jrcslnji8n4imig8f717jv89nlmllp5sk2i"; - name = "kontact-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kontact-20.12.3.tar.xz"; + sha256 = "0vysa621chslz8l0xhnxs8bymkgjwqg24bhp2kw5lllz4f46iidl"; + name = "kontact-20.12.3.tar.xz"; }; }; kontactinterface = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kontactinterface-20.12.2.tar.xz"; - sha256 = "0i3kxim4rc4mvqlq06g0a8h106gb93v4s0kymysd4a4yw3pq4fas"; - name = "kontactinterface-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kontactinterface-20.12.3.tar.xz"; + sha256 = "1nqxk2x0bzndfv35g1l8yhafknyb0s68vrmcwf4kd15g5rf3k7rw"; + name = "kontactinterface-20.12.3.tar.xz"; }; }; kontrast = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kontrast-20.12.2.tar.xz"; - sha256 = "0cqqclyqm0z59n296jh6pnb2zdzligmvsd2icb1qzxn2r69inipa"; - name = "kontrast-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kontrast-20.12.3.tar.xz"; + sha256 = "12q21d6fj29akvy6yk769pfwwhw24y13bhhbwrpnyv2ih96j9s8d"; + name = "kontrast-20.12.3.tar.xz"; }; }; konversation = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/konversation-20.12.2.tar.xz"; - sha256 = "0m13qpvzxm5arawsqh2hygs266jv9915lhc3xhs0b1wbhjb3ii8l"; - name = "konversation-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/konversation-20.12.3.tar.xz"; + sha256 = "0cwnlihdidr5pxcbz4l68w1q6a9g3y1997gk7xqqnh4kz2fkc37q"; + name = "konversation-20.12.3.tar.xz"; }; }; kopete = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kopete-20.12.2.tar.xz"; - sha256 = "0ahcxkvi5ibdl3krm3aw5gamcyfi4s4af2wl6r3sk73l7q4kpxvi"; - name = "kopete-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kopete-20.12.3.tar.xz"; + sha256 = "0jl498q59dfwkazf7iqzlvia9jr6hhmkhy0hprbvww4av2si7x6w"; + name = "kopete-20.12.3.tar.xz"; }; }; korganizer = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/korganizer-20.12.2.tar.xz"; - sha256 = "1f2j60gdx3hxz64lhx9cyi7sa75s2qr8zghhk8h1wgdwaz9hvjz8"; - name = "korganizer-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/korganizer-20.12.3.tar.xz"; + sha256 = "16mz7rmh65xljlf1jq719nkihr23wh840lf5cxzcx3vpk4gcc87w"; + name = "korganizer-20.12.3.tar.xz"; }; }; kosmindoormap = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kosmindoormap-20.12.2.tar.xz"; - sha256 = "0rr6lgfbjdvnxipx0dnzp4hlrvq61ha015mz7qkly88ckwp6m05q"; - name = "kosmindoormap-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kosmindoormap-20.12.3.tar.xz"; + sha256 = "02dgnwand9sbas4v4c12xn8szgc3a7crmh8dd4q7rpcrzm2x1m9k"; + name = "kosmindoormap-20.12.3.tar.xz"; }; }; kpat = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kpat-20.12.2.tar.xz"; - sha256 = "1gcv343aabwcgx3kb9khkvilnxipq200pz14d8qdj41lsa71cynx"; - name = "kpat-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kpat-20.12.3.tar.xz"; + sha256 = "1v1lzvl0xb5h4vma78ln400a81wilx16m987aijxg4c8gq4h5n11"; + name = "kpat-20.12.3.tar.xz"; }; }; kpimtextedit = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kpimtextedit-20.12.2.tar.xz"; - sha256 = "1ccvzwbxbsbb4b5hfjvf30fv44b1byjzb08x4vagbrqb47ck763y"; - name = "kpimtextedit-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kpimtextedit-20.12.3.tar.xz"; + sha256 = "07lkc5zgsgvjz9544ckp17sii5bm06fynb0s046rks6z8fcncxrk"; + name = "kpimtextedit-20.12.3.tar.xz"; }; }; kpkpass = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kpkpass-20.12.2.tar.xz"; - sha256 = "1m0cqlrpjmfam0lyjjzpd8wgsv9v0x6fr76qr5ndyrfbfcv0qin3"; - name = "kpkpass-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kpkpass-20.12.3.tar.xz"; + sha256 = "0lcgalcyfd5ggznwifwvvybj6z080gx12y4gx4mdh7jjjx0j4ng9"; + name = "kpkpass-20.12.3.tar.xz"; }; }; kpmcore = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kpmcore-20.12.2.tar.xz"; - sha256 = "1z8fln51jsgar69m2x8rb95zxbq6r28cycpa7y52gaiywahbsin4"; - name = "kpmcore-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kpmcore-20.12.3.tar.xz"; + sha256 = "02jaz24wvw4jqi0k41067wwwy5yi6z80a1ah36ypxawzah9y94ik"; + name = "kpmcore-20.12.3.tar.xz"; }; }; kpublictransport = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kpublictransport-20.12.2.tar.xz"; - sha256 = "1n7gy9pnykxd39ralfxrrvbsgxn68f1jzvbmkyvj759xrl2na1kq"; - name = "kpublictransport-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kpublictransport-20.12.3.tar.xz"; + sha256 = "15y6h44wdl78rfs40b71ijmvs2qb2ylnq72r8v6rn3fdnfhx2l4r"; + name = "kpublictransport-20.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kqtquickcharts-20.12.2.tar.xz"; - sha256 = "06lrvckmddyxl11kyic99dhfn8il88hs1vsnr89y3m8543ij885n"; - name = "kqtquickcharts-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kqtquickcharts-20.12.3.tar.xz"; + sha256 = "1icc28acp7n8f5hiiq9rvmyv21f1ayghcr8d97lwm29aagsblx5j"; + name = "kqtquickcharts-20.12.3.tar.xz"; }; }; krdc = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/krdc-20.12.2.tar.xz"; - sha256 = "0wzv25pdalwgcb74dav4jkxpvak0nix46njn04w2vhy3rdlgplzr"; - name = "krdc-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/krdc-20.12.3.tar.xz"; + sha256 = "0s7wp11zcgp5z1drywm636wx5lkbalym4xxpmrb28xbdcgy9wgi2"; + name = "krdc-20.12.3.tar.xz"; }; }; kreversi = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kreversi-20.12.2.tar.xz"; - sha256 = "1c0xisbbq6p6ghl5rvhiddpgsa91m4bq8hmrpdw8s02j4g8aix39"; - name = "kreversi-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kreversi-20.12.3.tar.xz"; + sha256 = "0v6nhrzxd7pwc7wyj1wv7spbc437vb14pwdd731w8s02223kkkzf"; + name = "kreversi-20.12.3.tar.xz"; }; }; krfb = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/krfb-20.12.2.tar.xz"; - sha256 = "0js84sc9s8h7b1zkdg2k83qhh2q3dz5yfk17am480b3889pyjyd8"; - name = "krfb-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/krfb-20.12.3.tar.xz"; + sha256 = "0675smz307zwb4sdnhdlcgi7v38pxj0frr4c3cbhcpcmkjnbayc4"; + name = "krfb-20.12.3.tar.xz"; }; }; kross-interpreters = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kross-interpreters-20.12.2.tar.xz"; - sha256 = "04g8fqcr88k7b8sivkqasj8d5fywhmm69g4spv1rpm4m89gr70jn"; - name = "kross-interpreters-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kross-interpreters-20.12.3.tar.xz"; + sha256 = "1rq3gl0mndx3qhd0zk532z4m95zb4gwgahx208n6l5xh4rwgn7ck"; + name = "kross-interpreters-20.12.3.tar.xz"; }; }; kruler = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kruler-20.12.2.tar.xz"; - sha256 = "0xayhfav4723m5z5bgv4zxa95zvsfgvfh0wf80y8c7wwfgsyn9ja"; - name = "kruler-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kruler-20.12.3.tar.xz"; + sha256 = "1nvghf3gdn06nkk070zfbjmmh4z1anxxj15mwmdk3xriiwwm4w9z"; + name = "kruler-20.12.3.tar.xz"; }; }; kshisen = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kshisen-20.12.2.tar.xz"; - sha256 = "079sr9k8zg01imy2c54wx371fcxlzsm122ng0zl4cn69dndczjkf"; - name = "kshisen-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kshisen-20.12.3.tar.xz"; + sha256 = "19grx2zs26il2jplff4nb5sakvbkgsf9a91269gfjzsxzijf166q"; + name = "kshisen-20.12.3.tar.xz"; }; }; ksirk = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksirk-20.12.2.tar.xz"; - sha256 = "10ksb77ljwfm25m8jrxh4cbss0lrjdmiigjbmyppxcls1rz8a6cn"; - name = "ksirk-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksirk-20.12.3.tar.xz"; + sha256 = "1rq4r5d1mhdkpfxv71s6pyaac8yaf03z4ayfhjh1azf3zvv9i8a5"; + name = "ksirk-20.12.3.tar.xz"; }; }; ksmtp = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksmtp-20.12.2.tar.xz"; - sha256 = "0rcs5zcrj8sscr0h0vx4ndbj3ziyxns5glk5bzpj1092b11pwllw"; - name = "ksmtp-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksmtp-20.12.3.tar.xz"; + sha256 = "0qmriih43q1lp4bq68hzlnwzab0vcjyjddyhs44gv9r83icw6rw6"; + name = "ksmtp-20.12.3.tar.xz"; }; }; ksnakeduel = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksnakeduel-20.12.2.tar.xz"; - sha256 = "1cd1nldrmhimc1f059hqjkb8g8yjri7gf9cyxz7j0p48dxg93ns4"; - name = "ksnakeduel-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksnakeduel-20.12.3.tar.xz"; + sha256 = "132pdhfi9jy55y0ys785pz5xjw9f6fxx061ppvfy11giz9cbphsc"; + name = "ksnakeduel-20.12.3.tar.xz"; }; }; kspaceduel = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kspaceduel-20.12.2.tar.xz"; - sha256 = "0mz3s5q8fyl76ck8b9s65w2q90a5cz2p4clnbxam8f72fk2g0g1v"; - name = "kspaceduel-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kspaceduel-20.12.3.tar.xz"; + sha256 = "0ff1dpj01szzgg6yb774lzpimlf7japkv4ns0xb3a6vp5ghfayxw"; + name = "kspaceduel-20.12.3.tar.xz"; }; }; ksquares = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksquares-20.12.2.tar.xz"; - sha256 = "11mfyyjrdlh8dzpzwvyr48rfg758hr14sb0cw1zvd7d7cz86dr31"; - name = "ksquares-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksquares-20.12.3.tar.xz"; + sha256 = "0qp2j4abjjvazcqv9zyclvb425587dcwrsnlfrv7ami64ndr7xkb"; + name = "ksquares-20.12.3.tar.xz"; }; }; ksudoku = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksudoku-20.12.2.tar.xz"; - sha256 = "01i4niy1nlikbw1j7qlwldcaniwb1pl4hr4p6icgsvfzr8pjl09z"; - name = "ksudoku-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksudoku-20.12.3.tar.xz"; + sha256 = "0ykippr4d9s7mkmnqpbb3wa2l9cbhrmhvqaargm0553iqnwh6w4r"; + name = "ksudoku-20.12.3.tar.xz"; }; }; ksystemlog = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ksystemlog-20.12.2.tar.xz"; - sha256 = "1fyrpkk5ipp5q8sairmyx9bayndbbr9srrwdhp7grhbiw8kbjlc7"; - name = "ksystemlog-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ksystemlog-20.12.3.tar.xz"; + sha256 = "1szh1iqriynpsbcrilia46vpsj52ifk8q0paib79byf9wals4gqy"; + name = "ksystemlog-20.12.3.tar.xz"; }; }; kteatime = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kteatime-20.12.2.tar.xz"; - sha256 = "18rpnvagrcmd62qss31rkv81kkjcz9kcisj9q0j41p770jvan8id"; - name = "kteatime-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kteatime-20.12.3.tar.xz"; + sha256 = "1y9cc8xjfn3pqmqh34lrnq2slj8y09k3njwkxkxzk20ni676j5ph"; + name = "kteatime-20.12.3.tar.xz"; }; }; ktimer = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktimer-20.12.2.tar.xz"; - sha256 = "17sw7wl9844sg180h0x2skaj4bnkv6qin6cwklsp058wyf06w5wy"; - name = "ktimer-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktimer-20.12.3.tar.xz"; + sha256 = "1yypwzrqkl09hbc8d24m51pjz8lzj80xi6f86xb0jazdl7d83flw"; + name = "ktimer-20.12.3.tar.xz"; }; }; ktnef = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktnef-20.12.2.tar.xz"; - sha256 = "147dxalzgqfmacr0f44pbxg0ks5p7ck607gkbzf5asxgn4dlvgxq"; - name = "ktnef-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktnef-20.12.3.tar.xz"; + sha256 = "0wvqi09kz49m9lbxnk8070ikp4syhrxb90dgyiz1vax12baz7mvq"; + name = "ktnef-20.12.3.tar.xz"; }; }; ktorrent = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktorrent-20.12.2.tar.xz"; - sha256 = "1fvbg3700my5algzif4dyy7zsc74qrby7ldfbj7snlxa4scws042"; - name = "ktorrent-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktorrent-20.12.3.tar.xz"; + sha256 = "12gj8bmbgvplc6r8ic104q18hq4dwiajhj0dwm1yjwmnslzdplr8"; + name = "ktorrent-20.12.3.tar.xz"; }; }; ktouch = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktouch-20.12.2.tar.xz"; - sha256 = "0j3xzm5ghnfvqb98xwrjzkrdm991af8rgnay38s081ykvj2hxj3n"; - name = "ktouch-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktouch-20.12.3.tar.xz"; + sha256 = "1yv81mfavbvvlzc41ydfs1yjynza12n1cj8w36dgbgm6dwcldwfw"; + name = "ktouch-20.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-accounts-kcm-20.12.2.tar.xz"; - sha256 = "0dyr3600yrd2hjs2s54210h1kj95w5mz9pl2fpwzcqgkmmd9vss5"; - name = "ktp-accounts-kcm-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-accounts-kcm-20.12.3.tar.xz"; + sha256 = "0jj6cspzmbn1fnkq5dfc7vzylbsq8vglcgwx4a2x8j5g7s8vm9y2"; + name = "ktp-accounts-kcm-20.12.3.tar.xz"; }; }; ktp-approver = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-approver-20.12.2.tar.xz"; - sha256 = "1h3fi19qqmik6f7h12manb8yval0qqj7jdhrpp07ck67m7mibwzr"; - name = "ktp-approver-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-approver-20.12.3.tar.xz"; + sha256 = "1brzpm50d4nqkva34h9va15xm4l7g0hvq1b610qnn9mvhikrzy43"; + name = "ktp-approver-20.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-auth-handler-20.12.2.tar.xz"; - sha256 = "158n88pcxj7hdmsmhcqbfpqc4lhrpzighxgb4wdrzizi9dwpxb3h"; - name = "ktp-auth-handler-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-auth-handler-20.12.3.tar.xz"; + sha256 = "1i8jcxl828kany2668aid5vmhrla5rv6frb36xy7wdxv6y2q2gcc"; + name = "ktp-auth-handler-20.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-call-ui-20.12.2.tar.xz"; - sha256 = "0xhf79gqr6b8hiscv6jnmjnl8nb7c6vsvxn7hzvri9nm7hfmldya"; - name = "ktp-call-ui-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-call-ui-20.12.3.tar.xz"; + sha256 = "079jlq7zs3zb37bnb48q68rcfjg3b263qplgcpgs1f77k9g449ql"; + name = "ktp-call-ui-20.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-common-internals-20.12.2.tar.xz"; - sha256 = "06m8g80lj2cnx5cnfi6m1fy6pg6rm78kxg7v1493xcsfzizlc276"; - name = "ktp-common-internals-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-common-internals-20.12.3.tar.xz"; + sha256 = "0c9hcyfsjhd2ydm5ldgxh9j5wbckavn4nj2n8l4zkyxk7knxf5w4"; + name = "ktp-common-internals-20.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-list-20.12.2.tar.xz"; - sha256 = "037si47l8nc18d7yzh6d7i3gy710y5npxv4wcal6yg8mlr2qzjli"; - name = "ktp-contact-list-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-contact-list-20.12.3.tar.xz"; + sha256 = "03gqm2pjf2i6f0gvifd7bqclkfjbpabnlavadxf71qlnf7fki3rf"; + name = "ktp-contact-list-20.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-contact-runner-20.12.2.tar.xz"; - sha256 = "1pv7smf5mld5rgld2nsqjwgl7vwsf99f3z4hamlbq6bpdg02w936"; - name = "ktp-contact-runner-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-contact-runner-20.12.3.tar.xz"; + sha256 = "047bzbb02y17yq973bzxf1h1c41f25njrsxc5qa7igvwwcid7hbc"; + name = "ktp-contact-runner-20.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-desktop-applets-20.12.2.tar.xz"; - sha256 = "1mx1q1gk756pkbpwghsvkspj3npgfzp2lf4jqldkyygvyqn3gxx4"; - name = "ktp-desktop-applets-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-desktop-applets-20.12.3.tar.xz"; + sha256 = "1m4nizagb7i45ys8k60kw1m5jfflxy1iy3qp1i17d0fy4xk81i6h"; + name = "ktp-desktop-applets-20.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-filetransfer-handler-20.12.2.tar.xz"; - sha256 = "16ys5cyx1pzcv0affy8agp0sbci9rkvpknfffldrvlgqppxza5rd"; - name = "ktp-filetransfer-handler-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-filetransfer-handler-20.12.3.tar.xz"; + sha256 = "0wq9n5q8xgv70ikxavmmq7jnj24w9m3k7xaxl8qs7aas14jlcg29"; + name = "ktp-filetransfer-handler-20.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-kded-module-20.12.2.tar.xz"; - sha256 = "1wkvi5l9fvq24c3vdflg0azjxykid61i6mi59cnrnr866a1rbgrg"; - name = "ktp-kded-module-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-kded-module-20.12.3.tar.xz"; + sha256 = "0j28hdikn5713ngl3hf1gjr7syzba92irffhfrj6ia582gm7j2nz"; + name = "ktp-kded-module-20.12.3.tar.xz"; }; }; ktp-send-file = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-send-file-20.12.2.tar.xz"; - sha256 = "0j32c81rabbxh3m0jnnahny01qz2h7yc7l90w39r2jkv9r5f3yvf"; - name = "ktp-send-file-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-send-file-20.12.3.tar.xz"; + sha256 = "0lmyxvq49ibbvgg69cy1iayfgd4g777xbqdgzx0jgvvmd6ryrrqq"; + name = "ktp-send-file-20.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktp-text-ui-20.12.2.tar.xz"; - sha256 = "09wkpyadf3dvnrbxrasr66yw4hqnb3kbk6va9bs836fvcaiwagwd"; - name = "ktp-text-ui-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktp-text-ui-20.12.3.tar.xz"; + sha256 = "0gqgqjv0wamzcfzicvgc8n3jl4xizpzdjsq92bsbg1yk51ihn6iq"; + name = "ktp-text-ui-20.12.3.tar.xz"; }; }; ktuberling = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/ktuberling-20.12.2.tar.xz"; - sha256 = "0yndqhgw9s2hydfsz2x3lr1m22ii2whc4kcp2jbkj9ssiymp8s68"; - name = "ktuberling-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/ktuberling-20.12.3.tar.xz"; + sha256 = "0d4z9kk0vdljaf6damyjxnplmg6s1g6caw1ffd1dnyxhkszlka86"; + name = "ktuberling-20.12.3.tar.xz"; }; }; kturtle = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kturtle-20.12.2.tar.xz"; - sha256 = "1a46c6j7jng9l789wdpp7qj639872dfj268hj8nq63n27f82whr0"; - name = "kturtle-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kturtle-20.12.3.tar.xz"; + sha256 = "17mqi9kb57bva2rzqnmkiilr114zqqlh5f6sn9c13x7s8npdpgp6"; + name = "kturtle-20.12.3.tar.xz"; }; }; kubrick = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kubrick-20.12.2.tar.xz"; - sha256 = "0g3zxdbj5l28msvs8gpn15g739pwwids7wxmky6w3b4qyn427j8m"; - name = "kubrick-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kubrick-20.12.3.tar.xz"; + sha256 = "0a581gajl9k3864q3y99kcxqfh8adbwpyrc1rakgzwbwd342wgrj"; + name = "kubrick-20.12.3.tar.xz"; }; }; kwalletmanager = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kwalletmanager-20.12.2.tar.xz"; - sha256 = "02lx3p7860pigslx6s3bjg54sjjv1q93f9aknv5d32iblv2gaxiw"; - name = "kwalletmanager-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kwalletmanager-20.12.3.tar.xz"; + sha256 = "16lx0nblxlzmlydblysrbf92dxf0biqxrzwvy7nhsnkk2yh18m4r"; + name = "kwalletmanager-20.12.3.tar.xz"; }; }; kwave = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kwave-20.12.2.tar.xz"; - sha256 = "0nankggamy1jxllnsv642kav57kwkbxpkd2mz6rarjinfnnqi7kd"; - name = "kwave-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kwave-20.12.3.tar.xz"; + sha256 = "1bd193wszlzra1xg6ahijmswmpkm8ra05pzbk6zvc67j71kzdmzs"; + name = "kwave-20.12.3.tar.xz"; }; }; kwordquiz = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/kwordquiz-20.12.2.tar.xz"; - sha256 = "1iik5khnsarxjipmd8znbiqs20bd65hanhmdmp7awqs7p0k4a0sq"; - name = "kwordquiz-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/kwordquiz-20.12.3.tar.xz"; + sha256 = "0vqkj7zmp8v0iydll8gn7ybwha19sxpqd608wj6c7clwcr0y39yp"; + name = "kwordquiz-20.12.3.tar.xz"; }; }; libgravatar = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libgravatar-20.12.2.tar.xz"; - sha256 = "07pnj708wrvfmmy7j2vsx9j1sl9wx3hd7vfnpqa4zd24ci7x7y3d"; - name = "libgravatar-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libgravatar-20.12.3.tar.xz"; + sha256 = "130wk6v40rz0rsc1z8yyl5zf4s6rbhlwgqdjijp1k6xnsp7xm8n4"; + name = "libgravatar-20.12.3.tar.xz"; }; }; libkcddb = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkcddb-20.12.2.tar.xz"; - sha256 = "1px7cgc75ypxaqknamqgxps4796388j99ycrbgrlyrhzws1mva8k"; - name = "libkcddb-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkcddb-20.12.3.tar.xz"; + sha256 = "0m7fj11lp6i7fal0ckbpshyp5rw1pn3vxirnrg8ydp8ggs22jqi0"; + name = "libkcddb-20.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkcompactdisc-20.12.2.tar.xz"; - sha256 = "0yj2gkl1d76mf2lp02apxh4lmb9rnzvp0c8y0992ssnfsrivalp4"; - name = "libkcompactdisc-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkcompactdisc-20.12.3.tar.xz"; + sha256 = "192la7rlknjwlqw69yyqxcg2yar7p8fklykah5i3l5r6rcvx2h1w"; + name = "libkcompactdisc-20.12.3.tar.xz"; }; }; libkdcraw = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkdcraw-20.12.2.tar.xz"; - sha256 = "1hgw087frq9yzzwp2mkl3xqz2gd4v82kyiym2316i1xpmbkgcqfm"; - name = "libkdcraw-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkdcraw-20.12.3.tar.xz"; + sha256 = "1vwdr04z31aq37mx83vbgimkrpxq67dmlb68sl1wyivmllp084jg"; + name = "libkdcraw-20.12.3.tar.xz"; }; }; libkdegames = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz"; - sha256 = "0fcl06z5zl1hycj8f8q9dz6fc9lb0dqd5ciha4yig98ybzi3zn8r"; - name = "libkdegames-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkdegames-20.12.3.tar.xz"; + sha256 = "1l8nwbjkgsnqxqjc94wqq6phyxdj9n8y075bzv45xagf82b926s0"; + name = "libkdegames-20.12.3.tar.xz"; }; }; libkdepim = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkdepim-20.12.2.tar.xz"; - sha256 = "0f9c96w7ijlvfg9dr0w9wwaf05fn0z32zx8nn8jp42pzcbn6yr56"; - name = "libkdepim-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkdepim-20.12.3.tar.xz"; + sha256 = "1armxkai841ki9hgfwb4q53c8rlp55zgz1416dhrr97jrn03ckfa"; + name = "libkdepim-20.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkeduvocdocument-20.12.2.tar.xz"; - sha256 = "0lki60mv82ygss2bxgwg178xabvfn85zlg0pwk2gj30zg0jiaw66"; - name = "libkeduvocdocument-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkeduvocdocument-20.12.3.tar.xz"; + sha256 = "1x5w40avw73kjryiss71x10635l012jv5criaqlwyn3jfaf2idg0"; + name = "libkeduvocdocument-20.12.3.tar.xz"; }; }; libkexiv2 = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkexiv2-20.12.2.tar.xz"; - sha256 = "10j82xk7y7vf9y9ss83hc9fd9c1dbd55nwjf28bj7myqaji4wdpb"; - name = "libkexiv2-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkexiv2-20.12.3.tar.xz"; + sha256 = "1r11j2j0ymxg4dbhrznyr34cwdqcgh124lk9fmhdpjgq2q276qmp"; + name = "libkexiv2-20.12.3.tar.xz"; }; }; libkgapi = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkgapi-20.12.2.tar.xz"; - sha256 = "1yaas07ixxjnb5a37dq93skqs0vk08rdr9ll30jr7kdll311s5ni"; - name = "libkgapi-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkgapi-20.12.3.tar.xz"; + sha256 = "0h9rcn03jgw3rxxm3ylh1ap7ryswzm78hpfi6x9gdsfiqc8q8rpx"; + name = "libkgapi-20.12.3.tar.xz"; }; }; libkipi = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkipi-20.12.2.tar.xz"; - sha256 = "1axjvkrmjszxyh0fdm9k25g4gpzmn4hsw222k2qj3smvnhdj37zk"; - name = "libkipi-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkipi-20.12.3.tar.xz"; + sha256 = "1a0lpp3qkirsv8r6hpmndkn2f895jad5x7xlnxyf2x1s9qhzyvxv"; + name = "libkipi-20.12.3.tar.xz"; }; }; libkleo = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkleo-20.12.2.tar.xz"; - sha256 = "0xsljfiqqggdp31c7irjn6lgacdds5kb7sr3khg24bsgip9488k1"; - name = "libkleo-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkleo-20.12.3.tar.xz"; + sha256 = "034m92af08g5769kr9xs91mgkl3ribcafsmm96isjbngj9acqjcr"; + name = "libkleo-20.12.3.tar.xz"; }; }; libkmahjongg = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkmahjongg-20.12.2.tar.xz"; - sha256 = "1yl2smx0ybr164pl8nv5a7jibq3pmpf0v4ijvardp53j51bs2c2q"; - name = "libkmahjongg-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkmahjongg-20.12.3.tar.xz"; + sha256 = "16wb744gbi4rgz9k9zr4dm7ilhjhjyaszawjmm626p4k145rcg4v"; + name = "libkmahjongg-20.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libkomparediff2-20.12.2.tar.xz"; - sha256 = "03fn3l1qhzivck7jzfp7fwpgix701paj03rzvc46rs4f1bfmb1d9"; - name = "libkomparediff2-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libkomparediff2-20.12.3.tar.xz"; + sha256 = "0py3k5mn9kf82qcy89r1lkrhn702dgrjbgcd9ddslqfpiw8cb1l3"; + name = "libkomparediff2-20.12.3.tar.xz"; }; }; libksane = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libksane-20.12.2.tar.xz"; - sha256 = "1bhwfsyfd2z4hagfggz3ckxbyqrifcbwyn79h59qpng7nkzsgw4b"; - name = "libksane-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libksane-20.12.3.tar.xz"; + sha256 = "02sbizfw2a819l5f7di3k7x7cc4n19pipv68dfhsrh1hk6c5iia6"; + name = "libksane-20.12.3.tar.xz"; }; }; libksieve = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libksieve-20.12.2.tar.xz"; - sha256 = "0rjchcpc4sx53siv3b9hq6s12qh96rrb4xmnk3gjhsvqq9gmyq3j"; - name = "libksieve-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libksieve-20.12.3.tar.xz"; + sha256 = "0j149jszdslnyia09fn6xsbkxa2p0xmxz05pf3byxl9albxq17q0"; + name = "libksieve-20.12.3.tar.xz"; }; }; libktorrent = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/libktorrent-20.12.2.tar.xz"; - sha256 = "15ywv00vklvqw7x6id4vycf4rmi4j3s6z70c68h1b6v8n9j3rz3b"; - name = "libktorrent-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/libktorrent-20.12.3.tar.xz"; + sha256 = "1ykyfvr7w3h058gls7pnh9qwc6b4v9lp85s10qdbbsaiyly0h7n3"; + name = "libktorrent-20.12.3.tar.xz"; }; }; lokalize = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/lokalize-20.12.2.tar.xz"; - sha256 = "1ms7x5aw5z63q2xy6f3x8dl1k39yjqbabzh8qznaqs172bwmwzz7"; - name = "lokalize-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/lokalize-20.12.3.tar.xz"; + sha256 = "1a1dzg6qwd3dxcvln7nkpc5r6v6agqnzja6s09w9jb0gflrql372"; + name = "lokalize-20.12.3.tar.xz"; }; }; lskat = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/lskat-20.12.2.tar.xz"; - sha256 = "087zrwy5pabyy7zpkplxn9is2msr9kpa8r7bpc6kxylx85sd4nsr"; - name = "lskat-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/lskat-20.12.3.tar.xz"; + sha256 = "1fmyskr5i08gfjaghih2gihj6sgm8v5mn0m4wjmr9plg1vi6flcv"; + name = "lskat-20.12.3.tar.xz"; }; }; mailcommon = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/mailcommon-20.12.2.tar.xz"; - sha256 = "0qbbr5m5glcp7rh3aljkrfs27ypdcb5b72q602irivhbgv56c6v5"; - name = "mailcommon-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/mailcommon-20.12.3.tar.xz"; + sha256 = "0z0ppv6yi5n54hi6x5s5nagciqpdbxyl0z5sa3whl7d6ikga0s4m"; + name = "mailcommon-20.12.3.tar.xz"; }; }; mailimporter = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/mailimporter-20.12.2.tar.xz"; - sha256 = "16alrfyvgwih9i7fzvmfhbmlsp0l942qml43w2rwkg974g8188yv"; - name = "mailimporter-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/mailimporter-20.12.3.tar.xz"; + sha256 = "1lkkvriq69v0lpmk38my8k0vnw2yq182g6139i5r7krcyvrz4ynn"; + name = "mailimporter-20.12.3.tar.xz"; }; }; marble = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/marble-20.12.2.tar.xz"; - sha256 = "0kgiwsx58yhng92v5c90bz02vsn70p6y7gf6qr5fvljbldrxq3a2"; - name = "marble-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/marble-20.12.3.tar.xz"; + sha256 = "1hkvp97mjg6gqs0b39j2rpgwwi70vzwhm4szmcjc2083vllv3cap"; + name = "marble-20.12.3.tar.xz"; }; }; markdownpart = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/markdownpart-20.12.2.tar.xz"; - sha256 = "08fifhw40q2xhi3lp76a3b7jgipq3v1gvp1f5id83jvv9bg5m85k"; - name = "markdownpart-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/markdownpart-20.12.3.tar.xz"; + sha256 = "1g3r07fj4azpjbp6p6brcnd5dv7hi34w6z6a8bsg8cckmvhrirbl"; + name = "markdownpart-20.12.3.tar.xz"; }; }; mbox-importer = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/mbox-importer-20.12.2.tar.xz"; - sha256 = "1jiapp7pblanra83p720nj1rzqd566ij28za9jrkn3nj3xv2zm62"; - name = "mbox-importer-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/mbox-importer-20.12.3.tar.xz"; + sha256 = "0rjk9blsbgjpd6l6ghrlzj04llaibjs8ngcfddxgixg8dxvsp0k9"; + name = "mbox-importer-20.12.3.tar.xz"; }; }; messagelib = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/messagelib-20.12.2.tar.xz"; - sha256 = "07mzwsn0bmfsrsn6wlmz7kwrix4d33b007jvx37nckmarr6xcx54"; - name = "messagelib-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/messagelib-20.12.3.tar.xz"; + sha256 = "08rcw7y69xkrv0pwfz44hrbzkx9li2nabfjpgc9sc6i8klikgbis"; + name = "messagelib-20.12.3.tar.xz"; }; }; minuet = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/minuet-20.12.2.tar.xz"; - sha256 = "00d08qwfa4pvlcysp1af3n91bwb8idkl6gjwxrin3kliwns0ivfj"; - name = "minuet-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/minuet-20.12.3.tar.xz"; + sha256 = "0jidbfqsnk3dyd5f459p2jsyxs2jjpx3j356sg6c3hbs4imz5nm6"; + name = "minuet-20.12.3.tar.xz"; }; }; okular = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/okular-20.12.2.tar.xz"; - sha256 = "1959flll9rrwsgb3gpifvsciyvl70j46xb0acfx9zrvsddvbpabq"; - name = "okular-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/okular-20.12.3.tar.xz"; + sha256 = "1p3kdc0awgpihf10m3fxypq5hqr5vvwbcm8w3h39rk1m5g6hymxf"; + name = "okular-20.12.3.tar.xz"; }; }; palapeli = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/palapeli-20.12.2.tar.xz"; - sha256 = "1z80892gp6hg75vl6aicfvf5013412b5xglrpsp86lbx2r7d6ikw"; - name = "palapeli-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/palapeli-20.12.3.tar.xz"; + sha256 = "14hqifg18ngqsafp1k78wi2k7jpxglvcjdw55f0fi0iqjnsrk6xa"; + name = "palapeli-20.12.3.tar.xz"; }; }; parley = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/parley-20.12.2.tar.xz"; - sha256 = "16lymvvwglzvrfl74p7w9l2vahhrkm58fn6iicn5w1751bavjiq7"; - name = "parley-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/parley-20.12.3.tar.xz"; + sha256 = "0j4bbqlh0rix0wkfwp0jsf07akbysxnasbr1f2zwj75487mcwajn"; + name = "parley-20.12.3.tar.xz"; }; }; partitionmanager = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/partitionmanager-20.12.2.tar.xz"; - sha256 = "1f0nmz99fhp6c48sg92fwssxdvmwx2bj4l7phb0gqfnfqk4sw1xd"; - name = "partitionmanager-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/partitionmanager-20.12.3.tar.xz"; + sha256 = "06kk64gynlxf7njdgaklrx8b4jlbqpk6bbx0nk4lzbyw191dfr0m"; + name = "partitionmanager-20.12.3.tar.xz"; }; }; picmi = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/picmi-20.12.2.tar.xz"; - sha256 = "024afpylfb6n6dd0g1iif257a0mgzmmmjl24h2riz4cyfvd26mkc"; - name = "picmi-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/picmi-20.12.3.tar.xz"; + sha256 = "1xwkdrs6wmhhz6vrs17d7vj6sdlwl60mh8cb7yxx03pw5g6gkdd2"; + name = "picmi-20.12.3.tar.xz"; }; }; pimcommon = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/pimcommon-20.12.2.tar.xz"; - sha256 = "0fbmahp9m1jzi626rggmp09j3338z8f86hszvwfnk7ydn16hy5rs"; - name = "pimcommon-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/pimcommon-20.12.3.tar.xz"; + sha256 = "18gy521g0i806bjjdkszgajac733inrakhkdw1fslhcg2b90m6hb"; + name = "pimcommon-20.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/pim-data-exporter-20.12.2.tar.xz"; - sha256 = "13z8r2rq1453zprvpjnf5y5v3x1828l8gyvbivf0dmfhb3hi1bih"; - name = "pim-data-exporter-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/pim-data-exporter-20.12.3.tar.xz"; + sha256 = "17zc56420ndqfk8aw1mn1vwf34icgf03bbvvvg4s3m6cibnj0x4q"; + name = "pim-data-exporter-20.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/pim-sieve-editor-20.12.2.tar.xz"; - sha256 = "11ji1033yq4lwpi2b331i4f5kpak66h6zyviv344wyab05ljkyhd"; - name = "pim-sieve-editor-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/pim-sieve-editor-20.12.3.tar.xz"; + sha256 = "1d1z4i3g5n6rfs48phb700a68na75yg7cr4f3q2wzlnyyvpd1m51"; + name = "pim-sieve-editor-20.12.3.tar.xz"; }; }; poxml = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/poxml-20.12.2.tar.xz"; - sha256 = "1hnm13x102fq7g4pginhdpq473dw9y52kw497773b72my94yj2zz"; - name = "poxml-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/poxml-20.12.3.tar.xz"; + sha256 = "1z7py6qjrx0j0mya5cmxc0gm1fmjwbkrm0g8916vdlyc4m5vpg9l"; + name = "poxml-20.12.3.tar.xz"; }; }; print-manager = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/print-manager-20.12.2.tar.xz"; - sha256 = "1r19fsgnqdlmrpgbby13nj4v97nqlxlx8c0f7yv3izgncpavr0id"; - name = "print-manager-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/print-manager-20.12.3.tar.xz"; + sha256 = "19kwrl95p56zm5g11sws8h4vdc59w694ghhnmrwpyj2qra350dwa"; + name = "print-manager-20.12.3.tar.xz"; }; }; rocs = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/rocs-20.12.2.tar.xz"; - sha256 = "06sy6g32cigls1znvh5wvs7gw9h492d8zjqm6b50wsw0hbx61kvz"; - name = "rocs-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/rocs-20.12.3.tar.xz"; + sha256 = "0709qyixnhsrdhkqqkwigmbfnr21rz2yapvmfylmaipdfm0i72wv"; + name = "rocs-20.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/signon-kwallet-extension-20.12.2.tar.xz"; - sha256 = "0ycr0dn8bp51dc510gqxik0rm0wk5728px7cps9csy33izfjpx9p"; - name = "signon-kwallet-extension-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/signon-kwallet-extension-20.12.3.tar.xz"; + sha256 = "1a7hvkga6sj3sr4qv75n7p9gq44agncs0c7c9k6wni84h3y0icyp"; + name = "signon-kwallet-extension-20.12.3.tar.xz"; }; }; spectacle = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/spectacle-20.12.2.tar.xz"; - sha256 = "0v0vzspr0vwqi7m7yhnhavxzkfqdnz1g06ispfl1lmpjg1xh90by"; - name = "spectacle-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/spectacle-20.12.3.tar.xz"; + sha256 = "1h29w4ajmgfksdmxanfmb1gdjk4h7hpc2zwiqf0yrq8vm2hhxqjc"; + name = "spectacle-20.12.3.tar.xz"; }; }; step = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/step-20.12.2.tar.xz"; - sha256 = "1drdv95rimdsgarcc00jlfm3jmcan2ln32yq0q2nbbxsj0c502k7"; - name = "step-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/step-20.12.3.tar.xz"; + sha256 = "08z2zh8qq46288pddz9p5w10plpd26wgwil92maj6z765dqcxwqn"; + name = "step-20.12.3.tar.xz"; }; }; svgpart = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/svgpart-20.12.2.tar.xz"; - sha256 = "1v1qd5sgb89gkvb62jad8ava2y599a4acb6hkqyh758y798ylgwj"; - name = "svgpart-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/svgpart-20.12.3.tar.xz"; + sha256 = "1ldkyd7kb8m6zw7siw2rryxzk6v26xc00arwlq1zsy4inbs8idgl"; + name = "svgpart-20.12.3.tar.xz"; }; }; sweeper = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/sweeper-20.12.2.tar.xz"; - sha256 = "0yh6dqw37v8l54635k7g27dnsrl319kfxrkiiy09cx6pjzf87k1h"; - name = "sweeper-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/sweeper-20.12.3.tar.xz"; + sha256 = "12lp9m4sxblwp16dbb6gi1pf0yvav8gh5as1fpfx9kazava3xkhp"; + name = "sweeper-20.12.3.tar.xz"; }; }; umbrello = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/umbrello-20.12.2.tar.xz"; - sha256 = "0zzic469brh0w41w4ni66mfrj0p44xm1h32iwbb7imgnpw6dqksf"; - name = "umbrello-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/umbrello-20.12.3.tar.xz"; + sha256 = "0y6kyir86k9cjpmhm4giqfn7g651hfsbl1zq2j2y2nqiisc7vysp"; + name = "umbrello-20.12.3.tar.xz"; }; }; yakuake = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/yakuake-20.12.2.tar.xz"; - sha256 = "16irzxl6xfyanr7lrvap0ng911lml10bbjr0axk2a7m0gc1llrn4"; - name = "yakuake-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/yakuake-20.12.3.tar.xz"; + sha256 = "1y151cp5ygkxfd9ar4c38h2c1xwpx8mihh5f2sz6gbykzm3impbx"; + name = "yakuake-20.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.12.2"; + version = "20.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/20.12.2/src/zeroconf-ioslave-20.12.2.tar.xz"; - sha256 = "0yqni8vwwwya3cv006cf5svs1jhn6369clvrl6m79iacy0iirynk"; - name = "zeroconf-ioslave-20.12.2.tar.xz"; + url = "${mirror}/stable/release-service/20.12.3/src/zeroconf-ioslave-20.12.3.tar.xz"; + sha256 = "1zx7xmj7vj9d39cnnsgb15lbkr8yc81mcqilhq3jfhd3zgp8lrlv"; + name = "zeroconf-ioslave-20.12.3.tar.xz"; }; }; } From c97fefbc6f179d4090704ad1aed503e962231a2a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 06:24:52 -0500 Subject: [PATCH 0516/1183] kconfigwidgets: update patches --- ...> 0001-QDirIterator-follow-symlinks.patch} | 21 ++++++++++++------- .../kde-frameworks/kconfigwidgets/default.nix | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) rename pkgs/development/libraries/kde-frameworks/kconfigwidgets/{0001-qdiriterator-follow-symlinks.patch => 0001-QDirIterator-follow-symlinks.patch} (65%) diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch similarity index 65% rename from pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch index 3b6ea27d41e5..30cfafafab97 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch @@ -1,8 +1,17 @@ +From 05c0eb5d803ac52c0dd97a98f6d2821650c3c14c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 06:09:47 -0500 +Subject: [PATCH] QDirIterator follow symlinks + +--- + src/khelpclient.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index fbbc0fa..cb78741 100644 +index a053cd7..787d375 100644 --- a/src/khelpclient.cpp +++ b/src/khelpclient.cpp -@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) +@@ -34,7 +34,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) QString docPath; const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); for (const QString &dir : desktopDirs) { @@ -11,8 +20,6 @@ index fbbc0fa..cb78741 100644 while (it.hasNext()) { const QString desktopPath(it.next()); KDesktopFile desktopFile(desktopPath); -@@ -75,4 +75,3 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - // launch khelpcenter, or a browser for URIs not handled by khelpcenter - QDesktopServices::openUrl(url); - } -- +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index dcbdf6eb5f61..698d1a3cc146 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -9,7 +9,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + patches = [ ./0001-QDirIterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; outputBin = "dev"; postInstall = '' From 8bc1acd926a602099d07c4fcfd7828396afd61a3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 06:30:39 -0500 Subject: [PATCH 0517/1183] kdeFrameworks: mark broken with Qt < 5.14 --- pkgs/development/libraries/kde-frameworks/attica.nix | 1 - pkgs/development/libraries/kde-frameworks/bluez-qt.nix | 1 - pkgs/development/libraries/kde-frameworks/default.nix | 3 +++ pkgs/development/libraries/kde-frameworks/karchive.nix | 1 - pkgs/development/libraries/kde-frameworks/kcalendarcore.nix | 3 ++- pkgs/development/libraries/kde-frameworks/kcodecs.nix | 1 - pkgs/development/libraries/kde-frameworks/kconfig.nix | 1 - pkgs/development/libraries/kde-frameworks/kcoreaddons.nix | 1 - pkgs/development/libraries/kde-frameworks/kdbusaddons.nix | 1 - pkgs/development/libraries/kde-frameworks/kdnssd.nix | 1 - pkgs/development/libraries/kde-frameworks/kguiaddons.nix | 1 - pkgs/development/libraries/kde-frameworks/ki18n.nix | 1 - pkgs/development/libraries/kde-frameworks/kidletime.nix | 1 - pkgs/development/libraries/kde-frameworks/kirigami2.nix | 3 --- pkgs/development/libraries/kde-frameworks/kitemmodels.nix | 1 - pkgs/development/libraries/kde-frameworks/kitemviews.nix | 1 - pkgs/development/libraries/kde-frameworks/kplotting.nix | 1 - pkgs/development/libraries/kde-frameworks/kquickcharts.nix | 2 +- pkgs/development/libraries/kde-frameworks/kwayland.nix | 1 - pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix | 1 - .../libraries/kde-frameworks/kwindowsystem/default.nix | 1 - pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix | 1 - .../development/libraries/kde-frameworks/networkmanager-qt.nix | 1 - pkgs/development/libraries/kde-frameworks/prison.nix | 1 - pkgs/development/libraries/kde-frameworks/solid.nix | 1 - pkgs/development/libraries/kde-frameworks/sonnet.nix | 1 - .../libraries/kde-frameworks/syntax-highlighting.nix | 1 - pkgs/development/libraries/kde-frameworks/threadweaver.nix | 1 - 28 files changed, 6 insertions(+), 29 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 4cb2e8e958aa..d350e09f59dd 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -4,7 +4,6 @@ mkDerivation { name = "attica"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 9717e770ed51..78f4e2e6320e 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -7,7 +7,6 @@ mkDerivation { name = "bluez-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 02e25692ef16..200cbad9d786 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -28,6 +28,8 @@ existing packages here and modify it as necessary. let + minQtVersion = "5.14"; + srcs = import ./srcs.nix { inherit fetchurl; mirror = "mirror://kde"; @@ -79,6 +81,7 @@ let ]; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; platforms = lib.platforms.linux; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; } // (args.meta or {}); in mkDerivation (args // { diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 7a9ea86bbb53..0302e4e30091 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -8,7 +8,6 @@ mkDerivation { name = "karchive"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 xz zlib ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index e0b6c5313bb9..ae3c304cea38 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -2,7 +2,8 @@ mkDerivation, lib, extra-cmake-modules, - libical + libical, + qtbase }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 357c0e1d11cb..aa5183410a9e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -4,7 +4,6 @@ mkDerivation { name = "kcodecs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 94f4cb04807b..5e061af432a2 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -4,7 +4,6 @@ mkDerivation { name = "kconfig"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 6f2e3f923871..5c6adb86e752 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index b497ebe1c80e..eb3ce1c1a43f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kdbusaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index b4dabba624a0..8c7008beb62e 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kdnssd"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6c7365fd27e0..95ce416521f9 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -14,6 +14,5 @@ mkDerivation { meta = with lib; { maintainers = [ maintainers.ttuegel ]; - broken = versionOlder qtbase.version "5.14.0"; }; } diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 0733abc86920..633fad9c00ae 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -8,7 +8,6 @@ mkDerivation { name = "ki18n"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 883ef2862e49..8cedccb6f07a 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kidletime"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix index 60cef704865c..bb5a5a3fc80f 100644 --- a/pkgs/development/libraries/kde-frameworks/kirigami2.nix +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -2,9 +2,6 @@ mkDerivation { name = "kirigami2"; - meta = { - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtquickcontrols2 qttranslations qtgraphicaleffects ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index c3266a21c064..51195147a8d9 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kitemmodels"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index eeed5c703a29..ee317d853d0d 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kitemviews"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index f1c99e0c93bb..c4c3067034ba 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -6,7 +6,6 @@ mkDerivation { name = "kplotting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 5a06d4c1cad8..287268d2fff0 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, extra-cmake-modules, - qtquickcontrols2, + qtquickcontrols2, qtbase, }: mkDerivation { diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 5b73cc7fceab..6ba8c7e50365 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kwayland"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 821c703a5899..217be7568677 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kwidgetsaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index c418ca39433e..b91c3f25d494 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,7 +9,6 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 195e90feef6f..774f44311031 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -8,7 +8,6 @@ mkDerivation { name = "modemmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 4ded321674f7..1550d36e3e91 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -8,7 +8,6 @@ mkDerivation { name = "networkmanager-qt"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix index cf74ee20c2d7..1a94cd1a1df2 100644 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -8,7 +8,6 @@ mkDerivation { name = "prison"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libdmtx qrencode ]; diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index f769f76854af..846def179227 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -8,7 +8,6 @@ mkDerivation { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 431e4b810580..e7167b108784 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -7,7 +7,6 @@ mkDerivation { name = "sonnet"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index 4b3f8440c568..b61250df11b0 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -6,7 +6,6 @@ mkDerivation { name = "syntax-highlighting"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 70e948afda94..83a93acd8525 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -8,7 +8,6 @@ mkDerivation { name = "threadweaver"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.14.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; From acb2d5d9db7d8cefb7cc7967fb0a47e9175fe5f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 10:28:03 -0500 Subject: [PATCH 0518/1183] kpackage: update patches --- .../0001-Allow-external-paths-default.patch | 25 ++++++++++++ .../0002-QDirIterator-follow-symlinks.patch | 39 +++++++++++++++++++ .../kpackage/allow-external-paths.patch | 13 ------- .../kde-frameworks/kpackage/default.nix | 4 +- .../qdiriterator-follow-symlinks.patch | 26 ------------- 5 files changed, 66 insertions(+), 41 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch create mode 100644 pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch b/pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch new file mode 100644 index 000000000000..dbcdac463c9c --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kpackage/0001-Allow-external-paths-default.patch @@ -0,0 +1,25 @@ +From c134a83d226fc6b92412ee714bb6c7ab7e3a800f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 10:25:18 -0500 +Subject: [PATCH 1/2] Allow external paths default + +--- + src/kpackage/package.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp +index 36f5600..881f176 100644 +--- a/src/kpackage/package.cpp ++++ b/src/kpackage/package.cpp +@@ -858,7 +858,7 @@ PackagePrivate::PackagePrivate() + : QSharedData() + , fallbackPackage(nullptr) + , metadata(nullptr) +- , externalPaths(false) ++ , externalPaths(true) + , valid(false) + , checkedValid(false) + { +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch new file mode 100644 index 000000000000..5967bdaccf54 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch @@ -0,0 +1,39 @@ +From b1c0d2542234247a5051df015d70347597dfe8d8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 10:26:40 -0500 +Subject: [PATCH 2/2] QDirIterator follow symlinks + +--- + src/kpackage/packageloader.cpp | 2 +- + src/kpackage/private/packagejobthread.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp +index f03d882..d5aee56 100644 +--- a/src/kpackage/packageloader.cpp ++++ b/src/kpackage/packageloader.cpp +@@ -234,7 +234,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, + } else { + qCDebug(KPACKAGE_LOG) << "kpluginindex: Not cached" << plugindir; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")}; + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp +index 3eed307..dd6ca6e 100644 +--- a/src/kpackage/private/packagejobthread.cpp ++++ b/src/kpackage/private/packagejobthread.cpp +@@ -108,7 +108,7 @@ bool indexDirectory(const QString &dir, const QString &dest) + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch deleted file mode 100644 index c1c9efde7f74..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 5aec9fd..b15c933 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -820,7 +820,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(nullptr), - metadata(nullptr), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index 6bd42420b85d..f1f72165dae4 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -10,7 +10,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; patches = [ - ./allow-external-paths.patch - ./qdiriterator-follow-symlinks.patch + ./0001-Allow-external-paths-default.patch + ./0002-QDirIterator-follow-symlinks.patch ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch deleted file mode 100644 index cab334838ee7..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: kpackage-5.30.0/src/kpackage/packageloader.cpp -=================================================================== ---- kpackage-5.30.0.orig/src/kpackage/packageloader.cpp -+++ kpackage-5.30.0/src/kpackage/packageloader.cpp -@@ -238,7 +238,7 @@ QList PackageLoader::li - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = { QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop") }; - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -Index: kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp -=================================================================== ---- kpackage-5.30.0.orig/src/kpackage/private/packagejobthread.cpp -+++ kpackage-5.30.0/src/kpackage/private/packagejobthread.cpp -@@ -121,7 +121,7 @@ bool indexDirectory(const QString& dir, - - QJsonArray plugins; - -- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); -+ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - const QString path = it.fileInfo().absoluteFilePath(); From ec490b9d2cb72e71719d5231112f3bbc860bfb97 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 10:33:37 -0500 Subject: [PATCH 0519/1183] kio: update patches --- .../0001-Remove-impure-smbd-search-path.patch | 25 +++++++++++++++++++ .../kio/0002-Debug-module-loader.patch | 25 +++++++++++++++++++ .../libraries/kde-frameworks/kio/default.nix | 4 +-- .../kio/kio-debug-module-loader.patch | 13 ---------- .../kio/samba-search-path.patch | 14 ----------- 5 files changed, 52 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch create mode 100644 pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch new file mode 100644 index 000000000000..e541f7a05e8d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kio/0001-Remove-impure-smbd-search-path.patch @@ -0,0 +1,25 @@ +From af54a2a37655df26a33bc6783cb472c38f65322f Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 10:31:12 -0500 +Subject: [PATCH 1/2] Remove impure smbd search path + +--- + src/core/ksambashare.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp +index e810ce4..7cfb4e6 100644 +--- a/src/core/ksambashare.cpp ++++ b/src/core/ksambashare.cpp +@@ -61,7 +61,7 @@ KSambaSharePrivate::~KSambaSharePrivate() + bool KSambaSharePrivate::isSambaInstalled() + { + const bool daemonExists = +- !QStandardPaths::findExecutable(QStringLiteral("smbd"), {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); ++ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); + if (!daemonExists) { + qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; + } +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch new file mode 100644 index 000000000000..d0bad0caf4ab --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kio/0002-Debug-module-loader.patch @@ -0,0 +1,25 @@ +From 59d26b68704373d405b70806f890ddd545cc976a Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 10:31:48 -0500 +Subject: [PATCH 2/2] Debug module loader + +--- + src/kiod/kiod_main.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kiod/kiod_main.cpp b/src/kiod/kiod_main.cpp +index 1976ee1..eb402bf 100644 +--- a/src/kiod/kiod_main.cpp ++++ b/src/kiod/kiod_main.cpp +@@ -50,7 +50,7 @@ void KIOD::loadModule(const QString &name) + module = factory->create(); + } + if (!module) { +- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); ++ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); + return; + } + module->setModuleName(name); // makes it register to DBus +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index f4d771ab75f8..80d08bbb2162 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -22,7 +22,7 @@ mkDerivation { ]; outputs = [ "out" "dev" ]; patches = [ - ./samba-search-path.patch - ./kio-debug-module-loader.patch + ./0001-Remove-impure-smbd-search-path.patch + ./0002-Debug-module-loader.patch ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch deleted file mode 100644 index d26af49e5eb2..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: kio-5.33.0/src/kiod/kiod_main.cpp -=================================================================== ---- kio-5.33.0.orig/src/kiod/kiod_main.cpp -+++ kio-5.33.0/src/kiod/kiod_main.cpp -@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam - module = factory->create(); - } - if (!module) { -- qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString(); -+ qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString(); - return; - } - module->setModuleName(name); // makes it register to DBus diff --git a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch deleted file mode 100644 index d39ffbfde644..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/core/ksambashare.cpp b/src/core/ksambashare.cpp -index 1895783..9fe7286 100644 ---- a/src/core/ksambashare.cpp -+++ b/src/core/ksambashare.cpp -@@ -73,8 +73,7 @@ KSambaSharePrivate::~KSambaSharePrivate() - bool KSambaSharePrivate::isSambaInstalled() - { - const bool daemonExists = -- !QStandardPaths::findExecutable(QStringLiteral("smbd"), -- {QStringLiteral("/usr/sbin/"), QStringLiteral("/usr/local/sbin/")}).isEmpty(); -+ !QStandardPaths::findExecutable(QStringLiteral("smbd")).isEmpty(); - if (!daemonExists) { - qCDebug(KIO_CORE_SAMBASHARE) << "KSambaShare: Could not find smbd"; - } From d6e4f4fa657b8e7f90f3262d9d59894d77bf39b3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 11:18:11 -0500 Subject: [PATCH 0520/1183] knewstuff: remove backported patch --- pkgs/development/libraries/kde-frameworks/knewstuff.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index a6b811c0ad63..1473e1397bf1 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix @@ -16,10 +16,4 @@ mkDerivation { ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 ]; propagatedBuildInputs = [ attica kservice kxmlgui ]; - - patches = [ (fetchpatch { - url = "https://github.com/KDE/knewstuff/commit/dbf788c10130eaa3f5ea37a7f22eb4569471aa04.patch"; - sha256 = "1225rgqg1j120nvhgsahvsq2xlkg91lr37zp14x19krixxgx521j"; - revert = true; - }) ]; } From 4d4cdf9c910f8fcb02e6fd7e9c0a0e1ec7a40e63 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 14:14:27 -0500 Subject: [PATCH 0521/1183] knewstuff: delay resolving knsrcdir --- .../libraries/kde-frameworks/default.nix | 2 +- .../0001-Delay-resolving-knsrcdir.patch | 25 +++++++++++++++++++ .../{knewstuff.nix => knewstuff/default.nix} | 3 +++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch rename pkgs/development/libraries/kde-frameworks/{knewstuff.nix => knewstuff/default.nix} (91%) diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 200cbad9d786..a3dfcbf44ff2 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -161,7 +161,7 @@ let kiconthemes = callPackage ./kiconthemes {}; kinit = callPackage ./kinit {}; kio = callPackage ./kio {}; - knewstuff = callPackage ./knewstuff.nix {}; + knewstuff = callPackage ./knewstuff {}; knotifyconfig = callPackage ./knotifyconfig.nix {}; kparts = callPackage ./kparts.nix {}; kpeople = callPackage ./kpeople.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch b/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch new file mode 100644 index 000000000000..b42e75267f9f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/0001-Delay-resolving-knsrcdir.patch @@ -0,0 +1,25 @@ +From 09b5063e115c36b75e291230175b449a0f6d0c29 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Sun, 28 Mar 2021 13:34:33 -0500 +Subject: [PATCH] Delay resolving knsrcdir + +--- + KF5NewStuffCoreConfig.cmake.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in +index c65c7c4..3275627 100644 +--- a/KF5NewStuffCoreConfig.cmake.in ++++ b/KF5NewStuffCoreConfig.cmake.in +@@ -3,7 +3,7 @@ + include(CMakeFindDependencyMacro) + find_dependency(KF5Attica "@KF_DEP_VERSION@") + +-set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") ++set(KDE_INSTALL_KNSRCDIR "${KDE_INSTALL_DATADIR}/knsrcfiles") + + include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake") + @PACKAGE_INCLUDE_CORE_QCHTARGETS@ +-- +2.30.1 + diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix similarity index 91% rename from pkgs/development/libraries/kde-frameworks/knewstuff.nix rename to pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 1473e1397bf1..63c3178ffd6a 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -16,4 +16,7 @@ mkDerivation { ktextwidgets kwidgetsaddons qtbase qtdeclarative kirigami2 ]; propagatedBuildInputs = [ attica kservice kxmlgui ]; + patches = [ + ./0001-Delay-resolving-knsrcdir.patch + ]; } From 8dcbb049e371061d9cfecc364b5185428b84c262 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 7 Apr 2021 02:08:49 +0200 Subject: [PATCH 0522/1183] python3Packages.numpy: 1.20.1 -> 1.20.2 https://numpy.org/devdocs/release/1.20.2-notes.html --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index ed6f80b34a69..c5f6053058d8 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -40,14 +40,14 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.20.1"; + version = "1.20.2"; format = "pyproject.toml"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "02m6sms6wb4flfg8y4h0msan4y7w7qgfqxhdk21lcabhm2339iiv"; + sha256 = "1vkc1739lwqx0n9dwxzmy18axlz22za034xa8jh0lmfpbazj52c7"; }; patches = lib.optionals python.hasDistutilsCxxPatch [ From 73013bdfacee69d8b088417e60688609778e7524 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 7 Apr 2021 18:39:37 +0200 Subject: [PATCH 0523/1183] libdrm: 2.4.104 -> 2.4.105 (#118733) Note: There are no "*-symbol-check" files anymore. --- pkgs/development/libraries/libdrm/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index b4ba311165a2..b7fd94f9f123 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libdrm"; - version = "2.4.104"; + version = "2.4.105"; src = fetchurl { url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1jqvx9c23hgwhq109zqj6vg3ng40pcvh3r1k2fn1a424qasxhsnn"; + sha256 = "0iiamypwdfiz250ki120nh598r48yyacmnndb4mkximdgi5h478x"; }; outputs = [ "out" "dev" "bin" ]; @@ -20,12 +20,6 @@ stdenv.mkDerivation rec { patches = [ ./cross-build-nm-path.patch ]; - postPatch = '' - for a in */*-symbol-check ; do - patchShebangs $a - done - ''; - mesonFlags = [ "-Dnm-path=${stdenv.cc.targetPrefix}nm" "-Dinstall-test-programs=true" From e3bc983d8f23eef79be72823c52488e78c07a7ec Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 7 Apr 2021 20:05:59 +0200 Subject: [PATCH 0524/1183] mesa: 21.0.1 -> 21.0.2 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 397ae4227fe7..1723940915c1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,7 +32,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.1"; + version = "21.0.2"; branch = versions.major version; in @@ -47,7 +47,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; + sha256 = "122vvyk6dgvbfl119pysbdyii6f255r0cg7c8gp2sdsanmdxrha6"; }; prePatch = "patchShebangs ."; From d9da362d1c0870b3919e7d7d8d560e7000b700a2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 7 Apr 2021 20:33:32 +0200 Subject: [PATCH 0525/1183] libxkbcommon: 1.2.0 -> 1.2.1 --- pkgs/development/libraries/libxkbcommon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index adc595a87014..8c37bb0c173b 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libxkbcommon"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { url = "https://xkbcommon.org/download/${pname}-${version}.tar.xz"; - sha256 = "16is71cgqnvpl55y9kh1zb7r2gx2f3a1abljm7drjp90nbr7imlg"; + sha256 = "1cqzd4vd5jw3ghibmdqvy90mb1h8vvazc81bxgavk6sc0b9sfcz8"; }; outputs = [ "out" "dev" "doc" ]; From 5382b9e3df2b703b7b77a4f4bd7fc3265f5d6140 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 28 Mar 2021 13:31:46 -0500 Subject: [PATCH 0526/1183] plasma5: mark broken with Qt < 5.15 --- pkgs/desktops/plasma-5/bluedevil.nix | 1 - pkgs/desktops/plasma-5/default.nix | 24 ++++++++++++------- pkgs/desktops/plasma-5/discover.nix | 1 - pkgs/desktops/plasma-5/kactivitymanagerd.nix | 1 - pkgs/desktops/plasma-5/kdecoration.nix | 1 - pkgs/desktops/plasma-5/kgamma5.nix | 1 - pkgs/desktops/plasma-5/khotkeys.nix | 1 - pkgs/desktops/plasma-5/kinfocenter.nix | 1 - pkgs/desktops/plasma-5/kscreenlocker.nix | 1 - pkgs/desktops/plasma-5/ksshaskpass.nix | 1 - pkgs/desktops/plasma-5/ksysguard.nix | 1 - .../plasma-5/kwayland-integration.nix | 1 - .../plasma-5/kwayland-server/default.nix | 1 - pkgs/desktops/plasma-5/kwrited.nix | 1 - pkgs/desktops/plasma-5/libkscreen/default.nix | 3 --- .../plasma-5/libksysguard/default.nix | 1 - pkgs/desktops/plasma-5/milou.nix | 1 - pkgs/desktops/plasma-5/plasma-nm/default.nix | 1 - pkgs/desktops/plasma-5/plasma-pa.nix | 1 - .../plasma-5/plasma-systemmonitor.nix | 1 - pkgs/desktops/plasma-5/polkit-kde-agent.nix | 1 - pkgs/desktops/plasma-5/sddm-kcm.nix | 1 - .../plasma-5/xdg-desktop-portal-kde.nix | 1 - 23 files changed, 16 insertions(+), 32 deletions(-) diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index 7500dda7e3f2..db1e46f6d4e8 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -13,5 +13,4 @@ mkDerivation { ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 98bf4b025f2d..ea2e199e9310 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -30,6 +30,13 @@ existing packages here and modify it as necessary. }: let + minQtVersion = "5.15"; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; + srcs = import ./srcs.nix { inherit fetchurl; mirror = "mirror://kde"; @@ -81,14 +88,15 @@ let defaultSetupHook = if hasBin && hasDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; - meta = { - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; - homepage = "http://www.kde.org"; - } // (args.meta or {}); + meta = + let meta = args.meta or {}; in + meta // { + homepage = meta.homepage or "http://www.kde.org"; + license = meta.license or license; + maintainers = (meta.maintainers or []) ++ maintainers; + platforms = meta.platforms or lib.platforms.linux; + broken = meta.broken or broken; + }; in mkDerivation (args // { name = "${name}-${version}"; diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index 75e0fd6917d5..e065837cd2fd 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -33,7 +33,6 @@ mkDerivation { name = "discover"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python3 ]; buildInputs = [ # discount is needed for libmarkdown diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index 5c856b9d39c2..47543da11144 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -7,7 +7,6 @@ mkDerivation { name = "kactivitymanagerd"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 9a09ce30f4c9..9b67d7bc5293 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -5,5 +5,4 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index e7cc42e77cd5..d371ce815107 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; - meta.broken = lib.versionOlder qtbase.version "5.15"; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index ad78d602deca..fd366443861b 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -14,5 +14,4 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "bin" "dev" "out" ]; - meta.broken = lib.versionOlder qtbase.version "5.14"; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index 23e225bd7440..f7f50dc3b57f 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -10,7 +10,6 @@ mkDerivation { name = "kinfocenter"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index ace14b385e6b..2fc26216bf41 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -8,7 +8,6 @@ mkDerivation { name = "kscreenlocker"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index c4dabd71343e..bc6702ed6d3f 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -8,5 +8,4 @@ mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 27d0ab8a0fba..fe904bb97a48 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -9,7 +9,6 @@ mkDerivation { name = "ksysguard"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 2e923094dc54..f886a87feb57 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix index 6d2a3fabff2b..f24e0e6d6a04 100644 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -15,5 +15,4 @@ mkDerivation { kwayland plasma-wayland-protocols wayland wayland-protocols ]; patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index e6ee4829bcbf..bb8798d2d0e0 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -8,5 +8,4 @@ mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index 08a9e6f4f24b..5cd9ae94308a 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -6,9 +6,6 @@ mkDerivation { name = "libkscreen"; - meta = { - broken = lib.versionOlder qtbase.version "5.15.0"; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 8178d4079500..e291bc5c4c40 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -8,7 +8,6 @@ mkDerivation { name = "libksysguard"; - meta.broken = lib.versionOlder qtbase.version "5.14.0"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index ab23703a470b..0e7169abf6f6 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -7,7 +7,6 @@ mkDerivation { name = "milou"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 31fd35589577..585f7462c9bd 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -11,7 +11,6 @@ mkDerivation { name = "plasma-nm"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index 00f5fefdc434..bc39e520f8a6 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -17,5 +17,4 @@ mkDerivation { qtbase qtdeclarative ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix index 6b875745d270..f69808bf4528 100644 --- a/pkgs/desktops/plasma-5/plasma-systemmonitor.nix +++ b/pkgs/desktops/plasma-5/plasma-systemmonitor.nix @@ -16,7 +16,6 @@ mkDerivation { name = "plasma-systemmonitor"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtquickcontrols2 diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index 27f03e2d931e..72217204b35d 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -12,5 +12,4 @@ mkDerivation { knotifications kwindowsystem polkit-qt ]; outputs = [ "out" "dev" ]; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; } diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 9e3776e8e291..7c44e0f140d4 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -18,7 +18,6 @@ mkDerivation { name = "sddm-kcm"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index aade506483f8..f754bc5a46d4 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -9,7 +9,6 @@ mkDerivation { name = "xdg-desktop-portal-kde"; - meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ]; buildInputs = [ cups epoxy mesa pcre pipewire wayland wayland-protocols From e1aa8a713b3b0aee9a9540e880fa7ea7b73417ee Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 3 Apr 2021 05:58:22 -0500 Subject: [PATCH 0527/1183] kdeFrameworks: remove redundant maintainer lists I am automatically a maintainer of all packages in the set, so there is not reason to mention me explicitly as the maintainer of every individual package. --- .../libraries/kde-frameworks/attica.nix | 5 +--- .../libraries/kde-frameworks/baloo.nix | 3 +-- .../libraries/kde-frameworks/bluez-qt.nix | 5 +--- .../libraries/kde-frameworks/breeze-icons.nix | 3 +-- .../libraries/kde-frameworks/default.nix | 23 +++++++++++-------- .../extra-cmake-modules/default.nix | 1 - .../kde-frameworks/frameworkintegration.nix | 3 +-- .../kde-frameworks/kactivities-stats.nix | 3 +-- .../libraries/kde-frameworks/kactivities.nix | 3 +-- .../libraries/kde-frameworks/kapidox.nix | 1 - .../libraries/kde-frameworks/karchive.nix | 5 +--- .../kde-frameworks/kauth/default.nix | 3 +-- .../libraries/kde-frameworks/kbookmarks.nix | 3 +-- .../kde-frameworks/kcalendarcore.nix | 4 ---- .../kde-frameworks/kcmutils/default.nix | 3 +-- .../libraries/kde-frameworks/kcodecs.nix | 5 +--- .../libraries/kde-frameworks/kcompletion.nix | 3 +-- .../libraries/kde-frameworks/kconfig.nix | 5 +--- .../kde-frameworks/kconfigwidgets/default.nix | 3 +-- .../libraries/kde-frameworks/kcoreaddons.nix | 5 +--- .../libraries/kde-frameworks/kcrash.nix | 3 +-- .../libraries/kde-frameworks/kdbusaddons.nix | 5 +--- .../libraries/kde-frameworks/kdeclarative.nix | 3 +-- .../libraries/kde-frameworks/kded.nix | 3 +-- .../kdelibs4support/default.nix | 3 +-- .../kde-frameworks/kdesignerplugin.nix | 3 +-- .../kde-frameworks/kdesu/default.nix | 3 +-- .../libraries/kde-frameworks/kdnssd.nix | 5 +--- .../kde-frameworks/kdoctools/default.nix | 3 +-- .../libraries/kde-frameworks/kemoticons.nix | 3 +-- .../kde-frameworks/kfilemetadata/default.nix | 3 +-- .../libraries/kde-frameworks/kglobalaccel.nix | 3 +-- .../libraries/kde-frameworks/kguiaddons.nix | 6 +---- .../libraries/kde-frameworks/khtml.nix | 3 +-- .../libraries/kde-frameworks/ki18n.nix | 5 +--- .../kde-frameworks/kiconthemes/default.nix | 3 +-- .../libraries/kde-frameworks/kidletime.nix | 5 +--- .../kde-frameworks/kimageformats.nix | 1 - .../kde-frameworks/kinit/default.nix | 1 - .../libraries/kde-frameworks/kio/default.nix | 3 +-- .../libraries/kde-frameworks/kitemmodels.nix | 5 +--- .../libraries/kde-frameworks/kitemviews.nix | 3 --- .../libraries/kde-frameworks/kjobwidgets.nix | 3 +-- .../libraries/kde-frameworks/kjs.nix | 3 +-- .../libraries/kde-frameworks/kjsembed.nix | 3 +-- .../libraries/kde-frameworks/kmediaplayer.nix | 3 +-- .../kde-frameworks/knewstuff/default.nix | 3 +-- .../kde-frameworks/knotifications.nix | 3 +-- .../kde-frameworks/knotifyconfig.nix | 3 +-- .../kde-frameworks/kpackage/default.nix | 3 +-- .../libraries/kde-frameworks/kparts.nix | 3 +-- .../libraries/kde-frameworks/kpeople.nix | 3 +-- .../libraries/kde-frameworks/kplotting.nix | 5 +--- .../libraries/kde-frameworks/kpty.nix | 3 +-- .../libraries/kde-frameworks/kquickcharts.nix | 5 +--- .../libraries/kde-frameworks/kross.nix | 3 +-- .../libraries/kde-frameworks/krunner.nix | 3 +-- .../kde-frameworks/kservice/default.nix | 3 +-- .../libraries/kde-frameworks/ktexteditor.nix | 3 +-- .../libraries/kde-frameworks/ktextwidgets.nix | 3 +-- .../kde-frameworks/kunitconversion.nix | 3 +-- .../libraries/kde-frameworks/kwallet.nix | 3 +-- .../libraries/kde-frameworks/kwayland.nix | 5 +--- .../kde-frameworks/kwidgetsaddons.nix | 5 +--- .../kde-frameworks/kwindowsystem/default.nix | 5 +--- .../libraries/kde-frameworks/kxmlgui.nix | 3 +-- .../kde-frameworks/kxmlrpcclient.nix | 3 +-- .../kde-frameworks/modemmanager-qt.nix | 5 +--- .../kde-frameworks/networkmanager-qt.nix | 5 +--- .../kde-frameworks/oxygen-icons5.nix | 8 +++---- .../kde-frameworks/plasma-framework.nix | 3 +-- .../libraries/kde-frameworks/prison.nix | 5 +--- .../libraries/kde-frameworks/purpose.nix | 3 +-- .../kde-frameworks/qqc2-desktop-style.nix | 3 +-- .../libraries/kde-frameworks/solid.nix | 5 +--- .../libraries/kde-frameworks/sonnet.nix | 5 +--- .../libraries/kde-frameworks/syndication.nix | 4 +--- .../kde-frameworks/syntax-highlighting.nix | 5 +--- .../libraries/kde-frameworks/threadweaver.nix | 5 +--- 79 files changed, 88 insertions(+), 217 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index d350e09f59dd..8c71afd5dcf7 100644 --- a/pkgs/development/libraries/kde-frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix @@ -1,10 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase }: +{ mkDerivation, extra-cmake-modules, qtbase }: mkDerivation { name = "attica"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index d5da9f5af176..8497ec73a3a1 100644 --- a/pkgs/development/libraries/kde-frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime, kio, lmdb, qtbase, qtdeclarative, solid, @@ -7,7 +7,6 @@ mkDerivation { name = "baloo"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 78f4e2e6320e..c5764b4915ed 100644 --- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix @@ -1,13 +1,10 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , qtbase, qtdeclarative }: mkDerivation { name = "bluez-qt"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtdeclarative ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index d9192b940364..6e79a45ea921 100644 --- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix @@ -1,8 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }: +{ mkDerivation, extra-cmake-modules, gtk3, qtsvg, hicolor-icon-theme }: mkDerivation { name = "breeze-icons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules gtk3 ]; buildInputs = [ qtsvg ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index a3dfcbf44ff2..94d403b9e343 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -29,6 +29,11 @@ existing packages here and modify it as necessary. let minQtVersion = "5.14"; + broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; + license = with lib.licenses; [ + lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 + ]; srcs = import ./srcs.nix { inherit fetchurl; @@ -74,15 +79,15 @@ let defaultSetupHook = if hasSeparateDev then propagateBin else null; setupHook = args.setupHook or defaultSetupHook; - meta = { - homepage = "http://www.kde.org"; - license = with lib.licenses; [ - lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 - ]; - maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; - platforms = lib.platforms.linux; - broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion; - } // (args.meta or {}); + meta = + let meta = args.meta or {}; in + meta // { + homepage = meta.homepage or "http://www.kde.org"; + license = meta.license or license; + maintainers = (meta.maintainers or []) ++ maintainers; + platforms = meta.platforms or lib.platforms.linux; + broken = meta.broken or broken; + }; in mkDerivation (args // { name = "${name}-${version}"; diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 0aa400c644d6..b74fb29e5f2a 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -17,6 +17,5 @@ mkDerivation { platforms = platforms.linux ++ platforms.darwin; homepage = "http://www.kde.org"; license = licenses.bsd2; - maintainers = [ maintainers.ttuegel ]; }; } diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index 58b064806e52..c49eab2763c5 100644 --- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras @@ -7,7 +7,6 @@ mkDerivation { name = "frameworkintegration"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index b558306248ae..88fde8c5fd6d 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, boost, kactivities, kconfig, qtbase, }: mkDerivation { name = "kactivities-stats"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kactivities kconfig ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index eabac6aadd7e..b53de41455ad 100644 --- a/pkgs/development/libraries/kde-frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative, }: mkDerivation { name = "kactivities"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kio kwindowsystem qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index 4395f3cd0dd7..381dacaf4961 100644 --- a/pkgs/development/libraries/kde-frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix @@ -2,7 +2,6 @@ mkDerivation { name = "kapidox"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules python3 python3.pkgs.setuptools ]; postFixup = '' moveToOutput bin $bin diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index 0302e4e30091..3602cb7b0617 100644 --- a/pkgs/development/libraries/kde-frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, bzip2, xz, qtbase, zlib, }: mkDerivation { name = "karchive"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ bzip2 xz zlib ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 0a513d6eed94..630b51bf46ba 100644 --- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix @@ -1,11 +1,10 @@ { - mkDerivation, lib, propagate, + mkDerivation, propagate, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }: mkDerivation { name = "kauth"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ polkit-qt qttools ]; propagatedBuildInputs = [ kcoreaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index dc2339632e45..4d68c3694bd3 100644 --- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qttools, kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons, kxmlgui, qtbase, @@ -7,7 +7,6 @@ mkDerivation { name = "kbookmarks"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix index ae3c304cea38..f4f2b05ad736 100644 --- a/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix +++ b/pkgs/development/libraries/kde-frameworks/kcalendarcore.nix @@ -1,6 +1,5 @@ { mkDerivation, - lib, extra-cmake-modules, libical, qtbase @@ -8,9 +7,6 @@ mkDerivation { name = "kcalendarcore"; - meta = { - maintainers = [ lib.maintainers.nyanloutre ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ libical ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index ab14529be01e..22e2929ae0cb 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews, kpackage, kservice, kxmlgui, qtdeclarative, @@ -7,7 +7,6 @@ mkDerivation { name = "kcmutils"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index aa5183410a9e..a62135150a0f 100644 --- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix @@ -1,10 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, gperf }: +{ mkDerivation, extra-cmake-modules, qtbase, qttools, gperf }: mkDerivation { name = "kcodecs"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools gperf ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index fdfe28db6c04..ffa612ffaa19 100644 --- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }: mkDerivation { name = "kcompletion"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kwidgetsaddons qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 5e061af432a2..ba16e97ef3a6 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix @@ -1,10 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }: +{ mkDerivation, extra-cmake-modules, qtbase, qttools }: mkDerivation { name = "kconfig"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index 698d1a3cc146..fc10f3070b64 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix @@ -1,11 +1,10 @@ { - mkDerivation, lib, extra-cmake-modules, + mkDerivation, extra-cmake-modules, kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qttools, qtbase, }: mkDerivation { name = "kconfigwidgets"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 5c6adb86e752..a2102c7d7323 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools, shared-mime-info }: mkDerivation { name = "kcoreaddons"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools shared-mime-info ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index d45d73d33e41..27dc6d65edff 100644 --- a/pkgs/development/libraries/kde-frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kcoreaddons, kwindowsystem, qtbase, qtx11extras, }: mkDerivation { name = "kcrash"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eb3ce1c1a43f..5c435b445414 100644 --- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools, qtx11extras }: mkDerivation { name = "kdbusaddons"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 34e01b4c1b62..cc4e26998212 100644 --- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, extra-cmake-modules, + mkDerivation, extra-cmake-modules, epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage, kwidgetsaddons, kwindowsystem, qtdeclarative }: mkDerivation { name = "kdeclarative"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 1b326e51de92..936119ab7f5c 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, propagate, wrapGAppsHook, + mkDerivation, propagate, wrapGAppsHook, extra-cmake-modules, kdoctools, gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase, @@ -7,7 +7,6 @@ mkDerivation { name = "kded"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 5eced8832877..392aa9ea9025 100644 --- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, docbook_xml_dtd_45, extra-cmake-modules, kdoctools, kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons, @@ -10,7 +10,6 @@ mkDerivation { name = "kdelibs4support"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = [ ./nix-kde-include-dir.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8418863eabb5..f1305274070f 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio, kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet, @@ -7,7 +7,6 @@ mkDerivation { name = "kdesignerplugin"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index cd7055c4ea82..9a5f5a6942a8 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty, kservice, qtbase, }: mkDerivation { name = "kdesu"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; propagatedBuildInputs = [ kpty ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8c7008beb62e..8bb59bb36dba 100644 --- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, avahi, qtbase, qttools, }: mkDerivation { name = "kdnssd"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ avahi qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 68b5c08aa090..a87bef40b1e2 100644 --- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, docbook_xml_dtd_45, docbook_xsl_ns, karchive, ki18n, qtbase, perl, perlPackages @@ -7,7 +7,6 @@ mkDerivation { name = "kdoctools"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules # The build system insists on having native Perl. diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index b7f4f036db5e..66a0889b13d2 100644 --- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, karchive, kcoreaddons, kservice, qtbase, }: mkDerivation { name = "kemoticons"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcoreaddons ]; propagatedBuildInputs = [ kservice qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index 47831f0f5d92..c4bee741d2a8 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib }: mkDerivation { name = "kfilemetadata"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 483ab16dcc31..7001c98ee00f 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, qtbase, qttools, qtx11extras, libXdmcp, @@ -7,7 +7,6 @@ mkDerivation { name = "kglobalaccel"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 95ce416521f9..bcd18ab614b6 100644 --- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , qtbase, qtx11extras, wayland }: @@ -11,8 +11,4 @@ mkDerivation { propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; - - meta = with lib; { - maintainers = [ maintainers.ttuegel ]; - }; } diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 5bb3078ea867..3ef3a043c4e1 100644 --- a/pkgs/development/libraries/kde-frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, perl, giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, @@ -8,7 +8,6 @@ mkDerivation { name = "khtml"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 633fad9c00ae..46f502d06bb4 100644 --- a/pkgs/development/libraries/kde-frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, gettext, python3, qtbase, qtdeclarative, qtscript, }: mkDerivation { name = "ki18n"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedNativeBuildInputs = [ gettext python3 ]; buildInputs = [ qtdeclarative qtscript ]; diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 76bf0fd05370..122f3108da44 100644 --- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews, qtbase, qtsvg, qttools, @@ -7,7 +7,6 @@ mkDerivation { name = "kiconthemes"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = [ ./default-theme-breeze.patch ]; diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 8cedccb6f07a..2678cf0804eb 100644 --- a/pkgs/development/libraries/kde-frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qtx11extras }: mkDerivation { name = "kidletime"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index 29748a5f7f42..3d9c5851f246 100644 --- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix @@ -8,7 +8,6 @@ let inherit (lib) getDev; in mkDerivation { name = "kimageformats"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive openexr qtbase ]; outputs = [ "out" ]; # plugins only diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index 654f6e20604a..2a3a3dd5d1f0 100644 --- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix @@ -8,7 +8,6 @@ let inherit (lib) getLib; in mkDerivation { name = "kinit"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index 80d08bbb2162..47b958ea0b32 100644 --- a/pkgs/development/libraries/kde-frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, fetchpatch, extra-cmake-modules, kdoctools, qttools, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications, @@ -9,7 +9,6 @@ mkDerivation { name = "kio"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 51195147a8d9..0f398b0f57d1 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase }: mkDerivation { name = "kitemmodels"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index ee317d853d0d..0e772978e191 100644 --- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix @@ -6,9 +6,6 @@ mkDerivation { name = "kitemviews"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 810e2bf8c84e..2e116b7bb793 100644 --- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qttools, kcoreaddons, kwidgetsaddons, qtx11extras }: mkDerivation { name = "kjobwidgets"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 311f07241d65..33aeb284e167 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, pcre, qtbase, }: mkDerivation { name = "kjs"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index e8cd5070ae53..f552f963513d 100644 --- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, qttools, ki18n, kjs, qtsvg, }: mkDerivation { name = "kjsembed"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ ki18n qtsvg ]; propagatedBuildInputs = [ kjs ]; diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index a4714c9e4ad7..5de26e0c8dcb 100644 --- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , kparts , kxmlgui @@ -6,7 +6,6 @@ mkDerivation { name = "kmediaplayer"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix index 63c3178ffd6a..b775fcbef8f6 100644 --- a/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, fetchpatch, extra-cmake-modules, attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio, kitemviews, kpackage, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase, @@ -8,7 +8,6 @@ mkDerivation { name = "knewstuff"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 964e1b441154..d1a809d9f516 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , kcodecs, kconfig, kcoreaddons, kwindowsystem , libdbusmenu @@ -8,7 +8,6 @@ mkDerivation { name = "knotifications"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 6739f96183c1..1971e3e8039b 100644 --- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kcompletion, kconfig, ki18n, kio, phonon, qtbase, }: mkDerivation { name = "knotifyconfig"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig ki18n kio phonon ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index f1f72165dae4..d4edc09b2f00 100644 --- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, karchive, kconfig, kcoreaddons, ki18n, qtbase, }: mkDerivation { name = "kpackage"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ]; patches = [ diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index f657569277a1..e1d2a156160d 100644 --- a/pkgs/development/libraries/kde-frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice, ktextwidgets, kwidgetsaddons, kxmlgui @@ -7,7 +7,6 @@ mkDerivation { name = "kparts"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 04181fd3e13a..52c16ea2b9c2 100644 --- a/pkgs/development/libraries/kde-frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase, qtdeclarative, @@ -7,7 +7,6 @@ mkDerivation { name = "kpeople"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index c4c3067034ba..68df24d0087b 100644 --- a/pkgs/development/libraries/kde-frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix @@ -1,12 +1,9 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules, qttools, qtbase }: mkDerivation { name = "kplotting"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase qttools ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 150c5b3d2b26..2456f4e22fab 100644 --- a/pkgs/development/libraries/kde-frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix @@ -1,8 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }: +{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }: mkDerivation { name = "kpty"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix index 287268d2fff0..0ae30be653d4 100644 --- a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtquickcontrols2, qtbase, }: mkDerivation { name = "kquickcharts"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtquickcontrols2 ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index f45fb5ecd1d0..189e100aa70c 100644 --- a/pkgs/development/libraries/kde-frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix @@ -1,11 +1,10 @@ -{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons +{ mkDerivation, extra-cmake-modules, kcompletion, kcoreaddons , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons , kxmlgui, qtbase, qtscript, qtxmlpatterns, }: mkDerivation { name = "kross"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcompletion kcoreaddons kxmlgui ]; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 990c3c4fdf9b..7db7c61db466 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, fetchpatch, + mkDerivation, fetchpatch, extra-cmake-modules, kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase, qtdeclarative, solid, threadweaver, kwindowsystem @@ -8,7 +8,6 @@ let self = mkDerivation { name = "krunner"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 630582ecf763..c1488f728dd6 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, bison, extra-cmake-modules, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem, qtbase, shared-mime-info, @@ -7,7 +7,6 @@ mkDerivation { name = "kservice"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; propagatedNativeBuildInputs = [ bison flex ]; buildInputs = [ diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix index 98f9b3f82ca2..6a74dca7b4bd 100644 --- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, perl, karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2, qtscript, qtxmlpatterns, sonnet, syntax-highlighting, qtquickcontrols, @@ -8,7 +8,6 @@ mkDerivation { name = "ktexteditor"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 604066b96394..653d0ac8899b 100644 --- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qttools, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem, qtbase, sonnet, @@ -7,7 +7,6 @@ mkDerivation { name = "ktextwidgets"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index d6c079fd83b8..de0d9aab922e 100644 --- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix @@ -1,8 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }: +{ mkDerivation, extra-cmake-modules, ki18n, qtbase, }: mkDerivation { name = "kunitconversion"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index fca0dedd083e..f93f0437dbd1 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n, kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem, @@ -8,7 +8,6 @@ mkDerivation { name = "kwallet"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index 6ba8c7e50365..749735c4ad58 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, propagateBin, + mkDerivation, propagateBin, extra-cmake-modules, plasma-wayland-protocols, qtbase, wayland, wayland-protocols }: mkDerivation { name = "kwayland"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 217be7568677..ee347df18ab8 100644 --- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase, qttools }: mkDerivation { name = "kwidgetsaddons"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index b91c3f25d494..409293093382 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, libpthreadstubs, libXdmcp, qtbase, qttools, qtx11extras @@ -7,9 +7,6 @@ mkDerivation { name = "kwindowsystem"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index 5adcf281e622..0b29158e4b06 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qttools, attica, kconfig, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews, ktextwidgets, kwindowsystem, qtbase, sonnet, @@ -7,7 +7,6 @@ mkDerivation { name = "kxmlgui"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index acffde6a7cf1..aa334d69ef1d 100644 --- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix @@ -1,8 +1,7 @@ -{ mkDerivation, lib, extra-cmake-modules, ki18n, kio }: +{ mkDerivation, extra-cmake-modules, ki18n, kio }: mkDerivation { name = "kxmlrpcclient"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ ki18n ]; propagatedBuildInputs = [ kio ]; diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index 774f44311031..5ecb5317cfcc 100644 --- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, modemmanager, qtbase }: mkDerivation { name = "modemmanager-qt"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 1550d36e3e91..2ff4b2c2b408 100644 --- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, networkmanager, qtbase, }: mkDerivation { name = "networkmanager-qt"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager qtbase ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 2d795bfc50cc..32b219ab7e1c 100644 --- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix @@ -1,14 +1,12 @@ { mkDerivation , lib -, extra-cmake-modules, qtbase +, extra-cmake-modules +, qtbase }: mkDerivation { name = "oxygen-icons5"; - meta = { - license = lib.licenses.lgpl3Plus; - maintainers = [ lib.maintainers.ttuegel ]; - }; + meta.license = lib.licenses.lgpl3Plus; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ]; outputs = [ "out" ]; # only runtime outputs diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index 44005ec7d282..12540b07007c 100644 --- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, kdoctools, kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, @@ -9,7 +9,6 @@ mkDerivation { name = "plasma-framework"; - meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix index 1a94cd1a1df2..670fd02d6161 100644 --- a/pkgs/development/libraries/kde-frameworks/prison.nix +++ b/pkgs/development/libraries/kde-frameworks/prison.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, libdmtx, qrencode, qtbase, }: mkDerivation { name = "prison"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libdmtx qrencode ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 6f1527da7787..7e4d002e2a1e 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -1,12 +1,11 @@ { - mkDerivation, lib, extra-cmake-modules, qtbase + mkDerivation, extra-cmake-modules, qtbase , qtdeclarative, kconfig, kcoreaddons, ki18n, kio, kirigami2 , fetchpatch }: mkDerivation { name = "purpose"; - meta = { maintainers = [ lib.maintainers.bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase qtdeclarative kconfig kcoreaddons diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix index ed372e01aeb2..e400967407c6 100644 --- a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix +++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , qtquickcontrols2 , qtx11extras @@ -9,7 +9,6 @@ mkDerivation { name = "qqc2-desktop-style"; - meta = { maintainers = with lib.maintainers; [ ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; } diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index 846def179227..aa1b1ebe3458 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, bison, extra-cmake-modules, flex, media-player-info, qtbase, qtdeclarative, qttools }: mkDerivation { name = "solid"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ bison extra-cmake-modules flex media-player-info ]; buildInputs = [ qtdeclarative qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index e7167b108784..2eff7bad2402 100644 --- a/pkgs/development/libraries/kde-frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix @@ -1,13 +1,10 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules , aspell, qtbase, qttools }: mkDerivation { name = "sonnet"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ aspell qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/syndication.nix b/pkgs/development/libraries/kde-frameworks/syndication.nix index 71ee520995c4..fd5a9b9db846 100644 --- a/pkgs/development/libraries/kde-frameworks/syndication.nix +++ b/pkgs/development/libraries/kde-frameworks/syndication.nix @@ -5,9 +5,7 @@ mkDerivation { name = "syndication"; - meta = { - maintainers = [ lib.maintainers.bkchr ]; - }; + meta.maintainers = [ lib.maintainers.bkchr ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ]; } diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix index b61250df11b0..a295b23f3210 100644 --- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix +++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix @@ -1,12 +1,9 @@ -{ mkDerivation, lib +{ mkDerivation , extra-cmake-modules, perl, qtbase, qttools }: mkDerivation { name = "syntax-highlighting"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules perl ]; buildInputs = [ qttools ]; propagatedBuildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index 83a93acd8525..bfa529c9267a 100644 --- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix @@ -1,14 +1,11 @@ { - mkDerivation, lib, + mkDerivation, extra-cmake-modules, qtbase }: mkDerivation { name = "threadweaver"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ qtbase ]; outputs = [ "out" "dev" ]; From cf4a573ef17b812513f35801682adb28433df4fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 15:40:48 +0200 Subject: [PATCH 0528/1183] python3Packages.django_2: 2.2.19 -> 2.2.20 Fixes: CVE-2021-28658 --- pkgs/development/python-modules/django/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/2.nix b/pkgs/development/python-modules/django/2.nix index 7d28d30e8621..991c353df179 100644 --- a/pkgs/development/python-modules/django/2.nix +++ b/pkgs/development/python-modules/django/2.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "Django"; - version = "2.2.19"; + version = "2.2.20"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0hysjf8bz4g8xrn2cdx6pmawimpyr6ag2fg3jxsnc1byr3g3bhih"; + sha256 = "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95"; }; patches = lib.optional withGdal From 052d6c755daab622ae3d2a52fe5444c41e6cdbb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 15:46:10 +0200 Subject: [PATCH 0529/1183] python3Packages.asgiref: 3.3.1 -> 3.3.4 --- pkgs/development/python-modules/asgiref/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index ec630c40d034..f1128c010957 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -9,7 +9,7 @@ }: buildPythonPackage rec { - version = "3.3.1"; + version = "3.3.4"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "00r4l9x425wkbac6b6c2ksm2yjinrvvdf0ajizrzq32h0jg82016"; + sha256 = "1rr76252l6p12yxc0q4k9wigg1jz8nsqga9c0nixy9q77zhvh9n2"; }; propagatedBuildInputs = [ async-timeout ]; From 413fb40841257babcc563139a82f3b629984808f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Apr 2021 15:46:24 +0200 Subject: [PATCH 0530/1183] python3Packages.django_3: 3.1.7 -> 3.2 Fixes: CVE-2021-28658 --- pkgs/development/python-modules/django/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/3.nix b/pkgs/development/python-modules/django/3.nix index 7f2db712f00a..62ca390eac5b 100644 --- a/pkgs/development/python-modules/django/3.nix +++ b/pkgs/development/python-modules/django/3.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "Django"; - version = "3.1.7"; + version = "3.2"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "32ce792ee9b6a0cbbec340123e229ac9f765dff8c2a4ae9247a14b2ba3a365a7"; + sha256 = "179qdxa438fnycnnf1j5z6359h1kbp2q7djf01v5jrr26xjgkw11"; }; patches = lib.optional withGdal From 3e0b9f52d2de636726a3a1d0ff811afb03d96bc5 Mon Sep 17 00:00:00 2001 From: William Kral Date: Wed, 7 Apr 2021 10:55:35 -0700 Subject: [PATCH 0531/1183] bluez: 5.56 -> 5.58 Remove applying patch incorporated into this release --- pkgs/os-specific/linux/bluez/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 96f9f23e97e0..2e342fbc0392 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchurl , alsaLib , dbus @@ -20,11 +19,11 @@ ]; in stdenv.mkDerivation rec { pname = "bluez"; - version = "5.56"; + version = "5.58"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "sha256-WcTbqfyKripqX48S8ZvBsMLcJzVcfKMSPu0/5r19C50="; + sha256 = "1wgiv8cqya6n1w5fz24cb8q401bhn5aa6s7g95l26rzblmsmw1n8"; }; buildInputs = [ @@ -45,15 +44,6 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; - patches = [ - # Fixes https://github.com/NixOS/nixpkgs/issues/117663 - (fetchpatch { - name = "disconnect-fix.patch"; - url = "https://github.com/bluez/bluez/commit/28ddec8d6b829e002fa268c07b71e4c564ba9e16.patch"; - sha256 = "sha256-vzMf1i44e4JrpL7cXbn9oDr+3B+Glf7dPW3QDstEnEM="; - }) - ]; - postPatch = '' substituteInPlace tools/hid2hci.rules \ --replace /sbin/udevadm ${systemd}/bin/udevadm \ From 12e8ff8e75933e474bc3a24f0e0393327fcfd685 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Thu, 8 Apr 2021 02:26:58 -0500 Subject: [PATCH 0532/1183] libvpx: 1.9.0 -> 1.10.0 --- pkgs/development/libraries/libvpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index 5aa8cf704910..f19183966163 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -56,13 +56,13 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "webmproject"; repo = pname; rev = "v${version}"; - sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"; + sha256 = "sha256-EZP33U10fchyqy7Jr26vHgUUfWR6xtG3fcMWUII0m9w="; }; postPatch = "patchShebangs ."; From b233405aac04e996a818e08863a03f1086901aab Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 27 Mar 2021 00:00:00 +0000 Subject: [PATCH 0533/1183] python3.pkgs.mistune: write derivation for mistune=2.0.0a4 This version is required for md2gemini program and is incompatible with mistune=0.8.4 --- .../python-modules/mistune/common.nix | 18 +++++++++++++ .../python-modules/mistune/default.nix | 26 +++++-------------- pkgs/top-level/python-packages.nix | 6 ++++- 3 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 pkgs/development/python-modules/mistune/common.nix diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix new file mode 100644 index 000000000000..e7290ebf8227 --- /dev/null +++ b/pkgs/development/python-modules/mistune/common.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi, nose, version, sha256 }: + +buildPythonPackage rec { + inherit version; + pname = "mistune"; + + src = fetchPypi { + inherit pname version sha256; + }; + + buildInputs = [ nose ]; + + meta = with lib; { + description = "The fastest markdown parser in pure Python"; + homepage = "https://github.com/lepture/mistune"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index cde668bd5fbe..3020eca4eed5 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -1,23 +1,11 @@ -{ lib -, buildPythonPackage -, fetchPypi -, nose -}: - -buildPythonPackage rec { - pname = "mistune"; - version = "0.8.4"; - - src = fetchPypi { - inherit pname version; +self: rec { + mistune_0_8 = self.callPackage ./common.nix { + version = "0.8.4"; sha256 = "59a3429db53c50b5c6bcc8a07f8848cb00d7dc8bdb431a4ab41920d201d4756e"; }; - - buildInputs = [ nose ]; - - meta = with lib; { - description = "The fastest markdown parser in pure Python"; - homepage = "https://github.com/lepture/mistune"; - license = licenses.bsd3; + mistune_2_0 = self.callPackage ./common.nix { + version = "2.0.0a4"; + sha256 = "0i6cblmjl58kdmaa21xm0l1ls0kvjpfy45sf73fw3ws6305f628k"; }; + mistune = mistune_0_8; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a95c425694bf..0bf1d341c54b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4020,7 +4020,11 @@ in { mistletoe = callPackage ../development/python-modules/mistletoe { }; - mistune = callPackage ../development/python-modules/mistune { }; + inherit (import ../development/python-modules/mistune self) + mistune + mistune_0_8 + mistune_2_0 + ; mitmproxy = callPackage ../development/python-modules/mitmproxy { }; From 2b4ef94228eb7f12b5ea31242c70199af669af15 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 27 Mar 2021 00:00:00 +0000 Subject: [PATCH 0534/1183] python3.pkgs.cjkwrap: init at 2.2 --- .../python-modules/cjkwrap/default.nix | 19 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/cjkwrap/default.nix diff --git a/pkgs/development/python-modules/cjkwrap/default.nix b/pkgs/development/python-modules/cjkwrap/default.nix new file mode 100644 index 000000000000..43e5909ec47b --- /dev/null +++ b/pkgs/development/python-modules/cjkwrap/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "CJKwrap"; + version = "2.2"; + src = fetchPypi { + inherit pname version; + sha256 = "1b603sg6c2gv9vmlxwr6r1qvhadqk3qp6vifmijris504zjx5ix2"; + }; + + pythonImportsCheck = [ "cjkwrap" ]; + + meta = with lib; { + description = "A library for wrapping and filling CJK text"; + homepage = "https://f.gallai.re/cjkwrap"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0bf1d341c54b..1f6cda42a554 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1303,6 +1303,10 @@ in { citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + cjkwrap = callPackage ../development/python-modules/cjkwrap { }; + + cjson = callPackage ../development/python-modules/cjson { }; + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; class-registry = callPackage ../development/python-modules/class-registry { }; From b6bb9ebd4148e939566385ec31f8c57162456761 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Mon, 29 Mar 2021 00:00:00 +0000 Subject: [PATCH 0535/1183] md2gemini: init at 1.8.1 --- .../python-modules/md2gemini/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/md2gemini/default.nix diff --git a/pkgs/development/python-modules/md2gemini/default.nix b/pkgs/development/python-modules/md2gemini/default.nix new file mode 100644 index 000000000000..7b4686dcac40 --- /dev/null +++ b/pkgs/development/python-modules/md2gemini/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi, mistune_2_0, cjkwrap, wcwidth +, pytestCheckHook }: + +buildPythonPackage rec { + pname = "md2gemini"; + version = "1.8.1"; + + propagatedBuildInputs = [ mistune_2_0 cjkwrap wcwidth ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "md2gemini" ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0mfa0f0m762168fbsxjr1cx9yhj82dr8z1d28jl6hj9bkqnvvwiy"; + }; + + meta = with lib; { + description = "Markdown to Gemini text format conversion library"; + homepage = "https://github.com/makeworld-the-better-one/md2gemini"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef8d2f501ece..e13d5831fb04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6001,6 +6001,8 @@ in m2r = python3Packages.callPackage ../tools/text/m2r { }; + md2gemini = with python3.pkgs; toPythonApplication md2gemini; + mdbook = callPackage ../tools/text/mdbook { inherit (darwin.apple_sdk.frameworks) CoreServices; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f6cda42a554..b4644d0231ce 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3949,6 +3949,8 @@ in { mcstatus = callPackage ../development/python-modules/mcstatus { }; + md2gemini = callPackage ../development/python-modules/md2gemini { }; + MDP = callPackage ../development/python-modules/mdp { }; measurement = callPackage ../development/python-modules/measurement { }; From 403481caf97303ed3a0acc5a85983379c22049ed Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Sat, 3 Apr 2021 00:00:00 +0000 Subject: [PATCH 0536/1183] python3.pkgs.mistune: add pythonImportsCheck --- pkgs/development/python-modules/mistune/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/mistune/common.nix b/pkgs/development/python-modules/mistune/common.nix index e7290ebf8227..7aba4ade4141 100644 --- a/pkgs/development/python-modules/mistune/common.nix +++ b/pkgs/development/python-modules/mistune/common.nix @@ -9,6 +9,7 @@ buildPythonPackage rec { }; buildInputs = [ nose ]; + pythonImportsCheck = [ "mistune" ]; meta = with lib; { description = "The fastest markdown parser in pure Python"; From 64df21f0cb1df68a32e96333c3c03d6266f7a7e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Apr 2021 17:53:40 +0200 Subject: [PATCH 0537/1183] pythonPackages.smartypants: 1.8.6 -> 2.0.1 --- .../python-modules/smartypants/default.nix | 25 ++++++++++++------- .../python-modules/smartypants/hgtags | 17 ------------- 2 files changed, 16 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/python-modules/smartypants/hgtags diff --git a/pkgs/development/python-modules/smartypants/default.nix b/pkgs/development/python-modules/smartypants/default.nix index ec41c8a32aa1..29a1e3c9a201 100644 --- a/pkgs/development/python-modules/smartypants/default.nix +++ b/pkgs/development/python-modules/smartypants/default.nix @@ -2,10 +2,13 @@ , buildPythonPackage , fetchFromGitHub , isPyPy +, docutils +, pygments +, pytestCheckHook }: buildPythonPackage rec { - version = "1.8.6"; + version = "2.0.1"; pname = "smartypants"; disabled = isPyPy; @@ -13,19 +16,23 @@ buildPythonPackage rec { owner = "leohemsted"; repo = "smartypants.py"; rev = "v${version}"; - sha256 = "1cmzz44d2hm6y8jj2xcq1wfr26760gi7iq92ha8xbhb1axzd7nq6"; - # remove this file and the name on the next version update - extraPostFetch = '' - cp ${./hgtags} "$out"/.hgtags - ''; - name = "hg-archive"; + sha256 = "00p1gnb9pzb3svdq3c5b9b332gsp50wrqqa39gj00m133zadanjp"; }; + checkInputs = [ + docutils + pygments + pytestCheckHook + ]; + + preCheck = '' + patchShebangs smartypants + ''; + meta = with lib; { description = "Python with the SmartyPants"; homepage = "https://github.com/leohemsted/smartypants.py"; license = licenses.bsd3; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ dotlambda ]; }; - } diff --git a/pkgs/development/python-modules/smartypants/hgtags b/pkgs/development/python-modules/smartypants/hgtags deleted file mode 100644 index 522ca8d2c017..000000000000 --- a/pkgs/development/python-modules/smartypants/hgtags +++ /dev/null @@ -1,17 +0,0 @@ -47e996532eff9d3bb2c7048aca37d5fd1028e706 v1.5_1.2 -4ff48eba1d3d37d708005e465cf701b63eb68fd3 v1.5_1.1 -6ba7f3a14ff77e4e9bf9918413b1710c33deae4d v1.5_1.3.1 -71006a014216defb21e4db6e03434d289564ea60 v1.5_1.6 -90950ff693122f80710974abc0f2be64d4105e84 v1.5_1.3 -a6ecae6541d64f5b12c7b788c65362b0c012278d v1.5_1.0 -eed4a8a16f116f98e8280dc79128845020bbe766 v1.5_1.5 -f9a62f541f19ead9be4c3be896b64d1caa0b524c v1.5_1.4 -fc0bee49a07daf05f034560cfef81a8a8d034d1f v1.5_1.7 -096ed5f806b6dbc473fae1848643cf45005b9bf1 v1.7.0 -aaeb8099a24ad7db3f36ebe71ef326d6377730aa v1.7.1 -fd8ccc937af7280db4e581b2eb1354245f4672ab v1.8.0 -7839b0eab3e9daf5b346edfa5c54f3cc46fc202a v1.8.1 -6140b78317beabb6e49cd91b35a779ccb0af7327 v1.8.2 -c3b1c83c5ddada685b421b8f82f7e92c794bf2f6 v1.8.3 -460c1add9b9f89831e1ab965f1e1c31325f6e72d v1.8.4 -78165f4976299c37d6e3dd5463adcd61f9cb2b75 v1.8.5 From 13598220a699ec9039323aa79e8145d902657b5e Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Fri, 9 Apr 2021 01:51:21 +0200 Subject: [PATCH 0538/1183] isl_0_20: do not guess -march=/-mtune= See #106587 --- pkgs/development/libraries/isl/0.20.0.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index c35588555a7f..c40b3d7be0b4 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -10,6 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + configureFlags = [ + "--with-gcc-arch=generic" # don't guess -march=/mtune= + ]; + enableParallelBuilding = true; meta = { From 4bff6d04e44c0bf19c7a0975f882883ba2212a6a Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Apr 2021 16:50:17 +0200 Subject: [PATCH 0539/1183] libGL: use headers from glvnd The glvnd library contains a copy of the OpenGL headers. By compiling against the glvnd headers we completely avoid a dependency on Mesa (and LLVM). This reduces rebuild time. It also prevents accidents, such as where some packages kept a reference to the mesa.drivers output and thus had all Mesa drivers in their runtime closure. --- pkgs/development/libraries/mesa/stubs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/mesa/stubs.nix b/pkgs/development/libraries/mesa/stubs.nix index a53f2dc28e77..753ad1b91966 100644 --- a/pkgs/development/libraries/mesa/stubs.nix +++ b/pkgs/development/libraries/mesa/stubs.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { mkdir -p $dev/{,lib/pkgconfig,nix-support} echo "$out ${libglvnd} ${libglvnd.dev}" > $dev/nix-support/propagated-build-inputs - ln -s ${mesa.dev}/include $dev/include + ln -s ${libglvnd.dev}/include $dev/include genPkgConfig() { local name="$1" @@ -61,9 +61,9 @@ stdenv.mkDerivation { cat <$dev/lib/pkgconfig/$name.pc Name: $name Description: $lib library - Version: ${mesa.version} + Version: ${libglvnd.version} Libs: -L${libglvnd.out}/lib -l$lib - Cflags: -I${mesa.dev}/include -I${libglvnd.dev}/include + Cflags: -I${libglvnd.dev}/include EOF } From cd65dfa14cd2b0e665dd37595ded55b23f1e52cd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Apr 2021 18:58:08 +0200 Subject: [PATCH 0540/1183] gtk3: use libGL instead of mesa --- pkgs/development/libraries/gtk/3.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index d1e478ded262..0d4bec5f3441 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -36,7 +36,7 @@ , tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux -, mesa +, libGL , wayland , wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { # explicitly propagated, always needed Cocoa ] ++ lib.optionals waylandSupport [ - mesa + libGL wayland wayland-protocols ] ++ lib.optionals xineramaSupport [ From 79da76f83b148206e46c32c85fc4ea5bad558949 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Apr 2021 18:58:20 +0200 Subject: [PATCH 0541/1183] gtk4: use libGL instead of mesa --- pkgs/development/libraries/gtk/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 28247d6c9728..b64b8bc36fde 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -38,7 +38,7 @@ , tracker , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux -, mesa +, libGL , vulkan-loader , vulkan-headers , wayland @@ -124,7 +124,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals trackerSupport [ tracker ] ++ lib.optionals waylandSupport [ - mesa + libGL wayland wayland-protocols ] ++ lib.optionals xineramaSupport [ From aa0b68b26ae44bec9f06cac2bf471e51b5a4bec2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 4 Apr 2021 19:17:49 +0200 Subject: [PATCH 0542/1183] chromium: add explicit mesa dependency --- pkgs/applications/networking/browsers/chromium/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8d0a59f29190..71bc18f45d55 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -138,6 +138,7 @@ let bison gperf libkrb5 glib gtk3 dbus-glib libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL + mesa # required for libgbm pciutils protobuf speechd libXdamage at-spi2-core jre pipewire From acbfd3f7c09e4df7300261d85edf586c8a5028af Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 5 Apr 2021 11:22:30 +0200 Subject: [PATCH 0543/1183] mesa: add driversdev output and test that dev doesn't depend on drivers OpenGL applications should not depend on the Mesa drivers, since these are supposed to be loaded at runtime from /run/opengl-driver using the glvnd library. Furthermore, the drivers output has a large closure since it depends on LLVM. The only dependency from dev to drivers came from the xatracker pkg-config file. This commit moves this file into a new output called driversdev. --- pkgs/development/libraries/mesa/default.nix | 35 ++++++++++++++------- pkgs/servers/x11/xorg/overrides.nix | 2 +- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1723940915c1..fd226277a44d 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -34,9 +34,8 @@ let # Release frequency: https://www.mesa3d.org/releasing.html#schedule version = "21.0.2"; branch = versions.major version; -in -stdenv.mkDerivation { +self = stdenv.mkDerivation { pname = "mesa"; inherit version; @@ -88,7 +87,9 @@ stdenv.mkDerivation { "find_program('${stdenv.cc.targetPrefix}nm')" ''; - outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; + outputs = [ "out" "dev" "drivers" ] + ++ lib.optional enableOSMesa "osmesa" + ++ lib.optional stdenv.isLinux "driversdev"; # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ @@ -181,20 +182,22 @@ stdenv.mkDerivation { mv -t $osmesa/lib/ $out/lib/libOSMesa* ''; - # TODO: - # check $out doesn't depend on llvm: builder failures are ignored - # for some reason grep -qv '${llvmPackages.llvm}' -R "$out"; postFixup = optionalString stdenv.isLinux '' # set the default search path for DRI drivers; used e.g. by X server substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace "$drivers" "${libglvnd.driverLink}" + substituteInPlace "$dev/lib/pkgconfig/d3d.pc" --replace "$drivers" "${libglvnd.driverLink}" # remove pkgconfig files for GL/EGL; they are provided by libGL. rm -f $dev/lib/pkgconfig/{gl,egl}.pc - # Update search path used by pkg-config - for pc in $dev/lib/pkgconfig/{d3d,dri,xatracker}.pc; do - if [ -f "$pc" ]; then - substituteInPlace "$pc" --replace $out $drivers + # Move development files for libraries in $drivers to $driversdev + mkdir -p $driversdev/include + mv $dev/include/xa_* $dev/include/d3d* $driversdev/include + mkdir -p $driversdev/lib/pkgconfig + for pc in lib/pkgconfig/{xatracker,d3d}.pc; do + if [ -f "$dev/$pc" ]; then + substituteInPlace "$dev/$pc" --replace $out $drivers + mv $dev/$pc $driversdev/$pc fi done @@ -212,6 +215,14 @@ stdenv.mkDerivation { passthru = { inherit libdrm; inherit (libglvnd) driverLink; + + tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { + name = "mesa-dev-does-not-depend-on-llvm"; + buildCommand = '' + echo ${self.dev} >>$out + ''; + disallowedRequisites = [ llvmPackages.llvm self.drivers ]; + }; }; meta = { @@ -231,4 +242,6 @@ stdenv.mkDerivation { platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ primeos vcunat ]; # Help is welcome :) }; -} +}; + +in self diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 4c8322915953..3f88c0e0c993 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -433,7 +433,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { - buildInputs = attrs.buildInputs ++ [ mesa llvm ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ mesa mesa.driversdev llvm ]; # for libxatracker meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"]; }; From c08d9a7e0266c5a2b6ea0cef9e0b77d5b935969f Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 5 Apr 2021 11:30:23 +0200 Subject: [PATCH 0544/1183] firefox: add missing libdrm and libXdamage dependencies --- pkgs/applications/networking/browsers/firefox/common.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 3a8fec2c6efa..24195e578bd0 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -6,7 +6,7 @@ , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, nss_3_53 , yasm, libGLU, libGL, sqlite, unzip, makeWrapper -, hunspell, libXdamage, libevent, libstartup_notification +, hunspell, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib, pciutils , autoconf213, which, gnused, rustPackages, rustPackages_1_45 @@ -22,7 +22,7 @@ , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , ffmpegSupport ? true , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true, libxkbcommon +, waylandSupport ? true, libxkbcommon, libdrm , ltoSupport ? (stdenv.isLinux && stdenv.is64bit), overrideCC, buildPackages , gssSupport ? true, libkrb5 , pipewireSupport ? waylandSupport && webrtcSupport, pipewire @@ -161,6 +161,7 @@ buildStdenv.mkDerivation ({ xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file xorg.pixman yasm libGLU libGL xorg.xorgproto + xorg.libXdamage xorg.libXext makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib @@ -175,7 +176,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 ++ lib.optional gssSupport libkrb5 - ++ lib.optional waylandSupport libxkbcommon + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ] ++ lib.optional pipewireSupport pipewire ++ lib.optional (lib.versionAtLeast ffversion "82") gnum4 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos From 1cf80c56e3d3d45ba90208b49f34000bff3eb3e7 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 5 Apr 2021 18:44:09 +0200 Subject: [PATCH 0545/1183] qt514.qtwayland: fix build --- .../libraries/qt-5/5.14/default.nix | 1 + .../qt-5/5.14/qtwayland-libdrm-build.patch | 56 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 45cf6209ea08..3e3790ed1a4c 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -118,6 +118,7 @@ let ./qtwebkit-darwin-no-qos-classes.patch ]; qttools = [ ./qttools.patch ]; + qtwayland = [ ./qtwayland-libdrm-build.patch ]; }; qtModule = diff --git a/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch b/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch new file mode 100644 index 000000000000..fb3d6327e45b --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwayland-libdrm-build.patch @@ -0,0 +1,56 @@ +commit 7217ea9cf297e664be876eb82b66a1b4f157ca80 +Author: Peter Seiderer +Date: Fri Apr 3 21:52:30 2020 +0200 + + fix libdrm related configure test failure + + Fixes: + + Project ERROR: Test config.qtwayland_client.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-server-buffer tries to use undeclared library 'drm' + Project ERROR: Test config.qtwayland_compositor.tests.dmabuf-client-buffer tries to use undeclared library 'drm' + + Task-number: QTBUG-83303 + Change-Id: I3970f4e3855fcfa760493631a14adb6a16950aa9 + Reviewed-by: Ville Voutilainen + Reviewed-by: Heikki Halmet + Reviewed-by: Eskil Abrahamsen Blomfeldt + (cherry picked from commit ca63fe81df8ac910f43539719566ed6745700c2b) + (cherry picked from commit 1344ca6b5a8fbc1b28727feea6d856af8bf3bc93) + +diff --git a/src/client/configure.json b/src/client/configure.json +index 06213968..27c73f89 100644 +--- a/src/client/configure.json ++++ b/src/client/configure.json +@@ -74,7 +74,8 @@ + "label": "Linux dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_server_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing", +diff --git a/src/compositor/configure.json b/src/compositor/configure.json +index 0dbb3364..73e4c1a8 100644 +--- a/src/compositor/configure.json ++++ b/src/compositor/configure.json +@@ -80,13 +80,15 @@ + "label": "Linux dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_server_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "dmabuf-client-buffer": { + "label": "Linux Client dma-buf Buffer Sharing", + "type": "compile", + "test": "dmabuf_client_buffer", +- "use": "egl drm" ++ "libs": "-ldrm", ++ "use": "egl" + }, + "vulkan-server-buffer": { + "label": "Vulkan Buffer Sharing", From 46a702eba16d9ad244657081a11965ce0d84e440 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Mon, 5 Apr 2021 19:18:33 +0200 Subject: [PATCH 0546/1183] fcitx5-mozc: remove unused mesa dependency --- pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix index d077b0a25c59..57bb0220b312 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-mozc.nix @@ -1,5 +1,5 @@ { lib, clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchgit -, python3Packages, mesa, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 +, python3Packages, ninja, pkg-config, protobuf, zinnia, qt5, fcitx5 , jsoncpp, gtest, which, gtk2, unzip, abseil-cpp, breakpad }: let inherit (python3Packages) python gyp six; @@ -31,7 +31,7 @@ in clangStdenv.mkDerivation rec { sha256 = "R+w0slVFpqtt7PIr1pyupJjRoQsABVZiMdZ9fKGKAqw="; }; - nativeBuildInputs = [ gyp ninja mesa python pkg-config qt5.wrapQtAppsHook six which unzip ]; + nativeBuildInputs = [ gyp ninja python pkg-config qt5.wrapQtAppsHook six which unzip ]; buildInputs = [ protobuf zinnia qt5.qtbase fcitx5 abseil-cpp jsoncpp gtest gtk2 ]; From a955833297e5737cd2b259617de1c1ae4ae8b149 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Apr 2021 23:03:22 +0200 Subject: [PATCH 0547/1183] wayfire: add missing mesa dependency --- pkgs/applications/window-managers/wayfire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/default.nix b/pkgs/applications/window-managers/wayfire/default.nix index cb9f2fe85a7e..303ffc35fc71 100644 --- a/pkgs/applications/window-managers/wayfire/default.nix +++ b/pkgs/applications/window-managers/wayfire/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, meson, ninja, pkg-config, git , cairo, libdrm, libexecinfo, libinput, libjpeg, libxkbcommon, wayland -, wayland-protocols, wf-config, wlroots +, wayland-protocols, wf-config, wlroots, mesa }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wayland ]; buildInputs = [ cairo libdrm libexecinfo libinput libjpeg libxkbcommon wayland - wayland-protocols wf-config wlroots + wayland-protocols wf-config wlroots mesa ]; mesonFlags = [ "--sysconfdir" "/etc" ]; From 42981d6ce1eb2a9364308e09015463689a7bc457 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Apr 2021 23:04:27 +0200 Subject: [PATCH 0548/1183] atomEnv: add missing mesa dependency --- pkgs/applications/editors/atom/env.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index 3c0f348ebd52..53150e0ad61f 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,7 +1,7 @@ { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig , libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify, libsecret, libuuid, at-spi2-atk -, at-spi2-core, libdbusmenu +, at-spi2-core, libdbusmenu, mesa }: let @@ -12,6 +12,7 @@ let xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify xorg.libxcb libsecret libuuid at-spi2-atk at-spi2-core libdbusmenu + mesa # required for libgbm ]; libPathNative = lib.makeLibraryPath packages; From 7b0b03a0adfe92ef7687f8ddb924300997111c24 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Apr 2021 23:06:12 +0200 Subject: [PATCH 0549/1183] pcsxr: add missing libXxf86vm dependency --- pkgs/misc/emulators/pcsxr/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index e6f0ec477440..099795c63fd1 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file + xorg.libXxf86vm ]; dynarecTarget = From 0899c439d3dc560e0111e2bf5c1c5b649750cb81 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 8 Apr 2021 23:07:15 +0200 Subject: [PATCH 0550/1183] byzanz: add missing libXdamage dependency --- pkgs/applications/video/byzanz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 69d27c3a2c8f..80e1c1260bd4 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo ] + buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with lib; { From e32d94201ccd2bdf23b217907337634e9a0af0ae Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:41:26 +0200 Subject: [PATCH 0551/1183] drawio: add missing mesa dependency --- pkgs/applications/graphics/drawio/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 4155767a361a..e8ef97f949c4 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -4,7 +4,7 @@ , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat , gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst -, libxcb, libuuid, libxshmfence, nspr, nss, pango +, libxcb, libuuid, libxshmfence, nspr, nss, pango, mesa , systemd }: @@ -50,6 +50,7 @@ stdenv.mkDerivation rec { libXtst libxcb libuuid + mesa # for libgbm nspr nss pango From 2da39dda3ead24769696e2a7589d40b4f43a4ff2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:45:22 +0200 Subject: [PATCH 0552/1183] cagebreak: add missing mesa dependency --- pkgs/applications/window-managers/cagebreak/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/cagebreak/default.nix b/pkgs/applications/window-managers/cagebreak/default.nix index 93ac815346e4..505d1cb1520c 100644 --- a/pkgs/applications/window-managers/cagebreak/default.nix +++ b/pkgs/applications/window-managers/cagebreak/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland, scdoc, makeWrapper , wlroots, wayland-protocols, pixman, libxkbcommon -, cairo , pango, fontconfig, pandoc, systemd +, cairo , pango, fontconfig, pandoc, systemd, mesa , withXwayland ? true, xwayland , nixosTests }: @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon cairo pango fontconfig pandoc systemd + mesa # for libEGL headers ]; outputs = [ "out" "contrib" ]; From 1d078152bd472fbff16747f384840d252be0aa2e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:46:14 +0200 Subject: [PATCH 0553/1183] cage: add missing mesa headers --- pkgs/applications/window-managers/cage/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index f7083212e705..103be0e53d76 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, wayland, scdoc, makeWrapper , wlroots, wayland-protocols, pixman, libxkbcommon -, systemd, libGL, libX11 +, systemd, libGL, libX11, mesa , xwayland ? null , nixosTests }: @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon + mesa # for libEGL headers systemd libGL libX11 ]; From 30e6c07310e20607e386aeb44c35bd027ed442ee Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Fri, 9 Apr 2021 13:22:35 +0200 Subject: [PATCH 0554/1183] rustc: reenable aarch64-darwin for 1.51.0 --- pkgs/development/compilers/rust/1_51.nix | 1 + pkgs/development/compilers/rust/print-hashes.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/rust/1_51.nix b/pkgs/development/compilers/rust/1_51.nix index bbdf8111e15a..a489df471a8c 100644 --- a/pkgs/development/compilers/rust/1_51.nix +++ b/pkgs/development/compilers/rust/1_51.nix @@ -45,6 +45,7 @@ import ./default.nix { aarch64-unknown-linux-gnu = "1db7a4fbddc68cd29eb9bca9fa7d0d2d9e3d59ede7ddaad66222fb4336a6bacf"; aarch64-unknown-linux-musl = "adcc6c76a8967bacb6687b565d3cf739e35fde066b03edb745b05b52fa8b5b36"; x86_64-apple-darwin = "1bf5a7ecf6468ce1bf9fe49c8083b3f648b40c16fbfb7539d106fe28eb0e792e"; + aarch64-apple-darwin = "1ed91a867e7b86cc4bc84c0838240f1c25acd007100ec9f7a14c4873e4b56561"; powerpc64le-unknown-linux-gnu = "e0472589d3f9ba7ebf27f033af320e0d5cfb70222955bd8ed73ce2c9a70ae535"; }; diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh index 0639726f48d7..c24052fcc058 100755 --- a/pkgs/development/compilers/rust/print-hashes.sh +++ b/pkgs/development/compilers/rust/print-hashes.sh @@ -16,6 +16,7 @@ PLATFORMS=( aarch64-unknown-linux-gnu aarch64-unknown-linux-musl x86_64-apple-darwin + aarch64-apple-darwin powerpc64le-unknown-linux-gnu ) BASEURL=https://static.rust-lang.org/dist From 5ae84e81d72a537155b803286cc2927f55f38fa2 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:48:21 +0200 Subject: [PATCH 0555/1183] thunderbird: add missing libdrm and libXdamage dependencies --- .../networking/mailreaders/thunderbird/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 447c4b3f3b5c..e29757f49c84 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -61,7 +61,7 @@ , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? stdenv.isLinux, libpulseaudio , gtk3Support ? true, gtk2, gtk3, wrapGAppsHook -, waylandSupport ? true +, waylandSupport ? true, libdrm , libxkbcommon, calendarSupport ? true # Use official trademarked branding. Permission obtained at: @@ -137,12 +137,13 @@ stdenv.mkDerivation rec { xorg.libXt xorg.pixman xorg.xorgproto + xorg.libXdamage zip zlib ] ++ lib.optional alsaSupport alsaLib ++ lib.optional gtk3Support gtk3 ++ lib.optional pulseaudioSupport libpulseaudio - ++ lib.optional waylandSupport libxkbcommon; + ++ lib.optionals waylandSupport [ libxkbcommon libdrm ]; NIX_CFLAGS_COMPILE =[ "-I${glib.dev}/include/gio-unix-2.0" From dfefa8e328329b9dfbfd9d1a9b7b4ecca80287a8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:50:17 +0200 Subject: [PATCH 0556/1183] webkitgtk: add mesa dependency --- pkgs/development/libraries/webkitgtk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 84cf8d4833fe..4dbec69f8f1c 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -36,6 +36,7 @@ , readline , libGL , libGLU +, mesa , libintl , libmanette , openjpeg @@ -113,6 +114,7 @@ stdenv.mkDerivation rec { harfbuzz libGL libGLU + mesa # for libEGL headers libgcrypt libidn libintl From d57202dac7e3774b0a37697a48659cb336125604 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:50:31 +0200 Subject: [PATCH 0557/1183] signal-desktop: add mesa dependency --- .../networking/instant-messengers/signal-desktop/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index e821e182cd40..79adb34e92dc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,7 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 +, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 libnotify libuuid + mesa # for libgbm nspr nss pango From bdc502c4c021d7bcdd1269547c3897533ded2971 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:52:23 +0200 Subject: [PATCH 0558/1183] wingpanel: add mesa dependency --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 8e314d3d84bf..97c2d0c8845a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -13,6 +13,7 @@ , granite , gettext , mutter +, mesa , json-glib , python3 , elementary-gtk-theme @@ -55,6 +56,7 @@ stdenv.mkDerivation rec { json-glib libgee mutter + mesa # for libEGL ]; patches = [ From 0a70e6af02e8cdb8761c22ba0b1968f4b104611c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:56:12 +0200 Subject: [PATCH 0559/1183] cypress: add missing mesa dependency --- pkgs/development/web/cypress/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 2d04fc51c817..7e54a7c48efa 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook, mesa }: stdenv.mkDerivation rec { pname = "cypress"; @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { libXScrnSaver libXdamage libXtst ] ++ [ nss gtk2 alsaLib gnome2.GConf gtk3 unzip + mesa # for libgbm ]; runtimeDependencies = [ (lib.getLib udev) ]; From e6b96625184237c321701faad5951c9373a312ec Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 10:57:00 +0200 Subject: [PATCH 0560/1183] waybox: add missing mesa dependency --- pkgs/applications/window-managers/waybox/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/waybox/default.nix b/pkgs/applications/window-managers/waybox/default.nix index 666b2406d5f4..007e4dcc568b 100644 --- a/pkgs/applications/window-managers/waybox/default.nix +++ b/pkgs/applications/window-managers/waybox/default.nix @@ -11,6 +11,7 @@ , pixman , udev , libGL +, mesa }: stdenv.mkDerivation rec { @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { pixman udev libGL + mesa # for libEGL ]; meta = with lib; { From e88d3ebd5edfc94bc9588678fcc9ce099f32b046 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:26:18 +0200 Subject: [PATCH 0561/1183] kodi: add missing mesa dependency --- pkgs/applications/video/kodi/unwrapped.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 6f926176eaf8..3e6b3dc51dc0 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -127,6 +127,7 @@ in stdenv.mkDerivation { bluez giflib glib harfbuzz lcms2 libpthreadstubs ffmpeg flatbuffers fmt fstrcmp rapidjson lirc + mesa # for libEGL ] ++ lib.optional x11Support [ libX11 xorgproto libXt libXmu libXext.dev libXdmcp From e863b947b8bf2654c82080a7b0e5ce8f53786260 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:27:10 +0200 Subject: [PATCH 0562/1183] insomnia: add missing mesa dependency --- pkgs/development/web/insomnia/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 345b7c15426d..24b65e4e8af8 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeWrapper, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat -, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, gtk2 +, fontconfig, freetype, gdk-pixbuf, glib, gnome2, pango, mesa, nspr, nss, gtk3, gtk2 , at-spi2-atk, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 @@ -56,6 +56,7 @@ in stdenv.mkDerivation rec { libXrender libXtst libxcb + mesa # for libgbm nspr nss stdenv.cc.cc From da52495c64a383724f1ea684cb57ed684ed2c3d1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:28:24 +0200 Subject: [PATCH 0563/1183] hikari: add mesa dependency --- pkgs/applications/window-managers/hikari/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/hikari/default.nix b/pkgs/applications/window-managers/hikari/default.nix index 2325deaf37cb..ba0b204cbd98 100644 --- a/pkgs/applications/window-managers/hikari/default.nix +++ b/pkgs/applications/window-managers/hikari/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchzip, pkg-config, bmake, cairo, glib, libevdev, libinput, libxkbcommon, linux-pam, pango, pixman, - libucl, wayland, wayland-protocols, wlroots, + libucl, wayland, wayland-protocols, wlroots, mesa, features ? { gammacontrol = true; layershell = true; @@ -35,6 +35,7 @@ stdenv.mkDerivation { pango pixman libucl + mesa # for libEGL wayland wayland-protocols wlroots From 4206aec447ac049e5739470dab443cdaaca55dba Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:30:57 +0200 Subject: [PATCH 0564/1183] onlyoffice-bin: add libdrm dependency --- pkgs/applications/office/onlyoffice-bin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/office/onlyoffice-bin/default.nix b/pkgs/applications/office/onlyoffice-bin/default.nix index bfd3c3529e7d..987c2c3cb281 100644 --- a/pkgs/applications/office/onlyoffice-bin/default.nix +++ b/pkgs/applications/office/onlyoffice-bin/default.nix @@ -21,6 +21,7 @@ , gtk3 , libpulseaudio , libudev0-shim +, libdrm , makeWrapper , nspr , nss @@ -101,6 +102,7 @@ in stdenv.mkDerivation rec { gtk2 gtk3 libpulseaudio + libdrm nspr nss qt5.qtbase From d9e946acf97daf8b36f4dfaa1d43161d27d7024b Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:32:08 +0200 Subject: [PATCH 0565/1183] mullvad-vpn: add mesa dependency --- pkgs/applications/networking/mullvad-vpn/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 9267d8d231cd..b27598c40e40 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 +, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3, mesa , xorg, autoPatchelfHook, systemd, libnotify, libappindicator }: @@ -20,6 +20,7 @@ let deps = [ gtk3 libappindicator libnotify + mesa xorg.libX11 xorg.libXScrnSaver xorg.libXcomposite From 5e35b5c420d6700d2b0d8b266c9f77c886bef1c1 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:34:33 +0200 Subject: [PATCH 0566/1183] wio: add missing mesa dependency --- pkgs/applications/window-managers/wio/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix index 301b0184e9c7..c330bbe0e0f4 100644 --- a/pkgs/applications/window-managers/wio/default.nix +++ b/pkgs/applications/window-managers/wio/default.nix @@ -10,6 +10,7 @@ , wayland , wayland-protocols , wlroots +, mesa , xwayland , makeWrapper }: @@ -32,6 +33,7 @@ stdenv.mkDerivation rec { wayland wayland-protocols wlroots + mesa # for libEGL xwayland ]; From 9d90e2dda237e7c0f1a4d771a5652e0faa85d9bd Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Fri, 9 Apr 2021 13:35:26 +0200 Subject: [PATCH 0567/1183] streamlink-twitch-gui: add mesa dependency --- pkgs/applications/video/streamlink-twitch-gui/bin.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix index bc265d3e786b..4d90e6327b93 100644 --- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix +++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix @@ -19,6 +19,7 @@ , gtk3-x11 , libudev0-shim , libuuid +, mesa , nss , nspr , xorg @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { glib pango gtk3-x11 + mesa nss nspr libuuid From ff2e6fcf37be71e0561c72916ae2cde80d133228 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 3 Apr 2021 21:38:53 +0200 Subject: [PATCH 0568/1183] lib.licenses: add bsdOriginalUC (BSD 4-Clause University of California-Specific) --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 46ac0443a03f..88d598d92079 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -125,6 +125,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({ fullName = ''BSD 4-clause "Original" or "Old" License''; }; + bsdOriginalUC = spdx { + spdxId = "BSD-4-Clause-UC"; + fullName = "BSD 4-Clause University of California-Specific"; + }; + bsdProtection = spdx { spdxId = "BSD-Protection"; fullName = "BSD Protection License"; From d031d688925af69caffa779390ce5133ccd6782a Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 27 Mar 2021 01:27:03 +0100 Subject: [PATCH 0569/1183] util-linux: 2.36.1 -> 2.36.2 --- pkgs/os-specific/linux/util-linux/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index d7629f0df04d..5ce578838abb 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,22 +1,17 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, zlib, shadow +{ lib, stdenv, fetchurl, pkg-config, zlib, shadow , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.36.1"; + version = "2.36.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vbyydl1b13lx73di4bhc4br9ih24hcqv7bky0kyrn1c2x1c5yh9"; + sha256 = "0psc0asjp1rmfx1j7468zfnk9nphlphybw2n8dcl74v8v2lnnlgp"; }; patches = [ ./rtcwake-search-PATH-for-shutdown.patch - # Remove patch below in 2.36.2, see https://github.com/karelzak/util-linux/issues/1193 - (fetchpatch { - url = "https://github.com/karelzak/util-linux/commit/52f730e47869ce630fafb24fd46f755dc7ffc691.patch"; - sha256 = "1fz3p9127lfvmrdj1j1s8jds0jjz2dzkvmia66555ihv7hcfajbg"; - }) ]; outputs = [ "bin" "dev" "out" "man" ]; @@ -71,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "A set of system utilities for Linux"; + changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; license = licenses.gpl2; # also contains parts under more permissive licenses platforms = platforms.linux; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages From 4acadd5e6dc68079b2eaaa1d3c7486f3b4e8ebb7 Mon Sep 17 00:00:00 2001 From: uosis Date: Sun, 13 Sep 2020 22:47:47 -0600 Subject: [PATCH 0570/1183] util-linux: add missing libcap dependency --- pkgs/os-specific/linux/util-linux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 5ce578838abb..e97846193bf4 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, zlib, shadow +{ lib, stdenv, fetchurl, pkg-config, zlib, shadow, libcap_ng , ncurses ? null, perl ? null, pam, systemd ? null, minimal ? false }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = - [ zlib pam ] + [ zlib pam libcap_ng ] ++ lib.filter (p: p != null) [ ncurses systemd perl ]; doCheck = false; # "For development purpose only. Don't execute on production system!" From 79aa8089cc75ac2ddadc23d0e2a638e4e04c6859 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sat, 3 Apr 2021 21:40:46 +0200 Subject: [PATCH 0571/1183] util-linux: adjust meta.license --- pkgs/os-specific/linux/util-linux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index e97846193bf4..73f321f26318 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -67,7 +67,8 @@ stdenv.mkDerivation rec { homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "A set of system utilities for Linux"; changelog = "https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v${lib.versions.majorMinor version}/v${version}-ReleaseNotes"; - license = licenses.gpl2; # also contains parts under more permissive licenses + # https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing + license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ]; platforms = platforms.linux; priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages }; From 66d1da7e0068d19b3db47df463a2ea6c78552e1b Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Fri, 9 Apr 2021 21:00:03 -0700 Subject: [PATCH 0572/1183] pythonPackages.ptyprocess: fix stuck tests on darwin (#118948) --- pkgs/development/python-modules/ptyprocess/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 48b0ab48c739..d969a679a1ae 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch }: buildPythonPackage rec { @@ -12,6 +13,14 @@ buildPythonPackage rec { sha256 = "5c5d0a3b48ceee0b48485e0c26037c0acd7d29765ca3fbb5cb3831d347423220"; }; + patches = [ + # Remove after https://github.com/pexpect/ptyprocess/pull/64 is merged. + (fetchpatch { + url = "https://github.com/pexpect/ptyprocess/commit/40c1ccf3432a6787be1801ced721540e34c6cd87.patch"; + sha256 = "sha256-IemngBqBq3QRCmVscWtsuXHiFgvTOJIIB9SyAvsqHd0="; + }) + ]; + meta = { description = "Run a subprocess in a pseudo terminal"; homepage = "https://github.com/pexpect/ptyprocess"; From 378d7ba2619ea9180cd58b2b792b1ae1791495c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 10 Apr 2021 16:55:44 +0200 Subject: [PATCH 0573/1183] tracker: more temporary parallel-build fixup On master I didn't want to force a rebuild but x86_64 now failed also: https://hydra.nixos.org/build/141239433 The section will probably go away with the following update, so I didn't want to move the lines around. --- pkgs/development/libraries/tracker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index fae10f2b1b4a..ab769312c36f 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (rec { platforms = platforms.linux; }; } - // lib.optionalAttrs stdenv.isi686 { + // { # TMP: fatal error: libtracker-sparql/tracker-sparql-enum-types.h: No such file or directory enableParallelBuilding = false; } From 29bc87e961c0ab878b364cbc338898b2842d82db Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 10 Apr 2021 13:08:33 +0200 Subject: [PATCH 0574/1183] Fix "platfrom" typos --- doc/stdenv/cross-compilation.chapter.md | 2 +- pkgs/development/libraries/libquotient/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 96641426628e..3755c13facf5 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -123,7 +123,7 @@ depsBuildBuild = [ buildPackages.stdenv.cc ]; Add the following to your `mkDerivation` invocation. ```nix -doCheck = stdenv.hostPlatform == stdenv.buildPlatfrom; +doCheck = stdenv.hostPlatform == stdenv.buildPlatform; ``` ## Cross-building packages {#sec-cross-usage} diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 5405391a1e61..f4fe894eaf4d 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with lib; { - description = "A Qt5 library to write cross-platfrom clients for Matrix"; + description = "A Qt5 library to write cross-platform clients for Matrix"; homepage = "https://matrix.org/docs/projects/sdk/quotient"; license = licenses.lgpl21; maintainers = with maintainers; [ colemickens ]; From 9e4a925caf5d5649686402b52815503bddadd457 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 10 Apr 2021 13:10:23 +0200 Subject: [PATCH 0575/1183] zstd: do not cross-compile tests --- pkgs/tools/compression/zstd/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 6394ea3338d1..e890518a45a9 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -36,13 +36,15 @@ stdenv.mkDerivation rec { tests/playTests.sh ''; - cmakeFlags = [ - "-DZSTD_BUILD_SHARED:BOOL=${if (!static) then "ON" else "OFF"}" - "-DZSTD_BUILD_STATIC:BOOL=${if static then "ON" else "OFF"}" - "-DZSTD_PROGRAMS_LINK_SHARED:BOOL=${if (!static) then "ON" else "OFF"}" - "-DZSTD_LEGACY_SUPPORT:BOOL=${if legacySupport then "ON" else "OFF"}" - "-DZSTD_BUILD_TESTS:BOOL=ON" - ]; + cmakeFlags = lib.attrsets.mapAttrsToList + (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { + BUILD_SHARED = !static; + BUILD_STATIC = static; + PROGRAMS_LINK_SHARED = !static; + LEGACY_SUPPORT = legacySupport; + BUILD_TESTS = doCheck; + }; + cmakeDir = "../build/cmake"; dontUseCmakeBuildDir = true; preConfigure = '' @@ -50,7 +52,7 @@ stdenv.mkDerivation rec { ''; checkInputs = [ file ]; - doCheck = true; + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkPhase = '' runHook preCheck # Patch shebangs for playTests From 10353970bb4bebb868d68904c816790a5ca2a950 Mon Sep 17 00:00:00 2001 From: Stijn DW Date: Mon, 5 Apr 2021 17:46:06 +0200 Subject: [PATCH 0576/1183] maintainers: update github name, email --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2bf9f5f49ed..610e78b9184d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9266,8 +9266,8 @@ name = "Stian Lågstad"; }; StijnDW = { - email = "stekke@airmail.cc"; - github = "StijnDW"; + email = "nixdev@rinsa.eu"; + github = "Stekke"; githubId = 1751956; name = "Stijn DW"; }; From af8164fba2573a801cba602ddc9fe30a05fa13a9 Mon Sep 17 00:00:00 2001 From: Ivan Babrou Date: Fri, 5 Mar 2021 21:36:52 -0800 Subject: [PATCH 0577/1183] python3Packages.trustme: skip disallowed w+x test on aarch64-darwin --- pkgs/development/python-modules/trustme/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index f835509fe9b6..a959bef16826 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -1,12 +1,13 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , isPy3k , cryptography , futures ? null -, pytest , pyopenssl , service-identity +, pytestCheckHook , idna }: @@ -20,9 +21,9 @@ buildPythonPackage rec { }; checkInputs = [ - pytest pyopenssl service-identity + pytestCheckHook ]; propagatedBuildInputs = [ @@ -32,9 +33,11 @@ buildPythonPackage rec { futures ]; - checkPhase = '' - pytest - ''; + # aarch64-darwin forbids W+X memory, but this tests depends on it: + # * https://github.com/pyca/pyopenssl/issues/873 + disabledTests = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ + "test_pyopenssl_end_to_end" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; From fbb26ab53694b5370d11a160e313ebda145b19e4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 11 Mar 2020 16:51:10 -0400 Subject: [PATCH 0578/1183] shadow: add runtime-shell.patch This gets the right shell in the closure. By default, shadow wants to pull in the bash we are building it with, while we would prefer it used the runtime bash. --- pkgs/os-specific/linux/shadow/default.nix | 7 ++++++- pkgs/os-specific/linux/shadow/runtime-shell.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/shadow/runtime-shell.patch diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 0ff6fa1f3411..e20023b2b6eb 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, autoreconfHook, libxslt -, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison +, libxml2 , docbook_xml_dtd_45, docbook_xsl, itstool, flex, bison, runtimeShell , pam ? null, glibcCross ? null }: @@ -38,8 +38,11 @@ stdenv.mkDerivation rec { # Obtain XML resources from XML catalog (patch adapted from gtk-doc) ./respect-xml-catalog-files-var.patch dots_in_usernames + ./runtime-shell.patch ]; + RUNTIME_SHELL = runtimeShell; + # The nix daemon often forbids even creating set[ug]id files. postPatch = ''sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am @@ -77,6 +80,8 @@ stdenv.mkDerivation rec { mv $out/bin/su $su/bin ''; + disallowedReferences = lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) stdenv.shellPackage; + meta = with lib; { homepage = "https://github.com/shadow-maint"; description = "Suite containing authentication-related tools such as passwd and su"; diff --git a/pkgs/os-specific/linux/shadow/runtime-shell.patch b/pkgs/os-specific/linux/shadow/runtime-shell.patch new file mode 100644 index 000000000000..0b2e68e330e4 --- /dev/null +++ b/pkgs/os-specific/linux/shadow/runtime-shell.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index e4c6aaec..03883ad7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -682,7 +682,7 @@ if test "$enable_utmpx" = "yes"; then + [Define if utmpx should be used]) + fi + +-AC_DEFINE_UNQUOTED(SHELL, ["$SHELL"], [The default shell.]) ++AC_DEFINE_UNQUOTED(SHELL, ["$RUNTIME_SHELL"], [The runtime shell.]) + + AM_GNU_GETTEXT_VERSION(0.16) + AM_GNU_GETTEXT([external], [need-ngettext]) From 6605fadc687b2e3f3f3d611556ba36ff30eaf612 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 31 Jan 2021 15:12:28 +0900 Subject: [PATCH 0579/1183] bintools-wrapper: default platform versions for darwin Instead of always supplying flags, apply the flags as defaults. Use clang's native flags instead of lifting the linker flags from binutils with `-Wl,`. If a project is using clang to drive linking, make clang do the right thing with MACOSX_DEPLOYMENT_TARGET. This can be overridden by command line arguments. This will cause modern clang to pass `-platform_version 10.12 0.0.0`, since it doesn't know about the SDK settings. Older versions of clang will pass down `-macos_version_min` flags with no sdk version. At the linker layer, apply a default value for anything left ambiguous. If nothing is specified, pass a full `-platform_version`. If only `-macos_version_min` is specified, then lock down the sdk_version explicitly with `-sdk_version`. If a min version and sdk version is passed, do nothing. --- .../add-darwin-ldflags-before.sh | 70 +++++++++++++++++++ .../bintools-wrapper/default.nix | 26 +++++-- .../bintools-wrapper/ld-wrapper.sh | 8 +++ .../tools/misc/binutils/default.nix | 1 + 4 files changed, 100 insertions(+), 5 deletions(-) create mode 100644 pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh new file mode 100644 index 000000000000..37c6881810d9 --- /dev/null +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -0,0 +1,70 @@ +# Unconditionally adding in platform version flags will result in warnings that +# will be treated as errors by some packages. Add any missing flags here. + +# There are two things to be configured: the "platform version" (oldest +# supported version of macos, ios, etc), and the "sdk version". +# +# The modern way of configuring these is to use: +# -platform_version $platform $platform_version $sdk_version" +# +# The old way is still supported, and uses flags like: +# -${platform}_version_min $platform_version +# -sdk_version $sdk_version +# +# If both styles are specified ld will combine them. If multiple versions are +# specified for the same platform, ld will emit an error. +# +# The following adds flags for whichever properties have not already been +# provided. + +havePlatformVersionFlag= +haveDarwinSDKVersion= +haveDarwinPlatformVersion= + +n=0 +nParams=${#params[@]} +while (( n < nParams )); do + p=${params[n]} + case "$p" in + # the current platform + -@darwinPlatform@_version_min) + haveDarwinPlatformVersion=1 + ;; + + # legacy aliases + -macosx_version_min|-iphoneos_version_min|-iosmac_version_min|-uikitformac_version_min) + haveDarwinPlatformVersion=1 + ;; + + -sdk_version) + haveDarwinSDKVersion=1 + ;; + + -platform_version) + havePlatformVersionFlag=1 + + # If clang can't determine the sdk version it will pass 0.0.0. This + # has runtime effects so we override this to use the known sdk + # version. + if [ "${params[n+3]-}" = 0.0.0 ]; then + params[n+3]=@darwinSdkVersion@ + fi + ;; + esac + n=$((n + 1)) +done + +# If the caller has set -platform_version, trust they're doing the right thing. +# This will be the typical case for clang in nixpkgs. +if [ ! "$havePlatformVersionFlag" ]; then + if [ ! "$haveDarwinSDKVersion" ] && [ ! "$haveDarwinPlatformVersion" ]; then + # Nothing provided. Use the modern "-platform_version" to set both. + extraBefore+=(-platform_version @darwinPlatform@ @darwinMinVersion@ @darwinSdkVersion@) + elif [ ! "$haveDarwinSDKVersion" ]; then + # Add missing sdk version + extraBefore+=(-sdk_version @darwinSdkVersion@) + elif [ ! "$haveDarwinPlatformVersion" ]; then + # Add missing platform version + extraBefore+=(-@darwinPlatform@_version_min @darwinMinVersion@) + fi +fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index dac1f3bd7c10..77185e800e3e 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -252,11 +252,6 @@ stdenv.mkDerivation { fi '') - # Ensure consistent LC_VERSION_MIN_MACOSX and remove LC_UUID. - + optionalString stdenv.targetPlatform.isMacOS '' - echo "-sdk_version 10.12 -no_uuid" >> $out/nix-support/libc-ldflags-before - '' - ## ## User env support ## @@ -310,6 +305,13 @@ stdenv.mkDerivation { echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/libc-ldflags '' + ### + ### Remove LC_UUID + ### + + optionalString (stdenv.targetPlatform.isDarwin && !(stdenv.cc.bintools.bintools.isGNU or false)) '' + echo "-no_uuid" >> $out/nix-support/libc-ldflags-before + '' + + '' for flags in "$out/nix-support"/*flags*; do substituteInPlace "$flags" --replace $'\n' ' ' @@ -320,6 +322,20 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' + ### + ### Ensure consistent LC_VERSION_MIN_MACOSX + ### + + optionalString stdenv.targetPlatform.isDarwin ( + let + inherit (stdenv.targetPlatform) darwinMinVersion darwinPlatform darwinSdkVersion; + in '' + export darwinPlatform=${darwinPlatform} + export darwinMinVersion=${darwinMinVersion} + export darwinSdkVersion=${darwinSdkVersion} + substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh + '' + ) + ## ## Extra custom steps ## diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 9d02f99851a5..7ccf5510c880 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -78,6 +78,14 @@ fi extraAfter+=($NIX_LDFLAGS_AFTER_@suffixSalt@) +# These flags *must not* be pulled up to -Wl, flags, so they can't go in +# add-flags.sh. They must always be set, so must not be disabled by +# NIX_LDFLAGS_SET. +if [ -e @out@/nix-support/add-local-ldflags-before.sh ]; then + source @out@/nix-support/add-local-ldflags-before.sh +fi + + # Specify the target emulation if nothing is passed in ("-m" overrides this # environment variable). Ensures we never blindly fallback on targeting the host # platform. diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 37ba3420b18d..995f3f7430cc 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -143,6 +143,7 @@ stdenv.mkDerivation { passthru = { inherit targetPrefix; + isGNU = true; }; meta = with lib; { From 2316ada93f48a94f0dd7d2cc7dc5592b3f336a70 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 5 Feb 2021 15:51:12 +0900 Subject: [PATCH 0580/1183] luarocks: use targetPlatform.darwinMinVersion as default --- pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch | 2 +- pkgs/development/tools/misc/luarocks/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch index 4ba883f01130..8070af173aaf 100644 --- a/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch +++ b/pkgs/development/tools/misc/luarocks/darwin-3.1.3.patch @@ -7,7 +7,7 @@ index c5af5a2..1949fdc 100644 defaults.arch = "macosx-"..target_cpu defaults.variables.LIBFLAG = "-bundle -undefined dynamic_lookup -all_load" - local version = util.popen_read("sw_vers -productVersion") -+ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "10.12" ++ local version = os.getenv("MACOSX_DEPLOYMENT_TARGET") or "@darwinMinVersion@" version = tonumber(version and version:match("^[^.]+%.([^.]+)")) or 3 if version >= 10 then version = 8 diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 77f34cca7dec..d4f2ec4ded98 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { }; patches = [ ./darwin-3.1.3.patch ]; + + postPatch = lib.optionalString stdenv.targetPlatform.isDarwin '' + substituteInPlace src/luarocks/core/cfg.lua --subst-var-by 'darwinMinVersion' '${stdenv.targetPlatform.darwinMinVersion}' + ''; + preConfigure = '' lua -e "" || { luajit -e "" && { From 362cb82b75394680990cbe89f40fe65d35f66617 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 18 Feb 2021 13:37:57 +0900 Subject: [PATCH 0581/1183] cc-wrapper: specify default -mmacos-version-min This avoids contamination via MACSOX_DEPLOYMENT_TARGET when cross compiling. --- pkgs/build-support/cc-wrapper/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 31689022b326..91d834249014 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -487,6 +487,7 @@ stdenv.mkDerivation { + optionalString stdenv.targetPlatform.isDarwin '' echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags + echo "-m${targetPlatform.darwinPlatform}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before '' ## From 8b59d52ca3b6157f4cac333e6576c76f1fa546e8 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Fri, 5 Mar 2021 17:34:46 +0900 Subject: [PATCH 0582/1183] cc-wrapper: use legacy -mmacosx-version-min for gcc See https://github.com/NixOS/nixpkgs/pull/105026#discussion_r587169144 --- pkgs/build-support/cc-wrapper/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 91d834249014..3d2a142c36dd 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -485,10 +485,15 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' - + optionalString stdenv.targetPlatform.isDarwin '' - echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags - echo "-m${targetPlatform.darwinPlatform}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before - '' + + optionalString stdenv.targetPlatform.isDarwin ( + let darwinPlatformForCC = + if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" + else targetPlatform.darwinPlatform; + in '' + echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags + echo "-m${darwinPlatformForCC}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before + '' + ) ## ## Extra custom steps From 2a9b3b4943bea5d778da184828492e92512db324 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 10 Apr 2021 13:11:28 +0900 Subject: [PATCH 0583/1183] cc-wrapper, bintools-wrapper: support MACOSX_DEPLOYMENT_TARGET with roles In a typical build environment the toolchain will use the value of the MACOSX_DEPLOYMENT_TARGET environment variable to determine the version of macOS to support. When cross compiling there are two distinct toolchains, but they will look at this single environment variable. To avoid contamination, we always set the equivalent command line flag which effectively disables the toolchain's internal handling. Prior to this change, the MACOSX_DEPLOYMENT_TARGET variable was ignored, and the toolchains always used the Nix platform definition (`darwinMinVersion`) unless overridden with command line arguments. This change restores support for MACOSX_DEPLOYMENT_TARGET, and adds nix-specific MACOSX_DEPLOYMENT_TARGET_FOR_BUILD and MACOSX_DEPLOYMENT_TARGET_FOR_TARGET for cross compilation. --- .../add-darwin-ldflags-before.sh | 6 ++-- pkgs/build-support/cc-wrapper/add-flags.sh | 8 +++++ pkgs/build-support/cc-wrapper/default.nix | 24 ++++++++------- pkgs/build-support/wrapper-common/utils.bash | 29 +++++++++++++++++++ 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 37c6881810d9..318311e1be9d 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -21,6 +21,8 @@ havePlatformVersionFlag= haveDarwinSDKVersion= haveDarwinPlatformVersion= +mangleVarSingle MACOSX_DEPLOYMENT_TARGET ${role_suffixes[@]+"${role_suffixes[@]}"} + n=0 nParams=${#params[@]} while (( n < nParams )); do @@ -59,12 +61,12 @@ done if [ ! "$havePlatformVersionFlag" ]; then if [ ! "$haveDarwinSDKVersion" ] && [ ! "$haveDarwinPlatformVersion" ]; then # Nothing provided. Use the modern "-platform_version" to set both. - extraBefore+=(-platform_version @darwinPlatform@ @darwinMinVersion@ @darwinSdkVersion@) + extraBefore+=(-platform_version @darwinPlatform@ "${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@}" @darwinSdkVersion@) elif [ ! "$haveDarwinSDKVersion" ]; then # Add missing sdk version extraBefore+=(-sdk_version @darwinSdkVersion@) elif [ ! "$haveDarwinPlatformVersion" ]; then # Add missing platform version - extraBefore+=(-@darwinPlatform@_version_min @darwinMinVersion@) + extraBefore+=(-@darwinPlatform@_version_min "${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@}") fi fi diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 94589131b70e..f7276b04e549 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -65,5 +65,13 @@ if [ -e @out@/nix-support/cc-cflags-before ]; then NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="$(< @out@/nix-support/cc-cflags-before) $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi +# Only add darwin min version flag if a default darwin min version is set, +# which is a signal that we're targetting darwin. +if [ "@darwinMinVersion@" ]; then + mangleVarSingle MACOSX_DEPLOYMENT_TARGET ${role_suffixes[@]+"${role_suffixes[@]}"} + + NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" +fi + # That way forked processes will not extend these environment variables again. export NIX_CC_WRAPPER_FLAGS_SET_@suffixSalt@=1 diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 3d2a142c36dd..834c4e6d46a7 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -100,6 +100,15 @@ let else false; + + darwinPlatformForCC = optionalString stdenv.targetPlatform.isDarwin ( + if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" + else targetPlatform.darwinPlatform + ); + + darwinMinVersion = optionalString stdenv.targetPlatform.isDarwin ( + stdenv.targetPlatform.darwinMinVersion + ); in # Ensure bintools matches @@ -122,6 +131,7 @@ stdenv.mkDerivation { gnugrep_bin = if nativeTools then "" else gnugrep; inherit targetPrefix suffixSalt; + inherit darwinPlatformForCC darwinMinVersion; outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; @@ -473,6 +483,10 @@ stdenv.mkDerivation { done '' + + optionalString stdenv.targetPlatform.isDarwin '' + echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags + '' + # There are a few tools (to name one libstdcxx5) which do not work # well with multi line flags, so make the flags single line again + '' @@ -485,16 +499,6 @@ stdenv.mkDerivation { substituteAll ${../wrapper-common/utils.bash} $out/nix-support/utils.bash '' - + optionalString stdenv.targetPlatform.isDarwin ( - let darwinPlatformForCC = - if (targetPlatform.darwinPlatform == "macos" && isGNU) then "macosx" - else targetPlatform.darwinPlatform; - in '' - echo "-arch ${targetPlatform.darwinArch}" >> $out/nix-support/cc-cflags - echo "-m${darwinPlatformForCC}-version-min=${targetPlatform.darwinMinVersion}" >> $out/nix-support/cc-cflags-before - '' - ) - ## ## Extra custom steps ## diff --git a/pkgs/build-support/wrapper-common/utils.bash b/pkgs/build-support/wrapper-common/utils.bash index d164982b4345..66b7c3f3e83c 100644 --- a/pkgs/build-support/wrapper-common/utils.bash +++ b/pkgs/build-support/wrapper-common/utils.bash @@ -49,6 +49,35 @@ mangleVarBool() { done } +# Combine a singular value from all roles. If multiple roles are being served, +# and the value differs in these roles then the request is impossible to +# satisfy and we abort immediately. +mangleVarSingle() { + local var="$1" + shift + local -a role_suffixes=("$@") + + local outputVar="${var}_@suffixSalt@" + for suffix in "${role_suffixes[@]}"; do + local inputVar="${var}${suffix}" + if [ -v "$inputVar" ]; then + if [ -v "$outputVar" ]; then + if [ "${!outputVar}" != "${!inputVar}" ]; then + { + echo "Multiple conflicting values defined for $outputVar" + echo "Existing value is ${!outputVar}" + echo "Attempting to set to ${!inputVar} via $inputVar" + } >&2 + + exit 1 + fi + else + declare -gx ${outputVar}="${!inputVar}" + fi + fi + done +} + skip () { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "skipping impure path $1" >&2 From 6c4ce7960ebcd5559bedb68bef4acf32b44321d1 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 10 Apr 2021 18:06:25 +0900 Subject: [PATCH 0584/1183] bintools-wrapper, cc-wrapper: parameterize darwin min version variable These variables are the ones that the standard toolchain uses, so we should use those and not always use MACOSX_DEPLOYMENT_TARGET. See https://github.com/tpoechtrager/cctools-port/blob/236a426c1205a3bfcf0dbb2e2faf2296f0a100e5/cctools/ld64/src/ld/PlatformSupport.cpp#L54-L55 --- lib/systems/default.nix | 4 ++++ .../bintools-wrapper/add-darwin-ldflags-before.sh | 6 +++--- pkgs/build-support/bintools-wrapper/default.nix | 5 ++++- pkgs/build-support/cc-wrapper/add-flags.sh | 4 ++-- pkgs/build-support/cc-wrapper/default.nix | 5 ++++- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index d16b19c03caa..21b00374da47 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -120,6 +120,10 @@ rec { # platforms define the old name "sdkVer". darwinSdkVersion = final.sdkVer or "10.12"; darwinMinVersion = final.darwinSdkVersion; + darwinMinVersionVariable = + if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET" + else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET" + else null; emulator = pkgs: let qemu-user = pkgs.qemu.override { diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index 318311e1be9d..bd3edda3f2e7 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -21,7 +21,7 @@ havePlatformVersionFlag= haveDarwinSDKVersion= haveDarwinPlatformVersion= -mangleVarSingle MACOSX_DEPLOYMENT_TARGET ${role_suffixes[@]+"${role_suffixes[@]}"} +mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} n=0 nParams=${#params[@]} @@ -61,12 +61,12 @@ done if [ ! "$havePlatformVersionFlag" ]; then if [ ! "$haveDarwinSDKVersion" ] && [ ! "$haveDarwinPlatformVersion" ]; then # Nothing provided. Use the modern "-platform_version" to set both. - extraBefore+=(-platform_version @darwinPlatform@ "${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@}" @darwinSdkVersion@) + extraBefore+=(-platform_version @darwinPlatform@ "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}" @darwinSdkVersion@) elif [ ! "$haveDarwinSDKVersion" ]; then # Add missing sdk version extraBefore+=(-sdk_version @darwinSdkVersion@) elif [ ! "$haveDarwinPlatformVersion" ]; then # Add missing platform version - extraBefore+=(-@darwinPlatform@_version_min "${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@}") + extraBefore+=(-@darwinPlatform@_version_min "${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@}") fi fi diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 77185e800e3e..859e37905949 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -327,11 +327,14 @@ stdenv.mkDerivation { ### + optionalString stdenv.targetPlatform.isDarwin ( let - inherit (stdenv.targetPlatform) darwinMinVersion darwinPlatform darwinSdkVersion; + inherit (stdenv.targetPlatform) + darwinPlatform darwinSdkVersion + darwinMinVersion darwinMinVersionVariable; in '' export darwinPlatform=${darwinPlatform} export darwinMinVersion=${darwinMinVersion} export darwinSdkVersion=${darwinSdkVersion} + export darwinMinVersionVariable=${darwinMinVersionVariable} substituteAll ${./add-darwin-ldflags-before.sh} $out/nix-support/add-local-ldflags-before.sh '' ) diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index f7276b04e549..a6e991914e6b 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -68,9 +68,9 @@ fi # Only add darwin min version flag if a default darwin min version is set, # which is a signal that we're targetting darwin. if [ "@darwinMinVersion@" ]; then - mangleVarSingle MACOSX_DEPLOYMENT_TARGET ${role_suffixes[@]+"${role_suffixes[@]}"} + mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} - NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${MACOSX_DEPLOYMENT_TARGET_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" + NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@="-m@darwinPlatformForCC@-version-min=${@darwinMinVersionVariable@_@suffixSalt@:-@darwinMinVersion@} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@" fi # That way forked processes will not extend these environment variables again. diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 834c4e6d46a7..db751593701e 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -109,6 +109,9 @@ let darwinMinVersion = optionalString stdenv.targetPlatform.isDarwin ( stdenv.targetPlatform.darwinMinVersion ); + + darwinMinVersionVariable = optionalString stdenv.targetPlatform.isDarwin + stdenv.targetPlatform.darwinMinVersionVariable; in # Ensure bintools matches @@ -131,7 +134,7 @@ stdenv.mkDerivation { gnugrep_bin = if nativeTools then "" else gnugrep; inherit targetPrefix suffixSalt; - inherit darwinPlatformForCC darwinMinVersion; + inherit darwinPlatformForCC darwinMinVersion darwinMinVersionVariable; outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; From d0418480f1191167b0416dc3482c90ccd604d9bf Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 10 Apr 2021 18:11:16 +0900 Subject: [PATCH 0585/1183] lib.systems: add darwinPlatform where necessary --- lib/systems/examples.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 8a43b86db701..082be8902bb5 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -219,6 +219,7 @@ rec { sdkVer = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; + darwinPlatform = "ios-simulator"; useiOSPrebuilt = true; }; @@ -228,6 +229,7 @@ rec { sdkVer = "14.3"; xcodeVer = "12.3"; xcodePlatform = "iPhoneSimulator"; + darwinPlatform = "ios-simulator"; useiOSPrebuilt = true; }; From 33265e0dd9c485197e440192bef3f15e4f366af9 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 10 Apr 2021 18:11:48 +0900 Subject: [PATCH 0586/1183] darwin/xcode: remove platform version flags These are now provided by the standard bintools and cc wrappers. --- pkgs/os-specific/darwin/xcode/sdk-pkgs.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix index cabac19ba867..ab934d7eaaaf 100644 --- a/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix +++ b/pkgs/os-specific/darwin/xcode/sdk-pkgs.nix @@ -29,11 +29,6 @@ rec { binutils = wrapBintoolsWith { libc = targetIosSdkPkgs.libraries; bintools = binutils-unwrapped; - extraBuildCommands = lib.optionalString (sdk.platform == "iPhoneSimulator") '' - echo "-platform_version ios-sim ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags - '' + lib.optionalString (sdk.platform == "iPhoneOS") '' - echo "-platform_version ios ${minSdkVersion} ${sdk.version}" >> $out/nix-support/libc-ldflags - ''; }; clang = (wrapCCWith { @@ -46,10 +41,6 @@ rec { mv cc-cflags.tmp $out/nix-support/cc-cflags echo "-target ${targetPlatform.config}" >> $out/nix-support/cc-cflags echo "-isystem ${sdk}/usr/include${lib.optionalString (lib.versionAtLeast "10" sdk.version) " -isystem ${sdk}/usr/include/c++/4.2.1/ -stdlib=libstdc++"}" >> $out/nix-support/cc-cflags - '' + lib.optionalString (sdk.platform == "iPhoneSimulator") '' - echo "-mios-simulator-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags - '' + lib.optionalString (sdk.platform == "iPhoneOS") '' - echo "-miphoneos-version-min=${minSdkVersion}" >> $out/nix-support/cc-cflags ''; }) // { inherit sdk; From 6ee72dd5abf4eab49d6827ad19889c981c9a9eb0 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 11 Apr 2021 10:27:16 +0900 Subject: [PATCH 0587/1183] bintools-wrapper: ensure roles are set before mangling variables --- .../bintools-wrapper/add-darwin-ldflags-before.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh index bd3edda3f2e7..75d9484846a8 100644 --- a/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh +++ b/pkgs/build-support/bintools-wrapper/add-darwin-ldflags-before.sh @@ -21,6 +21,15 @@ havePlatformVersionFlag= haveDarwinSDKVersion= haveDarwinPlatformVersion= +# Roles will set by add-flags.sh, but add-flags.sh can be skipped when the +# cc-wrapper has added the linker flags. Both the cc-wrapper and the binutils +# wrapper mangle the same variable (MACOSX_DEPLOYMENT_TARGET), so if roles are +# empty due to being run through the cc-wrapper then the mangle here is a no-op +# and we still do the right thing. +# +# To be robust, make sure we always have the correct set of roles. +accumulateRoles + mangleVarSingle @darwinMinVersionVariable@ ${role_suffixes[@]+"${role_suffixes[@]}"} n=0 From 5c12a81336e524ebcdc3e5513436b9be080be2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 11 Apr 2021 00:12:49 +0200 Subject: [PATCH 0588/1183] libselinux: fix build without python --- pkgs/os-specific/linux/libselinux/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index 6582c6d8e8d6..2c9239b2e7d8 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -35,15 +35,16 @@ stdenv.mkDerivation rec { "MAN3DIR=$(man)/share/man/man3" "MAN5DIR=$(man)/share/man/man5" "MAN8DIR=$(man)/share/man/man8" - "PYTHON=${python3.pythonForBuild}/bin/python" - "PYTHONLIBDIR=$(py)/${python3.sitePackages}" "SBINDIR=$(bin)/sbin" "SHLIBDIR=$(out)/lib" "LIBSEPOLA=${lib.getLib libsepol}/lib/libsepol.a" + ] ++ optionals enablePython [ + "PYTHON=${python3.pythonForBuild.interpreter}" + "PYTHONLIBDIR=$(py)/${python3.sitePackages}" ]; - preInstall = '' + preInstall = optionalString enablePython '' mkdir -p $py/${python3.sitePackages}/selinux ''; From 46440dae4ecd7ca4435c4c1f4136b5f6b6600cab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 11 Apr 2021 02:30:44 +0200 Subject: [PATCH 0589/1183] libcap: use correct runtime shell --- pkgs/os-specific/linux/libcap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix index 871e04648e4e..47fa7c05e792 100644 --- a/pkgs/os-specific/linux/libcap/default.nix +++ b/pkgs/os-specific/linux/libcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, fetchurl, attr, perl +{ stdenv, lib, buildPackages, fetchurl, attr, perl, runtimeShell , usePam ? !isStatic, pam ? null , isStatic ? stdenv.hostPlatform.isStatic }: @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { prePatch = '' # use full path to bash - substituteInPlace progs/capsh.c --replace "/bin/bash" "${stdenv.shell}" + substituteInPlace progs/capsh.c --replace "/bin/bash" "${runtimeShell}" # set prefixes substituteInPlace Make.Rules \ From c852810d434cb6cb358a718ba1656bbec35e424d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 11 Apr 2021 10:20:34 +0200 Subject: [PATCH 0590/1183] python3Packages.httplib2: 0.19.0 -> 0.19.1 --- pkgs/development/python-modules/httplib2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index ce3b3aa1f671..684ab10a271f 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "04y2bc2yv3q84llxnafqrciqxjqpxbrd8glbnvvr16c20fwc3r4q"; + sha256 = "sha256-e0Mq9AVJEWQ9GEtYFXk2fMIs7GtAUsyJN6XheqAnD3I="; }; postPatch = '' From 37575e7ded7517db14a6ae4adfe63fac16466737 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 10 Apr 2021 09:38:35 +0200 Subject: [PATCH 0591/1183] gi-docgen: make DevHelp and index.json stable https://gitlab.gnome.org/GNOME/gi-docgen/-/merge_requests/53 https://github.com/NixOS/nixpkgs/issues/118910 --- pkgs/development/tools/documentation/gi-docgen/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index 72b5364eb45d..06de11fde592 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -61,6 +61,13 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/jtojnar/gi-docgen/commit/08dcc31f62be1a5af9bd9f8f702f321f4b5cffde.patch"; sha256 = "vAT8s7zQ9zCoZWK+6PsxcD5/48ZAfIOl4RSNljRCGWQ="; }) + # make DevHelp sections & index.json have stable ordering + # already merged upstream, so patch can removed when we update + # beyond 2021.2 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gi-docgen/-/commit/cc21241d4386d4f78dbcb087fd9a92899935cb5c.patch"; + sha256 = "0wna8mzrlbsv7f3bc7ndqll9l105kp8kdmhbbjhbdhzzzyvh6vcw"; + }) ]; nativeBuildInputs = [ From 5cf6870d1f9ea5ed143258b4c2293992442e2241 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 11 Apr 2021 20:50:53 +0200 Subject: [PATCH 0592/1183] wine{Unstable,Staging}: 6.5 -> 6.6 --- pkgs/misc/emulators/wine/sources.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 7f02ead3e025..549e9c7a551e 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -44,10 +44,17 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "6.5"; + version = "6.6"; url = "https://dl.winehq.org/wine/source/6.x/wine-${version}.tar.xz"; - sha256 = "sha256-BgD9IIwGkl1mNNKfVDu6CmQ2HDTpvXYJwvDiCWEK00c="; - inherit (stable) mono gecko32 gecko64; + sha256 = "sha256-meUixtzArB1T0gG/MFSJH98RhkJXRzw+s0HjdnH9hK0="; + inherit (stable) gecko32 gecko64; + + ## see http://wiki.winehq.org/Mono + mono = fetchurl rec { + version = "6.1.1"; + url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; + sha256 = "sha256-rDsUvq/eNLhIIofllwABE9wGqRXzLJ/QbHfrgZB544s="; + }; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -58,7 +65,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-u6wDavrFirN1e0fFra4ui3i4PnJF0gcENYoIyNwhIYc="; + sha256 = "sha256-ur7ZD9F/V4TkR4YzxwsuhP/Dq/svH29T4hFkp/ZNtTQ="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; From e5eb701c6e154e4510df09ee02e4f09d6b5f1e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Apr 2021 21:23:42 +0200 Subject: [PATCH 0593/1183] pythonPackages.pycairo: requires Python 3.6+ See https://pycairo.readthedocs.io/en/latest/changelog.html#v1-20-0. --- pkgs/development/python-modules/pycairo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index 1188b499302d..c8df65c2b7e1 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,5 @@ { lib +, pythonOlder , fetchFromGitHub , meson , ninja @@ -6,13 +7,15 @@ , pytestCheckHook , pkg-config , cairo -, isPy3k +, python }: buildPythonPackage rec { pname = "pycairo"; version = "1.20.0"; + disabled = pythonOlder "3.6"; + format = "other"; src = fetchFromGitHub { @@ -37,11 +40,11 @@ buildPythonPackage rec { ]; mesonFlags = [ - "-Dpython=${if isPy3k then "python3" else "python"}" + "-Dpython=${python.interpreter}" ]; meta = with lib; { - description = "Python 2/3 bindings for cairo"; + description = "Python 3 bindings for cairo"; homepage = "https://pycairo.readthedocs.io/"; license = with licenses; [ lgpl21Only mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; From bedbc7ff002e23b99905d1be90e600494885a20a Mon Sep 17 00:00:00 2001 From: davidak Date: Mon, 12 Apr 2021 06:07:42 +0200 Subject: [PATCH 0594/1183] mutter: fix build --- pkgs/desktops/gnome-3/core/mutter/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 07e3b536a410..03c20e1ef6a7 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -16,9 +16,11 @@ , ninja , xkeyboard_config , libxkbfile +, libXdamage , libxkbcommon , libXtst , libinput +, libdrm , gsettings-desktop-schemas , glib , gtk3 @@ -27,6 +29,7 @@ , libgudev , libwacom , xwayland +, mesa , meson , gnome-settings-daemon , xorgserver @@ -84,6 +87,7 @@ let self = stdenv.mkDerivation rec { nativeBuildInputs = [ desktop-file-utils gettext + mesa # needed for gbm meson ninja pkg-config @@ -102,12 +106,14 @@ let self = stdenv.mkDerivation rec { gsettings-desktop-schemas gtk3 libcanberra + libdrm libgudev libinput libstartup_notification libwacom libxkbcommon libxkbfile + libXdamage pango pipewire sysprof From 7f0e7c858611890bf6fa36a4274467a1c7fccd1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 11 Apr 2021 21:25:49 +0200 Subject: [PATCH 0595/1183] python2Packages.pycairo: init at 1.18.2 Required for e.g. gimp. --- .../python-modules/pycairo/1.18.nix | 49 +++++++++++++++++++ pkgs/top-level/python2-packages.nix | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/pycairo/1.18.nix diff --git a/pkgs/development/python-modules/pycairo/1.18.nix b/pkgs/development/python-modules/pycairo/1.18.nix new file mode 100644 index 000000000000..0a51c78c584d --- /dev/null +++ b/pkgs/development/python-modules/pycairo/1.18.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitHub +, meson +, ninja +, buildPythonPackage +, pytestCheckHook +, pkg-config +, cairo +, python +}: + +buildPythonPackage rec { + pname = "pycairo"; + version = "1.18.2"; + + format = "other"; + + src = fetchFromGitHub { + owner = "pygobject"; + repo = "pycairo"; + rev = "v${version}"; + sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + cairo + ]; + + checkInputs = [ + pytestCheckHook + ]; + + mesonFlags = [ + "-Dpython=${python.interpreter}" + ]; + + meta = with lib; { + description = "Python 2 bindings for cairo"; + homepage = "https://pycairo.readthedocs.io/"; + license = with licenses; [ lgpl21Only mpl11 ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index b6f4aa99f518..474d3c2f9510 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -391,6 +391,10 @@ with self; with super; { pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pycairo = callPackage ../development/python-modules/pycairo/1.18.nix { + inherit (pkgs) meson; + }; + pycangjie = disabled pycangjie; pycarddav = callPackage ../development/python-modules/pycarddav { }; From 4e90ff6e618054e2a4447994668ece919f91743b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 12 Apr 2021 13:31:17 +0200 Subject: [PATCH 0596/1183] fuse3: 3.10.2 -> 3.10.3 --- pkgs/os-specific/linux/fuse/common.nix | 2 +- pkgs/os-specific/linux/fuse/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 053ea34c82eb..cca1ecf5d246 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { inherit (src.meta) homepage; changelog = "https://github.com/libfuse/libfuse/releases/tag/fuse-${version}"; platforms = platforms.linux; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Only lgpl21Only ]; maintainers = [ maintainers.primeos ]; }; } diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index 02c46b9ba772..b7ee8772f46b 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.10.2"; - sha256Hash = "0m44hhk6jxkgkvk2jsjcwa3pqgzzqnpm606n3n8wn1ldypkvpsps"; + version = "3.10.3"; + sha256Hash = "054g3jqy8lhlj8kkwd16wxaxzynmh8h5iv20cryd0psg0hgmhd7v"; }; } From 1df5d16cf943b59c5799d110ae105b1fd9750554 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 12 Apr 2021 14:46:10 +0200 Subject: [PATCH 0597/1183] pythonPackages.backports-entry-points-selectable: 1.0.3 -> 1.0.4 --- .../backports-entry-points-selectable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix index a14d1fa920da..02117f7282e3 100644 --- a/pkgs/development/python-modules/backports-entry-points-selectable/default.nix +++ b/pkgs/development/python-modules/backports-entry-points-selectable/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "backports.entry-points-selectable"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit version; # pypi project name and tarball name differ pname = builtins.replaceStrings [ "-" ] [ "_" ] pname; - sha256 = "f30bcd19c5e2728ac93821d2b6ae0a325597e0ca12324fd91a39fa80e1cd0dd8"; + sha256 = "4acda84d96855beece3bf9aad9a1030aceb5f744b8ce9af7d5ee6dd672cdd3bd"; }; format = "pyproject"; From 25ae1fd29f81fd4a50d4cdf42292ae58d91336ac Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 13 Apr 2021 20:36:45 +0200 Subject: [PATCH 0598/1183] Revert "mesa: 21.0.1 -> 21.0.2" This reverts commit e3bc983d8f23eef79be72823c52488e78c07a7ec. It caused segmentation faults for at least Sway and XWayland with the iris driver, see [0]. The cause and impact of this regression is still unknown but let's revert it until we know more. [0]: https://github.com/NixOS/nixpkgs/pull/118753#issuecomment-818950977 --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fd226277a44d..1186882aa809 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,7 +32,7 @@ with lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "21.0.2"; + version = "21.0.1"; branch = versions.major version; self = stdenv.mkDerivation { @@ -46,7 +46,7 @@ self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "122vvyk6dgvbfl119pysbdyii6f255r0cg7c8gp2sdsanmdxrha6"; + sha256 = "1fqj2xhhd1ary0pfg31jq6fqcnd6qgyrw1445nmz554k8n2ck7rp"; }; prePatch = "patchShebangs ."; From d4dcbb28087854f1bc847bbaa0cd3c2161c2f5fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Apr 2021 14:53:30 +0200 Subject: [PATCH 0599/1183] python3Packages.woob: disable on python2 The futures package was disabled for python3 and importing it causes an eval error. --- pkgs/development/python-modules/woob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/woob/default.nix b/pkgs/development/python-modules/woob/default.nix index 15f2faa200ca..4794843a66d8 100644 --- a/pkgs/development/python-modules/woob/default.nix +++ b/pkgs/development/python-modules/woob/default.nix @@ -7,7 +7,6 @@ , cssselect , dateutil , feedparser -, futures , gdata , gnupg , google-api-python-client @@ -30,6 +29,7 @@ buildPythonPackage rec { pname = "woob"; version = "3.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -67,7 +67,7 @@ buildPythonPackage rec { simplejson termcolor unidecode - ] ++ lib.optionals isPy27 [ futures ]; + ]; checkPhase = '' nosetests From e64b418e3e01d586296eebd4a680001a99d72a75 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 14 Apr 2021 17:03:24 +0000 Subject: [PATCH 0600/1183] maintainers: add ambroisie --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c64c1ecde827..d3eab5c01ad8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -492,6 +492,12 @@ githubId = 15623522; name = "Amar Paul"; }; + ambroisie = { + email = "bruno.nixpkgs@belanyi.fr"; + github = "ambroisie"; + githubId = 12465195; + name = "Bruno BELANYI"; + }; ambrop72 = { email = "ambrop7@gmail.com"; github = "ambrop72"; From ccb1b4710d07fc851dd11da8746b341ed00cfbaa Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 14 Apr 2021 17:05:40 +0000 Subject: [PATCH 0601/1183] podgrab: init at 2021-04-14 Closes #117284. --- pkgs/servers/misc/podgrab/default.nix | 28 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/misc/podgrab/default.nix diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/servers/misc/podgrab/default.nix new file mode 100644 index 000000000000..6703fbc53ede --- /dev/null +++ b/pkgs/servers/misc/podgrab/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "podgrab"; + version = "unstable-2021-04-14"; + + src = fetchFromGitHub { + owner = "akhilrex"; + repo = pname; + rev = "3179a875b8b638fb86d0e829d12a9761c1cd7f90"; + sha256 = "sha256-vhxIm20ZUi+RusrAsSY54tv/D570/oMO5qLz9dNqgqo="; + }; + + vendorSha256 = "sha256-xY9xNuJhkWPgtqA/FBVIp7GuWOv+3nrz6l3vaZVLlIE="; + + postInstall = '' + mkdir -p $out/share/ + cp -r $src/client $out/share/ + cp -r $src/webassets $out/share/ + ''; + + meta = with lib; { + description = "A self-hosted podcast manager to download episodes as soon as they become live"; + homepage = "https://github.com/akhilrex/podgrab"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ambroisie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d009d82b156..f33aac22b54b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18391,6 +18391,8 @@ in hyp = callPackage ../servers/http/hyp { }; + podgrab = callPackage ../servers/misc/podgrab { }; + prosody = callPackage ../servers/xmpp/prosody { # _compat can probably be removed on next minor version after 0.10.0 lua5 = lua5_2_compat; From c7fc19466bb76903cd214f02b63b0be74111d238 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 01:27:53 +0200 Subject: [PATCH 0602/1183] python3Packages.cfn-lint: disable tests requiring network access --- pkgs/development/python-modules/cfn-lint/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 5e8634f9fc6b..a5f229089933 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -67,6 +67,9 @@ buildPythonPackage rec { "TestQuickStartTemplates" # requires git directory "test_update_docs" + # Tests depend on network access (fails in getaddrinfo) + "test_update_resource_specs_python_2" + "test_update_resource_specs_python_3" ]; pythonImportsCheck = [ From a812d1b7afdd4e8b26f986eaaa4e7621f337558e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:04:05 +0200 Subject: [PATCH 0603/1183] python3Packages.moto: relax idna pin --- pkgs/development/python-modules/moto/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index ddc3896c6a55..7f9b7010c52b 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -37,7 +37,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "ecdsa<0.15" "ecdsa" + --replace "ecdsa<0.15" "ecdsa" \ + --replace "idna<3,>=2.5" "idna" \ ''; patches = [ From f29e5138348f6b667954ea9f1ca8eadb67b58637 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:04:25 +0200 Subject: [PATCH 0604/1183] python3Packages.tensorboardx: fix build Adds missing optional soundfile dependency, that was ultimately required during tests. Move crc32 into propagatedBuildInputs. Both changes were recommended here: https://github.com/lanpa/tensorboardX/blob/v2.1/README.md#install Clean up the package, disable linting tests. --- .../python-modules/tensorboardx/default.nix | 60 +++++++++++++++---- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/tensorboardx/default.nix b/pkgs/development/python-modules/tensorboardx/default.nix index 00ea276845dd..f83467520c9a 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -1,6 +1,20 @@ -{ boto3, buildPythonPackage, crc32c, fetchFromGitHub, lib, matplotlib, moto -, numpy, pillow, pytorch, protobuf, six, pytestCheckHook -, tensorflow-tensorboard, torchvision }: +{ boto3 +, buildPythonPackage +, crc32c +, fetchFromGitHub +, lib +, matplotlib +, moto +, numpy +, pillow +, protobuf +, pytestCheckHook +, pytorch +, six +, soundfile +, tensorflow-tensorboard +, torchvision +}: buildPythonPackage rec { pname = "tensorboardx"; @@ -13,19 +27,43 @@ buildPythonPackage rec { sha256 = "1palz91y0b39pcmwg6wdmqfal38hai99dd6r88i3imqxdbmjghih"; }; - checkInputs = [ - pytestCheckHook boto3 crc32c matplotlib moto pillow pytorch tensorflow-tensorboard torchvision - ]; - - propagatedBuildInputs = [ numpy protobuf six ]; - # apparently torch API changed a bit at 1.6 postPatch = '' - substituteInPlace tensorboardX/pytorch_graph.py --replace "torch.onnx.set_training(model, False)" "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" + substituteInPlace tensorboardX/pytorch_graph.py --replace \ + "torch.onnx.set_training(model, False)" \ + "torch.onnx.select_model_mode_for_export(model, torch.onnx.TrainingMode.EVAL)" ''; + propagatedBuildInputs = [ + crc32c + numpy + protobuf + six + soundfile + ]; - disabledTests = [ "test_TorchVis" "test_onnx_graph" ]; + checkInputs = [ + boto3 + matplotlib + moto + pillow + pytestCheckHook + pytorch + tensorflow-tensorboard + torchvision + ]; + + disabledTests = [ + # ImportError: Visdom visualization requires installation of Visdom + "test_TorchVis" + # Requires network access (FileNotFoundError: [Errno 2] No such file or directory: 'wget') + "test_onnx_graph" + ]; + + disabledTestPaths = [ + # we are not interested in linting errors + "tests/test_lint.py" + ]; meta = with lib; { description = "Library for writing tensorboard-compatible logs"; From 36e6c2888aa7845f9fee1b55ad0a542f92bc9cee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:11:17 +0200 Subject: [PATCH 0605/1183] python3Packages.twine: rely on importlib-metadata unconditionally Changed from conditional to unconditional in https://github.com/pypa/twine/commit/22aaa04a88780cfc67fc0e5b80eab9784e81c982 --- pkgs/development/python-modules/twine/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 67c66e623c3d..9a246faff51c 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ + importlib-metadata keyring pkginfo pyblake2 @@ -33,7 +34,7 @@ buildPythonPackage rec { tqdm colorama rfc3986 - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; # Requires network doCheck = false; From a71b18f5d48e5c6aa2b8effc797b3d381deaeab5 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Tue, 13 Apr 2021 11:37:17 +0800 Subject: [PATCH 0606/1183] mautrix-signal: init at v0.1.1 The script wrapping python -m mautrix_signal was inspired by the gunicorn script in powerdns-admin --- pkgs/servers/mautrix-signal/default.nix | 55 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/servers/mautrix-signal/default.nix diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix new file mode 100644 index 000000000000..2bf69a630615 --- /dev/null +++ b/pkgs/servers/mautrix-signal/default.nix @@ -0,0 +1,55 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonPackage rec { + pname = "mautrix-signal"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "tulir"; + repo = "mautrix-signal"; + rev = "v${version}"; + sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl"; + }; + + propagatedBuildInputs = with python3Packages; [ + CommonMark + aiohttp + asyncpg + attrs + mautrix + phonenumbers + pillow + prometheus_client + pycryptodome + python-olm + python_magic + qrcode + ruamel_yaml + unpaddedbase64 + yarl + ]; + + doCheck = false; + + postInstall = '' + mkdir -p $out/bin + + # Make a little wrapper for running mautrix-signal with its dependencies + echo "$mautrixSignalScript" > $out/bin/mautrix-signal + echo "#!/bin/sh + exec python -m mautrix_signal \"$@\" + " > $out/bin/mautrix-signal + chmod +x $out/bin/mautrix-signal + wrapProgram $out/bin/mautrix-signal \ + --set PATH ${python3Packages.python}/bin \ + --set PYTHONPATH "$PYTHONPATH" + ''; + + meta = with lib; { + homepage = "https://github.com/tulir/mautrix-signal"; + description = "A Matrix-Signal puppeting bridge"; + license = licenses.agpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b0c876113bd..d258f30bf59f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6036,6 +6036,8 @@ in matrix-corporal = callPackage ../servers/matrix-corporal { }; + mautrix-signal = recurseIntoAttrs (callPackage ../servers/mautrix-signal { }); + mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; From b49be812b505e4afe8ea75056e7915b021615192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 02:42:30 +0200 Subject: [PATCH 0607/1183] python3Packages.python-utils: fix build Tests have been excluded from the pypi package, hence we fetch the source from GitHub now. Disable coverage and linting, drop unused dependencies. --- .../python-modules/python-utils/default.nix | 33 ++++++++++++++----- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix index 637c25cc5aab..f11ce745fed9 100644 --- a/pkgs/development/python-modules/python-utils/default.nix +++ b/pkgs/development/python-modules/python-utils/default.nix @@ -1,23 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pytestrunner, pytestcov, pytest-flakes, sphinx, six }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, six +}: buildPythonPackage rec { pname = "python-utils"; version = "2.5.6"; - src = fetchPypi { - inherit pname version; - sha256 = "352d5b1febeebf9b3cdb9f3c87a3b26ef22d3c9e274a8ec1e7048ecd2fac4349"; + src = fetchFromGitHub { + owner = "WoLpH"; + repo = pname; + rev = "v${version}"; + sha256 = "0gd2jana5w6bn7z58di4a8dwcxvc8rx282jawbw7ws7qm2a5klz3"; }; + # disable coverage and linting postPatch = '' - rm -r tests/__pycache__ - rm tests/*.pyc - substituteInPlace pytest.ini --replace "--pep8" "" + sed -i '/--cov/d' pytest.ini + sed -i '/--flake8/d' pytest.ini ''; - checkInputs = [ pytestCheckHook pytestrunner pytestcov pytest-flakes sphinx ]; + propagatedBuildInputs = [ + six + ]; - propagatedBuildInputs = [ six ]; + checkInputs = [ + pytestCheckHook + ]; + + pytestFlagsArray = [ + "_python_utils_tests" + ]; meta = with lib; { description = "Module with some convenient utilities"; From 65234f091107959952095e2e45f5a4dd1d087004 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 15 Apr 2021 03:18:07 +0200 Subject: [PATCH 0608/1183] nixos/test/prometheus-exporters/bird: fix race condition The bird socket would not always be instantly present, when the exporter was queried, leading to the test sometimes failing in its entirety. --- nixos/tests/prometheus-exporters.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 62c0080dd516..cf3518286fdd 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -132,7 +132,9 @@ let exporterTest = '' wait_for_unit("prometheus-bird-exporter.service") wait_for_open_port(9324) - succeed("curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'") + wait_until_succeeds( + "curl -sSf http://localhost:9324/metrics | grep -q 'MyObviousTestString'" + ) ''; }; From dca0aec9b8204a596e4b0e46b533cab318d81150 Mon Sep 17 00:00:00 2001 From: Stijn DW Date: Sat, 10 Apr 2021 21:50:34 +0200 Subject: [PATCH 0609/1183] infnoise: init at master --- pkgs/misc/drivers/infnoise/default.nix | 43 +++++++++++++++++++++++ pkgs/misc/drivers/infnoise/makefile.patch | 14 ++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 59 insertions(+) create mode 100644 pkgs/misc/drivers/infnoise/default.nix create mode 100644 pkgs/misc/drivers/infnoise/makefile.patch diff --git a/pkgs/misc/drivers/infnoise/default.nix b/pkgs/misc/drivers/infnoise/default.nix new file mode 100644 index 000000000000..b64cb56c4076 --- /dev/null +++ b/pkgs/misc/drivers/infnoise/default.nix @@ -0,0 +1,43 @@ +{ lib, stdenv, fetchFromGitHub, libftdi }: + +stdenv.mkDerivation rec { + pname = "infnoise"; + version = "unstable-2019-08-12"; + + src = fetchFromGitHub { + owner = "13-37-org"; + repo = "infnoise"; + rev = "132683d4b5ce0902468b666cba63baea36e97f0c"; + sha256 = "1dzfzinyvhyy9zj32kqkl19fyhih6sy8r5sa3qahbbr4c30k7flp"; + }; + + # Patch makefile so we can set defines from the command line instead of it depending on .git + patches = [ ./makefile.patch ]; + GIT_COMMIT = src.rev; + GIT_VERSION = version; + GIT_DATE = "2019-08-12"; + + buildInputs = [ libftdi ]; + + sourceRoot = "source/software"; + makefile = "Makefile.linux"; + makeFlags = [ "PREFIX=$(out)" ]; + postPatch = '' + substituteInPlace init_scripts/infnoise.service --replace "/usr/local" "$out" + ''; + + meta = with lib; { + homepage = "https://github.com/13-37-org/infnoise"; + description = "Driver for the Infinite Noise TRNG"; + longDescription = '' + The Infinite Noise TRNG is a USB key hardware true random number generator. + It can either provide rng for userland applications, or provide rng for the OS entropy. + Add the following to your system configuration for plug and play support, adding to the OS entropy: + systemd.packages = [ pkgs.infnoise ]; + services.udev.packages = [ pkgs.infnoise ]; + ''; + license = licenses.cc0; + maintainers = with maintainers; [ StijnDW ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/infnoise/makefile.patch b/pkgs/misc/drivers/infnoise/makefile.patch new file mode 100644 index 000000000000..b38519036d2c --- /dev/null +++ b/pkgs/misc/drivers/infnoise/makefile.patch @@ -0,0 +1,14 @@ +diff --git a/software/Makefile.linux b/software/Makefile.linux +index db48aa5..df8b3d2 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -1,6 +1,6 @@ +-GIT_VERSION := $(shell git --no-pager describe --tags --always) +-GIT_COMMIT := $(shell git rev-parse --verify HEAD) +-GIT_DATE := $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only)) ++GIT_VERSION ?= $(shell git --no-pager describe --tags --always) ++GIT_COMMIT ?= $(shell git rev-parse --verify HEAD) ++GIT_DATE ?= $(firstword $(shell git --no-pager show --date=iso-strict --format="%ad" --name-only)) + + PREFIX = $(DESTDIR)/usr/local + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c6eb4ee80b..06c71f930172 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29617,6 +29617,8 @@ in image_optim = callPackage ../applications/graphics/image_optim { inherit (nodePackages) svgo; }; + infnoise = callPackage ../misc/drivers/infnoise { }; + # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; From 80e725f3dc9daff0b720b4cb7d7088cdc65e015d Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Wed, 31 Mar 2021 16:58:36 -0600 Subject: [PATCH 0610/1183] sphinx_rtd_theme: 0.4.3 -> 0.5.1 --- .../python-modules/sphinx_rtd_theme/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 3062f35669ed..06338ec118fb 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -12,12 +12,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "eda689eda0c7301a80cf122dad28b1861e5605cbf455558f3775e1e8200e83a5"; + sha256 = "19c31qhfiqbm6y7mamglrc2mc7l6n4lasb8jry01lc67l3nqk9pd"; }; propagatedBuildInputs = [ sphinx ]; checkInputs = [ readthedocs-sphinx-ext pytest ]; + CI=1; # Don't use NPM to fetch assets. Assets are included in sdist. checkPhase = '' py.test @@ -25,8 +26,8 @@ buildPythonPackage rec { meta = with lib; { description = "ReadTheDocs.org theme for Sphinx"; - homepage = "https://github.com/snide/sphinx_rtd_theme/"; - license = licenses.bsd3; + homepage = "https://github.com/readthedocs/sphinx_rtd_theme"; + license = licenses.mit; platforms = platforms.unix; }; From f1b36d19fda8678c796f0627e2bd2723171ea0f4 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 14 Apr 2021 17:06:37 +0000 Subject: [PATCH 0611/1183] nixos/podgrab: add module Closes #117284. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/podgrab.nix | 50 +++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 nixos/modules/services/misc/podgrab.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5271cbebc261..d0ef7a42eaf5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -526,6 +526,7 @@ ./services/misc/parsoid.nix ./services/misc/plex.nix ./services/misc/plikd.nix + ./services/misc/podgrab.nix ./services/misc/tautulli.nix ./services/misc/pinnwand.nix ./services/misc/pykms.nix diff --git a/nixos/modules/services/misc/podgrab.nix b/nixos/modules/services/misc/podgrab.nix new file mode 100644 index 000000000000..7077408b7942 --- /dev/null +++ b/nixos/modules/services/misc/podgrab.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.podgrab; +in +{ + options.services.podgrab = with lib; { + enable = mkEnableOption "Podgrab, a self-hosted podcast manager"; + + passwordFile = mkOption { + type = with types; nullOr str; + default = null; + example = "/run/secrets/password.env"; + description = '' + The path to a file containing the PASSWORD environment variable + definition for Podgrab's authentification. + ''; + }; + + port = mkOption { + type = types.port; + default = 8080; + example = 4242; + description = "The port on which Podgrab will listen for incoming HTTP traffic."; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.podgrab = { + description = "Podgrab podcast manager"; + wantedBy = [ "multi-user.target" ]; + environment = { + CONFIG = "/var/lib/podgrab/config"; + DATA = "/var/lib/podgrab/data"; + GIN_MODE = "release"; + PORT = toString cfg.port; + }; + serviceConfig = { + DynamicUser = true; + EnvironmentFile = lib.optional (cfg.passwordFile != null) [ + cfg.passwordFile + ]; + ExecStart = "${pkgs.podgrab}/bin/podgrab"; + WorkingDirectory = "${pkgs.podgrab}/share"; + StateDirectory = [ "podgrab/config" "podgrab/data" ]; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ ambroisie ]; +} From 1144486f3a330c1e3a005022246db4eac194225d Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 14 Apr 2021 17:15:41 +0000 Subject: [PATCH 0612/1183] nixos/tests/podgrab: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/podgrab.nix | 34 +++++++++++++++++++++++++++ pkgs/servers/misc/podgrab/default.nix | 4 +++- 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/podgrab.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 47384cf5a8a2..1a6df8a181c7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -321,6 +321,7 @@ in pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; plikd = handleTest ./plikd.nix {}; plotinus = handleTest ./plotinus.nix {}; + podgrab = handleTest ./podgrab.nix {}; podman = handleTestOn ["x86_64-linux"] ./podman.nix {}; pomerium = handleTestOn ["x86_64-linux"] ./pomerium.nix {}; postfix = handleTest ./postfix.nix {}; diff --git a/nixos/tests/podgrab.nix b/nixos/tests/podgrab.nix new file mode 100644 index 000000000000..e927e25fea56 --- /dev/null +++ b/nixos/tests/podgrab.nix @@ -0,0 +1,34 @@ +let + defaultPort = 8080; + customPort = 4242; +in +import ./make-test-python.nix ({ pkgs, ... }: { + name = "podgrab"; + + nodes = { + default = { ... }: { + services.podgrab.enable = true; + }; + + customized = { ... }: { + services.podgrab = { + enable = true; + port = customPort; + }; + }; + }; + + testScript = '' + start_all() + + default.wait_for_unit("podgrab") + default.wait_for_open_port("${toString defaultPort}") + default.succeed("curl --fail http://localhost:${toString defaultPort}") + + customized.wait_for_unit("podgrab") + customized.wait_for_open_port("${toString customPort}") + customized.succeed("curl --fail http://localhost:${toString customPort}") + ''; + + meta.maintainers = with pkgs.lib.maintainers; [ ambroisie ]; +}) diff --git a/pkgs/servers/misc/podgrab/default.nix b/pkgs/servers/misc/podgrab/default.nix index 6703fbc53ede..a5fd230d48fc 100644 --- a/pkgs/servers/misc/podgrab/default.nix +++ b/pkgs/servers/misc/podgrab/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "podgrab"; @@ -19,6 +19,8 @@ buildGoModule rec { cp -r $src/webassets $out/share/ ''; + passthru.tests = { inherit (nixosTests) podgrab; }; + meta = with lib; { description = "A self-hosted podcast manager to download episodes as soon as they become live"; homepage = "https://github.com/akhilrex/podgrab"; From 52c35767ae7d8cdb86bf8fb10d570b3562d1bc34 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 16 Apr 2021 10:18:32 -0400 Subject: [PATCH 0613/1183] python3Packages.tqdm: 4.58.0 -> 4.60.0 --- .../development/python-modules/tqdm/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 70893dc541f0..ae89b3ee0b07 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.58.0"; + version = "4.60.0"; src = fetchPypi { inherit pname version; - sha256 = "1fjvaag1wy70gglxjkfnn0acrya7fbhzi4adbs1bpap8x03wffn2"; + sha256 = "ebdebdb95e3477ceea267decfc0784859aa3df3e27e22d23b83e9b272bf157ae"; }; nativeBuildInputs = [ @@ -39,14 +39,19 @@ buildPythonPackage rec { # Remove performance testing. # Too sensitive for on Hydra. - PYTEST_ADDOPTS = "-k \"not perf\""; + disabledTests = [ + "perf" + ]; LC_ALL="en_US.UTF-8"; - meta = { + pythonImportsCheck = [ "tqdm" ]; + + meta = with lib; { description = "A Fast, Extensible Progress Meter"; homepage = "https://github.com/tqdm/tqdm"; - license = with lib.licenses; [ mit ]; - maintainers = with lib.maintainers; [ fridh ]; + changelog = "https://tqdm.github.io/releases/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fridh ]; }; } From 6a22ce0edf4c879e00f6fa195fbb63ed854cda00 Mon Sep 17 00:00:00 2001 From: nyanotech Date: Sat, 17 Apr 2021 12:33:31 +0000 Subject: [PATCH 0614/1183] nixos/printers: fix ensureDefaultPrinter `lpoptions -d` sets the default printer *for this user*, while `lpadmin -d` sets the system-wide default printer. --- nixos/modules/hardware/printers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix index 752de41f26de..c587076dcd18 100644 --- a/nixos/modules/hardware/printers.nix +++ b/nixos/modules/hardware/printers.nix @@ -15,7 +15,7 @@ let ${ppdOptionsString p.ppdOptions} ''; ensureDefaultPrinter = name: '' - ${pkgs.cups}/bin/lpoptions -d '${name}' + ${pkgs.cups}/bin/lpadmin -d '${name}' ''; # "graph but not # or /" can't be implemented as regex alone due to missing lookahead support From 85f67e5b60ee672b0c90110616a94d23ccdbb300 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Apr 2021 14:02:52 +0200 Subject: [PATCH 0615/1183] python3Packages.tabview: init at 1.4.4 --- .../python-modules/tabview/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/tabview/default.nix diff --git a/pkgs/development/python-modules/tabview/default.nix b/pkgs/development/python-modules/tabview/default.nix new file mode 100644 index 000000000000..35a7f7d8a7dc --- /dev/null +++ b/pkgs/development/python-modules/tabview/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python +}: + +buildPythonPackage rec { + pname = "tabview"; + version = "1.4.4"; + format = "setuptools"; + + # newest release only available as wheel on pypi + src = fetchFromGitHub { + owner = "TabViewer"; + repo = "tabview"; + rev = version; + sha256 = "1d1l8fhdn3w2zg7wakvlmjmgjh9lh9h5fal1clgyiqmhfix4cn4m"; + }; + + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + + meta = with lib; { + description = "Python curses command line CSV and tabular data viewer"; + homepage = "https://github.com/TabViewer/tabview"; + changelog = "https://github.com/TabViewer/tabview/blob/main/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77dad75554ff..7499fb7dbd3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7501,6 +7501,8 @@ in tab = callPackage ../tools/text/tab { }; + tabview = with python3Packages; toPythonApplication tabview; + tautulli = python3Packages.callPackage ../servers/tautulli { }; pleroma-otp = callPackage ../servers/pleroma-otp { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57da419a7da7..d25569ecd266 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7689,6 +7689,8 @@ in { tabulate = callPackage ../development/python-modules/tabulate { }; + tabview = callPackage ../development/python-modules/tabview { }; + tadasets = callPackage ../development/python-modules/tadasets { }; tag-expressions = callPackage ../development/python-modules/tag-expressions { }; From 4cd296cf91c8fb05da111aef3cd3fbcead967a36 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:57:03 +0700 Subject: [PATCH 0616/1183] gnome3.metacity: Fix missing xdamage --- pkgs/desktops/gnome-3/misc/metacity/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index d1b1aeec4c40..c74d57d9f4dd 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libXres xorg.libXpresent + xorg.libXdamage glib gsettings-desktop-schemas gtk3 From 8b4e8f0f95646e127a0dc962913cf9ad58fa5d13 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:57:24 +0700 Subject: [PATCH 0617/1183] gnome3.gnome-shell: Fix missing mesa --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 2cd22e3ceaa5..97a72e379a58 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -57,6 +57,7 @@ , gnome-autoar , asciidoc-full , bash-completion +, mesa }: # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup @@ -147,6 +148,7 @@ stdenv.mkDerivation rec { gnome-desktop gnome-settings-daemon gobject-introspection + mesa # recording pipewire From 85d9aa3a8b1fef006d0c30f7619a6c0701471604 Mon Sep 17 00:00:00 2001 From: Hernawan Fa'iz Abdillah Date: Sat, 17 Apr 2021 13:58:29 +0700 Subject: [PATCH 0618/1183] gnome3.gnome-flashback: Fix missing xxf86vm --- pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index b65d27bb7571..935778aa6490 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -25,6 +25,7 @@ , writeTextFile , writeShellScriptBin , xkeyboard_config +, xorg , runCommand }: let @@ -101,6 +102,7 @@ let libcanberra-gtk3 libpulseaudio libxkbfile + xorg.libXxf86vm polkit gdm gnome-panel From e7d4fa42395d7ccba66cc9b945ad690b64642ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 17 Apr 2021 18:33:31 +0200 Subject: [PATCH 0619/1183] flexoptix-app: Init at 5.9.0 --- pkgs/tools/misc/flexoptix-app/default.nix | 47 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/misc/flexoptix-app/default.nix diff --git a/pkgs/tools/misc/flexoptix-app/default.nix b/pkgs/tools/misc/flexoptix-app/default.nix new file mode 100644 index 000000000000..40f30bd7ad90 --- /dev/null +++ b/pkgs/tools/misc/flexoptix-app/default.nix @@ -0,0 +1,47 @@ +{ lib, appimageTools, fetchurl }: let + pname = "flexoptix-app"; + version = "5.9.0"; + name = "${pname}-${version}"; + + src = fetchurl { + name = "${name}.AppImage"; + url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; + sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + }; + + udevRules = fetchurl { + url = "https://www.flexoptix.net/skin/udev_rules/99-tprogrammer.rules"; + sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; + }; + + appimageContents = appimageTools.extractType2 { + inherit name src; + }; + +in appimageTools.wrapType2 { + inherit name src; + + multiPkgs = null; # no 32bit needed + extraPkgs = { pkgs, ... }@args: [ + pkgs.hidapi + ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps + substituteInPlace $out/share/applications/flexoptix-app.desktop \ + --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + mkdir -p $out/lib/udev/rules.d + ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules + ''; + + meta = { + description = "Configure FLEXOPTIX Universal Transcievers in seconds"; + homepage = "https://www.flexoptix.net"; + changelog = "https://www.flexoptix.net/en/flexoptix-app/?os=linux#flexapp__modal__changelog"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ das_j ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad05948227ed..a63851f08ecb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4472,6 +4472,8 @@ in flent = python3Packages.callPackage ../applications/networking/flent { }; + flexoptix-app = callPackage ../tools/misc/flexoptix-app { }; + flpsed = callPackage ../applications/editors/flpsed { }; fluentd = callPackage ../tools/misc/fluentd { }; From 7d6380769c6b87e03f015cfe0376a0b7484a5b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 17 Apr 2021 18:33:41 +0200 Subject: [PATCH 0620/1183] nixos/flexoptix-app: Add the module --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/flexoptix-app.nix | 25 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/programs/flexoptix-app.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f72be732216e..78e49a58be68 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -131,6 +131,7 @@ ./programs/file-roller.nix ./programs/firejail.nix ./programs/fish.nix + ./programs/flexoptix-app.nix ./programs/freetds.nix ./programs/fuse.nix ./programs/geary.nix diff --git a/nixos/modules/programs/flexoptix-app.nix b/nixos/modules/programs/flexoptix-app.nix new file mode 100644 index 000000000000..93dcdfeb5147 --- /dev/null +++ b/nixos/modules/programs/flexoptix-app.nix @@ -0,0 +1,25 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.programs.flexoptix-app; +in { + options = { + programs.flexoptix-app = { + enable = mkEnableOption "FLEXOPTIX app + udev rules"; + + package = mkOption { + description = "FLEXOPTIX app package to use"; + type = types.package; + default = pkgs.flexoptix-app; + defaultText = "\${pkgs.flexoptix-app}"; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; +} From a63e80407da46ba7d71bb395a13cf65dd468607f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Apr 2021 14:10:26 +0200 Subject: [PATCH 0621/1183] python3Packages.clevercsv: init at 0.6.7 Co-Authored-By: Joerg Thalheim --- .../python-modules/clevercsv/default.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/clevercsv/default.nix diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix new file mode 100644 index 000000000000..36944b5dbec4 --- /dev/null +++ b/pkgs/development/python-modules/clevercsv/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, chardet +, cleo +, clikit +, pandas +, regex +, tabview +, python +}: + +buildPythonPackage rec { + pname = "clevercsv"; + version = "0.6.7"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "alan-turing-institute"; + repo = "CleverCSV"; + rev = "v${version}"; + sha256 = "0j3959bji48pkp0vnk7yls5l75ywjl77jdkvzs62n5mi5lky88p9"; + }; + + propagatedBuildInputs = [ + chardet + cleo + clikit + pandas + regex + tabview + ]; + + pythonImportsCheck = [ + "clevercsv" + "clevercsv.cparser" + ]; + + checkPhase = '' + # by linking the installed version the tests also have access to compiled native libraries + rm -r clevercsv + ln -s $out/${python.sitePackages}/clevercsv/ clevercsv + # their ci only runs unit tests, there are also integration and fuzzing tests + ${python.interpreter} -m unittest discover -v -f -s ./tests/test_unit + ''; + + meta = with lib; { + description = "CleverCSV is a Python package for handling messy CSV files"; + longDescription = '' + CleverCSV is a Python package for handling messy CSV files. It provides + a drop-in replacement for the builtin CSV module with improved dialect + detection, and comes with a handy command line application for working + with CSV files. + ''; + homepage = "https://github.com/alan-turing-institute/CleverCSV"; + changelog = "https://github.com/alan-turing-institute/CleverCSV/blob/master/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7499fb7dbd3d..8dae2f8c1db0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2017,6 +2017,8 @@ in clasp = callPackage ../tools/misc/clasp { }; + clevercsv = with python3Packages; toPythonApplication clevercsv; + clevis = callPackage ../tools/security/clevis { asciidoc = asciidoc-full; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d25569ecd266..32425fc76f22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1343,6 +1343,8 @@ in { cleo = callPackage ../development/python-modules/cleo { }; + clevercsv = callPackage ../development/python-modules/clevercsv { }; + clf = callPackage ../development/python-modules/clf { }; click = callPackage ../development/python-modules/click { }; From f929c7cdf361b131f928d6e5a4e28ae830a82d73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Apr 2021 14:13:01 +0200 Subject: [PATCH 0622/1183] python3Packages.deepdiff: fix build and tests --- .../python-modules/deepdiff/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 20aba1b4fa2b..7c72d1940319 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -1,34 +1,43 @@ { lib , buildPythonPackage -, fetchPypi -, mock -, jsonpickle -, mmh3 +, fetchFromGitHub +, click , ordered-set +, clevercsv +, jsonpickle , numpy , pytestCheckHook +, pyyaml }: buildPythonPackage rec { pname = "deepdiff"; version = "5.2.3"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "ae2cb98353309f93fbfdda4d77adb08fb303314d836bb6eac3d02ed71a10b40e"; + # pypi source does not contain all fixtures required for tests + src = fetchFromGitHub { + owner = "seperman"; + repo = "deepdiff"; + rev = version; + sha256 = "0j3il23n3yfny6kzy2n67s0zsrqckck7x1ambqh29nzi0bqwslzk"; }; - # # Extra packages (may not be necessary) - checkInputs = [ - mock - numpy - pytestCheckHook + propagatedBuildInputs = [ + click + ordered-set ]; - propagatedBuildInputs = [ + pythonImportsCheck = [ + "deepdiff" + ]; + + checkInputs = [ + clevercsv jsonpickle - mmh3 - ordered-set + numpy + pytestCheckHook + pyyaml ]; meta = with lib; { From fd97b66ec6b41faf527d694fdca7b1f0786f9a1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 17 Apr 2021 14:15:52 +0200 Subject: [PATCH 0623/1183] python3Packages.deepdiff: 5.2.3 -> 5.3.0 Also expose cli under the `deepdiff` attribute. --- pkgs/development/python-modules/deepdiff/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 7c72d1940319..83140ff0bb00 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "5.2.3"; + version = "5.3.0"; format = "setuptools"; # pypi source does not contain all fixtures required for tests @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "seperman"; repo = "deepdiff"; rev = version; - sha256 = "0j3il23n3yfny6kzy2n67s0zsrqckck7x1ambqh29nzi0bqwslzk"; + sha256 = "1izw2qpd93nj948zakamjn7q7dlmmr7sapg0c65hxvs0nmij8sl4"; }; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dae2f8c1db0..120f33419bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28559,6 +28559,8 @@ in dcm2niix = callPackage ../applications/science/biology/dcm2niix { }; + deepdiff = with python3Packages; toPythonApplication deepdiff; + deepsea = callPackage ../tools/security/deepsea { }; deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; From 9db7133769af87ff50b2215795680d73fefef5c5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Apr 2021 21:47:13 +0000 Subject: [PATCH 0624/1183] factorio: 1.1.30 -> 1.1.32 --- pkgs/games/factorio/versions.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index c8a441aaece7..e8261de0505b 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -10,12 +10,12 @@ "version": "1.1.32" }, "stable": { - "name": "factorio_alpha_x64-1.1.30.tar.xz", + "name": "factorio_alpha_x64-1.1.32.tar.xz", "needsAuth": true, - "sha256": "14mcf9pj6s5ms2hl68n3r5jk1q5y2qzw88wiahsb5plkv9qyqyp6", + "sha256": "0ciz7y8xqlk9vg3akvflq1aabzgbqpazfnihyk4gsadk12b6a490", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/alpha/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.32/alpha/linux64", + "version": "1.1.32" } }, "demo": { @@ -46,12 +46,12 @@ "version": "1.1.32" }, "stable": { - "name": "factorio_headless_x64-1.1.30.tar.xz", + "name": "factorio_headless_x64-1.1.32.tar.xz", "needsAuth": false, - "sha256": "1rac6d8v8swiw1nn2hl53rhjfhsyv98qg8hfnwhfqn76jgspspdl", + "sha256": "0dg98ycs7m8rm996pk0p1iajalpmiy30p0pwr9dw2chf1d887kvz", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/headless/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.32/headless/linux64", + "version": "1.1.32" } } } From 6a1a3eca9bd2aaa8236572288a76f3fe7c1aa43e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 17 Apr 2021 21:48:09 +0000 Subject: [PATCH 0625/1183] factorio-demo: 1.1.30 -> 1.1.32 --- pkgs/games/factorio/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index e8261de0505b..151836096ffb 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -28,12 +28,12 @@ "version": "1.1.30" }, "stable": { - "name": "factorio_demo_x64-1.1.30.tar.xz", + "name": "factorio_demo_x64-1.1.32.tar.xz", "needsAuth": false, - "sha256": "1b3na8xn9lhlvrsd6hxr130nf9p81s26n25a4qdgkczz6waysgjv", + "sha256": "19zwl20hn8hh942avqri1kslf7dcqi9nim50vh4w5d0493srybfw", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.30/demo/linux64", - "version": "1.1.30" + "url": "https://factorio.com/get-download/1.1.32/demo/linux64", + "version": "1.1.32" } }, "headless": { From 15cd5fc57ead4d312acbc3edad680ebe4fc0706a Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 18 Apr 2021 16:15:48 +0200 Subject: [PATCH 0626/1183] nixos/nginx: set isSystemUser --- nixos/modules/services/web-servers/nginx/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 389911ffcce8..b9ff13329550 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -879,6 +879,7 @@ in users.users = optionalAttrs (cfg.user == "nginx") { nginx = { group = cfg.group; + isSystemUser = true; uid = config.ids.uids.nginx; }; }; From 760b1438804ab38837649f41dcaf37215fe2625e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 11:12:38 -0700 Subject: [PATCH 0627/1183] discord: fix autoPatchelfHook not finding libXdamage.so.1 --- pkgs/applications/networking/instant-messengers/discord/base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index e4c588e6c18e..b29e1cfc124c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -18,6 +18,7 @@ in stdenv.mkDerivation rec { cups libdrm libuuid + libXdamage libX11 libXScrnSaver libXtst From 2ac2ff3ddb41345701b834abe4b6e6ce93e4b13f Mon Sep 17 00:00:00 2001 From: Sandro Date: Mon, 19 Apr 2021 02:16:42 +0200 Subject: [PATCH 0628/1183] discord: remove unused input --- .../applications/networking/instant-messengers/discord/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index b29e1cfc124c..b649fd20d512 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -1,5 +1,5 @@ { pname, version, src, binaryName, desktopName -, autoPatchelfHook, fetchurl, makeDesktopItem, lib, stdenv, wrapGAppsHook +, autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook , alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig , freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext From b0dae10ba7b8dc1d90c7afd1735037351089c14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Apr 2021 09:59:19 +0200 Subject: [PATCH 0629/1183] qt5.qtwebengine, webkitgtk: try harder to avoid timeouts I hope this will improve the situation on aarch64-linux. I don't think it could make anything worse. Recent staging-next timeouts: https://hydra.nixos.org/build/141551270 https://hydra.nixos.org/build/141547098 For now let's not touch meta.timeout, as there's less consensus and the setting seems less reliable in practice, too. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 2 ++ pkgs/development/libraries/webkitgtk/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index cd3fa583303d..e2ca47f45f2c 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -236,6 +236,8 @@ qtModule { sed 's/${lib.head (lib.splitString "-" version)} /${qtCompatVersion} /' -i "$out"/lib/cmake/*/*Config.cmake ''; + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "A web engine based on the Chromium web browser"; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 4dbec69f8f1c..84a9e2a1db77 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -177,6 +177,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; + requiredSystemFeatures = [ "big-parallel" ]; + meta = { description = "Web content rendering engine, GTK port"; homepage = "https://webkitgtk.org/"; From f9b14ee4fb85d6f28b94ce5686214f50b4f448ac Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 9 Apr 2021 01:16:54 +0200 Subject: [PATCH 0630/1183] matrix-synapse: 1.30.0 -> 1.31.0 (cherry picked from commit 3fca2338d85b893e3cce50c9f521a13c5e79a01e) --- 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 468c46b12695..c41c6cbdab1a 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.30.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "1ca69v479537bbj2hjliwk9zzy9fqqsf7fm188k6xxj0a37q9y41"; + sha256 = "0yr1lij66s9sc6razzjr9r6xvl462ff31xg0a3m7ys2f9zzrms0v"; }; patches = [ From 17144c992e128934079248e47c324195b4228b45 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 20 Apr 2021 23:06:31 +0200 Subject: [PATCH 0631/1183] matrix-synapse: 1.31.0 -> 1.32.0 ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.32.0 --- 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 c41c6cbdab1a..f0a9d1eb08c0 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.31.0"; + version = "1.32.0"; src = fetchPypi { inherit pname version; - sha256 = "0yr1lij66s9sc6razzjr9r6xvl462ff31xg0a3m7ys2f9zzrms0v"; + sha256 = "sha256-CuPO5+zZitDvMjAxAkmEyVFxdZeqzjFH/7wDLvcUgSM="; }; patches = [ From ce8eb071d1c12554b2ddc16510c8809d1c75ff6d Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 31 Mar 2021 23:31:47 +0300 Subject: [PATCH 0632/1183] nginx: replace zlib to zlib-ng --- 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 55e57b74c9fa..0ed011fa565d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18698,6 +18698,7 @@ in nginx = nginxStable; nginxQuic = callPackage ../servers/http/nginx/quic.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 @@ -18707,6 +18708,7 @@ in }; nginxStable = callPackage ../servers/http/nginx/stable.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 @@ -18714,6 +18716,7 @@ in }; nginxMainline = callPackage ../servers/http/nginx/mainline.nix { + zlib = zlib-ng.override { withZlibCompat = true; }; withPerl = false; # We don't use `with` statement here on purpose! # See https://github.com/NixOS/nixpkgs/pull/10474/files#r42369334 From b36d55b67c6a9beb2226a1766466119f115794d6 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 14 Apr 2021 16:16:48 +0300 Subject: [PATCH 0633/1183] nginxMainline: 1.19.9 -> 1.20.0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 0409f6a26ea4..b7a11fc240d7 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.9"; - sha256 = "0hfqqyfgqa6wqazmb3d434nb3r5p8szfisa0m6nfh9lqdbqdyd9f"; + version = "1.20.0"; + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; } From f4b6314e6041172da9ec011c59e4fa8fe88dc12f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 20 Apr 2021 23:55:56 +0300 Subject: [PATCH 0634/1183] nginxStable: 1.18.0 -> 1.20.0 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index c08615ef5125..5972177204fc 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.18.0"; - sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; + version = "1.20.0"; + sha256 = "072dn2qhgx20y4pfa3mi97qszbifhcnwj28ccin4iamwivn93vsl"; } From f25190d7f2e3907c32fca75961ac337d85b0dcfc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 10:50:46 -0700 Subject: [PATCH 0635/1183] python3Packages.yamlloader: fix build, add missing test dep --- pkgs/development/python-modules/yamlloader/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix index 5126afde05fa..d2b66cb073d7 100644 --- a/pkgs/development/python-modules/yamlloader/default.nix +++ b/pkgs/development/python-modules/yamlloader/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pyyaml +, pytest, pyyaml, hypothesis }: buildPythonPackage rec { @@ -16,6 +16,7 @@ buildPythonPackage rec { ]; checkInputs = [ + hypothesis pytest ]; From bd8fb47110a5bfc3eca64ba4658b3a388fd95eda Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 10:51:20 -0700 Subject: [PATCH 0636/1183] python3Packages.dask-glm: add missing setuptools-scm dep --- pkgs/development/python-modules/dask-glm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 86bc2da1565c..ca25e05bb1ed 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -5,6 +5,7 @@ , dask , numpy, toolz # dask[array] , multipledispatch +, setuptools-scm , scipy , scikitlearn , pytest @@ -19,6 +20,7 @@ buildPythonPackage rec { sha256 = "58b86cebf04fe5b9e58092e1c467e32e60d01e11b71fdc628baaa9fc6d1adee5"; }; + nativeBuildInputs = [ setuptools-scm ]; checkInputs = [ pytest ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; From 75ea2abae67b6481c7d298bf3ce64fedcc8c2853 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 10:53:32 -0700 Subject: [PATCH 0637/1183] python3Packages.xdis: 5.0.8 -> 5.0.9 --- 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 3da25743594e..59cad86606fd 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "5.0.8"; + version = "5.0.9"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "01g1bk7rscwmvr2i183z0y2bs1iw7bxk7c5rcf9gf25242nppv6a"; + sha256 = "sha256-joKPTEq0UabXMyld0DHrhC1D/Om2B5st0qa2F9r0muA="; }; checkInputs = [ pytest ]; From e24256f4c97771ce763b800b4afbb9ec9b188018 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 18 Apr 2021 11:02:00 -0700 Subject: [PATCH 0638/1183] python3Packages.thinc: fix build --- pkgs/development/python-modules/thinc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index ceefc2fd9d14..a92d349e9928 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -16,6 +16,7 @@ , pathlib , plac , preshed +, pydantic , srsly , tqdm , wasabi @@ -47,6 +48,7 @@ buildPythonPackage rec { preshed srsly tqdm + pydantic wasabi ] ++ lib.optional (pythonOlder "3.4") pathlib; @@ -61,11 +63,9 @@ buildPythonPackage rec { doCheck = false; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace setup.cfg \ --replace "blis>=0.4.0,<0.8.0" "blis>=0.4.0,<1.0" \ - --replace "catalogue>=0.0.7,<1.1.0" "catalogue>=0.0.7,<3.0" \ - --replace "plac>=0.9.6,<1.2.0" "plac>=0.9.6,<2.0" \ - --replace "srsly>=0.0.6,<1.1.0" "srsly>=0.0.6,<3.0" + --replace "pydantic>=1.7.1,<1.8.0" "pydantic~=1.7" ''; checkPhase = '' From 3c0a20777f63bb56d5d682120ee9d85ed2c7446f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 10:49:51 -0700 Subject: [PATCH 0639/1183] python3Packages.keyring: always use importlib-metadata --- pkgs/development/python-modules/keyring/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index e7340561cdc5..79283ff6e774 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder +{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch , setuptools-scm , importlib-metadata , dbus-python @@ -25,15 +25,16 @@ buildPythonPackage rec { pytestCheckHook ]; - propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ - importlib-metadata - ] ++ lib.optionals stdenv.isLinux [ + propagatedBuildInputs = [ + # this should be optional, however, it has a different API + importlib-metadata # see https://github.com/jaraco/keyring/issues/503#issuecomment-798973205 + dbus-python jeepney secretstorage ]; - pythonImportsCheck = [ "keyring" ]; + pythonImportsCheck = [ "keyring" "keyring.backend" ]; meta = with lib; { description = "Store and access your passwords safely"; From 50ddbc8590cd800d5931afcbb0bd4081908f4281 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 12:00:56 -0700 Subject: [PATCH 0640/1183] python37Packages.poetry-core: fix build --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index cc1724024add..72c02b4c1e70 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.2"; + version = "1.1.0a3"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; + sha256 = "sha256-GlRTtnxnc4slS4q1I7UTHUYGUJkzU9ew2NpJwSX7KYA="; }; nativeBuildInputs = [ From 3bcc26dca493341d1ede59257400c24b9c48700c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 12:04:44 -0700 Subject: [PATCH 0641/1183] python3Packages.typeguard: 2.11.0 -> 2.12.0, fix tests --- pkgs/development/python-modules/typeguard/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 9d00adfea831..2ee404cb18ed 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -2,7 +2,7 @@ , fetchPypi , pythonOlder , lib -, setuptools_scm +, setuptools-scm , pytest , typing-extensions , glibcLocales @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "typeguard"; - version = "2.11.1"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "33243c1cbfcb9736a06c6db22dd08876b5f297e6344aa272a2862c0f8e669f64"; + sha256 = "sha256-/Kd/1My6Y0ZbQhzburWhqOOZTm1vGLRdortHXAnxR+8="; }; - buildInputs = [ setuptools_scm ]; + buildInputs = [ setuptools-scm ]; nativeBuildInputs = [ glibcLocales ]; LC_ALL="en_US.utf-8"; @@ -28,8 +28,9 @@ buildPythonPackage rec { checkInputs = [ pytest typing-extensions ]; + # mypy tests aren't passing with latest mypy checkPhase = '' - py.test . + py.test . --ignore=tests/mypy ''; disabled = pythonOlder "3.3"; From 5eafa75805d5c5f74584b1b5e242197942548f2d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 12:06:13 -0700 Subject: [PATCH 0642/1183] python3Packages.mflask-mongoengine: add missing dep --- pkgs/development/python-modules/flask-mongoengine/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index e26cac70b3ca..f7cb7224dc54 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -8,6 +8,7 @@ , nose , rednose , coverage +, email_validator }: buildPythonPackage rec { @@ -22,6 +23,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ + email_validator flask flask_wtf mongoengine From bdeaccefbffe6fdd7e3fb13a69360d31e00767bb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 14:59:00 -0700 Subject: [PATCH 0643/1183] python3Packages.stone: init at 3.2.1 --- .../python-modules/stone/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/stone/default.nix diff --git a/pkgs/development/python-modules/stone/default.nix b/pkgs/development/python-modules/stone/default.nix new file mode 100644 index 000000000000..21c92fcee7e9 --- /dev/null +++ b/pkgs/development/python-modules/stone/default.nix @@ -0,0 +1,51 @@ +{ lib, buildPythonPackage, fetchPypi +, coverage +, mock +, ply +, pytestrunner +, pytestCheckHook +, six +}: + +buildPythonPackage rec { + pname = "stone"; + version = "3.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xby5mpsms7b2rv8j6mvxzmzz5i9ii01brb9ylxz6kiv2i08piwv"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner == 5.2.0" "pytest-runner" \ + --replace "pytest < 5" "pytest" + substituteInPlace test/requirements.txt \ + --replace "coverage==5.3" "coverage" + ''; + + nativeBuildInputs = [ pytestrunner ]; + + propagatedBuildInputs = [ ply six ]; + + checkInputs = [ pytestCheckHook coverage mock ]; + + # try to import from `test` directory, which is exported by the python interpreter + # and cannot be overriden without removing some py3 to py2 support + disabledTestPaths = [ + "test/test_tsd_types.py" + "test/test_js_client.py" + ]; + disabledTests = [ + "test_type_name_with_module" + ]; + + pythonImportsCheck = [ "stone" ]; + + meta = with lib; { + description = "Official Api Spec Language for Dropbox"; + homepage = "https://github.com/dropbox/stone"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e904a609124..d276a3999c1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7597,6 +7597,8 @@ in { stm32loader = callPackage ../development/python-modules/stm32loader { }; + stone = callPackage ../development/python-modules/stone { }; + strategies = callPackage ../development/python-modules/strategies { }; stravalib = callPackage ../development/python-modules/stravalib { }; From e095b69930f6ef9e32d20d4e52fee1e48bd210a0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 15:00:36 -0700 Subject: [PATCH 0644/1183] python3Packages.dropbox: add missing stone dep --- pkgs/development/python-modules/dropbox/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index dca83a57a7bc..8fc4ee1358b1 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytestrunner, requests, urllib3, mock, setuptools }: +, pytestrunner, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -10,11 +10,16 @@ buildPythonPackage rec { sha256 = "7ba43384029424779a4b3ec8d5832362c5c0f37cd644be2fb87e2b30a569849e"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner == 5.2.0" "pytest-runner" + ''; + # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - buildInputs = [ pytestrunner ]; - propagatedBuildInputs = [ requests urllib3 mock setuptools ]; + nativeBuildInputs = [ pytestrunner ]; + propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; meta = with lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; From 43d3569e0fc3b26246b16f20d0d98a6cf6bd8b29 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 20 Apr 2021 15:01:08 -0700 Subject: [PATCH 0645/1183] python3Packages.habanero: add missing dep, tqdm --- pkgs/development/python-modules/habanero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index cf3f80d7ed41..e24f2fc09691 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -1,5 +1,5 @@ { buildPythonPackage, lib, fetchFromGitHub -, requests +, requests, tqdm , nose, vcrpy }: @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "1d8yj9xz5qabcj57rpjzvg0jcscvzrpb0739mll29nijbsaimfr1"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests tqdm ]; checkInputs = [ nose vcrpy ]; checkPhase = "make test"; From 65ce0419ad75602f44fbb81461dfec7adc27880f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 21 Apr 2021 11:18:14 +0300 Subject: [PATCH 0646/1183] nginx: add release notes --- nixos/doc/manual/release-notes/rl-2105.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index e0552c25a856..68613b1e5616 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -94,6 +94,12 @@ been introduced. + + + Nginx has been updated to stable version 1.20.0. + Now nginx uses the zlib-ng library by default. + + From 7c5a6c46480441048bf09fe191f08d8c811d2f07 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 21 Apr 2021 16:16:48 +0200 Subject: [PATCH 0647/1183] matrix-synapse: 1.32.0 -> 1.32.1 ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.32.1 --- 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 f0a9d1eb08c0..ba10396ed8f2 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.32.0"; + version = "1.32.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CuPO5+zZitDvMjAxAkmEyVFxdZeqzjFH/7wDLvcUgSM="; + sha256 = "sha256-A9ZWoZq+ZeUeQkqb84q1PG7BEBL2sVyG3qwRq0AqsNk="; }; patches = [ From 23372dc07992fba7df92250400daa281b38620d3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:19:45 -0700 Subject: [PATCH 0648/1183] Revert "python37Packages.poetry-core: fix build" This reverts commit 50ddbc8590cd800d5931afcbb0bd4081908f4281. This is a pre-release, and causes poetry to fail --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index 72c02b4c1e70..cc1724024add 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.1.0a3"; + version = "1.0.2"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-GlRTtnxnc4slS4q1I7UTHUYGUJkzU9ew2NpJwSX7KYA="; + sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; }; nativeBuildInputs = [ From 93e27be68cc220fb777f5b9ab43c724b9ba87847 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:25:59 -0700 Subject: [PATCH 0649/1183] poetry-core: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/poetry-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index cc1724024add..bec70aacca72 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "poetry-core"; - version = "1.0.2"; + version = "1.0.3"; format = "pyproject"; src = fetchFromGitHub { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "sha256-OE6oc/3HYrMmgPnINxvSZ27m8YeZk5Gnn9ok8GlSIZ0="; + sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; }; nativeBuildInputs = [ From a24bac685793063190bda89fb2e717543cc27652 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 09:26:22 -0700 Subject: [PATCH 0650/1183] python3Packages.poetry: 1.1.5 -> 1.1.6 --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index a04f4a1d8c12..51e95efbee50 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.5"; + version = "1.1.6"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf"; + sha256 = "sha256-3Nx9xuQMIho+oRjqskHL9eQGKDAWntEGZcWe7evnmNU="; }; postPatch = '' From 8dc5406544bd4a8a6f25514abb7822f38fd661d2 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 21 Apr 2021 09:45:07 -0700 Subject: [PATCH 0651/1183] vimPlugins: prefer self over super in overrides --- pkgs/misc/vim-plugins/overrides.nix | 68 ++++++++++++++--------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 7e12d083c32f..fe951cb83b8a 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -159,11 +159,11 @@ self: super: { }); defx-nvim = super.defx-nvim.overrideAttrs (old: { - dependencies = with super; [ nvim-yarp ]; + dependencies = with self; [ nvim-yarp ]; }); deoplete-fish = super.deoplete-fish.overrideAttrs (old: { - dependencies = with super; [ deoplete-nvim vim-fish ]; + dependencies = with self; [ deoplete-nvim vim-fish ]; }); deoplete-go = super.deoplete-go.overrideAttrs (old: { @@ -177,7 +177,7 @@ self: super: { }); deoplete-khard = super.deoplete-khard.overrideAttrs (old: { - dependencies = [ self.deoplete-nvim ]; + dependencies = with self; [ deoplete-nvim ]; passthru.python3Dependencies = ps: [ (ps.toPythonModule khard) ]; meta = { description = "Address-completion for khard via deoplete"; @@ -197,11 +197,11 @@ self: super: { ensime-vim = super.ensime-vim.overrideAttrs (old: { passthru.python3Dependencies = ps: with ps; [ sexpdata websocket_client ]; - dependencies = with super; [ vimproc-vim vimshell-vim super.self forms ]; + dependencies = with self; [ vimproc-vim vimshell-vim self.self forms ]; }); forms = super.forms.overrideAttrs (old: { - dependencies = with super; [ super.self ]; + dependencies = with self; [ self.self ]; }); fruzzy = @@ -240,7 +240,7 @@ self: super: { }); fzf-vim = super.fzf-vim.overrideAttrs (old: { - dependencies = [ self.fzfWrapper ]; + dependencies = with self; [ fzfWrapper ]; }); # Mainly used as a dependency for fzf-vim. Wraps the fzf program as a vim @@ -317,7 +317,7 @@ self: super: { }); lf-vim = super.lf-vim.overrideAttrs (old: { - dependencies = with super; [ vim-floaterm ]; + dependencies = with self; [ vim-floaterm ]; }); meson = buildVimPluginFrom2Nix { @@ -336,32 +336,32 @@ self: super: { }); ncm2 = super.ncm2.overrideAttrs (old: { - dependencies = with super; [ nvim-yarp ]; + dependencies = with self; [ nvim-yarp ]; }); ncm2-jedi = super.ncm2-jedi.overrideAttrs (old: { - dependencies = with super; [ nvim-yarp ncm2 ]; + dependencies = with self; [ nvim-yarp ncm2 ]; passthru.python3Dependencies = ps: with ps; [ jedi ]; }); ncm2-neoinclude = super.ncm2-neoinclude.overrideAttrs (old: { - dependencies = with super; [ neoinclude-vim ]; + dependencies = with self; [ neoinclude-vim ]; }); ncm2-neosnippet = super.ncm2-neosnippet.overrideAttrs (old: { - dependencies = with super; [ neosnippet-vim ]; + dependencies = with self; [ neosnippet-vim ]; }); ncm2-syntax = super.ncm2-syntax.overrideAttrs (old: { - dependencies = with super; [ neco-syntax ]; + dependencies = with self; [ neco-syntax ]; }); ncm2-ultisnips = super.ncm2-ultisnips.overrideAttrs (old: { - dependencies = with super; [ ultisnips ]; + dependencies = with self; [ ultisnips ]; }); nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { - dependencies = with super; [ popfix ]; + dependencies = with self; [ popfix ]; }); onehalf = super.onehalf.overrideAttrs (old: { @@ -375,7 +375,7 @@ self: super: { }; skim-vim = super.skim-vim.overrideAttrs (old: { - dependencies = [ self.skim ]; + dependencies = with self; [ skim ]; }); sql-nvim = super.sql-nvim.overrideAttrs (old: { @@ -415,7 +415,7 @@ self: super: { }); telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { - dependencies = [ self.sql-nvim ]; + dependencies = with self; [ sql-nvim ]; }); telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { @@ -469,23 +469,23 @@ self: super: { }); vim-addon-actions = super.vim-addon-actions.overrideAttrs (old: { - dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); vim-addon-async = super.vim-addon-async.overrideAttrs (old: { - dependencies = with super; [ vim-addon-signs ]; + dependencies = with self; [ vim-addon-signs ]; }); vim-addon-background-cmd = super.vim-addon-background-cmd.overrideAttrs (old: { - dependencies = with super; [ vim-addon-mw-utils ]; + dependencies = with self; [ vim-addon-mw-utils ]; }); vim-addon-completion = super.vim-addon-completion.overrideAttrs (old: { - dependencies = with super; [ tlib_vim ]; + dependencies = with self; [ tlib_vim ]; }); vim-addon-goto-thing-at-cursor = super.vim-addon-goto-thing-at-cursor.overrideAttrs (old: { - dependencies = with super; [ tlib_vim ]; + dependencies = with self; [ tlib_vim ]; }); vim-addon-manager = super.vim-addon-manager.overrideAttrs (old: { @@ -493,11 +493,11 @@ self: super: { }); vim-addon-mru = super.vim-addon-mru.overrideAttrs (old: { - dependencies = with super; [ vim-addon-other vim-addon-mw-utils ]; + dependencies = with self; [ vim-addon-other vim-addon-mw-utils ]; }); vim-addon-nix = super.vim-addon-nix.overrideAttrs (old: { - dependencies = with super; [ + dependencies = with self; [ vim-addon-completion vim-addon-goto-thing-at-cursor vim-addon-errorformats @@ -508,23 +508,23 @@ self: super: { }); vim-addon-sql = super.vim-addon-sql.overrideAttrs (old: { - dependencies = with super; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; + dependencies = with self; [ vim-addon-completion vim-addon-background-cmd tlib_vim ]; }); vim-addon-syntax-checker = super.vim-addon-syntax-checker.overrideAttrs (old: { - dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); vim-addon-toggle-buffer = super.vim-addon-toggle-buffer.overrideAttrs (old: { - dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); vim-addon-xdebug = super.vim-addon-xdebug.overrideAttrs (old: { - dependencies = with super; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; + dependencies = with self; [ webapi-vim vim-addon-mw-utils vim-addon-signs vim-addon-async ]; }); vim-bazel = super.vim-bazel.overrideAttrs (old: { - dependencies = with super; [ vim-maktaba ]; + dependencies = with self; [ vim-maktaba ]; }); vim-beancount = super.vim-beancount.overrideAttrs (old: { @@ -572,7 +572,7 @@ self: super: { }); vim-codefmt = super.vim-codefmt.overrideAttrs (old: { - dependencies = with super; [ vim-maktaba ]; + dependencies = with self; [ vim-maktaba ]; }); vim-dasht = super.vim-dasht.overrideAttrs (old: { @@ -583,7 +583,7 @@ self: super: { }); vim-easytags = super.vim-easytags.overrideAttrs (old: { - dependencies = with super; [ vim-misc ]; + dependencies = with self; [ vim-misc ]; patches = [ (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags @@ -628,7 +628,7 @@ self: super: { }); vim-gist = super.vim-gist.overrideAttrs (old: { - dependencies = with super; [ webapi-vim ]; + dependencies = with self; [ webapi-vim ]; }); vim-grammarous = super.vim-grammarous.overrideAttrs (old: { @@ -692,7 +692,7 @@ self: super: { }); vim-snipmate = super.vim-snipmate.overrideAttrs (old: { - dependencies = with super; [ vim-addon-mw-utils tlib_vim ]; + dependencies = with self; [ vim-addon-mw-utils tlib_vim ]; }); vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { @@ -730,7 +730,7 @@ self: super: { pname = "vim2nix"; version = "1.0"; src = ./vim2nix; - dependencies = with super; [ vim-addon-manager ]; + dependencies = with self; [ vim-addon-manager ]; }; vimacs = super.vimacs.overrideAttrs (old: { @@ -770,7 +770,7 @@ self: super: { }); vimshell-vim = super.vimshell-vim.overrideAttrs (old: { - dependencies = with super; [ vimproc-vim ]; + dependencies = with self; [ vimproc-vim ]; }); YankRing-vim = super.YankRing-vim.overrideAttrs (old: { From 6ba50946122310ddcb522fff901f475b5a73a76f Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 21 Apr 2021 09:51:34 -0700 Subject: [PATCH 0652/1183] vimPlugins.completion-*: add dependencies vimPlugins.gitsigns-nvim: add dependency vimPlugins.telescope-*: add dependencies --- pkgs/misc/vim-plugins/overrides.nix | 35 ++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index fe951cb83b8a..ff842988ab42 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -125,15 +125,23 @@ self: super: { ''; }); - completion-tabnine = super.completion-tabnine.overrideAttrs (old: { - buildInputs = [ tabnine ]; + completion-buffers = super.completion-buffers.overrideAttrs (old: { + dependencies = with self; [ completion-nvim ]; + }); + completion-tabnine = super.completion-tabnine.overrideAttrs (old: { + dependencies = with self; [ completion-nvim ]; + buildInputs = [ tabnine ]; postFixup = '' mkdir $target/binaries ln -s ${tabnine}/bin/TabNine $target/binaries/TabNine_$(uname -s) ''; }); + completion-treesitter = super.completion-treesitter.overrideAttrs (old: { + dependencies = with self; [ completion-nvim nvim-treesitter ]; + }); + cpsm = super.cpsm.overrideAttrs (old: { buildInputs = [ python3 @@ -258,6 +266,10 @@ self: super: { configurePhase = "cd plugins/nvim"; }); + gitsigns-nvim = super.gitsigns-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + jedi-vim = super.jedi-vim.overrideAttrs (old: { # checking for python3 support in vim would be neat, too, but nobody else seems to care buildInputs = [ python3.pkgs.jedi ]; @@ -415,10 +427,15 @@ self: super: { }); telescope-frecency-nvim = super.telescope-frecency-nvim.overrideAttrs (old: { - dependencies = with self; [ sql-nvim ]; + dependencies = with self; [ sql-nvim telescope-nvim ]; + }); + + telescope-fzf-writer-nvim = super.telescope-fzf-writer-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; }); telescope-fzy-native-nvim = super.telescope-fzy-native-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; preFixup = let fzy-lua-native-path = "deps/fzy-lua-native"; @@ -442,6 +459,18 @@ self: super: { meta.platforms = lib.platforms.all; }); + telescope-nvim = super.telescope-nvim.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim popup-nvim ]; + }); + + telescope-symbols-nvim = super.telescope-symbols-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + + telescope-z-nvim = super.telescope-z-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-nvim ]; + }); + unicode-vim = let unicode-data = fetchurl { From a0b99746691a5432faf210b87ccef1c2040648e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 20:17:35 +0200 Subject: [PATCH 0653/1183] cinnamon.cinnamon-common: fix build regression It's probably fallout from PR #118479 --- pkgs/desktops/cinnamon/cinnamon-common/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 127516e58c18..65eede258326 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -19,6 +19,7 @@ , libsoup , libstartup_notification , libXtst +, libXdamage , muffin , networkmanager , pkg-config @@ -79,6 +80,7 @@ stdenv.mkDerivation rec { libsoup libstartup_notification libXtst + libXdamage muffin networkmanager pkg-config From acf90e478d970767da3b42652e99598f6dc414bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 20:33:51 +0200 Subject: [PATCH 0654/1183] mate.marco: fix build regression It's probably fallout from PR #118479. Whole `mate` builds for me now. --- pkgs/desktops/mate/marco/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 3c16004010c1..e06379b91071 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop +, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -20,6 +21,8 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 libgtop + libXdamage + libXpresent libstartup_notification gtk3 gnome3.zenity From 97c2e3df3949be0e00b178245e62882f836ec7d9 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 21 Apr 2021 12:52:45 +0200 Subject: [PATCH 0655/1183] python3Packages.sphinx-serve: init at 1.0.1 --- .../python-modules/sphinx-serve/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/sphinx-serve/default.nix diff --git a/pkgs/development/python-modules/sphinx-serve/default.nix b/pkgs/development/python-modules/sphinx-serve/default.nix new file mode 100644 index 000000000000..ca2b587e3acc --- /dev/null +++ b/pkgs/development/python-modules/sphinx-serve/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "sphinx-serve"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "8d90f6595114108500b1f935d3f4d07bf5192783c67ce83f944ef289099669c9"; + }; + + doCheck = false; # No tests + + pythonImportsCheck = [ "sphinx_serve" ]; + + meta = with lib; { + description = "Spawns a simple HTTP server to preview your sphinx documents"; + homepage = "https://github.com/tlatsas/sphinx-serve"; + maintainers = with maintainers; [ FlorianFranzen ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59e57c5298c8..b8c5d584915b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8066,6 +8066,8 @@ in { sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + sphinx-serve = callPackage ../development/python-modules/sphinx-serve { }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; spidev = callPackage ../development/python-modules/spidev { }; From 96bf6939b3fc0da5ca6185c88080dd3a54f49335 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 21 Apr 2021 21:42:13 +0200 Subject: [PATCH 0656/1183] keybase-gui: fix build regression autoPatchelf wasn't finding some libraries anymore. It was probably fallout from PR #118479. --- pkgs/tools/security/keybase/gui.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index cfc282c303cd..8894a77a86a4 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev +{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev, libdrm, mesa , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { xorg.libXrender xorg.libXtst xorg.libxcb + libdrm + mesa.out ]; runtimeDependencies = [ From 25ef296a8ca511fb7c7623771011e8ccb916f590 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 01:07:27 +0200 Subject: [PATCH 0657/1183] python-packages.nix: remove trailing whitespace satisfies editorconfig action. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c8841b12a39..7895757e23b8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2031,7 +2031,7 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; ds4drv = callPackage ../development/python-modules/ds4drv { }; - + dsmr-parser = callPackage ../development/python-modules/dsmr-parser { }; duckdb = callPackage ../development/python-modules/duckdb { From 64be38f31fa76963ec31d361f0b797f0cca9d31f Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Wed, 21 Apr 2021 14:55:55 -0300 Subject: [PATCH 0658/1183] clojure-lsp: 2021.02.14-19.46.47 -> 2021.04.13-12.47.33 --- .../tools/misc/clojure-lsp/default.nix | 32 +++++---------- .../tools/misc/clojure-lsp/repository.nix | 40 ------------------- 2 files changed, 11 insertions(+), 61 deletions(-) delete mode 100644 pkgs/development/tools/misc/clojure-lsp/repository.nix diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index c0d4567fe0b7..dc342e501e4c 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -1,39 +1,29 @@ -{ lib, stdenv, callPackage, fetchFromGitHub, leiningen, openjdk11 -, graalvm11-ce, babashka }: +{ lib, stdenv, graalvm11-ce, babashka, fetchurl, fetchFromGitHub }: -let +stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "2021.02.14-19.46.47"; - leiningen11 = leiningen.override ({ jdk = openjdk11; }); + version = "2021.04.13-12.47.33"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-Zj7/8RcuxCy2xdd+5jeOb1GTsQsX0EVW32k32fA6uf4="; + sha256 = "1la0d28pvp1fqnxp3scb2vawcblilwyx42djxn379vag403p1i2d"; }; - repository = callPackage ./repository.nix { - inherit src pname version; - leiningen = leiningen11; + jar = fetchurl { + url = "https://github.com/clojure-lsp/clojure-lsp/releases/download/${version}/clojure-lsp.jar"; + sha256 = "059gz7y2rzwdxpyqy80w4lghzgxi5lb4rxmks1721yq6k7ljjyqy"; }; -in stdenv.mkDerivation rec { - inherit src pname version; - - postPatch = '' - # Hack to set maven cache in another directory since MAVEN_OPTS doesn't work - substituteInPlace project.clj \ - --replace ":main" ":local-repo \"${repository}\" :main" - ''; GRAALVM_HOME = graalvm11-ce; + CLOJURE_LSP_JAR = jar; - buildInputs = [ graalvm11-ce leiningen11 repository ]; + buildInputs = [ graalvm11-ce ]; buildPhase = with lib; '' runHook preBuild - export LEIN_HOME="$(mktemp -d)" bash ./graalvm/native-unix-compile.sh runHook postBuild @@ -51,14 +41,14 @@ in stdenv.mkDerivation rec { checkPhase = '' runHook preCheck - ${babashka}/bin/bb ./integration-test/run-all.clj ./clojure-lsp + ${babashka}/bin/bb integration-test/run-all.clj ./clojure-lsp runHook postCheck ''; meta = with lib; { description = "Language Server Protocol (LSP) for Clojure"; - homepage = "https://github.com/snoe/clojure-lsp"; + homepage = "https://github.com/clojure-lsp/clojure-lsp"; license = licenses.mit; maintainers = [ maintainers.ericdallo ]; platforms = graalvm11-ce.meta.platforms; diff --git a/pkgs/development/tools/misc/clojure-lsp/repository.nix b/pkgs/development/tools/misc/clojure-lsp/repository.nix deleted file mode 100644 index 122096e9657a..000000000000 --- a/pkgs/development/tools/misc/clojure-lsp/repository.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib, stdenv, src, pname, version, leiningen }: - -stdenv.mkDerivation { - inherit src; - - name = "${pname}-${version}-repository"; - buildInputs = [ leiningen ]; - - postPatch = '' - # Hack to set maven cache in another directory since MAVEN_OPTS doesn't work - substituteInPlace project.clj \ - --replace ":main" ":local-repo \"$out\" :main" - ''; - - buildPhase = '' - runHook preBuild - - export LEIN_HOME="$(mktemp -d)" - lein with-profiles +native-image deps - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - find $out -type f \ - -name \*.lastUpdated -or \ - -name resolver-status.properties -or \ - -name _remote.repositories \ - -delete - - runHook postInstall - ''; - - dontFixup = true; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "sha256-aWZPsJF32ENyYNZCHf5amxVF9pb+5M73JqG/OITZlak="; -} From 79046fb4f82cf32414a17b31d8290bf76cd28c1f Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 3 Apr 2021 15:29:01 -0300 Subject: [PATCH 0659/1183] gap: 4.10.2 -> 4.11.0 --- .../applications/science/math/gap/default.nix | 31 ++++++------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index ce93c14b334f..3b3d8a58b569 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -5,6 +5,7 @@ , makeWrapper , readline , gmp +, zlib # one of # - "minimal" (~400M): # Install the bare minimum of packages required by gap to start. @@ -61,11 +62,11 @@ in stdenv.mkDerivation rec { pname = "gap"; # https://www.gap-system.org/Releases/ - version = "4.10.2"; + version = "4.11.0"; src = fetchurl { url = "https://files.gap-system.org/gap-${lib.versions.major version}.${lib.versions.minor version}/tar.bz2/gap-${version}.tar.bz2"; - sha256 = "0cp6ddk0469zzv1m1vair6gm27ic6c5m77ri8rn0znq3gaps6x94"; + sha256 = "sha256-vwcKENwqxgWT/mXfD4c9ctTWdQHobrJipva9SPyGhgI="; }; # remove all non-essential packages (which take up a lot of space) @@ -76,6 +77,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline gmp + zlib ]; nativeBuildInputs = [ @@ -83,34 +85,22 @@ stdenv.mkDerivation rec { ]; patches = [ - # https://github.com/gap-system/gap/pull/3294 - (fetchpatch { - name = "add-make-install-targets.patch"; - url = "https://github.com/gap-system/gap/commit/3361c172e6c5ff3bb3f01ba9d6f1dd4ad42cea80.patch"; - sha256 = "1kwp9qnfvmlbpf1c3rs6j5m2jz22rj7a4hb5x1gj9vkpiyn5pdyj"; - }) - # Fix for locale specific tests causing issues. Already upstream. # Backport of https://github.com/gap-system/gap/pull/4022 - # WHEN REMOVING: also remove the`rm tst/testinstall/strings.tst` line in - # `postPatch` below. That line is necessary since the patch is not intended - # for gap 4.10. (fetchpatch { name = "remove-locale-specific-tests.patch"; url = "https://github.com/gap-system/gap/commit/c18b0c4215b5212a2cc4f305e2d5b94ba716bee8.patch"; - excludes = ["tst/testinstall/stringobj.tst"]; - sha256 = "1mz5b4mbw2jdd1ypp5s0dy6pp0jsvwsxr2dm4kbkls20r1r192sc"; + sha256 = "sha256-De+T9Y7ewRT6plJrj2VR8axRvD/JCTYKOBWB7Bw0oq0="; }) # fixes aarch64 gc crashes: https://github.com/gap-system/gap/pull/3965 - ./mark-genstackfuncbags-as-noinline.patch + (fetchpatch { + name = "mark-genstackfuncbags-as-noinline.patch"; + url = "https://github.com/gap-system/gap/commit/f0a8f49ff8dad0a5fa77253d45457c6f40f96778.patch"; + sha256 = "sha256-GU9tOP1stX2vn8m8kXOBupEpxIYArA76ibKL8eLn0MY="; + }) ]; - postPatch = '' - # File not covered by the remove-locale-specific-tests.patch patch above. - rm tst/testinstall/strings.tst - ''; - # "teststandard" is a superset of testinstall. It takes ~1h instead of ~1min. # tests are run twice, once with all packages loaded and once without # checkTarget = "teststandard"; @@ -155,7 +145,6 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" "$out/share/gap/" - mkdir -p "$out/share/gap" echo "Copying files to target directory" cp -ar . "$out/share/gap/build-dir" From cd215e793a0d78ae35b4a5feacaea54af178d037 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sat, 3 Apr 2021 19:10:27 -0300 Subject: [PATCH 0660/1183] pynac: 0.7.26 -> 0.7.27 --- .../science/math/pynac/default.nix | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 00d35b491d62..9cdcd2b9ea30 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitHub -, fetchurl +, fetchpatch , autoreconfHook , pkg-config , flint @@ -11,16 +11,36 @@ }: stdenv.mkDerivation rec { - version = "0.7.26"; + version = "0.7.27"; pname = "pynac"; src = fetchFromGitHub { owner = "pynac"; repo = "pynac"; rev = "pynac-${version}"; - sha256 = "09d2p74x1arkydlxy6pw4p4byi7r8q7f29w373h4d8a215kadc6d"; + sha256 = "sha256-1HHCIeaNE2UsJNX92UlDGLJS8I4nC/8FnwX7Y4F9HpU="; }; + patches = [ + (fetchpatch { + name = "handle_factor.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/handle_factor.patch?h=9.3.rc3"; + sha256 = "sha256-U1lb5qwBqZZgklfDMhBX4K5u8bz5x42O4w7hyNy2YVw="; + }) + + (fetchpatch { + name = "power_inf_loop.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/power_inf_loop.patch?h=9.3.rc3"; + sha256 = "sha256-VYeaJl8u2wl7FQ/6xnpZv1KpdNYEmJoPhuMrBADyTRs="; + }) + + (fetchpatch { + name = "too_much_sub.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/too_much_sub.patch?h=9.3.rc3"; + sha256 = "sha256-lw7xSQ/l+rzPu+ghWF4omYF0mKksGGPuuHJTktvbdis="; + }) + ]; + buildInputs = [ flint gmp @@ -34,14 +54,6 @@ stdenv.mkDerivation rec { pkg-config ]; - patches = [ - (fetchurl { - name = "py_ssize_t_clean.patch"; - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/py_ssize_t_clean.patch?h=9.2"; - sha256 = "0l3gbg9hc4v671zf4w376krnk3wh8hj3649610nlvzzxckcryzab"; - }) - ]; - meta = with lib; { description = "Python is Not a CAS -- modified version of Ginac"; longDescription = '' From 4d56f7c18ad3303c4a6e7021228a4d2df9954a00 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 16 Apr 2021 10:25:33 -0300 Subject: [PATCH 0661/1183] graphs: 20161026 -> 20210214 --- pkgs/data/misc/graphs/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/graphs/default.nix b/pkgs/data/misc/graphs/default.nix index 54b6c16613e8..19438d835665 100644 --- a/pkgs/data/misc/graphs/default.nix +++ b/pkgs/data/misc/graphs/default.nix @@ -4,11 +4,13 @@ stdenv.mkDerivation rec { pname = "graphs"; - version = "20161026"; + version = "20210214"; src = fetchurl { - url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0a2b5lly9nifphvknz88rrhfbbc8vqnlqcv19zdpfq8h8nnyjbb2"; + url = "https://mirrors.mit.edu/sage/spkg/upstream/${pname}/${pname}-${version}.tar.bz2"; + # TODO: switch to the url below once Sage 9.3 is released + # url = "mirror://sageupstream/${pname}/${pname}-${version}.tar.bz2"; + sha256 = "sha256-ByN8DZhTYRUFw4n9e7klAMh0P1YxurtND0Xf2DMvN0E="; }; installPhase = '' From ceaf48fdb215b131a4c9deeafcdaaa1370238ea2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Fri, 3 Aug 2018 15:03:55 +0200 Subject: [PATCH 0662/1183] singular: 4.1.1p2 -> 4.2.0p2 Adds proper tests. Also removes the "enableFactory" option because singular actually enables factory by default and explicitly disabling it breaks the build. So the option was never really available. --- .../science/math/singular/default.nix | 139 ++++++++++++++---- ...le-docs-for-optional-unpackaged-deps.patch | 112 ++++++++++++++ 2 files changed, 219 insertions(+), 32 deletions(-) create mode 100644 pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index fad05099a733..add89c95a0c1 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,57 +1,84 @@ -{ stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkg-config +{ stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib , fetchpatch -, autoreconfHook +, autoreconfHook269 +, sharutils , file , flint , ntl , cddlib -, enableFactory ? true +, gfan +, lrcalc +, doxygen +, graphviz +# upstream generates docs with texinfo 4. later versions of texinfo +# use letters instead of numbers for post-appendix chapters, and we +# want it to match the upstream format because sage depends on it. +, texinfo4 +, texlive +, enableDocs ? true , enableGfanlib ? true }: stdenv.mkDerivation rec { pname = "singular"; - version = "4.1.1p2"; + version = "4.2.0p2"; - src = let - # singular sorts its tarballs in directories by base release (without patch version) - # for example 4.1.1p1 will be in the directory 4-1-1 - baseVersion = builtins.head (lib.splitString "p" version); - urlVersion = builtins.replaceStrings [ "." ] [ "-" ] baseVersion; - in - fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/${urlVersion}/singular-${version}.tar.gz"; - sha256 = "07x9kri8vl4galik7lr6pscq3c51n8570pyw64i7gbj0m706f7wf"; + # since the tarball does not contain tests or documentation (and + # there is no separate tests tarball for 4.2.0), we fetch from + # GitHub. + src = fetchFromGitHub { + owner = "Singular"; + repo = "Singular"; + + # 4.2.0p2 is not tagged, but the tarball matches commit + # 6f68939ddf612d96e3caaaaa8275f77613ac1da8. the commit below has + # two extra fixes. + rev = "3cda50c00a849455efa2502e56596955491a353a"; + sha256 = "sha256-OizPhGE6L2LTOrKfeDdDB6BSdvYkDVXvbbYjV14hnHM="; + + # if a release is tagged it will be in the format below. + # rev = "Release${lib.replaceStrings ["."] ["-"] version}"; + + # the repository's .gitattributes file contains the lines "/Tst/ + # export-ignore" and "/doc/ export-ignore" so some directories are + # not included in the tarball downloaded by fetchzip. setting + # fetchSubmodules works around this by using fetchgit instead of + # fetchzip. + fetchSubmodules = true; }; + patches = lib.optionals enableDocs [ + # singular supports building without 4ti2, bertini, normaliz or + # topcom just fine, but the docbuilding does not skip manual pages + # tagged as depending on those binaries (probably a bug in + # doc2tex.pl::HandleLib, since it seems to ignore "-exclude" + # argumens). skip them manually. + ./disable-docs-for-optional-unpackaged-deps.patch + ]; + configureFlags = [ "--with-ntl=${ntl}" - ] ++ lib.optionals enableFactory [ - "--enable-factory" + "--disable-pyobject-module" + ] ++ lib.optionals enableDocs [ + "--enable-doc-build" ] ++ lib.optionals enableGfanlib [ "--enable-gfanlib" ]; - postUnpack = '' + prePatch = '' + # don't let the tests depend on `hostname` + substituteInPlace Tst/regress.cmd --replace 'mysystem_catch("hostname")' 'nix_test_runner' + patchShebangs . + '' + lib.optionalString enableDocs '' + # work around encoding problem + sed -i -e 's/\xb7/@cdot{}/g' doc/decodegb.doc ''; - patches = [ - # NTL error handler was introduced in the library part, preventing users of - # the library from implementing their own error handling - # https://www.singular.uni-kl.de/forum/viewtopic.php?t=2769 - (fetchpatch { - name = "move_error_handler_out_of_libsingular.patch"; - # rebased version of https://github.com/Singular/Sources/commit/502cf86d0bb2a96715be6764774b64a69c1ca34c.patch - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/singular-ntl-error-handler.patch?h=50b9ae2fd233c30860e1cbb3e63a26f2cc10560a"; - sha256 = "0vgh4m9zn1kjl0br68n04j4nmn5i1igfn28cph0chnwf7dvr9194"; - }) - ]; - # For reference (last checked on commit 75f460d): - # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md - # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md + # https://github.com/Singular/Singular/blob/spielwiese/doc/Building-Singular-from-source.md + # https://github.com/Singular/Singular/blob/spielwiese/doc/external-packages-dynamic-modules.md buildInputs = [ # necessary gmp @@ -60,6 +87,8 @@ stdenv.mkDerivation rec { readline ntl flint + lrcalc + gfan ] ++ lib.optionals enableGfanlib [ cddlib ]; @@ -67,7 +96,13 @@ stdenv.mkDerivation rec { bison perl pkg-config - autoreconfHook + autoreconfHook269 + sharutils # needed for regress.cmd install checks + ] ++ lib.optionals enableDocs [ + doxygen + graphviz + texinfo4 + texlive.combined.scheme-small ]; preAutoreconf = '' @@ -85,23 +120,62 @@ stdenv.mkDerivation rec { # do nothing ''; + doCheck = true; # very basic checks, does not test any libraries + installPhase = '' mkdir -p "$out" cp -r Singular/LIB "$out/lib" make install - + '' + lib.optionalString enableDocs '' + # Sage uses singular.hlp (which is not in the tarball) + mkdir -p $out/share/info + cp doc/singular.hlp $out/share/info + '' + '' # Make sure patchelf picks up the right libraries rm -rf libpolys factory resources omalloc Singular ''; + # singular tests are a bit complicated, see + # https://github.com/Singular/Singular/tree/spielwiese/Tst + # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + testsToRun = [ + "Old/universal.lst" + "Buch/buch.lst" + "Plural/short.lst" + "Old/factor.tst" + ] ++ lib.optionals enableGfanlib [ + # tests that require gfanlib + "Short/ok_s.lst" + ]; + # simple test to make sure singular starts and finds its libraries doInstallCheck = true; installCheckPhase = '' + # Very basic sanity check to make sure singular starts and finds its libraries. + # This is redundant with the below tests. It is only kept because the singular test + # runner is a bit complicated. In case we decide to give up those tests in the future, + # this will still be useful. It takes barely any time. "$out/bin/Singular" -c 'LIB "freegb.lib"; exit;' if [ $? -ne 0 ]; then echo >&2 "Error loading the freegb library in Singular." exit 1 fi + + # Run the test suite + cd Tst + perl ./regress.cmd \ + -s "$out/bin/Singular" \ + ${lib.concatStringsSep " " (map lib.escapeShellArg testsToRun)} \ + 2>"$TMPDIR/out-err.log" + + # unfortunately regress.cmd always returns exit code 0, so check stderr + # https://www.singular.uni-kl.de/forum/viewtopic.php&t=2773 + if [[ -s "$TMPDIR/out-err.log" ]]; then + cat "$TMPDIR/out-err.log" + exit 1 + fi + + echo "Exit status $?" ''; enableParallelBuilding = true; @@ -110,6 +184,7 @@ stdenv.mkDerivation rec { description = "A CAS for polynomial computations"; maintainers = teams.sage.members; # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` + # https://www.singular.uni-kl.de:8002/trac/ticket/837 platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 homepage = "http://www.singular.uni-kl.de"; diff --git a/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch b/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch new file mode 100644 index 000000000000..46d92922f3ce --- /dev/null +++ b/pkgs/applications/science/math/singular/disable-docs-for-optional-unpackaged-deps.patch @@ -0,0 +1,112 @@ +commit 9e8b044d982e132cf35a106a1cc0cf7e77b27f7c +Author: Mauricio Collares +Date: Thu Apr 15 20:33:21 2021 -0300 + + Disable manual sections using optional packages not yet in Nixpkgs + + * normaliz.lib depends on normaliz. + * polymake.lib depends on topcom. + * recover.lib depends on bertini. + * sing4ti2.lib depends on 4ti2. + * tateProdCplxNegGrad.lib uses multigrading.lib, which depends on 4ti2. + +diff --git a/doc/singular.doc b/doc/singular.doc +index 64b969d39..e704f95f0 100644 +--- a/doc/singular.doc ++++ b/doc/singular.doc +@@ -407,7 +407,6 @@ LIB "all.lib"; + * nfmodsyz_lib:: Syzygy modules of submodules of free modules over algebraic number fields + * noether_lib:: Noether normalization of an ideal + * normal_lib:: procedure for normalization +-* normaliz_lib:: integral closure, normalization for monomial ideals, toric ideals + * pointid_lib:: factorized lex GB of the vanishing ideal of a set of points + * primdec_lib:: procedures for primary decomposition + * primdecint_lib:: primary decomposition over the integers +@@ -416,7 +415,6 @@ LIB "all.lib"; + * reesclos_lib:: Rees Algebra and integral closure of an ideal + * rstandard_lib:: Janet bases and border bases for ideals + * sagbi_lib:: Subalgebras bases Analogous to Groebner bases for ideals +-* sing4ti2_lib:: interface to program 4ti2 + * symodstd_lib:: Groebner bases for symmetric ideals + * toric_lib:: toric ideals + @end menu +@@ -521,10 +519,6 @@ LIB "all.lib"; + @node normal_lib + @subsection normal_lib + @c lib normal.lib +-@c --------------------------------------------------------- +-@node normaliz_lib +-@subsection normaliz_lib +-@c lib normaliz.lib tag:normaliz + @c ---------------------------------------------------------- + @node pointid_lib + @subsection pointid_lib +@@ -558,10 +552,6 @@ LIB "all.lib"; + @subsection sagbi_lib + @c lib sagbi.lib + @c --------------------------------------------------------- +-@node sing4ti2_lib +-@subsection sing4ti2_lib +-@c lib sing4ti2.lib tag:sing4ti2 +-@c ---------------------------------------------------------- + @node symodstd_lib + @subsection symodstd_lib + @c lib symodstd.lib +@@ -873,7 +863,6 @@ iniD, reslist, sumlist, dividelist, createlist + * solve_lib:: procedures to solve polynomial systems + * triang_lib:: procedures for decomposing zero-dimensional ideals + * ntsolve_lib:: one real solution of polynomial systems (Newton iteration) +-* recover_lib:: Hybrid numerical/symbolical algorithms + * rootisolation_lib:: real root isolation with intervals + * signcond_lib:: computing realizable sign conditions + * zeroset_lib:: procedures for roots and factorization +@@ -904,10 +893,6 @@ iniD, reslist, sumlist, dividelist, createlist + @subsection ntsolve_lib + @c lib ntsolve.lib + @c --------------------------------------------------------- +-@node recover_lib +-@subsection recover_lib +-@c lib recover.lib tag:bertini +-@c ---------------------------------------------------------- + @node rootisolation_lib + @subsection rootisolation_lib + @c lib rootisolation.lib +@@ -1108,7 +1093,6 @@ but not for serious computations. + * cimonom_lib:: complete intersection for toric ideals + * gfan_lib:: A gfanlib interface for Singular + * gitfan_lib:: Compute GIT-fans +-* polymake_lib:: interface to TOPCOM + * realizationMatroids_lib:: Realizability for Tropical Fan Curves + * tropical_lib:: interface to gfan + * tropicalNewton_lib:: Newton polygons in tropical geometry +@@ -1125,10 +1109,7 @@ but not for serious computations. + @node gitfan_lib + @subsection gitfan_lib + @c lib gitfan.lib +-@c ---------------------------------------------------------- +-@node polymake_lib +-@subsection polymake_lib +-@c lib polymake.lib tag:topcom ++ + @c ---------------------------------------------------------- + @node realizationMatroids_lib + @subsection realizationMatroids_lib +@@ -1219,7 +1200,6 @@ Comments should be send to the author of the library directly. + * stanleyreisner_lib:: T1 and T2 for a general Stanley-Reiser ring + * swalk_lib:: Sagbi Walk Conversion Algorithm + * systhreads_lib:: multi-threaded objects +-* tateProdCplxNegGrad_lib:: sheaf cohomology on product of projective spaces + * VecField_lib:: vector fields + @end menu + @c ---------------------------------------------------------- +@@ -1310,10 +1290,6 @@ Todos/Issues: + @subsection systhreads_lib + @c lib systhreads.lib + @c --------------------------------------------------------- +-@node tateProdCplxNegGrad_lib +-@subsection tateProdCplxNegGrad_lib +-@c lib tateProdCplxNegGrad.lib +-@c --------------------------------------------------------- + @node VecField_lib + @subsection VecField_lib + @c lib VecField.lib From aebef1703fafa705282df3ece34121f18b9a1b1f Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 21 Apr 2021 13:34:32 -0300 Subject: [PATCH 0663/1183] singular: import aarch64 support patch --- .../science/math/singular/default.nix | 9 +++-- .../math/singular/redhat-aarch64.patch | 38 +++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/math/singular/redhat-aarch64.patch diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index add89c95a0c1..172004b9e094 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gmp, bison, perl, ncurses, readline, coreutils, pkg-config , lib , fetchpatch -, autoreconfHook269 +, autoreconfHook , sharutils , file , flint @@ -48,7 +48,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - patches = lib.optionals enableDocs [ + patches = [ + # add aarch64 support to cpu-check.m4. copied from redhat. + ./redhat-aarch64.patch + ] ++ lib.optionals enableDocs [ # singular supports building without 4ti2, bertini, normaliz or # topcom just fine, but the docbuilding does not skip manual pages # tagged as depending on those binaries (probably a bug in @@ -96,7 +99,7 @@ stdenv.mkDerivation rec { bison perl pkg-config - autoreconfHook269 + autoreconfHook sharutils # needed for regress.cmd install checks ] ++ lib.optionals enableDocs [ doxygen diff --git a/pkgs/applications/science/math/singular/redhat-aarch64.patch b/pkgs/applications/science/math/singular/redhat-aarch64.patch new file mode 100644 index 000000000000..e0db6e87f994 --- /dev/null +++ b/pkgs/applications/science/math/singular/redhat-aarch64.patch @@ -0,0 +1,38 @@ +diff --git a/m4/cpu-check.m4 b/m4/cpu-check.m4 +index 3cf0a7f08..12bb926ac 100644 +--- a/m4/cpu-check.m4 ++++ b/m4/cpu-check.m4 +@@ -37,6 +37,18 @@ if test "$ac_cv_singcpuname" = ppc; then + AC_DEFINE(SI_CPU_PPC,1,"PPC") + AC_SUBST(SI_CPU_PPC) + fi ++if test "$ac_cv_singcpuname" = arm -o "$ac_cv_singcpuname" = armel; then ++ AC_DEFINE(SI_CPU_ARM,1,"ARM") ++ AC_SUBST(SI_CPU_ARM) ++fi ++if test "$ac_cv_singcpuname" = aarch64; then ++ AC_DEFINE(SI_CPU_AARCH64,1,"AARCH64") ++ AC_SUBST(SI_CPU_AARCH64) ++fi ++if test "$ac_cv_singcpuname" = s390; then ++ AC_DEFINE(SI_CPU_S390,1,"S390") ++ AC_SUBST(SI_CPU_S390) ++fi + + # UNAME and PATH + AC_MSG_CHECKING(uname for Singular) +@@ -65,6 +77,14 @@ dnl testet on: ppc_Linux, 740/750 PowerMac G3, 512k L2 cache + [powerpc*|ppc*], [AC_DEFINE(HAVE_GENERIC_MULT,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms)], + dnl the following settings seems to be better on arm processors + [arm*], [], ++dnl FIXME: need to run some tests ++ [aarch64*], [ ++ AC_DEFINE(HAVE_MULT_MOD,1,multiplication is fast on the cpu: a*b is with mod otherwise using tables of logartihms) ++ AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add) ++ AC_DEFINE(HAVE_DIV_MOD,1,division using extend euclidian algorithm otherwise using tables of logartihms) ++ ], ++dnl FIXME: need to run some tests ++ [s390*], [AC_DEFINE(HAVE_GENERIC_ADD,1,use branch for addition in Z/p otherwise it uses a generic add)], + [] + ) + From cd7cf5942b4e366f9058affeb90178dcc4dde858 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 21 Apr 2021 20:05:48 -0300 Subject: [PATCH 0664/1183] singular: use older autoconf macro to unbreak aarch64 --- .../science/math/singular/default.nix | 6 + .../use-older-ax-prog-cc-for-build.patch | 194 ++++++++++++++++++ 2 files changed, 200 insertions(+) create mode 100644 pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 172004b9e094..9a1d63169212 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -51,6 +51,12 @@ stdenv.mkDerivation rec { patches = [ # add aarch64 support to cpu-check.m4. copied from redhat. ./redhat-aarch64.patch + + # the newest version of ax-prog-cc-for-build.m4 seems to trigger + # linker errors. see + # https://github.com/alsa-project/alsa-firmware/issues/3 for a + # related issue. + ./use-older-ax-prog-cc-for-build.patch ] ++ lib.optionals enableDocs [ # singular supports building without 4ti2, bertini, normaliz or # topcom just fine, but the docbuilding does not skip manual pages diff --git a/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch b/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch new file mode 100644 index 000000000000..f664378617cf --- /dev/null +++ b/pkgs/applications/science/math/singular/use-older-ax-prog-cc-for-build.patch @@ -0,0 +1,194 @@ +diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 +index f7410d74b..12cb005a5 100644 +--- a/m4/ax_prog_cc_for_build.m4 ++++ b/m4/ax_prog_cc_for_build.m4 +@@ -32,35 +32,31 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 18 ++#serial 9 + + AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) + AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_CPP])dnl +-AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++AC_REQUIRE([AC_EXEEXT])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl + + dnl Use the standard macros, but make them use other variable names + dnl + pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl +-pushdef([ac_cv_prog_cc_c89], ac_cv_build_prog_cc_c89)dnl + pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl + pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl + pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl + pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl +-pushdef([ac_cv_c_compiler_gnu], ac_cv_build_c_compiler_gnu)dnl + pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl + pushdef([ac_cv_objext], ac_cv_build_objext)dnl + pushdef([ac_exeext], ac_build_exeext)dnl + pushdef([ac_objext], ac_build_objext)dnl + pushdef([CC], CC_FOR_BUILD)dnl + pushdef([CPP], CPP_FOR_BUILD)dnl +-pushdef([GCC], GCC_FOR_BUILD)dnl + pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl + pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl +-pushdef([EXEEXT], BUILD_EXEEXT)dnl + pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl +-pushdef([OBJEXT], BUILD_OBJEXT)dnl + pushdef([host], build)dnl + pushdef([host_alias], build_alias)dnl + pushdef([host_cpu], build_cpu)dnl +@@ -71,29 +67,27 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl + pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl + pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl + pushdef([ac_cv_host_os], ac_cv_build_os)dnl +-pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl +-pushdef([am_cv_CC_dependencies_compiler_type], am_cv_build_CC_dependencies_compiler_type)dnl +-pushdef([am_cv_prog_cc_c_o], am_cv_build_prog_cc_c_o)dnl +-pushdef([cross_compiling], cross_compiling_build)dnl ++pushdef([ac_cpp], ac_build_cpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl + +-cross_compiling_build=no ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= + +-ac_build_tool_prefix= +-AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], +- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) +- +-AC_LANG_PUSH([C]) + AC_PROG_CC +-_AC_COMPILER_EXEEXT +-_AC_COMPILER_OBJEXT + AC_PROG_CPP ++AC_EXEEXT ++ ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling + + dnl Restore the old definitions + dnl +-popdef([cross_compiling])dnl +-popdef([am_cv_prog_cc_c_o])dnl +-popdef([am_cv_CC_dependencies_compiler_type])dnl +-popdef([ac_tool_prefix])dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cpp])dnl + popdef([ac_cv_host_os])dnl + popdef([ac_cv_host_vendor])dnl + popdef([ac_cv_host_cpu])dnl +@@ -104,33 +98,25 @@ popdef([host_vendor])dnl + popdef([host_cpu])dnl + popdef([host_alias])dnl + popdef([host])dnl +-popdef([OBJEXT])dnl + popdef([LDFLAGS])dnl +-popdef([EXEEXT])dnl + popdef([CPPFLAGS])dnl + popdef([CFLAGS])dnl +-popdef([GCC])dnl + popdef([CPP])dnl + popdef([CC])dnl + popdef([ac_objext])dnl + popdef([ac_exeext])dnl + popdef([ac_cv_objext])dnl + popdef([ac_cv_exeext])dnl +-popdef([ac_cv_c_compiler_gnu])dnl + popdef([ac_cv_prog_cc_g])dnl + popdef([ac_cv_prog_cc_cross])dnl + popdef([ac_cv_prog_cc_works])dnl +-popdef([ac_cv_prog_cc_c89])dnl + popdef([ac_cv_prog_gcc])dnl + popdef([ac_cv_prog_CPP])dnl + +-dnl restore global variables ac_ext, ac_cpp, ac_compile, +-dnl ac_link, ac_compiler_gnu (dependant on the current +-dnl language after popping): +-AC_LANG_POP([C]) +- + dnl Finally, set Makefile variables + dnl ++BUILD_EXEEXT=$ac_build_exeext ++BUILD_OBJEXT=$ac_build_objext + AC_SUBST(BUILD_EXEEXT)dnl + AC_SUBST(BUILD_OBJEXT)dnl + AC_SUBST([CFLAGS_FOR_BUILD])dnl +diff --git a/m4/ax_prog_cxx_for_build.m4 b/m4/ax_prog_cxx_for_build.m4 +index 4d976769f..17c19a89f 100644 +--- a/m4/ax_prog_cxx_for_build.m4 ++++ b/m4/ax_prog_cxx_for_build.m4 +@@ -31,7 +31,7 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 4 ++#serial 3 + + AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD]) + AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl +@@ -49,7 +49,6 @@ pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl + pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl + pushdef([CXX], CXX_FOR_BUILD)dnl + pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl +-pushdef([GXX], GXX_FOR_BUILD)dnl + pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl + pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl + pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl +@@ -63,25 +62,26 @@ pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl + pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl + pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl + pushdef([ac_cv_host_os], ac_cv_build_os)dnl +-pushdef([ac_tool_prefix], ac_build_tool_prefix)dnl +-pushdef([am_cv_CXX_dependencies_compiler_type], am_cv_build_CXX_dependencies_compiler_type)dnl +-pushdef([cross_compiling], cross_compiling_build)dnl ++pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl ++pushdef([ac_compile], ac_build_compile)dnl ++pushdef([ac_link], ac_build_link)dnl + +-cross_compiling_build=no ++save_cross_compiling=$cross_compiling ++save_ac_tool_prefix=$ac_tool_prefix ++cross_compiling=no ++ac_tool_prefix= + +-ac_build_tool_prefix= +-AS_IF([test -n "$build"], [ac_build_tool_prefix="$build-"], +- [test -n "$build_alias"],[ac_build_tool_prefix="$build_alias-"]) +- +-AC_LANG_PUSH([C++]) + AC_PROG_CXX + AC_PROG_CXXCPP + ++ac_tool_prefix=$save_ac_tool_prefix ++cross_compiling=$save_cross_compiling ++ + dnl Restore the old definitions + dnl +-popdef([cross_compiling])dnl +-popdef([am_cv_CXX_dependencies_compiler_type])dnl +-popdef([ac_tool_prefix])dnl ++popdef([ac_link])dnl ++popdef([ac_compile])dnl ++popdef([ac_cxxcpp])dnl + popdef([ac_cv_host_os])dnl + popdef([ac_cv_host_vendor])dnl + popdef([ac_cv_host_cpu])dnl +@@ -103,10 +103,6 @@ popdef([ac_cv_prog_cxx_works])dnl + popdef([ac_cv_prog_gxx])dnl + popdef([ac_cv_prog_CXXCPP])dnl + +-dnl restore global variables (dependant on the current +-dnl language after popping): +-AC_LANG_POP([C++]) +- + dnl Finally, set Makefile variables + dnl + AC_SUBST([CXXFLAGS_FOR_BUILD])dnl From 8122221c9b90145407c76387e8c4707ee90feff7 Mon Sep 17 00:00:00 2001 From: Benjamin Koch Date: Thu, 22 Apr 2021 02:17:12 +0200 Subject: [PATCH 0665/1183] nixos/nextcloud: Rename services.nextcloud.nginx.disableImagemagick to services.nextcloud.nginx.enableImagemagick Enable options are preferred. Suggested here: https://github.com/NixOS/nixpkgs/pull/115372#issuecomment-821900334 --- nixos/modules/services/web-apps/nextcloud.nix | 15 ++++++++------- nixos/tests/nextcloud/basic.nix | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 58e8e5a0a8b1..545deaa905f2 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -10,7 +10,7 @@ let extensions = { enabled, all }: (with all; enabled - ++ optional (!cfg.disableImagemagick) imagick + ++ optional cfg.enableImagemagick imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu ++ optional cfg.caching.redis redis @@ -63,6 +63,9 @@ in { Further details about this can be found in the `Nextcloud`-section of the NixOS-manual (which can be openend e.g. by running `nixos-help`). '') + (mkRemovedOptionModule [ "services" "nextcloud" "disableImagemagick" ] '' + Use services.nextcloud.nginx.enableImagemagick instead. + '') ]; options.services.nextcloud = { @@ -303,16 +306,14 @@ in { }; }; - disableImagemagick = mkOption { - type = types.bool; - default = false; - description = '' - Whether to not load the ImageMagick module into PHP. + enableImagemagick = mkEnableOption '' + Whether to load the ImageMagick module into PHP. This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). You may want to disable it for increased security. In that case, previews will still be available for some images (e.g. JPEG and PNG). See https://github.com/nextcloud/server/issues/13099 - ''; + '' // { + default = true; }; caching = { diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 5074b6cdafef..76f7f68dc960 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -51,7 +51,7 @@ in { nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }: lib.mkMerge [ (nextcloud args) - { services.nextcloud.disableImagemagick = true; } ]; + { services.nextcloud.enableImagemagick = false; } ]; }; testScript = { nodes, ... }: let From f0975780a72c4a626c0a1537cd50ec57cbc7d850 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Tue, 20 Apr 2021 16:45:30 -0400 Subject: [PATCH 0666/1183] mar1d: 0.2.0 -> 0.3.0 --- pkgs/games/mar1d/default.nix | 68 ++++++++++++------------------------ 1 file changed, 22 insertions(+), 46 deletions(-) diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 1323e1a8ac9c..1715a68f5d8a 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,58 +1,34 @@ -{ lib, stdenv -, fetchFromGitHub -, cmake +{ stdenv +, lib +, SDL2 +, SDL2_mixer , libGLU -, xlibsWrapper -, xorg -, xinput_calibrator -, doxygen -, libpthreadstubs -, alsaLib -, alsaOss -, libao -, width ? 30 -, mute ? false -, effects ? false -, sensitivity ? 5 -, reverseY ? false +, libconfig +, meson +, ninja +, pkg-config +, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "MAR1D"; - version = "0.2.0"; - options = "-w${toString width}" - + " -s${toString sensitivity}" - + (if mute then " -m" else "") - + (if effects then " -f" else "") - + (if reverseY then " -r" else ""); + version = "0.3.0"; src = fetchFromGitHub { - sha256 = "152w5dnlxzv60cl24r5cmrj2q5ar0jiimrmxnp87kf4d2dpbnaq7"; + sha256 = "sha256-/QZH2H0PFCLeweXUE11vimLnJTt86PjnTnHC9vWkKsk="; rev = "v${version}"; - repo = "fp_mario"; - owner = "olynch"; + repo = "MAR1D"; + owner = "Radvendii"; }; - buildInputs = - [ - alsaLib - alsaOss - cmake - doxygen - libao - libpthreadstubs - libGLU - xlibsWrapper - xinput_calibrator - xorg.libXrandr - xorg.libXi - xorg.xinput - xorg.libXxf86vm - ]; + nativeBuildInputs = [ meson ninja pkg-config ]; - preConfigure = '' - cd src - ''; + buildInputs = [ + SDL2 + SDL2_mixer + libconfig + libGLU + ]; meta = with lib; { description = "First person Super Mario Bros"; @@ -62,9 +38,9 @@ stdenv.mkDerivation rec { original, however, the game still takes place in a two dimensional world. You must view the world as mario does, as a one dimensional line. ''; - homepage = "https://github.com/olynch/fp_mario"; + homepage = "https://mar1d.com"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From d15f49411c2b3bc4d19c8d5a5e3b98f8bfa56c1a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 04:32:54 +0000 Subject: [PATCH 0667/1183] alembic: 1.7.16 -> 1.8.0 --- 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 cdcf4b7b8a49..cbfec4dd46af 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.16"; + version = "1.8.0"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "1vmhwjhppjv8m0ysk2qz0wl47cbl8i40bjjq5l4jmmp1ysvlbknf"; + sha256 = "sha256-c4SN3kNY8415+O/2AYuHNQFEmuTBtLaWj5fsj0yJ2vs="; }; outputs = [ "bin" "dev" "out" "lib" ]; From d562b79b09a452b54eabffbf7db1c39680cb0e1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 04:50:48 +0000 Subject: [PATCH 0668/1183] ameba: 0.14.2 -> 0.14.3 --- pkgs/development/tools/ameba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 9a8cc799bf27..24760051b28c 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.14.2"; + version = "0.14.3"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "sha256-wtUWmvAm7iTiP8eYgPiRasYjzeCIJCQd3D+8f1kMONA="; + sha256 = "sha256-oZdaHV+vnYUiCXNMrSuHvZzDYDgFZsoD715DE3tJ2bE="; }; meta = with lib; { From 090165d7c17f814cfe458b22026fda026888f78b Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 21 Apr 2021 23:53:20 -0300 Subject: [PATCH 0669/1183] singular: disable vspace on aarch64 --- .../science/math/singular/default.nix | 3 +++ .../math/singular/disable-vspace-on-aarch64.patch | 15 +++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 9a1d63169212..695af3d17440 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { # add aarch64 support to cpu-check.m4. copied from redhat. ./redhat-aarch64.patch + # vspace causes hangs in modstd and other libraries on aarch64 + ./disable-vspace-on-aarch64.patch + # the newest version of ax-prog-cc-for-build.m4 seems to trigger # linker errors. see # https://github.com/alsa-project/alsa-firmware/issues/3 for a diff --git a/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch new file mode 100644 index 000000000000..3e51b7fb2cec --- /dev/null +++ b/pkgs/applications/science/math/singular/disable-vspace-on-aarch64.patch @@ -0,0 +1,15 @@ +diff --git a/kernel/mod2.h b/kernel/mod2.h +index 867fcae47..2abd84f23 100644 +--- a/kernel/mod2.h ++++ b/kernel/mod2.h +@@ -60,8 +60,10 @@ + + /* define for parallel processes with shared memory */ + #ifndef __CCYGWIN__ ++#ifndef SI_CPU_AARCH64 + #define HAVE_VSPACE 1 + #endif ++#endif + + /*#define PROFILING*/ + #ifdef PROFILING From a0f410646c54c19f7bc239f25178cb1ffe7608d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Garaba=20Fl=C3=B3ri=C3=A1n?= Date: Sat, 17 Apr 2021 10:23:29 -0300 Subject: [PATCH 0670/1183] sage: use threejs fork --- .../applications/science/math/sage/default.nix | 6 ++++-- ...grep-threejs-version-from-minified-js.patch | 16 ---------------- .../science/math/sage/sage-src.nix | 3 --- .../science/math/sage/threejs-sage.nix | 18 ++++++++++++++++++ 4 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch create mode 100644 pkgs/applications/science/math/sage/threejs-sage.nix diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 8ef1f5189e5b..4a18d1e88a60 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -38,14 +38,16 @@ let logo64 = "${sage-src}/doc/common/themes/sage/static/sageicon.png"; }; + three = callPackage ./threejs-sage.nix { }; + # A bash script setting various environment variables to tell sage where # the files its looking fore are located. Also see `sage-env`. env-locations = callPackage ./env-locations.nix { inherit pari_data; inherit singular maxima-ecl; + inherit three; ecl = maxima-ecl.ecl; cysignals = python3.pkgs.cysignals; - three = nodePackages.three; mathjax = nodePackages.mathjax; }; @@ -70,8 +72,8 @@ let inherit python3 pythonEnv; inherit sage-env; inherit pynac singular maxima-ecl; + inherit three; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config - three = nodePackages.three; }; # Doesn't actually build anything, just runs sages testsuite. This is a diff --git a/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch b/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch deleted file mode 100644 index 88cb66506b1d..000000000000 --- a/pkgs/applications/science/math/sage/patches/dont-grep-threejs-version-from-minified-js.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/sage/repl/rich_output/display_manager.py b/src/sage/repl/rich_output/display_manager.py -index fb21f7a9c9..f39470777d 100644 ---- a/src/sage/repl/rich_output/display_manager.py -+++ b/src/sage/repl/rich_output/display_manager.py -@@ -749,9 +749,9 @@ class DisplayManager(SageObject): - import sage.env - import re - import os -- with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.min.js')) as f: -+ with open(os.path.join(sage.env.THREEJS_DIR, 'build', 'three.js')) as f: - text = f.read().replace('\n','') -- version = re.search(r'REVISION="(\d+)"', text).group(1) -+ version = re.search(r"REVISION = '(\d+)'", text).group(1) - return """ - - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 1fb605b35998..8ac5143f4436 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -131,9 +131,6 @@ stdenv.mkDerivation rec { # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) ./patches/sympy-1.7-update.patch - # workaround until we use sage's fork of threejs, which contains a "version" file - ./patches/dont-grep-threejs-version-from-minified-js.patch - # updated eclib output has punctuation changes and tidier whitespace ./patches/eclib-20210223-test-formatting.patch diff --git a/pkgs/applications/science/math/sage/threejs-sage.nix b/pkgs/applications/science/math/sage/threejs-sage.nix new file mode 100644 index 000000000000..0e4ad4dee955 --- /dev/null +++ b/pkgs/applications/science/math/sage/threejs-sage.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "threejs-sage"; + version = "r122"; + + src = fetchFromGitHub { + owner = "sagemath"; + repo = "threejs-sage"; + rev = version; + sha256 = "sha256-xPAPt36Fon3hYQq6SOmGkIyUzAII2LMl10nqYG4UPI0="; + }; + + installPhase = '' + mkdir -p $out/lib/node_modules/three + cp -r build version $out/lib/node_modules/three + ''; +} From 00d2e243952dd582c34a2324509b6a0dc64dd1c7 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 16 Apr 2021 18:38:14 -0300 Subject: [PATCH 0671/1183] eclib: 20210223 -> 20190909 This reverts commits 003705ef0835d9b0db805a384b749172dfdca022 and ef615b5a61c049317da5ed5637e4561b224dd66d. --- .../eclib-20210223-test-formatting.patch | 131 ------------------ .../science/math/sage/sage-src.nix | 3 - pkgs/development/libraries/eclib/default.nix | 4 +- 3 files changed, 2 insertions(+), 136 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch diff --git a/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch b/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch deleted file mode 100644 index 3fdb8f768e9d..000000000000 --- a/pkgs/applications/science/math/sage/patches/eclib-20210223-test-formatting.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff --git a/src/sage/libs/eclib/interface.py b/src/sage/libs/eclib/interface.py -index e898456720..6b98c12328 100644 ---- a/src/sage/libs/eclib/interface.py -+++ b/src/sage/libs/eclib/interface.py -@@ -758,78 +758,78 @@ class mwrank_MordellWeil(SageObject): - - sage: EQ = mwrank_MordellWeil(E, verbose=True) - sage: EQ.search(1) -- P1 = [0:1:0] is torsion point, order 1 -- P1 = [-3:0:1] is generator number 1 -- saturating up to 20...Checking 2-saturation -+ P1 = [0:1:0] is torsion point, order 1 -+ P1 = [-3:0:1] is generator number 1 -+ saturating up to 20...Checking 2-saturation... - Points have successfully been 2-saturated (max q used = 7) -- Checking 3-saturation -+ Checking 3-saturation... - Points have successfully been 3-saturated (max q used = 7) -- Checking 5-saturation -+ Checking 5-saturation... - Points have successfully been 5-saturated (max q used = 23) -- Checking 7-saturation -+ Checking 7-saturation... - Points have successfully been 7-saturated (max q used = 41) -- Checking 11-saturation -+ Checking 11-saturation... - Points have successfully been 11-saturated (max q used = 17) -- Checking 13-saturation -+ Checking 13-saturation... - Points have successfully been 13-saturated (max q used = 43) -- Checking 17-saturation -+ Checking 17-saturation... - Points have successfully been 17-saturated (max q used = 31) -- Checking 19-saturation -+ Checking 19-saturation... - Points have successfully been 19-saturated (max q used = 37) - done -- P2 = [-2:3:1] is generator number 2 -- saturating up to 20...Checking 2-saturation -+ P2 = [-2:3:1] is generator number 2 -+ saturating up to 20...Checking 2-saturation... - possible kernel vector = [1,1] - This point may be in 2E(Q): [14:-52:1] - ...and it is! - Replacing old generator #1 with new generator [1:-1:1] - Points have successfully been 2-saturated (max q used = 7) - Index gain = 2^1 -- Checking 3-saturation -+ Checking 3-saturation... - Points have successfully been 3-saturated (max q used = 13) -- Checking 5-saturation -+ Checking 5-saturation... - Points have successfully been 5-saturated (max q used = 67) -- Checking 7-saturation -+ Checking 7-saturation... - Points have successfully been 7-saturated (max q used = 53) -- Checking 11-saturation -+ Checking 11-saturation... - Points have successfully been 11-saturated (max q used = 73) -- Checking 13-saturation -+ Checking 13-saturation... - Points have successfully been 13-saturated (max q used = 103) -- Checking 17-saturation -+ Checking 17-saturation... - Points have successfully been 17-saturated (max q used = 113) -- Checking 19-saturation -+ Checking 19-saturation... - Points have successfully been 19-saturated (max q used = 47) - done (index = 2). - Gained index 2, new generators = [ [1:-1:1] [-2:3:1] ] -- P3 = [-14:25:8] is generator number 3 -- saturating up to 20...Checking 2-saturation -+ P3 = [-14:25:8] is generator number 3 -+ saturating up to 20...Checking 2-saturation... - Points have successfully been 2-saturated (max q used = 11) -- Checking 3-saturation -+ Checking 3-saturation... - Points have successfully been 3-saturated (max q used = 13) -- Checking 5-saturation -+ Checking 5-saturation... - Points have successfully been 5-saturated (max q used = 71) -- Checking 7-saturation -+ Checking 7-saturation... - Points have successfully been 7-saturated (max q used = 101) -- Checking 11-saturation -+ Checking 11-saturation... - Points have successfully been 11-saturated (max q used = 127) -- Checking 13-saturation -+ Checking 13-saturation... - Points have successfully been 13-saturated (max q used = 151) -- Checking 17-saturation -+ Checking 17-saturation... - Points have successfully been 17-saturated (max q used = 139) -- Checking 19-saturation -+ Checking 19-saturation... - Points have successfully been 19-saturated (max q used = 179) - done (index = 1). -- P4 = [-1:3:1] = -1*P1 + -1*P2 + -1*P3 (mod torsion) -- P4 = [0:2:1] = 2*P1 + 0*P2 + 1*P3 (mod torsion) -- P4 = [2:13:8] = -3*P1 + 1*P2 + -1*P3 (mod torsion) -- P4 = [1:0:1] = -1*P1 + 0*P2 + 0*P3 (mod torsion) -- P4 = [2:0:1] = -1*P1 + 1*P2 + 0*P3 (mod torsion) -- P4 = [18:7:8] = -2*P1 + -1*P2 + -1*P3 (mod torsion) -- P4 = [3:3:1] = 1*P1 + 0*P2 + 1*P3 (mod torsion) -- P4 = [4:6:1] = 0*P1 + -1*P2 + -1*P3 (mod torsion) -- P4 = [36:69:64] = 1*P1 + -2*P2 + 0*P3 (mod torsion) -- P4 = [68:-25:64] = -2*P1 + -1*P2 + -2*P3 (mod torsion) -- P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion) -+ P4 = [-1:3:1] = -1*P1 + -1*P2 + -1*P3 (mod torsion) -+ P4 = [0:2:1] = 2*P1 + 0*P2 + 1*P3 (mod torsion) -+ P4 = [2:13:8] = -3*P1 + 1*P2 + -1*P3 (mod torsion) -+ P4 = [1:0:1] = -1*P1 + 0*P2 + 0*P3 (mod torsion) -+ P4 = [2:0:1] = -1*P1 + 1*P2 + 0*P3 (mod torsion) -+ P4 = [18:7:8] = -2*P1 + -1*P2 + -1*P3 (mod torsion) -+ P4 = [3:3:1] = 1*P1 + 0*P2 + 1*P3 (mod torsion) -+ P4 = [4:6:1] = 0*P1 + -1*P2 + -1*P3 (mod torsion) -+ P4 = [36:69:64] = 1*P1 + -2*P2 + 0*P3 (mod torsion) -+ P4 = [68:-25:64] = -2*P1 + -1*P2 + -2*P3 (mod torsion) -+ P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion) - sage: EQ - Subgroup of Mordell-Weil group: [[1:-1:1], [-2:3:1], [-14:25:8]] - -@@ -1076,7 +1076,7 @@ class mwrank_MordellWeil(SageObject): - sage: EQ.search(1) - P1 = [0:1:0] is torsion point, order 1 - P1 = [-3:0:1] is generator number 1 -- saturating up to 20...Checking 2-saturation -+ saturating up to 20...Checking 2-saturation... - ... - P4 = [12:35:27] = 1*P1 + -1*P2 + -1*P3 (mod torsion) - sage: EQ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 8ac5143f4436..e90697257375 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -131,9 +131,6 @@ stdenv.mkDerivation rec { # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) ./patches/sympy-1.7-update.patch - # updated eclib output has punctuation changes and tidier whitespace - ./patches/eclib-20210223-test-formatting.patch - # upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623) (fetchSageDiff { base = "9.3.beta3"; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index a8697207ed1a..4709441a1011 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20210223"; # upgrade might break the sage interface + version = "20190909"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "JohnCremona"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xnSw5cdg4PLa0GT/blCYDz/IG5aj+HG2NHSlyCiH9g0="; + sha256 = "0y1vdi4120gdw56gg2dn3wh625yr9wpyk3wpbsd25w4lv83qq5da"; }; buildInputs = [ pari From 9bcbff30c3b8a6ec7e0c526043f23c58ebc7af54 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Mon, 19 Apr 2021 22:44:54 -0300 Subject: [PATCH 0672/1183] flint: add sage team to maintainers --- pkgs/development/libraries/flint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 2c540d130087..0adaa2fe5e74 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { inherit version; description = "Fast Library for Number Theory"; license = lib.licenses.gpl2Plus; - maintainers = [lib.maintainers.raskin]; + maintainers = lib.teams.sage.members; platforms = lib.platforms.unix; homepage = "http://www.flintlib.org/"; downloadPage = "http://www.flintlib.org/downloads.html"; From 090b71f62766f953a0c57409df2789291d47ce18 Mon Sep 17 00:00:00 2001 From: Masanori Ogino Date: Fri, 2 Apr 2021 18:10:36 -0300 Subject: [PATCH 0673/1183] sage: 9.2 -> 9.3.rc4 Co-authored-by: Mauricio Collares --- .../science/math/sage/default.nix | 6 + .../patches/do-not-test-find-library.patch | 92 ++++++----- .../sphinx-docbuild-subprocesses.patch | 34 ++-- .../math/sage/patches/sympy-1.7-update.patch | 25 --- .../science/math/sage/sage-env.nix | 6 +- .../science/math/sage/sage-src.nix | 146 ++---------------- .../science/math/sage/sage_docbuild.nix | 20 +++ .../science/math/sage/sagedoc.nix | 12 +- .../science/math/sage/sagelib.nix | 16 +- 9 files changed, 115 insertions(+), 242 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch create mode 100644 pkgs/applications/science/math/sage/sage_docbuild.nix diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 4a18d1e88a60..e39db4b1ac2d 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -19,6 +19,10 @@ let linbox = pkgs.linbox.override { withSage = true; }; pkg-config = pkgs.pkg-config; # not to confuse with pythonPackages.pkg-config }; + + sage_docbuild = self.callPackage ./sage_docbuild.nix { + inherit sage-src; + }; }; }; @@ -55,6 +59,7 @@ let # the env-locations file. sage-env = callPackage ./sage-env.nix { sagelib = python3.pkgs.sagelib; + sage_docbuild = python3.pkgs.sage_docbuild; inherit env-locations; inherit python3 singular palp flint pynac pythonEnv maxima-ecl; ecl = maxima-ecl.ecl; @@ -88,6 +93,7 @@ let pythonRuntimeDeps = with python3.pkgs; [ sagelib + sage_docbuild cvxopt networkx service-identity diff --git a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 981759202386..0dbfba642e82 100644 --- a/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,13 +1,13 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 1ddfc7cfb9..45033d6328 100644 +index 2908f5d04f..81dfd75c0d 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -203,97 +203,13 @@ var('ARB_LIBRARY', 'arb') - var('SAGE_BANNER', '') - var('SAGE_IMPORTALL', 'yes') +@@ -218,93 +218,12 @@ NTL_LIBDIR = var("NTL_LIBDIR") + SAGE_BANNER = var("SAGE_BANNER", "") + SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes") - --def _get_shared_lib_filename(libname, *additional_libnames): +-def _get_shared_lib_path(*libnames: str) -> Optional[str]: - """ - Return the full path to a shared library file installed in - ``$SAGE_LOCAL/lib`` or the directories associated with the @@ -25,80 +25,76 @@ index 1ddfc7cfb9..45033d6328 100644 - For distributions like Debian that use a multiarch layout, we also try the - multiarch lib paths (i.e. ``/usr/lib//``). - -- This returns ``None`` if the file does not exist. +- This returns ``None`` if no matching library file could be found. - - EXAMPLES:: - - sage: import sys - sage: from fnmatch import fnmatch -- sage: from sage.env import _get_shared_lib_filename -- sage: lib_filename = _get_shared_lib_filename("Singular", -- ....: "singular-Singular") +- sage: from sage.env import _get_shared_lib_path +- sage: lib_filename = _get_shared_lib_path("Singular", "singular-Singular") - sage: if sys.platform == 'cygwin': - ....: pattern = "*/cygSingular-*.dll" - ....: elif sys.platform == 'darwin': -- ....: pattern = "*/libSingular.dylib" +- ....: pattern = "*/libSingular-*.dylib" - ....: else: -- ....: pattern = "*/lib*Singular.so" -- sage: fnmatch(lib_filename, pattern) +- ....: pattern = "*/lib*Singular-*.so" +- sage: fnmatch(str(lib_filename), pattern) - True -- sage: _get_shared_lib_filename("an_absurd_lib") is None +- sage: _get_shared_lib_path("an_absurd_lib") is None - True - """ - -- for libname in (libname,) + additional_libnames: +- for libname in libnames: +- search_directories: List[Path] = [] +- patterns: List[str] = [] - if sys.platform == 'cygwin': -- # Later down we take the last matching DLL found, so search -- # SAGE_LOCAL second so that it takes precedence -- bindirs = [ -- sysconfig.get_config_var('BINDIR'), -- os.path.join(SAGE_LOCAL, 'bin') +- # Later down we take the first matching DLL found, so search +- # SAGE_LOCAL first so that it takes precedence +- search_directories = [ +- Path(SAGE_LOCAL) / 'bin', +- Path(sysconfig.get_config_var('BINDIR')), - ] -- pats = ['cyg{}.dll'.format(libname), 'cyg{}-*.dll'.format(libname)] -- filenames = [] -- for bindir in bindirs: -- for pat in pats: -- filenames += glob.glob(os.path.join(bindir, pat)) -- -- # Note: This is not very robust, since if there are multi DLL +- # Note: The following is not very robust, since if there are multible - # versions for the same library this just selects one more or less -- # at arbitrary. However, practically speaking, on Cygwin, there +- # at arbitrary. However, practically speaking, on Cygwin, there - # will only ever be one version -- if filenames: -- return filenames[-1] +- patterns = [f'cyg{libname}.dll', f'cyg{libname}-*.dll'] - else: - if sys.platform == 'darwin': - ext = 'dylib' - else: - ext = 'so' - -- libdirs = [ -- os.path.join(SAGE_LOCAL, 'lib'), -- sysconfig.get_config_var('LIBDIR') -- ] -- multilib = sysconfig.get_config_var('MULTILIB') -- if multilib: -- libdirs.insert(1, os.path.join(libdirs[0], multilib)) +- search_directories = [Path(SAGE_LOCAL) / 'lib'] +- libdir = sysconfig.get_config_var('LIBDIR') +- if libdir is not None: +- libdir = Path(libdir) +- search_directories.append(libdir) - -- for libdir in libdirs: -- basename = 'lib{}.{}'.format(libname, ext) -- filename = os.path.join(libdir, basename) -- if os.path.exists(filename): -- return filename +- multiarchlib = sysconfig.get_config_var('MULTIARCH') +- if multiarchlib is not None: +- search_directories.append(libdir / multiarchlib), +- +- patterns = [f'lib{libname}.{ext}'] +- +- for directory in search_directories: +- for pattern in patterns: +- path = next(directory.glob(pattern), None) +- if path is not None: +- return str(path.resolve()) - - # Just return None if no files were found - return None -- - # locate singular shared object # On Debian it's libsingular-Singular so try that as well --SINGULAR_SO = _get_shared_lib_filename('Singular', 'singular-Singular') -+SINGULAR_SO = '/default' - var('SINGULAR_SO', SINGULAR_SO) +-SINGULAR_SO = var("SINGULAR_SO", _get_shared_lib_path("Singular", "singular-Singular")) ++SINGULAR_SO = var("SINGULAR_SO", '/default') # locate libgap shared object --GAP_SO= _get_shared_lib_filename('gap','') -+GAP_SO = '/default' - var('GAP_SO', GAP_SO) +-GAP_SO = var("GAP_SO", _get_shared_lib_path("gap", "")) ++GAP_SO = var("GAP_SO", '/default') # post process + if ' ' in DOT_SAGE: diff --git a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch index 661077cfa8cd..3c64be100d25 100644 --- a/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch +++ b/pkgs/applications/science/math/sage/patches/sphinx-docbuild-subprocesses.patch @@ -1,8 +1,8 @@ -diff --git a/src/sage_setup/docbuild/__init__.py b/src/sage_setup/docbuild/__init__.py -index 73a078e619..059125c59f 100644 ---- a/src/sage_setup/docbuild/__init__.py -+++ b/src/sage_setup/docbuild/__init__.py -@@ -86,27 +86,6 @@ def builder_helper(type): +diff --git a/src/sage_docbuild/__init__.py b/src/sage_docbuild/__init__.py +index 79005b903a..fbe6fe2595 100644 +--- a/src/sage_docbuild/__init__.py ++++ b/src/sage_docbuild/__init__.py +@@ -85,27 +85,6 @@ def builder_helper(type): """ Returns a function which builds the documentation for output type ``type``. @@ -11,16 +11,16 @@ index 73a078e619..059125c59f 100644 - - Check that :trac:`25161` has been resolved:: - -- sage: from sage_setup.docbuild import DocBuilder, setup_parser +- sage: from sage_docbuild import DocBuilder, setup_parser - sage: DocBuilder._options = setup_parser().parse_args([])[0] # builder_helper needs _options to be set - -- sage: import sage_setup.docbuild.sphinxbuild +- sage: import sage_docbuild.sphinxbuild - sage: def raiseBaseException(): - ....: raise BaseException("abort pool operation") -- sage: original_runsphinx, sage_setup.docbuild.sphinxbuild.runsphinx = sage_setup.docbuild.sphinxbuild.runsphinx, raiseBaseException +- sage: original_runsphinx, sage_docbuild.sphinxbuild.runsphinx = sage_docbuild.sphinxbuild.runsphinx, raiseBaseException - -- sage: from sage_setup.docbuild import builder_helper, build_ref_doc -- sage: from sage_setup.docbuild import _build_many as build_many +- sage: from sage_docbuild import builder_helper, build_ref_doc +- sage: from sage_docbuild import _build_many as build_many - sage: helper = builder_helper("html") - sage: try: - ....: build_many(build_ref_doc, [("docname", "en", "html", {})]) @@ -30,24 +30,24 @@ index 73a078e619..059125c59f 100644 """ def f(self, *args, **kwds): output_dir = self._output_dir(type) -@@ -128,10 +107,9 @@ def builder_helper(type): +@@ -127,10 +106,9 @@ def builder_helper(type): logger.debug(build_command) # Run Sphinx with Sage's special logger - sys.argv = ["sphinx-build"] + build_command.split() - from .sphinxbuild import runsphinx -+ args = "python3 -um sage_setup.docbuild.sphinxbuild -N".split() + build_command.split() ++ args = "python3 -um sage_docbuild.sphinxbuild -N".split() + build_command.split() try: - runsphinx() + subprocess.check_call(args) except Exception: if ABORT_ON_ERROR: raise -diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py -index fe7eba43b2..463790965c 100644 ---- a/src/sage_setup/docbuild/sphinxbuild.py -+++ b/src/sage_setup/docbuild/sphinxbuild.py -@@ -321,3 +321,8 @@ def runsphinx(): +diff --git a/src/sage_docbuild/sphinxbuild.py b/src/sage_docbuild/sphinxbuild.py +index f58f6c61d7..ef51a55411 100644 +--- a/src/sage_docbuild/sphinxbuild.py ++++ b/src/sage_docbuild/sphinxbuild.py +@@ -326,3 +326,8 @@ def runsphinx(): sys.stderr = saved_stderr sys.stdout.flush() sys.stderr.flush() diff --git a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch b/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch deleted file mode 100644 index 1d21622a2354..000000000000 --- a/pkgs/applications/science/math/sage/patches/sympy-1.7-update.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/sage/interfaces/sympy.py b/src/sage/interfaces/sympy.py -index cc35a42a9f..6e577d5d8d 100644 ---- a/src/sage/interfaces/sympy.py -+++ b/src/sage/interfaces/sympy.py -@@ -397,7 +397,7 @@ def _sympysage_rf(self): - sage: from sympy import Symbol, rf - sage: _ = var('x, y') - sage: rfxy = rf(Symbol('x'), Symbol('y')) -- sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma') -+ sage: assert rising_factorial(x,y)._sympy_() == rfxy.rewrite('gamma', piecewise=False) - sage: assert rising_factorial(x,y) == rfxy._sage_() - """ - from sage.arith.all import rising_factorial -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index 7c18ec1efa..c2619ac42d 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -955,6 +955,6 @@ cdef class Expression(CommutativeRingElement): - sage: unicode_art(13 - I) - 13 - ⅈ - sage: unicode_art(1.3 - I) -- 1.3 - 1.0⋅ⅈ -+ 1.3 - ⅈ - sage: unicode_art(cos(I)) - cosh(1) diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 568a4a39f393..fd67076c97de 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -2,6 +2,7 @@ , lib , writeTextFile , sagelib +, sage_docbuild , env-locations , gfortran , bash @@ -191,6 +192,7 @@ writeTextFile rec { # for find_library export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [stdenv.cc.libc singular]}''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" ''; -} // { - lib = sagelib; # equivalent of `passthru`, which `writeTextFile` doesn't support +} // { # equivalent of `passthru`, which `writeTextFile` doesn't support + lib = sagelib; + docbuild = sage_docbuild; } diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index e90697257375..91e855777f0e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -24,14 +24,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.2"; + version = "9.3.rc4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "103j8d5x6szl9fxaz0dvdi4y47q1af9h9y5hmjh2xayi62qmp5ql"; + sha256 = "sha256-LDY07By2j6JagkgT9zeDJ93+m2/oXXEnDRTDzmR8ftk="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -53,14 +53,6 @@ stdenv.mkDerivation rec { # Parallelize docubuild using subprocesses, fixing an isolation issue. See # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - - # Register sorted dict pprinter earlier (https://trac.sagemath.org/ticket/31053) - (fetchSageDiff { - base = "9.3.beta4"; - name = "register-pretty-printer-earlier.patch"; - rev = "d658230ce06ca19f4a3b3a4576297ee82f2d2151"; - sha256 = "sha256-9mPUV7K5PoLDH2vVaYaOfvDLDpmxU0Aj7m/eaXYotDs="; - }) ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -70,31 +62,6 @@ stdenv.mkDerivation rec { # To help debug the transient error in # https://trac.sagemath.org/ticket/23087 when it next occurs. ./patches/configurationpy-error-verbose.patch - - # fix intermittent errors in Sage 9.2's psage.py (this patch is - # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730 - (fetchSageDiff { - base = "9.2.rc2"; - name = "fix-psage-is-locked.patch"; - rev = "75df605f216ddc7b6ca719be942d666b241520e9"; - sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q"; - }) - - # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052 - (fetchSageDiff { - base = "9.2"; - name = "sagespawn-implicit-casting.patch"; - rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6"; - sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0="; - }) - - # fix intermittent errors in doctest/test.py: https://trac.sagemath.org/ticket/26912 - (fetchSageDiff { - base = "9.3.beta8"; - name = "set-cysignals-crash-ndebug.patch"; - rev = "ca5257a5d0f32efc9f8f07e126020856270b1a18"; - sha256 = "sha256-KViw63xE3O0eUiOYzoxNrr4NL+csql9GPJLDJCf/EZs="; - }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -111,114 +78,29 @@ stdenv.mkDerivation rec { # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests ./patches/ignore-cmp-deprecation.patch - - # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) - (fetchSageDiff { - base = "9.3.beta2"; - name = "pillow-8.0.1-update.patch"; - rev = "f05f2d0aac9c4b5abe68105cee2cc7f2c8461847"; - sha256 = "sha256-uY2UlgSd5hhOUUukB4Xc3Gjy0/e7p/qyq9jdvz10IOs="; - }) - - # don't use deprecated numpy type aliases (https://trac.sagemath.org/ticket/31364) - (fetchSageDiff { - base = "9.3.beta7"; - name = "dont-use-deprecated-numpy-type-aliases.patch"; - rev = "dfdef60515d4a4269e82d91280f76a7fdf10bf97"; - sha256 = "sha256-77/3LkT5J7DQN8IPlGJKB6ZcJPaF7xwje06JNns+0AE="; - }) - - # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) - ./patches/sympy-1.7-update.patch - - # upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623) - (fetchSageDiff { - base = "9.3.beta3"; - name = "arb-2.18.1-update.patch"; - rev = "0c9c4ed35c2eaf34ae0d19387c07b7f460e4abce"; - sha256 = "sha256-CjOJIsyyVCziAfvE6pWSihPO35IZMcY2/taXAsqhPLY="; - }) - - # giac 1.6.0-47 update (https://trac.sagemath.org/ticket/30537) - (fetchSageDiff { - base = "9.3.beta7"; - name = "giac-1.6.0-47-update.patch"; - rev = "f05720bf63dfaf33a4e3b6d3ed2c2c0ec46b5d31"; - sha256 = "sha256-gDUq+84eXd5GxLBWUSI61GMJpBF2KX4LBVOt3mS1NF8="; - }) - - # Make gcd/lcm interact better with pari and gmpy2 (https://trac.sagemath.org/ticket/30849) - # needed for pari 2.13.1 update, which we will do in the future - (fetchSageDiff { - base = "9.3.beta0"; - name = "make-gcd-lcm-interact-better-with-pari-and-gmpy2.patch"; - rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30"; - sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0="; - }) - - # cypari 2.1.2 update (https://trac.sagemath.org/ticket/31029) - (fetchSageDiff { - base = "9.3.beta3"; - name = "cypari-2.1.2-update.patch"; - rev = "b9aadfd08e81d74ca7c229bb80eb853b592887d0"; - sha256 = "sha256-eKaMy7kpu+YKdL8bPStgocxBCTfc2Z/10RrGy2LENFw="; - }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; postPatch = '' - # make sure shebangs etc are fixed, but sage-python23 still works - find . -type f -exec sed \ - -e 's/sage-python23/python3/g' \ - -i {} \; - - echo '#!${runtimeShell} - python3 "$@"' > build/bin/sage-python23 - # Make sure sage can at least be imported without setting any environment # variables. It won't be close to feature complete though. sed -i \ - "s|var('SAGE_ROOT'.*|var('SAGE_ROOT', '$out')|" \ + "s|var(\"SAGE_ROOT\".*|var(\"SAGE_ROOT\", \"$out\")|" \ src/sage/env.py - # Do not use sage-env-config (generated by ./configure). - # Instead variables are set manually. - echo '# do nothing' > src/bin/sage-env-config - ''; + # src/doc/en/reference/spkg/conf.py expects index.rst in its directory, + # a list of external packages in the sage distribution (build/pkgs) + # generated by the bootstrap script (which we don't run). this is not + # relevant for other distributions, so remove it. + rm src/doc/en/reference/spkg/conf.py + sed -i "/spkg/d" src/doc/en/reference/index.rst - # Test src/doc/en/reference/spkg/conf.py will fail if - # src/doc/en/reference/spkg/index.rst is not generated. It is - # generated by src/doc/bootstrap, so I've copied the relevant part - # here. An alternative would be to create an empty - # src/doc/en/reference/spkg/index.rst file. - configurePhase = '' - OUTPUT_DIR="src/doc/en/reference/spkg" - mkdir -p "$OUTPUT_DIR" - OUTPUT_INDEX="$OUTPUT_DIR"/index.rst - cat > "$OUTPUT_INDEX" <> "$OUTPUT_INDEX" " $PKG_BASE" - fi - fi - done - cat >> "$OUTPUT_INDEX" < "$OUTPUT" - ${sage-with-env}/bin/sage -python -m sage_setup.docbuild \ + ${sage-with-env}/bin/sage --docbuild \ --mathjax \ --no-pdf-links \ all html diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 245ddcedeee0..f60cb64d2e8d 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -63,7 +63,6 @@ assert (!blas.isILP64) && (!lapack.isILP64); # `sage-tests` and will not have html docs without `sagedoc`. buildPythonPackage rec { - format = "other"; version = src.version; pname = "sagelib"; src = sage-src; @@ -74,6 +73,7 @@ buildPythonPackage rec { jupyter_core pkg-config pip # needed to query installed packages + ecl ]; buildInputs = [ @@ -130,7 +130,7 @@ buildPythonPackage rec { sqlite ]; - buildPhase = '' + preBuild = '' export SAGE_ROOT="$PWD" export SAGE_LOCAL="$SAGE_ROOT" export SAGE_SHARE="$SAGE_LOCAL/share" @@ -146,15 +146,13 @@ buildPythonPackage rec { mkdir -p "$SAGE_SHARE/sage/ext/notebook-ipython" mkdir -p "var/lib/sage/installed" - source build/bin/sage-dist-helpers - cd src - - ${python.interpreter} -u setup.py --no-user-cfg build + # src/setup.py should not be used, see https://trac.sagemath.org/ticket/31377#comment:124 + cd build/pkgs/sagelib/src ''; - installPhase = '' - ${python.interpreter} -u setup.py --no-user-cfg install --prefix=$out - + postInstall = '' rm -r "$out/${python.sitePackages}/sage/cython_debug" ''; + + doCheck = false; # we will run tests in sage-tests.nix } From cc9ffa35208cd8c723ed9b084c56224bb0d9f6ed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 06:54:59 +0000 Subject: [PATCH 0674/1183] bupstash: 0.8.0 -> 0.9.0 --- pkgs/tools/backup/bupstash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/bupstash/default.nix b/pkgs/tools/backup/bupstash/default.nix index 54644ac3a0ef..4a8de070ced2 100644 --- a/pkgs/tools/backup/bupstash/default.nix +++ b/pkgs/tools/backup/bupstash/default.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, installShellFiles, rustPlatform, ronn, pkg-config, libsodium }: rustPlatform.buildRustPackage rec { pname = "bupstash"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "andrewchambers"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zZHJlC0OICIc3G825t7GrZwdmkaaLQKzX2IwkKigkV4="; + sha256 = "sha256-uA5XEG9nvqsXg34bqw8k4Rjk5F9bPFSk1HQ4Bv6Ar+I="; }; - cargoSha256 = "sha256-KVeIF6x+gpb8vkqCtZptF5EX9G1Zv6q8L6tskN6HziM="; + cargoSha256 = "sha256-4r+Ioh6Waoy/7LVF3CPz18c2bCRYym5T4za1GSKw7WQ="; nativeBuildInputs = [ ronn pkg-config installShellFiles ]; buildInputs = [ libsodium ]; From c7bfba04eec7bf83b1d253e404f1b30d4908763f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 18 Mar 2021 12:06:23 +0100 Subject: [PATCH 0675/1183] maintainers: Add jakubgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakub Sokołowski --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 28413f04f8de..3b4dc8625d77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4401,6 +4401,12 @@ githubId = 5283991; name = "Jake Waksbaum"; }; + jakubgs = { + email = "jakub@gsokolowski.pl"; + github = "jakubgs"; + githubId = 2212681; + name = "Jakub Grzgorz Sokołowski"; + }; jamiemagee = { email = "jamie.magee@gmail.com"; github = "JamieMagee"; From 15a78be3c3b282eb6a5f82c048b949d2468689ad Mon Sep 17 00:00:00 2001 From: Louis Blin <45168934+lbpdt@users.noreply.github.com> Date: Thu, 22 Apr 2021 10:51:17 +0100 Subject: [PATCH 0676/1183] terraform-provider-rancher2: 1.8.3 -> 1.13.0 Also update the repository to be sourced from Rancher's org on GitHub, as the old repo under `terraform-providers/` has been archived: https://github.com/terraform-providers/terraform-provider-rancher2 The 'About' section mentions how the new location is under `rancher/`: https://github.com/rancher/terraform-provider-rancher2 --- .../cluster/terraform-providers/providers.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 290460e1e5fe..33fba6e5a0fc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -823,11 +823,13 @@ "version": "1.5.0" }, "rancher2": { - "owner": "terraform-providers", + "owner": "rancher", + "provider-source-address": "registry.terraform.io/hashicorp/rancher2", "repo": "terraform-provider-rancher2", - "rev": "v1.8.3", - "sha256": "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna", - "version": "1.8.3" + "rev": "v1.13.0", + "sha256": "0xczv9qsviryiw95yd6cl1nnb0daxs971fm733gfvwm36jvmyr89", + "vendorSha256": "0apy6qbmshfj4pzz9nqdhyk6h7l9qwrccz30q8ljl928pj49q04c", + "version": "1.13.0" }, "random": { "owner": "hashicorp", From 822064185dd602ef965267e0cd94a224ba17693d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 10:42:23 +0000 Subject: [PATCH 0677/1183] govc: 0.24.1 -> 0.25.0 --- pkgs/tools/virtualization/govc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 3727d1ac1da3..00330f7d1a43 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.24.1"; + version = "0.25.0"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "sha256-D2UrYdjstOxx9EAdBtAC44khp8hRf6W3+6kzytUVnOo="; + sha256 = "sha256-Ri8snbmgcAZmdumKzBl3P6gf/eZgwdgg7V+ijyeZjks="; }; meta = { From 554a42d92c7ac260c199c7dde21133e513686699 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 22 Apr 2021 12:45:01 +0200 Subject: [PATCH 0678/1183] matrix-synapse: 1.32.1 -> 1.32.2 ChangeLog: https://github.com/matrix-org/synapse/releases/tag/v1.32.2 --- 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 ba10396ed8f2..b54ad76e8f7d 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.32.1"; + version = "1.32.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-A9ZWoZq+ZeUeQkqb84q1PG7BEBL2sVyG3qwRq0AqsNk="; + sha256 = "sha256-Biwj/zORBsU8XvpMMlSjR3Nqx0q1LqaSX/vX+UDeXI8="; }; patches = [ From 78bdfddde198664f5b2e04c4b7c070bd34d4a33f Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 14 Apr 2021 11:38:51 +0800 Subject: [PATCH 0679/1183] signald: init at 0.13.1 --- .../instant-messengers/signald/default.nix | 87 +++++++++++++++++++ .../signald/git-describe-always.patch | 9 ++ .../signald/gradle-plugin.patch | 26 ++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 124 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/signald/default.nix create mode 100644 pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch create mode 100644 pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix new file mode 100644 index 000000000000..593e63d32f52 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/default.nix @@ -0,0 +1,87 @@ +{ lib, stdenv, fetchurl, fetchgit, jre, coreutils, gradle_6, git, perl +, makeWrapper }: + +let + pname = "signald"; + + version = "0.13.1"; + + # This package uses the .git directory + src = fetchgit { + url = "https://gitlab.com/signald/signald"; + rev = version; + sha256 = "1ilmg0i1kw2yc7m3hxw1bqdpl3i9wwbj8623qmz9cxhhavbcd5i7"; + leaveDotGit = true; + }; + + buildConfigJar = fetchurl { + url = "https://dl.bintray.com/mfuerstenau/maven/gradle/plugin/de/fuerstenau/BuildConfigPlugin/1.1.8/BuildConfigPlugin-1.1.8.jar"; + sha256 = "0y1f42y7ilm3ykgnm6s3ks54d71n8lsy5649xgd9ahv28lj05x9f"; + }; + + patches = [ ./git-describe-always.patch ./gradle-plugin.patch ]; + + postPatch = '' + patchShebangs gradlew + sed -i -e 's|BuildConfig.jar|${buildConfigJar}|' build.gradle + ''; + + # fake build to pre-download deps into fixed-output derivation + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src version postPatch patches; + nativeBuildInputs = [ gradle_6 perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon build + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | sh + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "0w8ixp1l0ch1jc2dqzxdx3ljlh17hpgns2ba7qvj43nr4prl71l7"; + }; + +in stdenv.mkDerivation rec { + inherit pname src version postPatch patches; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + + # Use the local packages from -deps + sed -i -e 's|mavenCentral()|mavenLocal(); maven { url uri("${deps}") }|' build.gradle + + gradle --offline --no-daemon distTar + ''; + + installPhase = '' + mkdir -p $out + tar xvf ./build/distributions/signald.tar --strip-components=1 --directory $out/ + wrapProgram $out/bin/signald \ + --prefix PATH : ${lib.makeBinPath [ coreutils ]} \ + --set JAVA_HOME "${jre}" + ''; + + nativeBuildInputs = [ git gradle_6 makeWrapper ]; + + doCheck = true; + + meta = with lib; { + description = "Unofficial daemon for interacting with Signal"; + longDescription = '' + Signald is a daemon that facilitates communication over Signal. It is + unofficial, unapproved, and not nearly as secure as the real Signal + clients. + ''; + homepage = "https://signald.org"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ expipiplus1 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch b/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch new file mode 100644 index 000000000000..2f4830e27dd5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/git-describe-always.patch @@ -0,0 +1,9 @@ +diff --git a/version.sh b/version.sh +index 7aeeb3c..060cba3 100755 +--- a/version.sh ++++ b/version.sh +@@ -1,3 +1,3 @@ + #!/bin/sh +-VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --abbrev=0)..HEAD --count) ++VERSION=$(git describe --exact-match 2> /dev/null) || VERSION=$(git describe --always --abbrev=0)+git$(date +%Y-%m-%d)r$(git rev-parse --short=8 HEAD).$(git rev-list $(git describe --always --abbrev=0)..HEAD --count) + echo $VERSION diff --git a/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch new file mode 100644 index 000000000000..6952654758d3 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/signald/gradle-plugin.patch @@ -0,0 +1,26 @@ +diff --git a/build.gradle b/build.gradle +index 11d7a99..66805bb 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -3,9 +3,12 @@ import org.gradle.nativeplatform.platform.internal.OperatingSystemInternal + import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform + import org.xml.sax.SAXParseException + +-plugins { +- id 'de.fuerstenau.buildconfig' version '1.1.8' ++buildscript { ++ dependencies { ++ classpath files ("BuildConfig.jar") ++ } + } ++apply plugin: 'de.fuerstenau.buildconfig' + + apply plugin: 'java' + apply plugin: 'application' +@@ -185,4 +188,4 @@ task integrationTest(type: Test) { + testClassesDirs = sourceSets.integrationTest.output.classesDirs + classpath = sourceSets.integrationTest.runtimeClasspath + outputs.upToDateWhen { false } +-} +\ No newline at end of file ++} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d258f30bf59f..555a3f01dfa9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8236,6 +8236,8 @@ in sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + signald = callPackage ../applications/networking/instant-messengers/signald { }; + signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; signal-desktop = callPackage ../applications/networking/instant-messengers/signal-desktop { }; From 81229d3afe9c66b210e3fa13b5c43b36f09d098b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 13:14:39 +0200 Subject: [PATCH 0680/1183] wordpress: 5.6.2 -> 5.7.1 Fixes: CVE-2021-29447, CVE-2021-29450 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 330470f0fd58..8ad888e759b6 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.6.2"; + version = "5.7.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-W9/U3i6jALXolDFraiI/a+PNPoNHim0rZHzaqSy4gkI="; + sha256 = "08c9g80lhs4h2psf3ykn0l4k1yyy0x21kxjqy8ckjpjvw3281nd4"; }; installPhase = '' From 8967e3c9e020f81282850e78d7d7618a42cfdd7c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 13:41:50 +0200 Subject: [PATCH 0681/1183] python3Packages.keyring: disable keychain tests on darwin It is highly unlikely that we can communicate with keychain in our build environment. The tests were only recently enabled and have blocked this package ever since. --- .../python-modules/keyring/default.nix | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 79283ff6e774..6ebc99f57327 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, pythonOlder , setuptools-scm , importlib-metadata , dbus-python @@ -21,10 +25,6 @@ buildPythonPackage rec { setuptools-scm ]; - checkInputs = [ - pytestCheckHook - ]; - propagatedBuildInputs = [ # this should be optional, however, it has a different API importlib-metadata # see https://github.com/jaraco/keyring/issues/503#issuecomment-798973205 @@ -34,7 +34,25 @@ buildPythonPackage rec { secretstorage ]; - pythonImportsCheck = [ "keyring" "keyring.backend" ]; + pythonImportsCheck = [ + "keyring" + "keyring.backend" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + # Keychain communications isn't possible in our build environment + # keyring.errors.KeyringError: Can't get password from keychain: (-25307, 'Unknown Error') + disabledTests = lib.optionals (stdenv.isDarwin) [ + "test_multiprocess_get" + "test_multiprocess_get_after_native_get" + ]; + + disabledTestsPaths = [ + "tests/backends/test_macOS.py" + ]; meta = with lib; { description = "Store and access your passwords safely"; From 9dd668c1fbc92b8785b5ecccfe863256ca3b9def Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 22 Apr 2021 08:47:48 +0200 Subject: [PATCH 0682/1183] vault: 1.7.0 -> 1.7.1 Fixes CVE-2021-27668 and CVE-2021-27400. Changelog: https://github.com/hashicorp/vault/blob/b41bb14cf6d6d2e0c6acc89c32deada52f744cd2/CHANGELOG.md --- pkgs/tools/security/vault/default.nix | 4 ++-- pkgs/tools/security/vault/vault-bin.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index f8e831ef2c3b..e04ab9df08c8 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1lsz8fyjcxamvs9n3m974q2jxhv828fb5p6qx8wlqdaahqgrc8qg"; + sha256 = "0ncy99gw2pp5v2qbbgvri7qlirjj8qsvgjmjqyx3gddlpzpyiz3q"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index fc8b2865f253..40ce05331f96 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,26 +1,26 @@ { lib, stdenv, fetchurl, unzip }: let - version = "1.7.0"; + version = "1.7.1"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "0d8wqxqilv1jdf4dl7w2jp3lfh0w0rawidmhjlj3ykpg6l3gblma"; + sha256 = "021qa8jcqwy27q83lvamvv5zqnkwk5y0jsb8al5yxpgzxqnmsyb1"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "128r0phm5i1cpayz0ia8qsmnk1ia3qylidy9f8iwk3l8r834s4yd"; + sha256 = "02hhxpa8craa91nfgvwziswisfdnqw4gbwrxyxr753v1y00y1sz8"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "01vxjv95his8jqin2cwcw691wdwn6p876rp021bmvr6diw6clkrp"; + sha256 = "141zzfwrjdjv8ymrdc4mxs2f4cphdir4xjaa40s571ri38in33zh"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "0ahdv14fz7ybl11b61z7j13nbjd6hp6fcpc5bk6y8lh4qj8x0pzg"; + sha256 = "1plrmmy86zb2ij49dk2mwn364i2n83ch4gjz5pln2d4wjx21gpaq"; }; }; From 7501beac87f5fefc84a5ca59ad9a78bffff9df9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 22 Apr 2021 10:23:43 -0300 Subject: [PATCH 0683/1183] mate: fix licenses --- pkgs/desktops/mate/atril/default.nix | 2 +- pkgs/desktops/mate/caja-dropbox/default.nix | 2 +- pkgs/desktops/mate/caja-extensions/default.nix | 2 +- pkgs/desktops/mate/caja/default.nix | 8 ++++---- pkgs/desktops/mate/engrampa/default.nix | 8 ++++---- pkgs/desktops/mate/eom/default.nix | 2 +- pkgs/desktops/mate/libmatekbd/default.nix | 2 +- pkgs/desktops/mate/libmatemixer/default.nix | 2 +- pkgs/desktops/mate/libmateweather/default.nix | 2 +- pkgs/desktops/mate/marco/default.nix | 2 +- pkgs/desktops/mate/mate-backgrounds/default.nix | 2 +- pkgs/desktops/mate/mate-common/default.nix | 2 +- pkgs/desktops/mate/mate-control-center/default.nix | 2 +- pkgs/desktops/mate/mate-desktop/default.nix | 2 +- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 8 ++++---- pkgs/desktops/mate/mate-icon-theme/default.nix | 2 +- pkgs/desktops/mate/mate-media/default.nix | 2 +- pkgs/desktops/mate/mate-menus/default.nix | 2 +- pkgs/desktops/mate/mate-netbook/default.nix | 2 +- pkgs/desktops/mate/mate-notification-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-panel/default.nix | 2 +- pkgs/desktops/mate/mate-power-manager/default.nix | 2 +- pkgs/desktops/mate/mate-session-manager/default.nix | 2 +- pkgs/desktops/mate/mate-settings-daemon/default.nix | 2 +- pkgs/desktops/mate/mate-terminal/default.nix | 2 +- pkgs/desktops/mate/mate-themes/default.nix | 8 ++++---- pkgs/desktops/mate/pluma/default.nix | 8 ++++---- 27 files changed, 42 insertions(+), 42 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 1a6d947153e8..7e8afde588c6 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index ded175db092b..3b96f67b12a9 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; - license = with licenses; [ gpl3 cc-by-nd-30 ]; + license = with licenses; [ gpl3Plus cc-by-nd-30 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 99438bdd6101..5c08074f0450 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 44721a2cab21..c533f78849cc 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "File manager for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = with lib.licenses; [ gpl2 lgpl2 ]; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 6ba30c16f59f..81d34b8b1259 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Archive Manager for MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 75d37e5ea35d..27c120796541 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "An image viewing and cataloging program for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 92bfd4fe8339..8d0b567f1615 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index bc44710e6e72..9d42c23c7148 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; - license = with licenses; [ gpl2 lgpl2 ]; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index a88ba7c6ed31..b042df0fe1ae 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index aa2ee9d4913b..b652be0f71b1 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ licenses.gpl2 ]; + license = [ licenses.gpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 26aedcc2818d..cfe1325b839f 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus cc-by-sa-40 ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 57f50ad83890..58314df673ab 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Common files for development of MATE packages"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index fd675f0406c8..b94e7ecfd06d 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 4270b0a1f921..b1b59dc6402c 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index f0bca054ae8c..7dc4423fb6b2 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Faenza icon theme from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index d6c16c1c7171..cf18cf528f28 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Icon themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl3; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index fa6b6e4305a0..6072e81fb3cc 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo maintainers.chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 751dcd508594..5b11c20380a8 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index dc10cca40a41..9b7a5ae67180 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { devices with low resolution displays. ''; homepage = "https://mate-desktop.org"; - license = with licenses; [ gpl3 lgpl2Plus ]; + license = with licenses; [ gpl3Only lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 28497084fb63..62181418fdfe 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; - license = licenses.gpl2; + license = with licenses; [ gpl2Plus gpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index c332b700227d..328fcfd20dee 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index fe74cf2505a4..3a99538d9298 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = with licenses; [ gpl2Plus fdl11Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ romildo chpatrick ]; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index bdd129e0deca..0f8ac83085d2 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2Plus ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ed908759877b..6c35a1d63120 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; - license = with licenses; [ gpl2 lgpl21 ]; + license = with licenses; [ gpl2Plus gpl3Plus lgpl2Plus mit ]; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index d17d2fafd1b5..2c4d4223eccc 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 8153ea1ec7af..6a1be82c8a6d 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -29,11 +29,11 @@ stdenv.mkDerivation rec { url = "https://pub.mate-desktop.org/releases/themes"; }; - meta = { + meta = with lib; { description = "A set of themes from MATE"; homepage = "https://mate-desktop.org"; - license = lib.licenses.lgpl21; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ lgpl21Plus lgpl3Only gpl3Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 279e443e5250..4c98c9cf5207 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { passthru.updateScript = mateUpdateScript { inherit pname version; }; - meta = { + meta = with lib; { description = "Powerful text editor for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = lib.licenses.gpl2; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.romildo ]; + license = with licenses; [ gpl2Plus lgpl2Plus fdl11Plus ]; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; }; } From 3922a641d0862d50892b9524d75761f89bfae69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 22 Apr 2021 10:40:54 -0300 Subject: [PATCH 0684/1183] mate.mate-session-manager: fix stale substituteInPlace --- pkgs/desktops/mate/mate-session-manager/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 0f8ac83085d2..c0cd12bd2732 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { postFixup = '' substituteInPlace $out/share/xsessions/mate.desktop \ - --replace "Exec=mate-session" "Exec=$out/bin/mate-session" \ - --replace "TryExec=mate-session" "TryExec=$out/bin/mate-session" + --replace "Exec=mate-session" "Exec=$out/bin/mate-session" ''; passthru.providedSessions = [ "mate" ]; From b4d83909f83b7ad2e58ded8f198769d20ed8912e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:08:20 -0700 Subject: [PATCH 0685/1183] Revert "python3Packages.pyramid: 1.10.5 -> 2.0" This reverts commit 92ac2fe9bec3b10ddc85e4d157f2c6833a5eb564. Removed the "pyramid.compat" module, which is used by many other packages --- pkgs/development/python-modules/pyramid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index da9569b7fb73..a26eff37ef21 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pyramid"; - version = "2.0"; + version = "1.10.5"; src = fetchPypi { inherit pname version; - sha256 = "45431b387587ed0fac6213b54d6e9f0936f0cc85238a8f5af7852fc9484c5c77"; + sha256 = "fe1bd1140e6b79fe07f0053981d49be2dc66656cc8b481dd7ffcaa872fc25467"; }; checkInputs = [ webtest zope_component ]; From 7e5d77ff5403d91ac5661e9c9fe14f180bb6839e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:13:48 -0700 Subject: [PATCH 0686/1183] python3Packages.azure-mgmt-synapse: add missing dep, azure-mgmt-core --- pkgs/development/python-modules/azure-mgmt-synapse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix index fe3a99e62dc1..1b26495e9b7b 100644 --- a/pkgs/development/python-modules/azure-mgmt-synapse/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-synapse/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , azure-common +, azure-mgmt-core , msrest , msrestazure }: @@ -17,6 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-common + azure-mgmt-core msrest msrestazure ]; From f7fc07717e8e6b760112e034f8fafd477729f896 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:16:31 -0700 Subject: [PATCH 0687/1183] python3Packages.django_silk: add missing dep, setuptools-scm --- pkgs/development/python-modules/django_silk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 653bcdc55512..b1d4eaec5c9a 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -9,6 +9,7 @@ , simplejson , dateutil , requests +, setuptools-scm , sqlparse , jinja2 , autopep8 @@ -52,6 +53,7 @@ buildPythonPackage rec { --replace 'use_scm_version=True' 'version="${version}"' ''; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ mock ]; propagatedBuildInputs = [ django pygments simplejson dateutil requests From 55db7f0a6e2175fc823e51433a9f6e4ffac6d24f Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:19:37 -0700 Subject: [PATCH 0688/1183] python3Packages.diff_cover: add missing dep, chardet --- pkgs/development/python-modules/diff_cover/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index e9f6184c528d..5c340bf7ac8a 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi +, chardet , inflect , jinja2 , jinja2_pluralize @@ -27,7 +28,7 @@ buildPythonPackage rec { sha256 = "e80f7a4979b7a9d373903776588279ed2898f17729e608255c4119462c822edb"; }; - propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; + propagatedBuildInputs = [ chardet jinja2 jinja2_pluralize pygments six inflect ]; checkInputs = [ mock coverage pytest nose pylint pyflakes pycodestyle ]; From 4e3cca0da52cbe872e131aa2b37b7fdfff261dd2 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:20:59 -0700 Subject: [PATCH 0689/1183] python3Packages.jupyter_server: add missing dep, argon2_cffi --- pkgs/development/python-modules/jupyter_server/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 1af7d693588b..89e6fdc7aa18 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -4,6 +4,7 @@ , pythonOlder , pytestCheckHook , pytest-tornasync +, argon2_cffi , jinja2 , tornado , pyzmq @@ -36,6 +37,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + argon2_cffi jinja2 tornado pyzmq From b029adf1ef38bc35ab73b2f75d42f5e323fa1462 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:41:37 -0700 Subject: [PATCH 0690/1183] python3Packages.jupyter_server: fix tests --- pkgs/development/python-modules/jupyter_server/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index 89e6fdc7aa18..50f193c2058c 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -66,7 +66,12 @@ buildPythonPackage rec { pytestFlagsArray = [ "jupyter_server/tests/" ]; # disabled failing tests - disabledTests = [ "test_server_extension_list" "test_list_formats" "test_base_url" ]; + disabledTests = [ + "test_server_extension_list" + "test_list_formats" + "test_base_url" + "test_culling" + ]; meta = with lib; { description = "The backend—i.e. core services, APIs, and REST endpoints—to Jupyter web applications."; From 2094cc3f30222d294d150ff13e1e778e7f2b2297 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:42:29 -0700 Subject: [PATCH 0691/1183] python3Packages.sqlalchemy-citext: add missing implicit dep, psycopg2 --- pkgs/development/python-modules/sqlalchemy-citext/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index f701da577245..8fc03d788af9 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, psycopg2 , sqlalchemy , python }: @@ -16,6 +17,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy + + # not listed in `install_requires`, but is imported in citext/__init__.py + psycopg2 ]; # tests are not packaged in pypi tarball From 38987c05efdaa0c14cee0a4f5e18c06def9e6649 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 10:49:19 -0700 Subject: [PATCH 0692/1183] python3Packages.python-frontmatter: fix expression, fix build --- .../python-frontmatter/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-frontmatter/default.nix b/pkgs/development/python-modules/python-frontmatter/default.nix index 9afa43bf3932..e00ef7d9deeb 100644 --- a/pkgs/development/python-modules/python-frontmatter/default.nix +++ b/pkgs/development/python-modules/python-frontmatter/default.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib, fetchFromGitHub, buildPythonPackage, pyyaml, six, pytest, pyaml }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "python-frontmatter"; version = "1.0.0"; @@ -11,20 +11,26 @@ python3Packages.buildPythonPackage rec { sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ pyyaml + pyaml # yes, it's needed six ]; - checkInputs = with python3Packages; [ + # tries to import test.test, which conflicts with module + # exported by python interpreter + doCheck = false; + checkInputs = [ pytest ]; + pythonImportsCheck = [ "frontmatter" ]; + meta = with lib; { homepage = "https://github.com/eyeseast/python-frontmatter"; description = "Parse and manage posts with YAML (or other) frontmatter"; license = licenses.mit; maintainers = with maintainers; [ siraben ]; - platforms = lib.platforms.unix; + platforms = platforms.unix; }; } From 8b2d889aebdfe60b756005eec2013ac0767e5bfc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 11:22:49 -0700 Subject: [PATCH 0693/1183] python37Packages.poetry-core: fix build for python<=3.7 --- pkgs/development/python-modules/poetry-core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix index bec70aacca72..4d8c444dcd20 100644 --- a/pkgs/development/python-modules/poetry-core/default.nix +++ b/pkgs/development/python-modules/poetry-core/default.nix @@ -23,6 +23,13 @@ buildPythonPackage rec { sha256 = "07x0zagf9cfr7g3132jjd5byywkbnzpfbxjfjzpzpj70fqw70qrc"; }; + postPatch = lib.optionalString (pythonOlder "3.8") '' + # remove >1.0.3 + substituteInPlace pyproject.toml \ + --replace 'importlib-metadata = {version = "^1.7.0", python = "~2.7 || >=3.5, <3.8"}' \ + 'importlib-metadata = {version = ">=1.7.0", python = "~2.7 || >=3.5, <3.8"}' + ''; + nativeBuildInputs = [ intreehooks ]; From ce47da9335c78b2d423b5ee6dbfb5c299cf14e21 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 11:35:57 -0700 Subject: [PATCH 0694/1183] python3Packages.jupyterlab: 3.0.12 -> 3.0.14 --- 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 513cce507e3b..ba2c0ed48834 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.0.12"; + version = "3.0.14"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "929c60d7fb4aa704084c02d8ededc209b8b378e0b3adab46158b7fa6acc24230"; + sha256 = "sha256-cTqEmR38yowLwmCRHxvVSsJaOGqGKFcTuVVaYPeVBZs="; }; nativeBuildInputs = [ jupyter-packaging ]; From fd1e471121dd6d1ef4692d50659a9f07dcc55061 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 11:36:16 -0700 Subject: [PATCH 0695/1183] python3Packages.flask-caching: disable optional backend tests --- .../python-modules/flask-caching/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/flask-caching/default.nix b/pkgs/development/python-modules/flask-caching/default.nix index 8182344487e3..708c5c351ea0 100644 --- a/pkgs/development/python-modules/flask-caching/default.nix +++ b/pkgs/development/python-modules/flask-caching/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytest, pytestcov, pytest-xprocess, pytestcache }: +{ lib, buildPythonPackage, fetchPypi, isPy27, flask, pytestCheckHook, pytestcov, pytest-xprocess, pytestcache }: buildPythonPackage rec { pname = "Flask-Caching"; @@ -12,12 +12,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; - checkInputs = [ pytest pytestcov pytest-xprocess pytestcache ]; + checkInputs = [ pytestCheckHook pytestcov pytest-xprocess pytestcache ]; - # backend_cache relies on pytest-cache, which is a stale package from 2013 - checkPhase = '' - pytest -k 'not backend_cache' - ''; + disabledTests = [ + # backend_cache relies on pytest-cache, which is a stale package from 2013 + "backend_cache" + # optional backends + "Redis" + "Memcache" + ]; meta = with lib; { description = "Adds caching support to your Flask application"; From fbddb37ac7628b3b1bf40d50c92beb1dfd79ea57 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 21 Apr 2021 12:01:01 -0700 Subject: [PATCH 0696/1183] python3Packages.b2sdk: 1.4.0 -> 1.6.0, fix build --- pkgs/development/python-modules/b2sdk/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index fcbbddb61445..b4a3e7acaec0 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,20 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools_scm, isPy27, pytestCheckHook +{ lib, buildPythonPackage, fetchPypi, setuptools-scm, isPy27, pytestCheckHook , requests, arrow, logfury, tqdm }: buildPythonPackage rec { pname = "b2sdk"; - version = "1.4.0"; + version = "1.6.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "fb82cbaef5dd7499b62622010fc8e328944ca8cbdd00b485530ab6600de1129d"; + sha256 = "sha256-6fjreuMUC056ljddfAidfBbJkvEDndB/dIkx1bF7efs="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'setuptools_scm<6.0' 'setuptools_scm' + substituteInPlace requirements.txt \ + --replace 'arrow>=0.8.0,<1.0.0' 'arrow' + ''; + pythonImportsCheck = [ "b2sdk" ]; - nativebuildInputs = [ setuptools_scm ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ requests arrow logfury tqdm ]; # requires unpackaged dependencies like liccheck From 96c6bde310f712d2515128ced4b1b04497f81102 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Thu, 22 Apr 2021 12:23:54 -0400 Subject: [PATCH 0697/1183] pulseeffects: 5.0.2 -> 5.0.3 Mostly bug fixes. Warning: This issue exhibits crashing with Priority Type: Real Time. Luckily due to bugfixes this usually isn't necessary anymore. Please disable that option if you are having issues. --- pkgs/applications/audio/pulseeffects/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 33b15e977e7a..7a7c7175a45d 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,15 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - # 5.0.3 crashes. Test carefully before updating. - # https://github.com/wwmm/pulseeffects/issues/927 - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "14ir25q6bws26im6qmj3k6hkfdh5pc6mbvln7wkdwy5dv0vix3cm"; + sha256 = "1dicvq17vajk3vr4g1y80599ahkw0dp5ynlany1cfljfjz40s8sx"; }; nativeBuildInputs = [ From d6eefb728e7f565149f53da09b317a84820a671d Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Thu, 22 Apr 2021 19:28:58 +0200 Subject: [PATCH 0698/1183] workstyle: 0.2.1 --- .../window-managers/i3/workstyle.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/window-managers/i3/workstyle.nix diff --git a/pkgs/applications/window-managers/i3/workstyle.nix b/pkgs/applications/window-managers/i3/workstyle.nix new file mode 100644 index 000000000000..b245139abefe --- /dev/null +++ b/pkgs/applications/window-managers/i3/workstyle.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "workstyle"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pierrechevalier83"; + repo = pname; + rev = "43b0b5bc0a66d40289ff26b8317f50510df0c5f9"; + sha256 = "0f4hwf236823qmqy31fczjb1hf3fvvac3x79jz2l7li55r6fd8hn"; + }; + + cargoSha256 = "1hy68wvsxncsy4yx4biigfvwyq18c7yp1g543c6nca15cdzs1c54"; + + doCheck = false; # No tests + + meta = with lib; { + description = "Sway workspaces with style"; + homepage = "https://github.com/pierrechevalier83/workstyle"; + license = licenses.mit; + maintainers = with maintainers; [ FlorianFranzen ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8f781f0e10a..6ed695d9d8a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23786,6 +23786,8 @@ in wlroots = wlroots_0_12; }; + workstyle = callPackage ../applications/window-managers/i3/workstyle.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; From 19e052d0d4e83501dbb4e8f692a12635d3c9bfe8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 00:04:13 +0200 Subject: [PATCH 0699/1183] python3Packages.stevedore: 3.2.2 -> 3.3.0 --- .../python-modules/stevedore/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 06d614feaacf..4a0cb6dcea43 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -10,23 +10,28 @@ buildPythonPackage rec { pname = "stevedore"; - version = "3.2.2"; + version = "3.3.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f845868b3a3a77a2489d226568abe7328b5c2d4f6a011cc759dfa99144a521f0"; + sha256 = "sha256-Olu9BlK/VSdIhx6qc6So3CiZeGvEl6KqH8tNzbDevu4="; }; - propagatedBuildInputs = [ pbr setuptools six ] - ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + propagatedBuildInputs = [ + pbr + setuptools + six + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; doCheck = false; pythonImportsCheck = [ "stevedore" ]; meta = with lib; { description = "Manage dynamic plugins for Python applications"; - homepage = "https://pypi.python.org/pypi/stevedore"; + homepage = "https://docs.openstack.org/stevedore/"; license = licenses.asl20; }; } From c4727f753fe8be3459f11546919c900c05774c14 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 00:58:47 +0200 Subject: [PATCH 0700/1183] python3Packages.pycocotools: init at 2.0.2 --- .../python-modules/pycocotools/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/pycocotools/default.nix diff --git a/pkgs/development/python-modules/pycocotools/default.nix b/pkgs/development/python-modules/pycocotools/default.nix new file mode 100644 index 000000000000..a6cdf877a07b --- /dev/null +++ b/pkgs/development/python-modules/pycocotools/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, cython +, matplotlib +}: + +buildPythonPackage rec { + pname = "pycocotools"; + version = "2.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94"; + }; + + propagatedBuildInputs = [ + cython + matplotlib + ]; + + pythonImportsCheck = [ + "pycocotools.coco" + "pycocotools.cocoeval" + ]; + + # has no tests + doCheck = false; + + meta = with lib; { + description = "Official APIs for the MS-COCO dataset"; + homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI"; + license = licenses.bsd2; + maintainers = with maintainers; [ hexa piegames ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c877b355873b..2e3e3cb6f736 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5682,6 +5682,8 @@ in { pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { }; + pycocotools = callPackage ../development/python-modules/pycocotools { }; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; pycognito = callPackage ../development/python-modules/pycognito { }; From 2cbebb37425d06396c70a08f5df2e65b03801d1e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 00:59:29 +0200 Subject: [PATCH 0701/1183] python3Packages.seqeval: init at 1.2.2 --- .../python-modules/seqeval/default.nix | 49 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/seqeval/default.nix diff --git a/pkgs/development/python-modules/seqeval/default.nix b/pkgs/development/python-modules/seqeval/default.nix new file mode 100644 index 000000000000..15322632ad7d --- /dev/null +++ b/pkgs/development/python-modules/seqeval/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, numpy +, scikitlearn +, perl +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "seqeval"; + version = "1.2.2"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "chakki-works"; + repo = "seqeval"; + rev = "v${version}"; + sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "use_scm_version=True," "version='${version}'," \ + --replace "setup_requires=['setuptools_scm']," "setup_requires=[]," + ''; + + propagatedBuildInputs = [ + numpy + scikitlearn + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # tests call perl script and get stuck in there + "test_statistical_tests" + "test_by_ground_truth" + ]; + + meta = with lib; { + description = "A Python framework for sequence labeling evaluation"; + homepage = "https://github.com/chakki-works/seqeval"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2e3e3cb6f736..65ca752fa14a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7745,6 +7745,8 @@ in { seqdiag = callPackage ../development/python-modules/seqdiag { }; + seqeval = callPackage ../development/python-modules/seqeval { }; + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { pythonPackages = self; pythonSupport = true; From 26dbd044cddba71db0913c6e35d5fb405224dc33 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 01:27:26 +0200 Subject: [PATCH 0702/1183] python3Packages.keyring: fix typo in disabledTestPaths keyword --- pkgs/development/python-modules/keyring/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 6ebc99f57327..cea38abee395 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { "test_multiprocess_get_after_native_get" ]; - disabledTestsPaths = [ + disabledTestPaths = [ "tests/backends/test_macOS.py" ]; From f185a7b84337dec22ce218e9917540572d30df25 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 22 Apr 2021 13:22:56 +0200 Subject: [PATCH 0703/1183] python3Packages.httplib2: allow local networking on darwin There is just one test failure on darwin, and it can probably be worked around by allowing local networking. This should hopefully fix the following testsuite error: ``` ___________________________ test_timeout_subsequent ____________________________ tests/test_other.py:137: in test_timeout_subsequent assert response.status == 200 E assert 408 == 200 E +408 E -200 Handler = .Handler'> _ = b'Request Timeout' http = response = {'content-type': 'text/plain', 'status': '408', 'content-length': 15} uri = 'http://localhost:58287/' ----------------------------- Captured stderr call ----------------------------- Traceback (most recent call last): File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 311, in server_socket_thread fun(client, tick) File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 392, in server_request_socket_handler request = HttpRequest.from_buffered(buf) File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 177, in from_buffered return parse_http_message(cls, buf) File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 120, in parse_http_message start_line = buf.readline() File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 110, in readline self._fill(more=1) File "/private/tmp/nix-build-python3.8-httplib2-0.19.1.drv-0/source/tests/__init__.py", line 81, in _fill chunk = self._sock.recv(8 << 10) ConnectionResetError: [Errno 54] Connection reset by peer ``` --- .../python-modules/httplib2/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 39bfdbfe7b23..40cd705f0901 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchFromGitHub , isPy27 @@ -30,6 +29,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; + pythonImportsCheck = [ "httplib2" ]; + + # Don't run tests for Python 2.7 + doCheck = !isPy27; + checkInputs = [ mock pytest-forked @@ -40,12 +44,9 @@ buildPythonPackage rec { pytestCheckHook ]; - # Don't run tests for Python 2.7 or Darwin - # Nearly 50% of the test suite requires local network access - # which isn't allowed on sandboxed Darwin builds - doCheck = !(isPy27 || stdenv.isDarwin); pytestFlagsArray = [ "--ignore python2" ]; - pythonImportsCheck = [ "httplib2" ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { description = "A comprehensive HTTP client library"; From d126b8020d5189877f4d0df165675654f05df67d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 02:40:52 +0200 Subject: [PATCH 0704/1183] python3Packages.rokuecp: init at 0.8.1 --- .../python-modules/rokuecp/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/rokuecp/default.nix diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix new file mode 100644 index 000000000000..baf12741b873 --- /dev/null +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, aiohttp +, xmltodict +, yarl +, aresponses +, pytest-asyncio +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "rokuecp"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "ctalkington"; + repo = "python-rokuecp"; + rev = version; + sha256 = "02mbmwljcvqj3ksj2irdm8849lcxzwa6fycgjqb0i75cgidxpans"; + }; + + propagatedBuildInputs = [ + aiohttp + xmltodict + yarl + ]; + + checkInputs = [ + aresponses + pytestCheckHook + pytest-asyncio + ]; + + meta = with lib; { + description = "Asynchronous Python client for Roku (ECP)"; + homepage = "https://github.com/ctalkington/python-rokuecp"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 77ccbe041c88..05cec82c7d62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7500,6 +7500,8 @@ in { roku = callPackage ../development/python-modules/roku { }; + rokuecp = callPackage ../development/python-modules/rokuecp { }; + roman = callPackage ../development/python-modules/roman { }; roombapy = callPackage ../development/python-modules/roombapy { }; From 1a698e1e8dbe344d35502ddadd7d2a2dc914c7dc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 02:41:53 +0200 Subject: [PATCH 0705/1183] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index e46a97b6fa9c..766178140d20 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -692,7 +692,7 @@ "rituals_perfume_genie" = ps: with ps; [ pyrituals ]; "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ ]; # missing inputs: rokuecp + "roku" = ps: with ps; [ rokuecp ]; "roomba" = ps: with ps; [ roombapy ]; "roon" = ps: with ps; [ ]; # missing inputs: roonapi "route53" = ps: with ps; [ boto3 ]; From 3c636eb23894f6a3d32429001caf67bab535bf20 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 02:42:05 +0200 Subject: [PATCH 0706/1183] home-assistant: enable roku component tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2865cd1fe591..11cdf76bee8e 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -340,6 +340,7 @@ in with py.pkgs; buildPythonApplication rec { "rest_command" "rituals_perfume_genie" "rmvtransport" + "roku" "rss_feed_template" "ruckus_unleashed" "safe_mode" From 32d80aaaa5c089e3c13dc50bb729a7cf1c098586 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 23 Apr 2021 01:01:15 +0000 Subject: [PATCH 0707/1183] nixos/tests/hibernate: install a system instead Rather than relying on carefully avoiding touching the 9P-mounted /nix/store, we instead install a small NixOS system, similar to the installer tests, and boot from that. This avoids the various pitfalls associated with trying to unsuspend properly and trades off a bunch of boilerplate for what will hopefully be a more reliable test. Additionally, this test now actually tests booting the system using a bootloader, rather than the previous method of just booting the kernel directly. --- nixos/tests/hibernate.nix | 126 ++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 25 deletions(-) diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index 8251c6e7ef85..ae506c8542fe 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -1,44 +1,120 @@ # Test whether hibernation from partition works. -import ./make-test-python.nix (pkgs: { +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; + +let + # System configuration of the installed system, which is used for the actual + # hibernate testing. + installedConfig = with pkgs.lib; { + imports = [ + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + ../modules/profiles/minimal.nix + ]; + + hardware.enableAllFirmware = mkForce false; + documentation.nixos.enable = false; + boot.loader.grub.device = "/dev/vda"; + + systemd.services.backdoor.conflicts = [ "sleep.target" ]; + + powerManagement.resumeCommands = "systemctl --no-block restart backdoor.service"; + + fileSystems = { + "/".device = "/dev/vda2"; + }; + swapDevices = mkOverride 0 [ { device = "/dev/vda1"; } ]; + }; + installedSystem = (import ../lib/eval-config.nix { + inherit system; + modules = [ installedConfig ]; + }).config.system.build.toplevel; +in makeTest { name = "hibernate"; nodes = { + # System configuration used for installing the installedConfig from above. machine = { config, lib, pkgs, ... }: with lib; { - virtualisation.emptyDiskImages = [ config.virtualisation.memorySize ]; + imports = [ + ../modules/profiles/installation-device.nix + ../modules/profiles/base.nix + ]; - systemd.services.backdoor.conflicts = [ "sleep.target" ]; + nix.binaryCaches = mkForce [ ]; + nix.extraOptions = '' + hashed-mirrors = + connect-timeout = 1 + ''; - swapDevices = mkOverride 0 [ { device = "/dev/vdb"; } ]; - - networking.firewall.allowedTCPPorts = [ 4444 ]; - - systemd.services.listener.serviceConfig.ExecStart = "${pkgs.netcat}/bin/nc -l 4444 -k"; - }; - - probe = { pkgs, ...}: { - environment.systemPackages = [ pkgs.netcat ]; + virtualisation.diskSize = 8 * 1024; + virtualisation.emptyDiskImages = [ + # Small root disk for installer + 512 + ]; + virtualisation.bootDevice = "/dev/vdb"; }; }; # 9P doesn't support reconnection to virtio transport after a hibernation. # Therefore, machine just hangs on any Nix store access. - # To work around it we run a daemon which listens to a TCP connection and - # try to connect to it as a test. + # To avoid this, we install NixOS onto a temporary disk with everything we need + # included into the store. testScript = '' + def create_named_machine(name): + return create_machine( + { + "qemuFlags": "-cpu max ${ + if system == "x86_64-linux" then "-m 1024" + else "-m 768 -enable-kvm -machine virt,gic-version=host"}", + "hdaInterface": "virtio", + "hda": "vm-state-machine/machine.qcow2", + "name": name, + } + ) + + + # Install NixOS machine.start() - machine.wait_for_unit("multi-user.target") - machine.succeed("mkswap /dev/vdb") - machine.succeed("swapon -a") - machine.start_job("listener") - machine.wait_for_open_port(4444) - machine.succeed("systemctl hibernate &") - machine.wait_for_shutdown() - probe.wait_for_unit("multi-user.target") - machine.start() - probe.wait_until_succeeds("echo test | nc machine 4444 -N") + machine.succeed( + # Partition /dev/vda + "flock /dev/vda parted --script /dev/vda -- mklabel msdos" + + " mkpart primary linux-swap 1M 1024M" + + " mkpart primary ext2 1024M -1s", + "udevadm settle", + "mkfs.ext3 -L nixos /dev/vda2", + "mount LABEL=nixos /mnt", + "mkswap /dev/vda1 -L swap", + # Install onto /mnt + "nix-store --load-db < ${pkgs.closureInfo {rootPaths = [installedSystem];}}/registration", + "nixos-install --root /mnt --system ${installedSystem} --no-root-passwd", + ) + machine.shutdown() + + # Start up + hibernate = create_named_machine("hibernate") + + # Drop in file that checks if we un-hibernated properly (and not booted fresh) + hibernate.succeed( + "mkdir /run/test", + "mount -t ramfs -o size=1m ramfs /run/test", + "echo not persisted to disk > /run/test/suspended", + ) + + # Hibernate machine + hibernate.succeed("systemctl hibernate &") + hibernate.wait_for_shutdown() + + # Restore machine from hibernation, validate our ramfs file is there. + resume = create_named_machine("resume") + resume.start() + resume.succeed("grep 'not persisted to disk' /run/test/suspended") ''; -}) +} From 7341e217b9c10d18cacc9d31ff66008248e3a42d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Apr 2021 04:20:00 +0000 Subject: [PATCH 0708/1183] scheme-manpages: 2021-01-17 -> 2021-03-11 --- pkgs/data/documentation/scheme-manpages/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/documentation/scheme-manpages/default.nix b/pkgs/data/documentation/scheme-manpages/default.nix index e9fa1b7e4f4f..900f28edc8d2 100644 --- a/pkgs/data/documentation/scheme-manpages/default.nix +++ b/pkgs/data/documentation/scheme-manpages/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "scheme-manpages-unstable"; - version = "2021-01-17"; + version = "2021-03-11"; src = fetchFromGitHub { owner = "schemedoc"; repo = "manpages"; - rev = "817798ccca81424e797fda0e218d53a95f50ded7"; - sha256 = "1amc0dmliz2a37pivlkx88jbc08ypfiwv3z477znx8khhc538glk"; + rev = "d0163a4e29d29b2f0beb762be4095775134f5ef9"; + sha256 = "0a8f7rq458c7985chwn1qb9yxcwyr0hl39r9vlvm5j687hy3igs2"; }; dontBuild = true; From a538030e844d60d080feaf28977e1c5ab3463318 Mon Sep 17 00:00:00 2001 From: schnusch Date: Fri, 23 Apr 2021 07:05:13 +0200 Subject: [PATCH 0709/1183] esbuild: 0.11.12 -> 0.11.13 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index e23894c42a0a..33c47c7aed89 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "1mxj4mrq1zbvv25alnc3s36bhnnhghivgwp45a7m3cp1389ffcd1"; + sha256 = "0v358n2vpa1l1a699zyq43yzb3lcxjp3k4acppx0ggva05qn9zd1"; }; vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; From d595069d0fb5b71d3feb94871fdfcaba4259895c Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Thu, 22 Apr 2021 08:04:23 -0700 Subject: [PATCH 0710/1183] python3Packages.fsspec: 0.8.3 -> 2021.04.0 other changes: - disable test exemption for a bug that a comment claims is no longer valid. --- .../python-modules/fsspec/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 1734ad2f507c..fbcf09de2eb3 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -5,34 +5,36 @@ , pytestCheckHook , numpy , stdenv +, aiohttp +, pytest-vcr +, requests }: buildPythonPackage rec { pname = "fsspec"; - version = "0.8.3"; + version = "2021.04.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "intake"; repo = "filesystem_spec"; rev = version; - sha256 = "0mfy0wxjfwwnp5q2afhhfbampf0fk71wsv512pi9yvrkzzfi1hga"; + sha256 = "sha256-9072kb1VEQ0xg9hB8yEzJMD2Ttd3UGjBmTuhE+Uya1k="; }; - checkInputs = [ - pytestCheckHook - numpy - ]; + checkInputs = [ pytestCheckHook numpy pytest-vcr ]; + + __darwinAllowLocalNetworking = true; + + propagatedBuildInputs = [ aiohttp requests ]; disabledTests = [ # Test assumes user name is part of $HOME # AssertionError: assert 'nixbld' in '/homeless-shelter/foo/bar' "test_strip_protocol_expanduser" - # flaky: works locally but fails on hydra - # as it uses the install dir for tests instead of a temp dir - # resolved in https://github.com/intake/filesystem_spec/issues/432 and - # can be enabled again from version 0.8.4 - "test_pathobject" + # test accesses this remote ftp server: + # https://ftp.fau.de/debian-cd/current/amd64/log/success + "test_find" ] ++ lib.optionals (stdenv.isDarwin) [ # works locally on APFS, fails on hydra with AssertionError comparing timestamps # darwin hydra builder uses HFS+ and has only one second timestamp resolution From ae4c8376367393bf854225fa4cae3e54c77de798 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Thu, 22 Apr 2021 08:10:15 -0700 Subject: [PATCH 0711/1183] maintainers: add nbren12 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 28413f04f8de..aa084fcbfa64 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6977,6 +6977,12 @@ githubId = 818502; name = "Nathan Yong"; }; + nbren12 = { + email = "nbren12@gmail.com"; + github = "nbren12"; + githubId = 1386642; + name = "Noah Brenowitz"; + }; nckx = { email = "github@tobias.gr"; github = "nckx"; From e195c22779b0e092833d54f7160f49bf04fdafb2 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Thu, 22 Apr 2021 08:08:27 -0700 Subject: [PATCH 0712/1183] python3Packages.gcsfs: init at 2021.04.0 --- .../python-modules/gcsfs/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/gcsfs/default.nix diff --git a/pkgs/development/python-modules/gcsfs/default.nix b/pkgs/development/python-modules/gcsfs/default.nix new file mode 100644 index 000000000000..483e4a61084e --- /dev/null +++ b/pkgs/development/python-modules/gcsfs/default.nix @@ -0,0 +1,37 @@ +{ buildPythonPackage, fetchFromGitHub, lib, pytestCheckHook, google-auth +, google-auth-oauthlib, requests, decorator, fsspec, ujson, aiohttp, crcmod +, pytest-vcr, vcrpy }: + +buildPythonPackage rec { + pname = "gcsfs"; + version = "2021.04.0"; + + # github sources needed for test data + src = fetchFromGitHub { + owner = "dask"; + repo = pname; + rev = version; + sha256 = "sha256-OA43DaQue7R5d6SzfKThEQFEwJndjLfznu1LMubs5fs="; + }; + + propagatedBuildInputs = [ + google-auth + google-auth-oauthlib + requests + decorator + fsspec + aiohttp + ujson + crcmod + ]; + + checkInputs = [ pytestCheckHook pytest-vcr vcrpy ]; + pythonImportsCheck = [ "gcsfs" ]; + + meta = with lib; { + description = "Convenient Filesystem interface over GCS"; + homepage = "https://github.com/dask/gcsfs"; + license = licenses.bsd3; + maintainers = [ maintainers.nbren12 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22df1c35d93..6a406e91d78e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2660,6 +2660,8 @@ in { gcovr = callPackage ../development/python-modules/gcovr { }; + gcsfs = callPackage ../development/python-modules/gcsfs { }; + gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); gdata = callPackage ../development/python-modules/gdata { }; From a6c65d3e59ebee0e807149b7841b11163dff1d56 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 09:03:42 +0200 Subject: [PATCH 0713/1183] python3Packages.stevedore: add maintainer --- pkgs/development/python-modules/stevedore/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 4a0cb6dcea43..becd79f9838b 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -33,5 +33,6 @@ buildPythonPackage rec { description = "Manage dynamic plugins for Python applications"; homepage = "https://docs.openstack.org/stevedore/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } From 47410ef56db594437dc782a9c6468cc2212f3f18 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Thu, 22 Apr 2021 08:39:46 -0700 Subject: [PATCH 0714/1183] pythonPackages.dask-glm: add missing build dependency setuptools-scm is a setup requirement of this package. --- pkgs/development/python-modules/dask-glm/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 86bc2da1565c..1cfe643944f8 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -8,6 +8,7 @@ , scipy , scikitlearn , pytest +, setuptools-scm }: buildPythonPackage rec { @@ -20,6 +21,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ cloudpickle dask numpy toolz multipledispatch scipy scikitlearn ]; checkPhase = '' From f4d48fc720547d1c63562267b6574f06d1e027b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 20:02:54 +0200 Subject: [PATCH 0715/1183] python3Packages.pydroid-ipcam: init at unstable-2021-04-16 --- .../python-modules/pydroid-ipcam/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/pydroid-ipcam/default.nix diff --git a/pkgs/development/python-modules/pydroid-ipcam/default.nix b/pkgs/development/python-modules/pydroid-ipcam/default.nix new file mode 100644 index 000000000000..ca171edde44d --- /dev/null +++ b/pkgs/development/python-modules/pydroid-ipcam/default.nix @@ -0,0 +1,36 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "pydroid-ipcam"; + version = "unstable-2021-04-16"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "9f22682c6f9182aa5e42762f52223337b8b6909c"; + sha256 = "1lvppyzmwg0fp8zch11j51an4sb074yl9shzanakvjmbqpnif6s6"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pydroid_ipcam" ]; + + meta = with lib; { + description = "Python library for Android IP Webcam"; + homepage = "https://github.com/home-assistant-libs/pydroid-ipcam"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7488dfd8fd36..8973960b23e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5785,6 +5785,8 @@ in { pydrive = callPackage ../development/python-modules/pydrive { }; + pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { }; + pydsdl = callPackage ../development/python-modules/pydsdl { }; pydub = callPackage ../development/python-modules/pydub { }; From 510dc52b8649610da4c1514b8ed1da76b9fa75de Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Fri, 23 Apr 2021 00:09:29 -0700 Subject: [PATCH 0716/1183] python3Packages.dask-ml: adding missing setup dependencies --- pkgs/development/python-modules/dask-ml/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 4f4b7b705c4e..517056866bb4 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -13,6 +13,7 @@ , multipledispatch , packaging , distributed +, setuptools-scm }: buildPythonPackage rec { @@ -38,6 +39,7 @@ buildPythonPackage rec { scipy six toolz + setuptools-scm ]; # has non-standard build from source, and pypi doesn't include tests From d312288e17991738c34572190b9759bc9672f7ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 09:09:36 +0200 Subject: [PATCH 0717/1183] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 65d304fb90be..b27a39d4e91d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -32,7 +32,7 @@ "amcrest" = ps: with ps; [ amcrest ha-ffmpeg ]; "ampio" = ps: with ps; [ ]; # missing inputs: asmog "analytics" = ps: with ps; [ aiohttp-cors ]; - "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam + "android_ip_webcam" = ps: with ps; [ pydroid-ipcam ]; "androidtv" = ps: with ps; [ adb-shell androidtv pure-python-adb ]; "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav From 4be19f893be9a2981597c0c73daee85e877627f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 09:31:07 +0200 Subject: [PATCH 0718/1183] python3Packages.slack-sdk: 3.4.2 -> 3.5.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 195bd720615c..9044ce19b5d8 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.4.2"; + version = "3.5.0"; disabled = !isPy3k; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-AbQqe6hCy6Ke5lwKHFWLJlXv7HdDApYYK++SPNQ2Nxg="; + sha256 = "sha256-5ZBaF/6p/eOWjAmo+IlF9zCb9xBr2bP6suPZblRogUg="; }; propagatedBuildInputs = [ From c890c058da5712a11798964f24c970fbda66ff52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 08:51:57 +0200 Subject: [PATCH 0719/1183] prs: 0.2.7 -> 0.2.8 --- pkgs/tools/security/prs/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/prs/default.nix b/pkgs/tools/security/prs/default.nix index 2d96c89970ec..854f28a8f4c0 100644 --- a/pkgs/tools/security/prs/default.nix +++ b/pkgs/tools/security/prs/default.nix @@ -1,6 +1,7 @@ { lib , rustPlatform , fetchFromGitLab +, installShellFiles , pkg-config , python3 , dbus @@ -12,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "sha256-1Jrgf5UW6k0x3q6kQIB6Q7moOhConEnUU9r+21W5Uu8="; + sha256 = "sha256-TPgS3gtSfCAtQyQCZ0HadxvmX6+dP/3SE/WumzzYUAw="; }; - cargoSha256 = "sha256-N3pLW/OGeurrl+AlwdfbZ3T7WzEOAuyUMdIR164Xp7k="; + cargoSha256 = "sha256-djKtmQHBVXEfn91avJCsVJwEJIE3xL1umvoLAIyXSrw="; postPatch = '' # The GPGME backend is recommended @@ -31,10 +32,16 @@ rustPlatform.buildRustPackage rec { done ''; - nativeBuildInputs = [ gpgme pkg-config python3 ]; + nativeBuildInputs = [ gpgme installShellFiles pkg-config python3 ]; buildInputs = [ dbus glib gpgme gtk3 libxcb ]; + postInstall = '' + for shell in bash fish zsh; do + installShellCompletion --cmd prs --$shell <($out/bin/prs internal completions $shell --stdout) + done + ''; + meta = with lib; { description = "Secure, fast & convenient password manager CLI using GPG and git to sync"; homepage = "https://gitlab.com/timvisee/prs"; From 2f4562567398e145083e8df79e839f9f2728e4e8 Mon Sep 17 00:00:00 2001 From: regnat Date: Fri, 23 Apr 2021 10:49:10 +0200 Subject: [PATCH 0720/1183] Allow easily marking a derivation as content-addressed --- pkgs/stdenv/generic/make-derivation.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 74609412782c..5b446b118269 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -89,6 +89,8 @@ in rec { , patches ? [] + , __contentAddressed ? false + , ... } @ attrs: let @@ -253,6 +255,12 @@ in rec { inherit doCheck doInstallCheck; inherit outputs; + } // lib.optionalAttrs (__contentAddressed) { + inherit __contentAddressed; + # Provide default values for outputHashMode and outputHashAlgo because + # most people won't care about these anyways + outputHashAlgo = attrs.outputHashAlgo or "sha256"; + outputHashMode = attrs.outputHashMode or "recursive"; } // lib.optionalAttrs (stdenv.hostPlatform != stdenv.buildPlatform) { cmakeFlags = (/**/ if lib.isString cmakeFlags then [cmakeFlags] From cc5b30c6ac03273cfd76975ba83744a210f1704d Mon Sep 17 00:00:00 2001 From: regnat Date: Fri, 23 Apr 2021 10:54:38 +0200 Subject: [PATCH 0721/1183] Make it easy to build everything as content-addressed Add a config field `contentAddressedByDefault` and an associated environment variable `NIXPKGS_CA_BY_DEFAULT` to make every nixpkgs derivation content-addressed by default --- pkgs/stdenv/generic/make-derivation.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5b446b118269..2bceb9e4333e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -89,7 +89,10 @@ in rec { , patches ? [] - , __contentAddressed ? false + , __contentAddressed ? + (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too + && (config.contentAddressedByDefault or false + || builtins.getEnv "NIXPKGS_CA_BY_DEFAULT" == "1") , ... } @ attrs: From dd2a8245a15167b271854cff7df040f813d4084d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 18 Mar 2021 13:51:43 +0100 Subject: [PATCH 0722/1183] gomobile: init at 2020-06-22 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Android SDK is provided by `nixpkgs`, and in case of the Status Project we build our app using that SDK in combination with gomobile since our protocol library is written in Go: https://github.com/golang/mobile This tool is quite powerful and allows you even to build entire applications in Go: https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile#hdr-Compile_android_APK_and_iOS_app Signed-off-by: Jakub Sokołowski --- pkgs/development/mobile/gomobile/default.nix | 61 +++++++++++++++++++ .../gomobile/resolve-nix-android-sdk.patch | 15 +++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 80 insertions(+) create mode 100644 pkgs/development/mobile/gomobile/default.nix create mode 100644 pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix new file mode 100644 index 000000000000..17b4e2fb3f62 --- /dev/null +++ b/pkgs/development/mobile/gomobile/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, fetchgit, buildGoModule, zlib, makeWrapper, xcodeenv, androidenv +, xcodeWrapperArgs ? { } +, xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs +, androidPkgs ? androidenv.composeAndroidPackages { + includeNDK = true; + ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. + } }: + +buildGoModule { + pname = "gomobile"; + version = "unstable-2020-06-22"; + + vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; + + src = fetchgit { + # WARNING: Next commit removes support for ARM 32 bit builds for iOS + rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5"; + name = "gomobile"; + url = "https://go.googlesource.com/mobile"; + sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; + }; + + subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; + + # Fails with: go: cannot find GOROOT directory + doCheck = false; + + patches = [ ./resolve-nix-android-sdk.patch ]; + + nativeBuildInputs = [ makeWrapper ] + ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; + + # Prevent a non-deterministic temporary directory from polluting the resulting object files + postPatch = '' + substituteInPlace cmd/gomobile/env.go --replace \ + 'tmpdir, err = ioutil.TempDir("", "gomobile-work-")' \ + 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "gomobile-work")' \ + --replace '"io/ioutil"' "" + substituteInPlace cmd/gomobile/init.go --replace \ + 'tmpdir, err = ioutil.TempDir(gomobilepath, "work-")' \ + 'tmpdir = filepath.Join(os.Getenv("NIX_BUILD_TOP"), "work")' + ''; + + # Necessary for GOPATH when using gomobile. + postInstall = '' + mkdir -p $out/src/golang.org/x + ln -s $src $out/src/golang.org/x/mobile + wrapProgram $out/bin/gomobile \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ + --prefix PATH : "${androidPkgs.androidsdk}/bin" \ + --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ + --set GOPATH $out + ''; + + meta = with lib; { + description = "A tool for building and running mobile apps written in Go"; + homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile"; + license = licenses.bsd3; + maintainers = with maintainers; [ jakubgs ]; + }; +} diff --git a/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch new file mode 100644 index 000000000000..cc143e3a447c --- /dev/null +++ b/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch @@ -0,0 +1,15 @@ +diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go +index 3b01adc..76216fa 100644 +--- a/cmd/gomobile/bind_androidapp.go ++++ b/cmd/gomobile/bind_androidapp.go +@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) { + var apiVer int + for _, fi := range fis { + name := fi.Name() ++ // Resolve symlinked directories (this is how the Nix Android SDK package is built) ++ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil { ++ fi = fi2 ++ } + if !fi.IsDir() || !strings.HasPrefix(name, "android-") { + continue + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd92369eaba2..4bc2befee377 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1563,6 +1563,10 @@ in xcodeenv = callPackage ../development/mobile/xcodeenv { }; + gomobile = callPackage ../development/mobile/gomobile { + buildGoModule = buildGo115Module; + }; + ssh-agents = callPackage ../tools/networking/ssh-agents { }; ssh-import-id = python3Packages.callPackage ../tools/admin/ssh-import-id { }; From 33fff37020843aa510c3aa94985b4ac077b83e73 Mon Sep 17 00:00:00 2001 From: Henri Menke Date: Fri, 23 Apr 2021 11:25:37 +0200 Subject: [PATCH 0723/1183] zfsUnstable: 2.1.0-rc3 -> 2.1.0-rc4 --- pkgs/os-specific/linux/zfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 845593e2665f..adfd0cda8199 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -210,9 +210,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc3"; + version = "2.1.0-rc4"; - sha256 = "sha256-ARRUuyu07dWwEuXerTz9KBmclhlmsnnGucfBxxn0Zsw="; + sha256 = "sha256-eakOEA7LCJOYDsZH24Y5JbEd2wh1KfCN+qX3QxQZ4e8="; isUnstable = true; }; From 063e5abdd268cf993df7b8bda1d8dda2676ca345 Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 23 Apr 2021 11:58:54 +0200 Subject: [PATCH 0724/1183] sphinx-serve: init from python3Packages.sphinx-serve --- 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 1ad15c084ab2..10f46475ebf2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17474,6 +17474,8 @@ in fftw = fftwFloat; }; + sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; + sphinxbase = callPackage ../development/libraries/sphinxbase { }; sphinxsearch = callPackage ../servers/search/sphinxsearch { }; From f192430e47c469f4b8ecef0e13da335e5fe55aba Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Fri, 23 Apr 2021 11:59:26 +0200 Subject: [PATCH 0725/1183] sphinx: init from python3Packages.sphinx --- 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 10f46475ebf2..bb3cb90812ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17474,6 +17474,8 @@ in fftw = fftwFloat; }; + sphinx = with python3Packages; toPythonApplication sphinx; + sphinx-serve = with python3Packages; toPythonApplication sphinx-serve; sphinxbase = callPackage ../development/libraries/sphinxbase { }; From 63a43ed80e2303c3d7b7f92a0551ec1aa01dd480 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 12:03:52 +0200 Subject: [PATCH 0726/1183] pythonPackages.bitarray: 1.8.1 -> 2.0.1 --- pkgs/development/python-modules/bitarray/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index dc09aa2c6bcb..c3965b10a2ab 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -1,14 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "bitarray"; - version = "1.8.1"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "e02f79fba7a470d438eb39017d503498faaf760b17b6b46af1a9de12fd58d311"; + sha256 = "sha256-7DpPbXEaee0jrqlUFjjTNT3D8IPyk6ExgLFLSC4+Ge8="; }; + checkPhase = '' + cd $out + ${python.interpreter} -c 'import bitarray; bitarray.test()' + ''; + pythonImportsCheck = [ "bitarray" ]; meta = with lib; { From 69460bcd0ca9361061f9c44fcc8edf9020f7b76c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 12:30:11 +0200 Subject: [PATCH 0727/1183] python3Packages.ytmusicapi: 0.15.1 -> 0.16.0 --- pkgs/development/python-modules/ytmusicapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ytmusicapi/default.nix b/pkgs/development/python-modules/ytmusicapi/default.nix index 1f211cd2872d..4728da51a64b 100644 --- a/pkgs/development/python-modules/ytmusicapi/default.nix +++ b/pkgs/development/python-modules/ytmusicapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "ytmusicapi"; - version = "0.15.1"; + version = "0.16.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-W/eZubJ/SNLBya1S6wLUwTwZCUD+wCQ5FAuNcSpl+9Y="; + sha256 = "sha256-/94/taeBI6xZ3uN/wfMnk/NPmk+j0+aaH8CAZBEsK10="; }; propagatedBuildInputs = [ From 56e173303df28c12148734272bd1eb928130bac9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 11:56:44 +0200 Subject: [PATCH 0728/1183] ffsend: 0.2.68 -> 0.2.71 --- pkgs/tools/misc/ffsend/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 4e059725f86b..ff1c4c7b8922 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.68"; + version = "0.2.71"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0ga1v4s8ks2v632mim8ljya0gi2j8bbwj98yfm3g00p0z1i526qk"; + sha256 = "sha256-dXFnM8085XVzUwk1e3SoO+O+z9lJ40htJzHBGRQ95XY="; }; - cargoSha256 = "1n9pf29xid6jcas5yx94k4cpmqgx0kpqq7gwf83jisjywxzygh6w"; + cargoSha256 = "sha256-VwxIH/n1DjZsMOLAREclqanb4q7QEOZ35KWWciyrnyQ="; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; buildInputs = @@ -54,7 +54,7 @@ buildRustPackage rec { web browser. ''; homepage = "https://gitlab.com/timvisee/ffsend"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ lilyball equirosa ]; platforms = platforms.unix; }; From a4597c441706e258a5fdb3827501202fac4fa088 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 23 Apr 2021 11:55:43 +0100 Subject: [PATCH 0729/1183] dockle: 0.3.11 -> 0.3.13 --- pkgs/development/tools/dockle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dockle/default.nix b/pkgs/development/tools/dockle/default.nix index 5ecaddc6f1bc..f0d8a5ac6e07 100644 --- a/pkgs/development/tools/dockle/default.nix +++ b/pkgs/development/tools/dockle/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dockle"; - version = "0.3.11"; + version = "0.3.13"; src = fetchFromGitHub { owner = "goodwithtech"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TAV+bdHURclrwM0ByfbM2S4GdAnHrwclStyUlGraOpw="; + sha256 = "sha256-U0nIGuQ4QjBaCck0Kg1RTS2IQwfivN3VI5vxh8lxAYE="; }; - vendorSha256 = "sha256-npbUE3ch8TamW0aikdKuFElE4YDRKwNVUscuvmlQxl4="; + vendorSha256 = "sha256-uHHm4AgnjTdPgpu3OpXXIRzrGhkpOoRY8qynfl7DO6w="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ btrfs-progs lvm2 ]; From a15c3530c5319d09eb8d5c7ec9a500947a2e4aa4 Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Fri, 23 Apr 2021 11:08:43 +0000 Subject: [PATCH 0730/1183] tabnine: 3.3.101 -> 3.3.115 --- pkgs/development/tools/tabnine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 49265d22f8dd..656a99cf94cb 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -1,19 +1,19 @@ { stdenv, lib, fetchurl, unzip }: let - version = "3.3.101"; + version = "3.3.115"; src = if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-apple-darwin/TabNine.zip"; - sha256 = "KrFDQSs7hMCioeqPKTNODe3RKnwNV8XafdYDUaxou/Y="; + sha256 = "104h3b9cvmz2m27a94cfc00xm8wa2p1pvrfs92hrz59hcs8vdldf"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://update.tabnine.com/bundles/${version}/x86_64-unknown-linux-musl/TabNine.zip"; - sha256 = "vbeuZf/phOj83xTha+AzpKIvvrjwMar7q2teAmr5ESQ="; + sha256 = "0rs2vmdz8c9zs53pjbzy27ir0p5v752cpsnqfaqf0ilx7k6fpnnm"; } else throw "Not supported on ${stdenv.hostPlatform.system}"; in From 5c4b9be2e144a2c3814dd2dae5ea0a7697822eb0 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 20 Apr 2021 18:20:48 +0200 Subject: [PATCH 0731/1183] mtxclient: 0.4.1 -> 0.5.1 --- pkgs/development/libraries/mtxclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 761026440f78..05950bc68654 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "1044zil3izhb3whhfjah7w0kg5mr3hys32cjffky681d3mb3wi5n"; + sha256 = "sha256-UKroV1p7jYuNzCAFMsuUsYC/C9AZ1D4rhwpwuER39vc="; }; cmakeFlags = [ From 7d797a730390468cad6880b899f057e68cc6f45a Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 20 Apr 2021 18:21:21 +0200 Subject: [PATCH 0732/1183] lmdbxx: 0.9.21.0 -> 1.0.0 and maintainer change --- pkgs/development/libraries/lmdbxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix index 9b1d320678a0..2d037afbe213 100644 --- a/pkgs/development/libraries/lmdbxx/default.nix +++ b/pkgs/development/libraries/lmdbxx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "lmdbxx"; - version = "0.9.14.0"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "drycpp"; + owner = "hoytech"; repo = "lmdbxx"; rev = version; - sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6"; + sha256 = "sha256-7CxQZdgHVvmof6wVR9Mzic6tg89XJT3Z1ICGRs7PZYo="; }; buildInputs = [ lmdb ]; From 2e896fce98a9e7266a3ecc87cb28d3360147e045 Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 20 Apr 2021 18:22:14 +0200 Subject: [PATCH 0733/1183] nheko: 0.8.1 -> 0.8.2 --- .../networking/instant-messengers/nheko/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 927f89c94939..b097864af431 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -7,7 +7,6 @@ , lmdb , lmdbxx , libsecret -, tweeny , mkDerivation , qtbase , qtkeychain @@ -30,13 +29,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "1v7k3ifzi05fdr06hmws1wkfl1bmhrnam3dbwahp086vkj0r8524"; + sha256 = "sha256-w4l91/W6F1FL+Q37qWSjYRHv4vad/10fxdKwfNeEwgw="; }; nativeBuildInputs = [ @@ -47,7 +46,6 @@ mkDerivation rec { buildInputs = [ nlohmann_json - tweeny mtxclient olm boost17x From fe3c957f3753a3b33107ca39cea8c4cd1b93f620 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 13:28:44 +0200 Subject: [PATCH 0734/1183] angrop: init at 9.0.6790 --- .../python-modules/angrop/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/angrop/default.nix diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix new file mode 100644 index 000000000000..45c092cf0d66 --- /dev/null +++ b/pkgs/development/python-modules/angrop/default.nix @@ -0,0 +1,37 @@ +{ lib +, angr +, buildPythonPackage +, fetchFromGitHub +, progressbar +, pythonOlder +}: + +buildPythonPackage rec { + pname = "angrop"; + version = "9.0.6790"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "angr"; + repo = pname; + rev = "v${version}"; + sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy"; + }; + + propagatedBuildInputs = [ + angr + progressbar + ]; + + # Tests have additional requirements, e.g., angr binaries + # cle is executing the tests with the angr binaries already and is a requirement of angr + doCheck = false; + pythonImportsCheck = [ "angrop" ]; + + meta = with lib; { + description = "ROP gadget finder and chain builder"; + homepage = "https://github.com/angr/angrop"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8169495a3e16..3839daa1ac33 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -395,6 +395,8 @@ in { angr = callPackage ../development/python-modules/angr { }; + angrop = callPackage ../development/python-modules/angrop { }; + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; annexremote = callPackage ../development/python-modules/annexremote { }; From 5324ef34a681f234360b18596618429022bf780f Mon Sep 17 00:00:00 2001 From: Andrey Kuznetsov Date: Fri, 23 Apr 2021 11:35:47 +0000 Subject: [PATCH 0735/1183] tabnine: install all binaries --- pkgs/development/tools/tabnine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/tabnine/default.nix b/pkgs/development/tools/tabnine/default.nix index 656a99cf94cb..0f596a0327d6 100644 --- a/pkgs/development/tools/tabnine/default.nix +++ b/pkgs/development/tools/tabnine/default.nix @@ -32,6 +32,9 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 TabNine $out/bin/TabNine + install -Dm755 TabNine-deep-cloud $out/bin/TabNine-deep-cloud + install -Dm755 TabNine-deep-local $out/bin/TabNine-deep-local + install -Dm755 WD-TabNine $out/bin/WD-TabNine ''; meta = with lib; { From e861822d4f26c77bf141b0f5c9e450248bbd6241 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 13:55:51 +0200 Subject: [PATCH 0736/1183] python3Packages.nclib: init at 1.0.0 --- .../python-modules/nclib/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/nclib/default.nix diff --git a/pkgs/development/python-modules/nclib/default.nix b/pkgs/development/python-modules/nclib/default.nix new file mode 100644 index 000000000000..0e15bfb6cc4d --- /dev/null +++ b/pkgs/development/python-modules/nclib/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nclib"; + version = "1.0.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0kf8x30lrwhijab586i54g70s3sxvm2945al48zj27grj0pagh7g"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "nclib" ]; + + meta = with lib; { + description = "Python module that provides netcat features"; + homepage = "https://nclib.readthedocs.io/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8169495a3e16..7013ce8e354c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4639,6 +4639,8 @@ in { ncclient = callPackage ../development/python-modules/ncclient { }; + nclib = callPackage ../development/python-modules/nclib { }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; ndjson = callPackage ../development/python-modules/ndjson { }; From 8001007e3147cad33f02d9a8e724c95763ff1205 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 14:03:59 +0200 Subject: [PATCH 0737/1183] python3Packages.twitterapi: 2.7.1 -> 2.7.2 --- pkgs/development/python-modules/twitterapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix index 11f596e01d07..316709c20413 100644 --- a/pkgs/development/python-modules/twitterapi/default.nix +++ b/pkgs/development/python-modules/twitterapi/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "twitterapi"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { owner = "geduldig"; repo = "TwitterAPI"; rev = "v${version}"; - sha256 = "sha256-fLexFlnoh58b9q4mo9atGQmMttKytTfAYmaPj6xmPj8="; + sha256 = "sha256-kSL+zAWn/6itBu4T1OcIbg4k5Asatgz/dqzbnlcsqkg="; }; propagatedBuildInputs = [ From b47e9b7ab767240d66395c937b5135f381fcbe55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 14:13:14 +0200 Subject: [PATCH 0738/1183] python3Packages.sendgrid: 6.6.0 -> 6.7.0 --- pkgs/development/python-modules/sendgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sendgrid/default.nix b/pkgs/development/python-modules/sendgrid/default.nix index 704549e987d7..911983691013 100644 --- a/pkgs/development/python-modules/sendgrid/default.nix +++ b/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.6.0"; + version = "6.7.0"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-R9ASHDIGuPRh4yf0FAlpjUZ6QAakYs35EFSqAPc02Q8="; + sha256 = "sha256-Y0h5Aiu85/EWCmSc+eCtK6ZaPuu/LYZiwhXOx0XhfwQ="; }; propagatedBuildInputs = [ From f789bacc630f069d7d1255f7b5df3982315cff5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 14:29:47 +0200 Subject: [PATCH 0739/1183] metasploit: 6.0.40 -> 6.0.41 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 18 ++++++---- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 38 ++++++++++++++++----- 4 files changed, 43 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 8c57845e79ba..ced514767e33 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.40" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.41" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index df2feb42ad3d..c5ccfc5a9d0a 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: fb842915658f23b8997aa2cab4c3a62f3170cbbd - ref: refs/tags/6.0.40 + revision: 451fe6ffdb90fffe3df6b788e6410217a511a3f4 + ref: refs/tags/6.0.41 specs: - metasploit-framework (6.0.40) + metasploit-framework (6.0.41) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -123,7 +123,7 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.445.0) + aws-partitions (1.446.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -146,7 +146,7 @@ GEM aws-eventstream (~> 1, >= 1.0.2) bcrypt (3.1.16) bcrypt_pbkdf (1.1.0) - bindata (2.4.8) + bindata (2.4.9) bson (4.12.0) builder (3.2.4) concurrent-ruby (1.0.5) @@ -168,11 +168,15 @@ GEM eventmachine (1.2.7) faker (2.17.0) i18n (>= 1.6, < 2) - faraday (1.3.0) + faraday (1.4.1) + faraday-excon (~> 1.1) faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) multipart-post (>= 1.2, < 3) - ruby2_keywords + ruby2_keywords (>= 0.0.4) + faraday-excon (1.1.0) faraday-net_http (1.0.1) + faraday-net_http_persistent (1.1.0) faye-websocket (0.11.0) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 19d53b1bb21e..27bbaf2b7c9c 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.40"; + version = "6.0.41"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-QEaTHGCgBl1Lh6zZO1OSY3kS+6+xOr1lbHPNeS1DZZ8="; + sha256 = "sha256-6oaTc3UQayZ/ThurwFXdI1prwriz/XVS9zoeD427mj8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 7440eae07c15..ed2c124450c7 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yvjc0vpcycr5plvkh63cjpivqi0slzq6sj60jllz8p99kli4xrj"; + sha256 = "1n7cr44r7fvmc3rpk5kwwsz34ym2cmih76ij5xh2w1mmfyh3bgry"; type = "gem"; }; - version = "1.445.0"; + version = "1.446.0"; }; aws-sdk-core = { groups = ["default"]; @@ -204,10 +204,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bmlqjb5h1ry6wm2d903d6yxibpqzzxwqczvlicsqv0vilaca5ic"; + sha256 = "16z30ca74h1mr452jnj1csv6yfnmdxsz0m1xpjf3svwybrx25rng"; type = "gem"; }; - version = "2.4.8"; + version = "2.4.9"; }; bson = { groups = ["default"]; @@ -344,10 +344,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hmssd8pj4n7yq4kz834ylkla8ryyvhaap6q9nzymp93m1xq21kz"; + sha256 = "0q646m07lfahakx5jdq77j004rcgfj6lkg13c0f84993gi78dhvi"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; }; faraday-net_http = { groups = ["default"]; @@ -359,6 +369,16 @@ }; version = "1.0.1"; }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l2c835wl7gv34xp49fhd1bl4czkpw2g3ahqsak2251iqv5589ka"; + type = "gem"; + }; + version = "1.1.0"; + }; faye-websocket = { groups = ["default"]; platforms = []; @@ -514,12 +534,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "fb842915658f23b8997aa2cab4c3a62f3170cbbd"; - sha256 = "17v58cnpkkbkdijvsfmimzxi4yb3j99kpndchx5ms1m0c0f96ij0"; + rev = "451fe6ffdb90fffe3df6b788e6410217a511a3f4"; + sha256 = "0gwspf6hy7isyx97bzdkp316nni3vmaw1aqv9rzjcsqhfmrr71pa"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.40"; + version = "6.0.41"; }; metasploit-model = { groups = ["default"]; From 8a3c8eed755214a4f3c1432fd6f0fa97408ef807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 14:44:17 +0200 Subject: [PATCH 0740/1183] radicale: use pytestCheckHook --- pkgs/servers/radicale/3.x.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index bd781d869e96..594cd1712ead 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -1,14 +1,20 @@ -{ lib, python3 }: +{ lib, python3, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { - pname = "Radicale"; + pname = "radicale"; version = "3.0.6"; - src = python3.pkgs.fetchPypi { - inherit pname version; - sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6"; + src = fetchFromGitHub { + owner = "Kozea"; + repo = "Radicale"; + rev = version; + sha256 = "1xlsvrmx6jhi71j6j8z9sli5vwxasivzjyqf8zq8r0l5p7350clf"; }; + postPatch = '' + sed -i '/addopts/d' setup.cfg + ''; + propagatedBuildInputs = with python3.pkgs; [ defusedxml passlib @@ -18,11 +24,7 @@ python3.pkgs.buildPythonApplication rec { ]; checkInputs = with python3.pkgs; [ - pytestrunner - pytest - pytestcov - pytest-flake8 - pytest-isort + pytestCheckHook waitress ]; From f2ab38587429211d065979139f10160ee537e333 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 15:13:36 +0200 Subject: [PATCH 0741/1183] radicale: add passthru.tests --- pkgs/servers/radicale/3.x.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 594cd1712ead..25f4d4b69c01 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "radicale"; @@ -28,6 +28,10 @@ python3.pkgs.buildPythonApplication rec { waitress ]; + passthru.tests = { + inherit (nixosTests) radicale; + }; + meta = with lib; { homepage = "https://www.radicale.org/3.0.html"; description = "CalDAV and CardDAV server"; From cf5d480a06a335f40a4ea42f1c739981b6e2ee34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 18 Apr 2021 22:25:54 +0000 Subject: [PATCH 0742/1183] lib.systems.doubles.all: reorganize The previous mess was partially grouped by OS, and partially grouped by architecture, which made it very difficult to know where to add new entries. I've chosen to group by OS entirely, because OSes are likely to maintain exhaustive lists of supported architectures, but it's far less likely we'd be able to find exhaustive lists of supported OSes for every architecture. --- lib/systems/doubles.nix | 66 +++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 8220bca249fb..7ad40c8c62c2 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -6,43 +6,51 @@ let inherit (lib.attrsets) matchAttrs; all = [ - "aarch64-linux" - "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" - - "mipsel-linux" - - "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd" - - "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux" - "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris" + # Cygwin + "i686-cygwin" "x86_64-cygwin" + # Darwin "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin" - "x86_64-windows" "i686-windows" + # FreeBSD + "i686-freebsd" "x86_64-freebsd" - "wasm64-wasi" "wasm32-wasi" + # Genode + "aarch64-genode" "i686-genode" "x86_64-genode" - "x86_64-redox" - - "powerpc64-linux" - "powerpc64le-linux" - - "riscv32-linux" "riscv64-linux" - - "arm-none" "armv6l-none" "aarch64-none" - "avr-none" - "i686-none" "x86_64-none" - "powerpc-none" - "msp430-none" - "riscv64-none" "riscv32-none" - "vc4-none" - "or1k-none" - - "mmix-mmixware" + # illumos + "x86_64-solaris" + # JS "js-ghcjs" - "aarch64-genode" "i686-genode" "x86_64-genode" + # Linux + "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" + "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux" + "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" + + # MMIXware + "mmix-mmixware" + + # NetBSD + "i686-netbsd" "x86_64-netbsd" + + # none + "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" + "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none" + "x86_64-none" + + # OpenBSD + "i686-openbsd" "x86_64-openbsd" + + # Redox + "x86_64-redox" + + # WASI + "wasm64-wasi" "wasm32-wasi" + + # Windows + "x86_64-windows" "i686-windows" ]; allParsed = map parse.mkSystemFromString all; From 8d212bee7c1efa21f1e0d0250fcb9736bb94ce57 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Apr 2021 14:26:42 +0200 Subject: [PATCH 0743/1183] intel-gmmlib: 21.1.1 -> 21.1.2 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index fa100f34607b..651a42da0b12 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.1.1"; + version = "21.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "0cdyrfyn05fadva8k02kp4nk14k274xfmhzwc0v7jijm1dw8v8rf"; + sha256 = "0zs8l0q1q7xps3kxlch6jddxjiny8n8avdg1ghiwbkvgf76gb3as"; }; nativeBuildInputs = [ cmake ]; From 21294b470cc44a8634915f4564190e72ad8aa9ad Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 15:50:34 +0200 Subject: [PATCH 0744/1183] python3Packages.httplib2: disable test_timeout_subsequent on darwin --- pkgs/development/python-modules/httplib2/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index 40cd705f0901..40bfe4d3e884 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , isPy27 @@ -44,9 +45,12 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "--ignore python2" ]; + disabledTests = lib.optionals (stdenv.isDarwin) [ + # fails with HTTP 408 Request Timeout, instead of expected 200 OK + "test_timeout_subsequent" + ]; - __darwinAllowLocalNetworking = true; + pytestFlagsArray = [ "--ignore python2" ]; meta = with lib; { description = "A comprehensive HTTP client library"; From 265d31bcbd6599c38499354bc5f111589814f101 Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 23 Apr 2021 12:15:27 +0200 Subject: [PATCH 0745/1183] nixos/sshguard: restart sshguard when services/backend changes backends changing shouldn't be very likely, but services may well change. we should restart sshguard from nixos-rebuild instead of merely plopping down a new config file and waiting for the user to restart sshguard. --- nixos/modules/services/security/sshguard.nix | 32 +++++++++++--------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/security/sshguard.nix b/nixos/modules/services/security/sshguard.nix index 033ff5ef4b5a..53bd9efa5ac7 100644 --- a/nixos/modules/services/security/sshguard.nix +++ b/nixos/modules/services/security/sshguard.nix @@ -5,6 +5,21 @@ with lib; let cfg = config.services.sshguard; + configFile = let + args = lib.concatStringsSep " " ([ + "-afb" + "-p info" + "-o cat" + "-n1" + ] ++ (map (name: "-t ${escapeShellArg name}") cfg.services)); + backend = if config.networking.nftables.enable + then "sshg-fw-nft-sets" + else "sshg-fw-ipset"; + in pkgs.writeText "sshguard.conf" '' + BACKEND="${pkgs.sshguard}/libexec/${backend}" + LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}" + ''; + in { ###### interface @@ -85,20 +100,7 @@ in { config = mkIf cfg.enable { - environment.etc."sshguard.conf".text = let - args = lib.concatStringsSep " " ([ - "-afb" - "-p info" - "-o cat" - "-n1" - ] ++ (map (name: "-t ${escapeShellArg name}") cfg.services)); - backend = if config.networking.nftables.enable - then "sshg-fw-nft-sets" - else "sshg-fw-ipset"; - in '' - BACKEND="${pkgs.sshguard}/libexec/${backend}" - LOGREADER="LANG=C ${pkgs.systemd}/bin/journalctl ${args}" - ''; + environment.etc."sshguard.conf".source = configFile; systemd.services.sshguard = { description = "SSHGuard brute-force attacks protection system"; @@ -107,6 +109,8 @@ in { after = [ "network.target" ]; partOf = optional config.networking.firewall.enable "firewall.service"; + restartTriggers = [ configFile ]; + path = with pkgs; if config.networking.nftables.enable then [ nftables iproute2 systemd ] else [ iptables ipset iproute2 systemd ]; From b71a8621a2a6966ed86871c9102ed18acbc45346 Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Thu, 22 Apr 2021 19:10:29 +0300 Subject: [PATCH 0746/1183] rapidjson: make headers compliant with C++20 (by stealing the relevant patch from Fedora) --- pkgs/development/libraries/rapidjson/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/rapidjson/default.nix b/pkgs/development/libraries/rapidjson/default.nix index 52a0877e77f3..1211892890ad 100644 --- a/pkgs/development/libraries/rapidjson/default.nix +++ b/pkgs/development/libraries/rapidjson/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake }: stdenv.mkDerivation rec { pname = "rapidjson"; @@ -11,6 +11,13 @@ stdenv.mkDerivation rec { sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab"; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch"; + sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; preConfigure = '' From a2ae19a00dc520731187e55e28303484e62d2faa Mon Sep 17 00:00:00 2001 From: Michael Livshin Date: Thu, 22 Apr 2021 19:06:10 +0300 Subject: [PATCH 0747/1183] antlr3: make C++ headers compliant with C++20 (by stealing the relevant patch from Fedora) --- pkgs/development/tools/parsing/antlr/3.5.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/antlr/3.5.nix b/pkgs/development/tools/parsing/antlr/3.5.nix index 2efe752c3635..cb6263aca424 100644 --- a/pkgs/development/tools/parsing/antlr/3.5.nix +++ b/pkgs/development/tools/parsing/antlr/3.5.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, fetchFromGitHub, jre}: +{lib, stdenv, fetchpatch, fetchurl, fetchFromGitHub, jre}: stdenv.mkDerivation rec { pname = "antlr"; @@ -14,6 +14,13 @@ stdenv.mkDerivation rec { sha256 = "1i0w2v9prrmczlwkfijfp4zfqfgrss90a7yk2hg3y0gkg2s4abbk"; }; + patches = [ + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/antlr3/raw/f1bb8d639678047935e1761c3bf3c1c7da8d0f1d/f/0006-antlr3memory.hpp-fix-for-C-20-mode.patch"; + sha256 = "0apk904afjqbad6c7z9r72a9lkbz69vwrl8j2a6zgxjn8dfb2p8b"; + }) + ]; + installPhase = '' mkdir -p "$out"/{lib/antlr,bin,include} cp "$jar" "$out/lib/antlr/antlr-${version}-complete.jar" From 68891e6a5b22830acccc13269d74ad61e2e319c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 23 Apr 2021 17:42:33 +0200 Subject: [PATCH 0748/1183] ghidra: 9.2.2 -> 9.2.3 --- pkgs/tools/security/ghidra/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 66112332663a..140ced9ff4ba 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -23,14 +23,13 @@ let }; in stdenv.mkDerivation rec { - pname = "ghidra"; - version = "9.2.2"; - versiondate = "20201229"; + version = "9.2.3"; + versiondate = "20210325"; src = fetchzip { url = "https://www.ghidra-sre.org/ghidra_${version}_PUBLIC_${versiondate}.zip"; - sha256 = "1xahkwiqdcwxssah16hhgrmyam49cb341xp5ysycj1h0kkm8p53s"; + sha256 = "sha256-/rQ3JeOR/D+HxzkJ+nV+pd/7V81+tCyTOndwpXI05hg="; }; nativeBuildInputs = [ @@ -72,7 +71,7 @@ in stdenv.mkDerivation rec { homepage = "https://ghidra-sre.org/"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; - maintainers = with maintainers; [ ck3d govanify ]; + maintainers = with maintainers; [ ck3d govanify mic92 ]; }; } From 4e8641a41505f2b80348a85f6395cb7f3b996d3e Mon Sep 17 00:00:00 2001 From: Alexander Ben Nasrallah Date: Mon, 1 Mar 2021 15:11:59 +0100 Subject: [PATCH 0749/1183] agda: extend agda language frameworks manual section - add code snippets - be more detailed on some aspects --- doc/languages-frameworks/agda.section.md | 99 +++++++++++++++++++++--- 1 file changed, 90 insertions(+), 9 deletions(-) diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md index 30a266502bf3..1675fcb0a79c 100644 --- a/doc/languages-frameworks/agda.section.md +++ b/doc/languages-frameworks/agda.section.md @@ -2,16 +2,19 @@ ## How to use Agda -Agda can be installed from `agda`: -```ShellSession -$ nix-env -iA agda -``` +Agda is available as the [agda](https://search.nixos.org/packages?channel=unstable&show=agda&from=0&size=30&sort=relevance&query=agda) +package. -To use Agda with libraries, the `agda.withPackages` function can be used. This function either takes: +The `agda` package installs an Agda-wrapper, which calls `agda` with `--library-file` +set to a generated library-file within the nix store, this means your library-file in +`$HOME/.agda/libraries` will be ignored. By default the agda package installs Agda +with no libraries, i.e. the generated library-file is empty. To use Agda with libraries, +the `agda.withPackages` function can be used. This function either takes: * A list of packages, * or a function which returns a list of packages when given the `agdaPackages` attribute set, * or an attribute set containing a list of packages and a GHC derivation for compilation (see below). +* or an attribute set containing a function which returns a list of packages when given the `agdaPackages` attribute set and a GHC derivation for compilation (see below). For example, suppose we wanted a version of Agda which has access to the standard library. This can be obtained with the expressions: @@ -27,9 +30,66 @@ agda.withPackages (p: [ p.standard-library ]) or can be called as in the [Compiling Agda](#compiling-agda) section. -If you want to use a library in your home directory (for instance if it is a development version) then typecheck it manually (using `agda.withPackages` if necessary) and then override the `src` attribute of the package to point to your local repository. +If you want to use a different version of a library (for instance a development version) +override the `src` attribute of the package to point to your local repository -Agda will not by default use these libraries. To tell Agda to use the library we have some options: +```nix +agda.withPackages (p: [ + (p.standard-library.overrideAttrs (oldAttrs: { + version = "local version"; + src = /path/to/local/repo/agda-stdlib; + })) +]) +``` + +You can also reference a GitHub repository +```nix +agda.withPackages (p: [ + (p.standard-library.overrideAttrs (oldAttrs: { + version = "1.5"; + src = fetchFromGitHub { + repo = "agda-stdlib"; + owner = "agda"; + rev = "v1.5"; + sha256 = "16fcb7ssj6kj687a042afaa2gq48rc8abihpm14k684ncihb2k4w"; + }; + })) +]) +``` + +If you want to use a library not added to Nixpkgs, you can add a +dependency to a local library by calling `agdaPackages.mkDerivation`. +```nix +agda.withPackages (p: [ + (p.mkDerivation { + pname = "your-agda-lib"; + version = "1.0.0"; + src = /path/to/your-agda-lib; + }) +]) +``` + +Again you can reference GitHub + +```nix +agda.withPackages (p: [ + (p.mkDerivation { + pname = "your-agda-lib"; + version = "1.0.0"; + src = fetchFromGitHub { + repo = "repo"; + owner = "owner"; + version = "..."; + rev = "..."; + sha256 = "..."; + }; + }) +]) +``` + +See [Building Agda Packages](#building-agda-packages) for more information on `mkDerivation`. + +Agda will not by default use these libraries. To tell Agda to use a library we have some options: * Call `agda` with the library flag: ```ShellSession @@ -46,7 +106,7 @@ depend: standard-library More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). ## Compiling Agda -Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. +Agda modules can be compiled using the GHC backend with the `--compile` flag. A version of `ghc` with `ieee754` is made available to the Agda program via the `--with-compiler` flag. This can be overridden by a different version of `ghc` as follows: ```nix @@ -65,6 +125,21 @@ A derivation can then be written using `agdaPackages.mkDerivation`. This has sim * `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. * `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. +Here is an example `default.nix` + +```nix +{ nixpkgs ? }: +with (import nixpkgs {}); +agdaPackages.mkDerivation { + version = "1.0"; + pname = "my-agda-lib"; + src = ./.; + buildInputs = [ + agdaPackages.standard-library + ]; +} +``` + ### Building Agda packages The default build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden. @@ -80,10 +155,16 @@ By default, Agda sources are files ending on `.agda`, or literate Agda files end ## Adding Agda packages to Nixpkgs To add an Agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other Agda libraries, so the top line of the `default.nix` can look like: + ```nix { mkDerivation, standard-library, fetchFromGitHub }: ``` -and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib: + +Note that the derivation function is called with `mkDerivation` set to `agdaPackages.mkDerivation`, therefore you +could use a similar set as in your `default.nix` from [Writing Agda Packages](#writing-agda-packages) with +`agdaPackages.mkDerivation` replaced with `mkDerivation`. + +Here is an example skeleton derivation for iowa-stdlib: ```nix mkDerivation { From 44a994ff9ed5856e03d9a720d67013595a07f23a Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Fri, 23 Apr 2021 18:34:51 +0200 Subject: [PATCH 0750/1183] nixos: use supportedSystems argument instead of hardcoded list for netboot The default value for the argument is identical to the hardcoded list, but using the argument allows to build other netboot images easily. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index 327a259de7fa..87382f42f502 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -138,7 +138,7 @@ in rec { # Build the initial ramdisk so Hydra can keep track of its size over time. initialRamdisk = buildFromConfig ({ ... }: { }) (config: config.system.build.initialRamdisk); - netboot = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeNetboot { + netboot = forMatchingSystems supportedSystems (system: makeNetboot { module = ./modules/installer/netboot/netboot-minimal.nix; inherit system; }); From 8f661c314320aff6eecfd5debfa7cea1801b8d6f Mon Sep 17 00:00:00 2001 From: "Robert T. McGibbon" Date: Fri, 23 Apr 2021 12:50:29 -0400 Subject: [PATCH 0751/1183] safeeyes: 2.0.9 -> 2.1.3 --- pkgs/applications/misc/safeeyes/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index f6bb7133d999..d866b643ef25 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -1,16 +1,16 @@ { lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg }: -let inherit (python3Packages) python buildPythonApplication fetchPypi; +let inherit (python3Packages) python buildPythonApplication fetchPypi croniter; in buildPythonApplication rec { pname = "safeeyes"; - version = "2.0.9"; + version = "2.1.3"; namePrefix = ""; src = fetchPypi { inherit pname version; - sha256 = "13q06jv8hm0dynmr3g5pf1m4j3w9iabrpz1nhpl02f7x0d90whg2"; + sha256 = "1b5w887hivmdrkm1ydbar4nmnks6grpbbpvxgf9j9s46msj03c9x"; }; buildInputs = [ @@ -30,6 +30,7 @@ in buildPythonApplication rec { xlib pygobject3 dbus-python + croniter libappindicator-gtk3 libnotify From 554874700af46b5b89697798acb78f733f825326 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 23 Apr 2021 17:12:57 +0000 Subject: [PATCH 0752/1183] netbsd.libkern: remove libkern is only used as part of building the kernel. There's no reason for us to have a seperate package for it. --- pkgs/os-specific/bsd/netbsd/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/os-specific/bsd/netbsd/default.nix b/pkgs/os-specific/bsd/netbsd/default.nix index d7ee21821090..6d01bff3b3e3 100644 --- a/pkgs/os-specific/bsd/netbsd/default.nix +++ b/pkgs/os-specific/bsd/netbsd/default.nix @@ -484,13 +484,6 @@ let ''; }; - libkern = mkDerivation { - path = "lib/libkern"; - version = "8.0"; - sha256 = "1wirqr9bms69n4b5sr32g1b1k41hcamm7c9n7i8c440m73r92yv4"; - meta.platforms = lib.platforms.netbsd; - }; - column = mkDerivation { path = "usr.bin/column"; version = "8.0"; From e353424e1a2c83276515aaf06afbc1a148ee3b53 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 23 Apr 2021 18:25:16 +0100 Subject: [PATCH 0753/1183] terragrunt: 0.28.24 -> 0.29.0 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 94026992c3d7..0d726e5cfc58 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.24"; + version = "0.29.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7wfBKXO4uUrFjEklmgfgzIECARsOolwXjNFOFqfn1ds="; + sha256 = "sha256-Ubft+R2nBUNRx3SfksORxBbKY/mSvY+tKkz1UcGXyjw="; }; vendorSha256 = "sha256-qlSCQtiGHmlk3DyETMoQbbSYhuUSZTsvAnBKuDJI8x8="; From 43dd56c602f352a43851e408d1838ef9cc9cc0e1 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 24 Apr 2021 01:36:17 +0800 Subject: [PATCH 0754/1183] neofetch: 7.1.0 -> unstable-2020-11-26 --- pkgs/tools/misc/neofetch/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/neofetch/default.nix b/pkgs/tools/misc/neofetch/default.nix index 30fd40a10806..d92870030841 100644 --- a/pkgs/tools/misc/neofetch/default.nix +++ b/pkgs/tools/misc/neofetch/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils }: +{ lib, stdenvNoCC, fetchFromGitHub, bash, makeWrapper, pciutils, ueberzug }: stdenvNoCC.mkDerivation rec { pname = "neofetch"; - version = "7.1.0"; + version = "unstable-2020-11-26"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "neofetch"; - rev = version; - sha256 = "0i7wpisipwzk0j62pzaigbiq42y1mn4sbraz4my2jlz6ahwf00kv"; + rev = "6dd85d67fc0d4ede9248f2df31b2cd554cca6c2f"; + sha256 = "sha256-PZjFF/K7bvPIjGVoGqaoR8pWE6Di/qJVKFNcIz7G8xE="; }; strictDeps = true; @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec { postInstall = '' wrapProgram $out/bin/neofetch \ - --prefix PATH : ${lib.makeBinPath [ pciutils ]} + --prefix PATH : ${lib.makeBinPath [ pciutils ueberzug ]} ''; makeFlags = [ From aad770e2a05cd1eaa8658e8314f1bb8a32236b21 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 23 Apr 2021 19:02:56 +0100 Subject: [PATCH 0755/1183] deno: 1.9.1 -> 1.9.2 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 4586477293b5..9b645fb55e34 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-h8dXGSu7DebzwZdc92A2d9xlYy6wD34phBUj5v5KuIc="; + sha256 = "sha256-FKhSFqFZhqzrXrJcBc0YBNHoUq0/1+ULZ9sE+LyNQTI="; }; - cargoSha256 = "sha256-htxpaALOXFQpQ68YE4b0T0jhcCIONgUZwpMPCcSdcgs="; + cargoSha256 = "sha256-Pp322D7YtdpeNnKWcE78tvLh5nFNcrh9oGYX2eCiPzI="; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; From 768a94035ff3304be208d66625c58109eb8a165a Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Fri, 23 Apr 2021 20:09:31 +0200 Subject: [PATCH 0756/1183] minio: 2021-04-06T23-11-00Z -> 2021-04-22T15-44-28Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 3fed8691ec58..b0d7f1048bc4 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-04-06T23-11-00Z"; + version = "2021-04-22T15-44-28Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-gwf6qA63EFxGQxk8DiAiqLpIYVhVQDQYPffLNP5JfVw="; + sha256 = "147a4vgf2hdpbndska443axzvxx56bmc0011m3cq4ca1vm783k8q"; }; - vendorSha256 = "sha256-VeYc+UtocpeNSV+0MocZj/83X/SMMv5PX2cPIPBV/sk="; + vendorSha256 = "0qj1zab97q8s5gy7a304wqi832y8m083cnk8hllz8lz9yjcw6q92"; doCheck = false; From 41d646f7581cb33318fa7703a3aaf0024d38773b Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 23 Apr 2021 14:15:06 -0400 Subject: [PATCH 0757/1183] tmux: fix cross-compilation --- pkgs/tools/misc/tmux/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 7fcd5322c2cb..629cf548c26b 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , pkg-config , bison @@ -31,6 +32,15 @@ stdenv.mkDerivation rec { sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; }; + patches = [ + # Fix cross-compilation + # https://github.com/tmux/tmux/pull/2651 + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch"; + sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr"; + }) + ]; + nativeBuildInputs = [ pkg-config autoreconfHook From 7748904754a155ecb960c858d7d58ba6aaf2f96c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Fri, 23 Apr 2021 20:32:59 +0200 Subject: [PATCH 0758/1183] ceph: substitute /bin/grep --- pkgs/tools/filesystems/ceph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index e923bb6132ec..413fc9de1859 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -161,6 +161,7 @@ in rec { preConfigure ='' substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" + substituteInPlace src/common/module.c --replace "/bin/grep" "grep" # for pybind/rgw to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" From 4de343cccfd6591ab798e03600d8b3626db8efbd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Fri, 23 Apr 2021 15:02:36 +0000 Subject: [PATCH 0759/1183] nixos/test-driver: use a variety of different Tesseract settings for OCR When performing OCR, some of the Tesseract settings perform better than others on a variety of different workloads, but they mostly take ~negligible incremental time to run compared to the overhead of running the ImageMagick filters. After this commit, we try using all three of the current Tesseract models (classic, LSTM, and classic+LSTM) to generate output text. This fixes chromium-90's tests at release-20.09, and should make cases where you're looking for *specific* text better, with the tradeoff of running Tesseract multiple times. To make it sensible to cherrypick this into release-20.09, this doesn't change the existing API surface for the test driver. In particular, get_screen_text continues to have the existing behaviour. --- .../development/writing-nixos-tests.xml | 22 ++++- nixos/lib/test-driver/test-driver.py | 81 +++++++++++-------- 2 files changed, 70 insertions(+), 33 deletions(-) diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml index 5f70f74d5d90..5a95436915fa 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -186,6 +186,25 @@ start_all() + + + get_screen_text_variants + + + + Return a list of different interpretations of what is currently visible + on the machine's screen using optical character recognition. The number + and order of the interpretations is not specified and is subject to + change, but if no exception is raised at least one will be returned. + + + + This requires passing to the test attribute + set. + + + + get_screen_text @@ -350,7 +369,8 @@ start_all() Wait until the supplied regular expressions matches the textual contents of the screen by using optical character recognition (see - get_screen_text). + get_screen_text and + get_screen_text_variants). diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 96b75a49928f..7800a49e4107 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1,7 +1,7 @@ #! /somewhere/python3 from contextlib import contextmanager, _GeneratorContextManager from queue import Queue, Empty -from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List +from typing import Tuple, Any, Callable, Dict, Iterator, Optional, List, Iterable from xml.sax.saxutils import XMLGenerator import queue import io @@ -205,6 +205,37 @@ class Logger: self.xml.endElement("nest") +def _perform_ocr_on_screenshot( + screenshot_path: str, model_ids: Iterable[int] +) -> List[str]: + if shutil.which("tesseract") is None: + raise Exception("OCR requested but enableOCR is false") + + magick_args = ( + "-filter Catrom -density 72 -resample 300 " + + "-contrast -normalize -despeckle -type grayscale " + + "-sharpen 1 -posterize 3 -negate -gamma 100 " + + "-blur 1x65535" + ) + + tess_args = f"-c debug_file=/dev/null --psm 11" + + cmd = f"convert {magick_args} {screenshot_path} tiff:{screenshot_path}.tiff" + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception(f"TIFF conversion failed with exit code {ret.returncode}") + + model_results = [] + for model_id in model_ids: + cmd = f"tesseract {screenshot_path}.tiff - {tess_args} --oem {model_id}" + ret = subprocess.run(cmd, shell=True, capture_output=True) + if ret.returncode != 0: + raise Exception(f"OCR failed with exit code {ret.returncode}") + model_results.append(ret.stdout.decode("utf-8")) + + return model_results + + class Machine: def __init__(self, args: Dict[str, Any]) -> None: if "name" in args: @@ -637,43 +668,29 @@ class Machine: """Debugging: Dump the contents of the TTY""" self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty)) + def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]: + with tempfile.TemporaryDirectory() as tmpdir: + screenshot_path = os.path.join(tmpdir, "ppm") + self.send_monitor_command(f"screendump {screenshot_path}") + return _perform_ocr_on_screenshot(screenshot_path, model_ids) + + def get_screen_text_variants(self) -> List[str]: + return self._get_screen_text_variants([0, 1, 2]) + def get_screen_text(self) -> str: - if shutil.which("tesseract") is None: - raise Exception("get_screen_text used but enableOCR is false") - - magick_args = ( - "-filter Catrom -density 72 -resample 300 " - + "-contrast -normalize -despeckle -type grayscale " - + "-sharpen 1 -posterize 3 -negate -gamma 100 " - + "-blur 1x65535" - ) - - tess_args = "-c debug_file=/dev/null --psm 11 --oem 2" - - with self.nested("performing optical character recognition"): - with tempfile.NamedTemporaryFile() as tmpin: - self.send_monitor_command("screendump {}".format(tmpin.name)) - - cmd = "convert {} {} tiff:- | tesseract - - {}".format( - magick_args, tmpin.name, tess_args - ) - ret = subprocess.run(cmd, shell=True, capture_output=True) - if ret.returncode != 0: - raise Exception( - "OCR failed with exit code {}".format(ret.returncode) - ) - - return ret.stdout.decode("utf-8") + return self._get_screen_text_variants([2])[0] def wait_for_text(self, regex: str) -> None: def screen_matches(last: bool) -> bool: - text = self.get_screen_text() - matches = re.search(regex, text) is not None + variants = self.get_screen_text_variants() + for text in variants: + if re.search(regex, text) is not None: + return True - if last and not matches: - self.log("Last OCR attempt failed. Text was: {}".format(text)) + if last: + self.log("Last OCR attempt failed. Text was: {}".format(variants)) - return matches + return False with self.nested("waiting for {} to appear on screen".format(regex)): retry(screen_matches) From c0cca46ef08eb8af2d50a5b9087fafa0c43ba640 Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Sat, 24 Apr 2021 03:38:02 +0800 Subject: [PATCH 0760/1183] zls: init at 0.1.0 --- pkgs/development/tools/zls/default.nix | 32 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/tools/zls/default.nix diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix new file mode 100644 index 000000000000..6adf3a2ae9b7 --- /dev/null +++ b/pkgs/development/tools/zls/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchFromGitHub, zig }: + +stdenv.mkDerivation rec { + pname = "zls"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "zigtools"; + repo = pname; + rev = version; + sha256 = "sha256-A4aOdmlIxBUeKyczzLxH4y1Rl9TgE1EeiKGbWY4p/00="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ zig ]; + + preBuild = '' + export HOME=$TMPDIR + ''; + + installPhase = '' + zig build -Drelease-safe --prefix $out install + ''; + + meta = with lib; { + description = "Zig LSP implementation + Zig Language Server"; + changelog = "https://github.com/zigtools/zls/releases/tag/${version}"; + homepage = "https://github.com/zigtools/zls"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 75dc83b72562..6bde5236e719 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13693,6 +13693,8 @@ in ytt = callPackage ../development/tools/ytt {}; + zls = callPackage ../development/tools/zls { }; + zydis = callPackage ../development/libraries/zydis { }; winpdb = callPackage ../development/tools/winpdb { }; From 9ef9098a6a7736a58c02f53c53620d14055a54bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 23 Apr 2021 20:43:13 +0200 Subject: [PATCH 0761/1183] spotdl: 3.5.1 -> 3.5.2 https://github.com/spotDL/spotify-downloader/releases/tag/v3.5.2 --- pkgs/tools/audio/spotdl/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 5dc6e39f8d2e..80480c91ca9a 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -1,30 +1,20 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , ffmpeg }: python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "v${version}"; - sha256 = "sha256-Mc0aODyt0rwmBhkvY/gH1ODz4k8LOxyU5xXglSb6sPs="; + sha256 = "sha256-V9jIA+ULjZRj+uVy4Yh55PapPiqFy9I9ZVln1nt/bJw="; }; - patches = [ - # https://github.com/spotDL/spotify-downloader/pull/1254 - (fetchpatch { - name = "subprocess-dont-use-shell.patch"; - url = "https://github.com/spotDL/spotify-downloader/commit/fe9848518900577776b463ef0798796201e226ac.patch"; - sha256 = "1kqq3y31dcx1zglywr564hkd2px3qx6sk3rkg7yz8n5hnfjhp6fn"; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ spotipy pytube From 261b8a48a12ce5150a9a94a78dff5cffb402d1a7 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 23 Apr 2021 16:07:46 -0400 Subject: [PATCH 0762/1183] liburing: fix build on 32-bit ARM Apply an upstream patch to fix compiling some of the tests. --- pkgs/development/libraries/liburing/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index 10554cb528ea..ddd7c7b207da 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; }; + patches = [ + # Fix build on 32-bit ARM + (fetchpatch { + url = "https://github.com/axboe/liburing/commit/808b6c72ab753bda0c300b5683cfd31750d1d49b.patch"; + sha256 = "1x7a9c5a6rwhfsbjqmhbnwh2aiin6yylckrqdjbzljrprzf11wrd"; + }) + ]; + separateDebugInfo = true; enableParallelBuilding = true; # Upstream's configure script is not autoconf generated, but a hand written one. From b81b6747eaa5d4de52b4ac95bef96f251addb5c4 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Fri, 23 Apr 2021 23:07:45 +0300 Subject: [PATCH 0763/1183] gimx: cleanup --- pkgs/games/gimx/default.nix | 10 +++++++--- pkgs/games/gimx/noff.patch | 16 ---------------- 2 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 pkgs/games/gimx/noff.patch diff --git a/pkgs/games/gimx/default.nix b/pkgs/games/gimx/default.nix index ab208dfa003c..0ae5a7917096 100644 --- a/pkgs/games/gimx/default.nix +++ b/pkgs/games/gimx/default.nix @@ -51,15 +51,19 @@ in stdenv.mkDerivation rec { mkdir -p $out/share cp -r ./loader/firmware $out/share/firmware cp -r ${gimx-config}/Linux $out/share/config - patch ${gimx-config}/Linux/Dualshock4.xml ${./noff.patch} -o $out/share/ds4.xml makeWrapper $out/bin/gimx $out/bin/gimx-with-confs \ --set GIMXCONF $out/share/config makeWrapper $out/bin/gimx $out/bin/gimx-test-ds4 \ - --set GIMXCONF $out/share \ + --set GIMXCONF $out/share/config \ --add-flags "--nograb" --add-flags "--curses" \ - --add-flags "-p /dev/ttyUSB0" --add-flags "-c ds4.xml" + --add-flags "-p /dev/ttyUSB0" --add-flags "-c Dualshock4.xml" + + makeWrapper $out/bin/gimx $out/bin/gimx-test-xone \ + --set GIMXCONF $out/share/config \ + --add-flags "--nograb" --add-flags "--curses" \ + --add-flags "-p /dev/ttyUSB0" --add-flags "-c XOnePadUsb.xml" ''; meta = with lib; { diff --git a/pkgs/games/gimx/noff.patch b/pkgs/games/gimx/noff.patch deleted file mode 100644 index 86b36adda231..000000000000 --- a/pkgs/games/gimx/noff.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Linux/Dualshock4.xml b/Linux/Dualshock4.xml -index 5e53ed3..45ee5ed 100644 ---- a/Linux/Dualshock4.xml -+++ b/Linux/Dualshock4.xml -@@ -94,6 +94,11 @@ - - - -+ -+ -+ -+ -+ - - - From 31f0207ac1f0165c1b4c088f08aa8f51e4480a3b Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 23 Apr 2021 22:13:08 +0200 Subject: [PATCH 0764/1183] imagemagick6: 6.9.12-3 -> 6.9.12-8 --- pkgs/applications/graphics/ImageMagick/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/6.x.nix b/pkgs/applications/graphics/ImageMagick/6.x.nix index de96650167f0..c77e60950c96 100644 --- a/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "6.9.12-3"; + version = "6.9.12-8"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick6"; rev = version; - sha256 = "sha256-h9c0N9AcFVpNYpKl+95q1RVJWuacN4N4kbAJIKJp8Jc="; + sha256 = "sha256-ZFCmoZOdZ3jbM5S90zBNiMGJKFylMLO0r3DB25wu3MM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 4a965004140fa61ee61de825fe02124b508f83a2 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 23 Apr 2021 22:27:14 +0200 Subject: [PATCH 0765/1183] imagemagick: 7.0.11-6 -> 7.0.11-8 --- 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 8cf7966703fb..b2c665258cd4 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.0.11-6"; + version = "7.0.11-8"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - sha256 = "sha256-QClOS58l17KHeQXya+IKNx6nIkd6jCKp8uupRH7Fwnk="; + sha256 = "sha256-h9hoFXnxuLVQRVtEh83P7efz2KFLLqOXKD6nVJEhqiM="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 3161796aaa9f75f39c7079468434076eb251ff3b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 22:31:12 +0200 Subject: [PATCH 0766/1183] python3Packages.xknx: 0.18.0 -> 0.18.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index a181a6741887..aefe3ed2b95c 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.0"; + version = "0.18.1"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-8g8DrFvhecdPsfiw+uKnfJOrLQeuFUziK2Jl3xKmrf4="; + sha256 = "sha256-Zf7Od3v54LxMofm67XHeRM4Yeg1+KQLRhFl1BihAxGc="; }; propagatedBuildInputs = [ From f5f575f63afa8a0c758603e3d5ec1e9c2f3d560f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 22:34:46 +0200 Subject: [PATCH 0767/1183] home-assistant: enable knx tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d4516167fddd..ab85db8a4f13 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -291,6 +291,7 @@ in with py.pkgs; buildPythonApplication rec { "intent_script" "ipp" "kmtronic" + "knx" "kodi" "light" "litterrobot" From 2a4aec9cdf279d01721423f492d2be09623c78f5 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Fri, 23 Apr 2021 20:47:26 +0000 Subject: [PATCH 0768/1183] vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 126 ++++++++++++++-------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index ba20377a7a0c..b12683a4daa8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "27fefd2ccd0b4c376afdc53e7bb4c6185518d1cd"; - sha256 = "0l1j2n8v2dngyxym8k0b1gf0dn2cc2gbwy36rrv447zb51g1vlv5"; + rev = "5b286768438921cbc77d6cfb4a7046ea45c8adfc"; + sha256 = "1g5g1yqr78l620vr7vslx15j2f4dfg4bb8wwjgfqx0pw5lc982yc"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -533,12 +533,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-04-20"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "19bfd9443708a769b2d1379af874f644ba9f1cd4"; - sha256 = "0c9i25dsqhb1v6kcym424zmc5yn396wz6k9w71s1ja5q4p1jmxd8"; + rev = "f9c4fc96fd08f13f549c4bc0eb56f2d91ca91919"; + sha256 = "087nvvxfxrllnx2ggi8m088wgcrm1hd9c5mqfx37zmzfjqk78rw4"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -618,12 +618,12 @@ let compe-tabnine = buildVimPluginFrom2Nix { pname = "compe-tabnine"; - version = "2021-04-21"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "tzachar"; repo = "compe-tabnine"; - rev = "cb7f22500a6c3b7e3eda36db6ce9ffe5fb45d94c"; - sha256 = "0lpy5h6171xjg6dinhv1m98p0qs0a3qrrhhg7vriicz3x4px73fb"; + rev = "f6ace45ef5cbd8b274d7163a2931c11083d34d44"; + sha256 = "0wjy38v3h5nqr2vw2ydhy2227cqkd8k14cnb3vr39xm5c0fc3ci5"; }; meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; @@ -1244,12 +1244,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-04-15"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "e9efa96bf130496537c978c8ee150bed280f7b19"; - sha256 = "0jzn6vax8ia9ha938jbs0wpm6wgz5m4vg6q3w8z562rq8kq70hcx"; + rev = "d21059cd5960f4d0a5627fda82d29371772b247f"; + sha256 = "0cbsiw0qkynm0glq8kidkbfxwy6lhn7rc6dvxflrrm62cl7yvw91"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1631,12 +1631,12 @@ let git-worktree-nvim = buildVimPluginFrom2Nix { pname = "git-worktree-nvim"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "ThePrimeagen"; repo = "git-worktree.nvim"; - rev = "0ef6f419ba56154320a2547c92bf1ccb08631f9e"; - sha256 = "1pr4p6akq2wivhqb116jrm72v4m1i649p624p3kb55frfxf5pynn"; + rev = "34d1c630546dc21517cd2faad82e23f02f2860d1"; + sha256 = "0ddz2z7plw320kgsddlfywsa202bl8sxr9jbvldhh0j34q5lgdja"; }; meta.homepage = "https://github.com/ThePrimeagen/git-worktree.nvim/"; }; @@ -2088,12 +2088,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-16"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "5b3984bbd411fae75933dcf21bfe2faeb6ec3b34"; - sha256 = "1ynd3ricc3xja9b0wswg4dh1b09p8pnppf682bfkm5a5cqar7n5k"; + rev = "d0bb06ffc40ff7c49dfa2548e007e9013eaeabb7"; + sha256 = "0zj12xp8djy3zr360lg9pkydz92cgkjiz33n9v5s2wyx63gk0dq4"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2364,12 +2364,12 @@ let lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "2f17e432ee85420adcf8e0a4ebf6e638657c4253"; - sha256 = "055pvfmmk8yzjajb9xx46mb5ixass3y1fsvx9p3nchsik1h3vsib"; + rev = "e3a558bc1dfbda29cde5b356b975a8abaf3f41b2"; + sha256 = "1qwrpyjfcn23z4lw5ln5gn4lh8y0rw68gbmyd62pdqazckqhasds"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2760,12 +2760,12 @@ let neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-04-21"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "e28c434c26f76f235087ca65ff8040ff834f9210"; - sha256 = "0fdbyijlpbh845jfpp5xcc378j5m7h2yav6dwj00bvm1n79zy1wh"; + rev = "a62ce86411048e1bed471d4c4ba5f56eb5b59c50"; + sha256 = "1cnywkl21a8mw62bing202nw04y375968bggqraky1c57fpdq35j"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3036,24 +3036,24 @@ let nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; - rev = "50a1c65caf42a0dfe3f63b3dfe1867eec5f4889d"; - sha256 = "1rar4dkd0i277k71a0ydw3ipgbxjjg1hmhddwd993ihcwvk5d496"; + rev = "41b3ed55c345b56190a282b125897dc99d2292d4"; + sha256 = "1pjfani0g0wixsyxk8j0g4289jhnkbxl703fpdp9dls7c427pi8x"; }; meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; - version = "2021-04-17"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-bqf"; - rev = "20e19029c9d212d8eb43eb590ac7530077e13350"; - sha256 = "097iplsdkkq72981nwfppj07d0fg0fzjglwlvpxq61w1jwscd8fj"; + rev = "55135d23dc8da4f75a95f425283c0080ec5a8ac6"; + sha256 = "162wa2hwq1i9v2xgdfvg1d4ab392m4jcw815cn9l3z4r10g9719p"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; @@ -3120,12 +3120,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-18"; + version = "2021-04-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "d646bbc4c820777c2b61dd73819eead1133b15f8"; - sha256 = "1bnxpcyrzi71b4ia0p1v8g3qx204ja4g3yfydcppdiwqfkhm2688"; + rev = "41f982b646b29059749bd588ba783cb99d8fc781"; + sha256 = "0z2kl2iqs8vcb8l4r508ny3h7vl3vm1l6cjsl5bi1s7387pizxbl"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3168,12 +3168,12 @@ let nvim-hlslens = buildVimPluginFrom2Nix { pname = "nvim-hlslens"; - version = "2021-04-21"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "nvim-hlslens"; - rev = "3ad85775c081a8ab8ae8d1f2ecd1afc1bc1500d6"; - sha256 = "0p55zms25kxlayjwy8i831c01fdja0k8y55iw3nx0p257fb06zbz"; + rev = "2f8bd90f3b4fa7620c61f66bcddb965139eb176f"; + sha256 = "1zsvr9pba62ngchfmab7yns64mlkdqclqv516c7h62fh82fyx23a"; }; meta.homepage = "https://github.com/kevinhwang91/nvim-hlslens/"; }; @@ -3216,12 +3216,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "0840c91e25557a47ed559d2281b0b65fe33b271f"; - sha256 = "1k34khp227g9xffnz0sr9bm6h3hnvi3g9csxynpdzd0s2sbjsfgk"; + rev = "62977b6b2eeb20bd37703ebe4bc4b4c2ef006db2"; + sha256 = "0niwaq3mc7x1zaf3qx9dp43607rnhq2nvyizkxb7j1yir8a8dk4x"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3312,12 +3312,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "e8e8c0f0f21ef5089bb305ded8ed81a16902baa7"; - sha256 = "19lb10zk6mn09l4adg4xfqpsjbag52fjg9sr2ic8c6la1x8abzqk"; + rev = "af3537fbe57a2a37ab2b620c9ecc487e31b4da64"; + sha256 = "1z4k0a8gyz8ycd6wq8npg056l0axz3vj7pipxcpi1i9xa4kx3j6i"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3348,12 +3348,12 @@ let nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-04-18"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "18cf678f6218ca40652b6d9017dad1b9e2899ba9"; - sha256 = "0xawv5pjz0mv4pf06vn3pvl4k996jmw4nmawbizqlvladcc2hc1k"; + rev = "522b26a8795994b719a921a03cfacb0d7dcabf78"; + sha256 = "0ww1agq33l3jhbfwr5ri9m3ipr48kgwzlzxv96w43x6y29p61g2v"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -3913,12 +3913,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-16"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "cd1b5632cc2b7981bd7bdb9e55701ae58942864f"; - sha256 = "1jam4fnzg0nvj06d1vd9ryaan8fza7xc7fwdd7675bw828cs2fq8"; + rev = "7d734e9b52fe54b6cd19435f0823d56dc2d17426"; + sha256 = "181vq3p1f136qmb0qbd77khc04vrkdw8z9851car7lxs5m83wwp2"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -4467,12 +4467,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "c6980a9acf8af836196508000c34dcb06b11137b"; - sha256 = "0q2xqxn56gdll1pk6f9kkkfwrp1hlawqmfmj1rzp5aahm77jdx9x"; + rev = "6fd1b3bd255a6ebc2e44cec367ff60ce8e6e6cab"; + sha256 = "1qifrnd0fq9844vvxy9fdp90kkb094a04wcshbfdy4cv489cqfax"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4996,12 +4996,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-04-15"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "07ab201a272fe8a848141a60adec3c0b837c0b37"; - sha256 = "131fj6fmpgbx7hiql1ci60rnpfffkzww0yf6ag3sclvnw375ylx4"; + rev = "0a87d08dbdb398b2bb644b5041f68396f0c92d5d"; + sha256 = "1ihg44f3pn4v3naxlzd9gmhw7hzywv4zzc97i9smbcacg9xm6mna"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -5992,12 +5992,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-16"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "895e56daca03c441427f2adca291cb10ea4d7ca8"; - sha256 = "139zdz0zsaqpwbscqzp61xilrvdjlvhrn985mfpgiwwrr6sa6gdr"; + rev = "8f4a23e6639ff67c0efd7242870d4beed47b5d37"; + sha256 = "0ss8qlxgidlf1ma6z3ma63lqgaynnbrj9fdbw38szwc823vdqiid"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6112,12 +6112,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-04-20"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "3ec431eaefb75520cbcfed0b6d0d7999d7ea3805"; - sha256 = "1h6lcxzm9njnyaxf9qjs4gspd5ag2dmqjjik947idxjs1435xjls"; + rev = "87fd4bf57646f984b37de5041232047fa5fdee5a"; + sha256 = "00clqf82731zz6r1h4vs15zy4dka549cbngr1j9w605k5m9hrrzs"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -8011,12 +8011,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2021-04-22"; + version = "2021-04-23"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "3ffa62fbe781b3df20fafa3bd9d710dc99c16a8c"; - sha256 = "0ysr07yy9fxgz8drn11hgcwns7d0minh4afrjxrz9lwcm7c994h4"; + rev = "df0f1dbdc0689f6172bdd3b8685868aa93446c6f"; + sha256 = "0idrzl2kgclalsxixrh21fkw6d2vd53apw47ajjlcsl94acy2139"; }; meta.homepage = "https://github.com/mhinz/vim-startify/"; }; From 37c937a95fcb4002d2c3eab6f85e5bd77076a3e5 Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Fri, 23 Apr 2021 20:47:52 +0000 Subject: [PATCH 0769/1183] vimPlugins.nvim-base16: init at 2021-04-12 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b12683a4daa8..7cee6b230582 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -3046,6 +3046,18 @@ let meta.homepage = "https://github.com/windwp/nvim-autopairs/"; }; + nvim-base16 = buildVimPluginFrom2Nix { + pname = "nvim-base16"; + version = "2021-04-12"; + src = fetchFromGitHub { + owner = "RRethy"; + repo = "nvim-base16"; + rev = "9d6649c01221680e5bb20ff9e2455280d9665de2"; + sha256 = "18a974l753d92x3jyv5j0anri99hxzfw454lkz94amabbnc010p6"; + }; + meta.homepage = "https://github.com/RRethy/nvim-base16/"; + }; + nvim-bqf = buildVimPluginFrom2Nix { pname = "nvim-bqf"; version = "2021-04-23"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index aef8958b55e4..c74ac0a73f4a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -529,6 +529,7 @@ roxma/nvim-cm-racer roxma/nvim-completion-manager roxma/nvim-yarp roxma/vim-tmux-clipboard +RRethy/nvim-base16 RRethy/vim-hexokinase RRethy/vim-illuminate rstacruz/vim-closer From a9a112e57fdd455fa6909af5bfdc3e9073514874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 23 Apr 2021 22:45:02 +0200 Subject: [PATCH 0770/1183] nsjail: fix bison link error The nsjail build has been broken since the 3.7.5 bison bump: /nix/store/(...)/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror': arm_syscalls.c:(.text+0x6833): undefined reference to `YYUSE' The issue is coming from kafel and has been fixed upstream. More infos at: https://github.com/google/kafel/pull/28. Kafel being distributed through a git submodule in the nsjail repo, we can't directly fetchpatch the fix from Github. We had to manually modify the said patch to add a /kafel prefix. We'll need to remove this patch for the next nsjail version bump. --- .../nsjail/001-fix-bison-link-error.patch | 30 +++++++++++++++++++ pkgs/tools/security/nsjail/default.nix | 7 ++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/nsjail/001-fix-bison-link-error.patch diff --git a/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch b/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch new file mode 100644 index 000000000000..427cea5b02b6 --- /dev/null +++ b/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch @@ -0,0 +1,30 @@ +From 8e309a0af0851ab54ca7c6d51b6f3d19ee42c8ee Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras +Date: Wed, 17 Mar 2021 16:36:40 +0200 +Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y + +The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well +avoid using it altogether and cast the unused variable to void instead. + +Fixes the following linker error: + +/usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror': +arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE' +--- + src/parser.y | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/parser.y b/src/parser.y +index e0f109c..0e01373 100644 +--- a/kafel/src/parser.y ++++ b/kafel/src/parser.y +@@ -420,8 +420,8 @@ const_def + + void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner, + const char *msg) { ++ (void)scanner; /* suppress unused-parameter warning */ + if (!ctxt->lexical_error) { +- YYUSE(scanner); + if (loc->filename != NULL) { + append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg); + } else { diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index d48564ce95b0..568113368a08 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "nsjail"; - version = "3.0"; + version = "3.0"; # Bumping? Remove the bison patch. src = fetchFromGitHub { owner = "google"; @@ -18,6 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; + patches = [ + # To remove after bumping 3.0 + ./001-fix-bison-link-error.patch + ]; + preBuild = '' makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap') ''; From 0bab17566ab3031433481dc456894a13ecba62ee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 23:12:21 +0200 Subject: [PATCH 0771/1183] python3Packages.pymetno: 0.8.2 -> 0.8.3 --- pkgs/development/python-modules/pymetno/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index 5e0131352c34..0115893700ac 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -8,15 +8,15 @@ }: buildPythonPackage rec { - pname = "PyMetno"; - version = "0.8.2"; + pname = "pymetno"; + version = "0.8.3"; format = "setuptools"; src = fetchFromGitHub { - repo = pname; owner = "Danielhiversen"; + repo = "PyMetno"; rev = version; - sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5"; + sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g="; }; propagatedBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "A library to communicate with the met.no api"; + description = "A library to communicate with the met.no API"; homepage = "https://github.com/Danielhiversen/pyMetno/"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; From 0dee033ce7d72ff1fe5c394af7943b978c0d68e2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 23 Apr 2021 23:24:13 +0200 Subject: [PATCH 0772/1183] chromiumDev: Fix the configuration phase (#120464) The Python 3 support still isn't ready... --- .../networking/browsers/chromium/common.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 4695667ee6cc..08bf466797ae 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -7,7 +7,7 @@ , xdg-utils, yasm, nasm, minizip, libwebp , libusb1, pciutils, nss, re2 -, python2Packages, perl, pkg-config +, python2Packages, python3Packages, perl, pkg-config , nspr, systemd, libkrb5 , util-linux, alsaLib , bison, gperf @@ -42,6 +42,16 @@ with lib; let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + # TODO: Python 3 support is incomplete and "python3 ../../build/util/python2_action.py" + # currently doesn't work due to mixed Python 2/3 dependencies: + pythonPackages = if chromiumVersionAtLeast "93" + then python3Packages + else python2Packages; + forcePython3Patch = (githubPatch + # Reland #8 of "Force Python 3 to be used in build."": + "a2d3c362802d9e6b62f895fcda75a3695b77b1b8" + "1r9spr2wmjk9x9l3m1gzn6692mlvbxdz0r5hlr5rfwiwr900rxi2" + ); # The additional attributes for creating derivations based on the chromium # source tree. @@ -127,9 +137,9 @@ let nativeBuildInputs = [ llvmPackages.lldClang.bintools - ninja which python2Packages.python perl pkg-config - python2Packages.ply python2Packages.jinja2 nodejs - gnutar python2Packages.setuptools + ninja which pythonPackages.python perl pkg-config + pythonPackages.ply pythonPackages.jinja2 nodejs + gnutar pythonPackages.setuptools ]; buildInputs = defaultDependencies ++ [ @@ -168,6 +178,8 @@ let postPatch = lib.optionalString (chromiumVersionAtLeast "91") '' # Required for patchShebangs (unsupported): chmod -x third_party/webgpu-cts/src/tools/deno + '' + optionalString (chromiumVersionAtLeast "92") '' + patch -p1 --reverse < ${forcePython3Patch} '' + '' # remove unused third-party for lib in ${toString gnSystemLibraries}; do From 9b99f69ffdc81682b430013358c0b9bbc769806b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 23:27:11 +0200 Subject: [PATCH 0773/1183] python3Packages.watchdog: 2.0.2 -> 2.0.3 --- .../python-modules/watchdog/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index ef80dedeb98d..df9586fc8e00 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -2,32 +2,22 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , argh , pathtools , pyyaml -, pytest-cov , pytestCheckHook , CoreServices }: buildPythonPackage rec { pname = "watchdog"; - version = "2.0.2"; + version = "2.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Uy/t2ZPnVVRnH6o2zQTFgM7T+uCEJUp3mvu9iq8AVms="; + sha256 = "sha256-QojTqYQyTbSS5XqhaWZiOKJXjwr1oIFoVSZgj7n2vWE="; }; - patches = [ - (fetchpatch { - # Fix test flakiness on Apple Silicon, remove after upgrade to 2.0.6. - url = "https://github.com/gorakhargosh/watchdog/commit/331fd7c2c819663be39bc146e78ce67553f265fa.patch"; - sha256 = "sha256-pLkZmbPN3qRNHs53OP0HIyDxqYCPPo6yOcBLD3aO2YE="; - }) - ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; propagatedBuildInputs = [ @@ -37,10 +27,15 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest-cov pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=watchdog" "" \ + --replace "--cov-report=term-missing" "" + ''; + pythonImportsCheck = [ "watchdog" ]; meta = with lib; { From 88289c4b37a525650abd4b77f86d271245f3fb7c Mon Sep 17 00:00:00 2001 From: "\"Andrey Kuznetsov\"" <"fear@loathing.in"> Date: Fri, 23 Apr 2021 21:32:16 +0000 Subject: [PATCH 0774/1183] vimPlugins.lsp-colors-nvim: init at 2021-04-23 --- pkgs/misc/vim-plugins/generated.nix | 12 ++++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 7cee6b230582..5a5c66c538f9 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -2314,6 +2314,18 @@ let meta.homepage = "https://github.com/tami5/lispdocs.nvim/"; }; + lsp-colors-nvim = buildVimPluginFrom2Nix { + pname = "lsp-colors-nvim"; + version = "2021-04-23"; + src = fetchFromGitHub { + owner = "folke"; + repo = "lsp-colors.nvim"; + rev = "525c57c1138ca5640547efb476758938aedba943"; + sha256 = "0dxalh12ifsghksl423bbawq096k8fcl1cgmnvaw3f2x71fngfs6"; + }; + meta.homepage = "https://github.com/folke/lsp-colors.nvim/"; + }; + lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; version = "2021-04-09"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index c74ac0a73f4a..5421387e950d 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -132,6 +132,7 @@ fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim +folke/lsp-colors.nvim@main freitass/todo.txt-vim frigoeu/psc-ide-vim fruit-in/brainfuck-vim From fc55a1bdd4a863e354c3b7fa8bf19fb874949124 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 23:34:26 +0200 Subject: [PATCH 0775/1183] nixos/tests/prometheus-exporters/bird: set router id Previously bird would refuse to start up because the router id wasn't set. > bird[682]: Cannot determine router ID, please configure it manually --- nixos/tests/prometheus-exporters.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index cf3518286fdd..9aa430c25a4f 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -118,6 +118,8 @@ let metricProvider = { services.bird2.enable = true; services.bird2.config = '' + router id 127.0.0.1; + protocol kernel MyObviousTestString { ipv4 { import all; From 9aac17868f30fec7429d95192f81ab3aee56965e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Apr 2021 23:49:58 +0200 Subject: [PATCH 0776/1183] python3Packages.python-picnic-api: init at 1.1.0 --- .../python-picnic-api/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/python-picnic-api/default.nix diff --git a/pkgs/development/python-modules/python-picnic-api/default.nix b/pkgs/development/python-modules/python-picnic-api/default.nix new file mode 100644 index 000000000000..4ff18224d2d8 --- /dev/null +++ b/pkgs/development/python-modules/python-picnic-api/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +}: + +buildPythonPackage rec { + pname = "python-picnic-api"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1axqw4bs3wa9mdac35h7r25v3i5g7v55cvyy48c4sg31dxnr4wcp"; + }; + + propagatedBuildInputs = [ + requests + ]; + + # Project doesn't ship tests + # https://github.com/MikeBrink/python-picnic-api/issues/13 + doCheck = false; + + pythonImportsCheck = [ + "python_picnic_api" + ]; + + meta = with lib; { + description = "Python wrapper for the Picnic API"; + homepage = "https://github.com/MikeBrink/python-picnic-api"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8169495a3e16..7422cdc2f4ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6968,6 +6968,8 @@ in { python-periphery = callPackage ../development/python-modules/python-periphery { }; + python-picnic-api = callPackage ../development/python-modules/python-picnic-api { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; python-prctl = callPackage ../development/python-modules/python-prctl { }; From 532493b50893e463e8bb3c76641cb4d31c7c3835 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 18 Apr 2021 22:53:35 +0000 Subject: [PATCH 0777/1183] lib.systems.doubles.netbsd: expand These are all the architectures supported by Nixpkgs on other platforms, that are also supported by NetBSD. (So I haven't added any architectures that are new to Nixpkgs here, even though NetBSD supports some that we don't have.) --- lib/systems/doubles.nix | 4 +++- lib/tests/systems.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 7ad40c8c62c2..6f638be585b1 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -33,7 +33,9 @@ let "mmix-mmixware" # NetBSD - "i686-netbsd" "x86_64-netbsd" + "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" + "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" + "riscv64-netbsd" "x86_64-netbsd" # none "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none" diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index c0800df25ed7..36f82b783b41 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -15,9 +15,9 @@ in with lib.systems.doubles; lib.runTests { testall = mseteq all (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ wasi ++ windows ++ embedded ++ mmix ++ js ++ genode ++ redox); - testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-none" "armv7a-linux" "armv7l-linux" "arm-none" "armv7a-darwin" ]; + testarm = mseteq arm [ "armv5tel-linux" "armv6l-linux" "armv6l-netbsd" "armv6l-none" "armv7a-linux" "armv7a-netbsd" "armv7l-linux" "armv7l-netbsd" "arm-none" "armv7a-darwin" ]; testi686 = mseteq i686 [ "i686-linux" "i686-freebsd" "i686-genode" "i686-netbsd" "i686-openbsd" "i686-cygwin" "i686-windows" "i686-none" "i686-darwin" ]; - testmips = mseteq mips [ "mipsel-linux" ]; + testmips = mseteq mips [ "mipsel-linux" "mipsel-netbsd" ]; testmmix = mseteq mmix [ "mmix-mmixware" ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin" "x86_64-solaris" "x86_64-windows" "x86_64-none" ]; @@ -29,7 +29,7 @@ with lib.systems.doubles; lib.runTests { testgnu = mseteq gnu (linux /* ++ kfreebsd ++ ... */); testillumos = mseteq illumos [ "x86_64-solaris" ]; testlinux = mseteq linux [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-linux" "mipsel-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux" "powerpc64-linux" "powerpc64le-linux" ]; - testnetbsd = mseteq netbsd [ "i686-netbsd" "x86_64-netbsd" ]; + testnetbsd = mseteq netbsd [ "aarch64-netbsd" "armv6l-netbsd" "armv7a-netbsd" "armv7l-netbsd" "i686-netbsd" "mipsel-netbsd" "powerpc-netbsd" "riscv32-netbsd" "riscv64-netbsd" "x86_64-netbsd" ]; testopenbsd = mseteq openbsd [ "i686-openbsd" "x86_64-openbsd" ]; testwindows = mseteq windows [ "i686-cygwin" "x86_64-cygwin" "i686-windows" "x86_64-windows" ]; testunix = mseteq unix (linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos ++ cygwin ++ redox); From 134fd7fbe4a3db8d2c607bdc63746bd34c90fa5b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 24 Apr 2021 00:27:21 +0200 Subject: [PATCH 0778/1183] openttd: 1.11.0 -> 1.11.1 --- pkgs/games/openttd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index a39b9cab3597..34de043a6585 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "sha256-XmUYTgc2i6Gvpi27PjWrrubE2mcw/0vJ60RH1TNjx6g="; + sha256 = "sha256-qZGeLkKbsI+in+jme6m8dckOnvb6ZCSOs0IjoyXUAKM="; }; nativeBuildInputs = [ cmake makeWrapper ]; From c1c22e065d69b2d91aae2cde32b34d4816625718 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sat, 24 Apr 2021 00:27:43 +0200 Subject: [PATCH 0779/1183] openttd-jgrpp: 0.40.5 -> 0.41.0 --- pkgs/games/openttd/jgrpp.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix index 7f756dd10b71..3dcb621db4b3 100644 --- a/pkgs/games/openttd/jgrpp.nix +++ b/pkgs/games/openttd/jgrpp.nix @@ -2,12 +2,12 @@ openttd.overrideAttrs (oldAttrs: rec { pname = "openttd-jgrpp"; - version = "0.40.5"; + version = "0.41.0"; src = fetchFromGitHub rec { owner = "JGRennison"; repo = "OpenTTD-patches"; rev = "jgrpp-${version}"; - sha256 = "sha256-g1RmgVjefOrOVLTvFBiPEd19aLoFvB9yX/hMiKgGcGw="; + sha256 = "sha256-DrtxqXyeqA+X4iLTvTSPFDKDoLCyVd458+nJWc+9MF4="; }; }) From 7ff0ccc324a25aad2a7b3bcce3b6ab08d2fb5672 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 20 Apr 2021 02:14:04 +0200 Subject: [PATCH 0780/1183] nixos/vnstat: homedir -> statedir before, a nixos update that didn't trigger the chmod would break vnstat and use a vnstatd group --- nixos/modules/services/monitoring/vnstat.nix | 28 +++++++++++--------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index e9bedb704a43..5e19c399568d 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -6,21 +6,21 @@ let cfg = config.services.vnstat; in { options.services.vnstat = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable update of network usage statistics via vnstatd. - ''; - }; + enable = mkEnableOption "update of network usage statistics via vnstatd"; }; config = mkIf cfg.enable { - users.users.vnstatd = { - isSystemUser = true; - description = "vnstat daemon user"; - home = "/var/lib/vnstat"; - createHome = true; + + environment.systemPackages = [ pkgs.vnstat ]; + + users = { + groups.vnstatd = {}; + + users.vnstatd = { + isSystemUser = true; + group = "vnstatd"; + description = "vnstat daemon user"; + }; }; systemd.services.vnstat = { @@ -33,7 +33,6 @@ in { "man:vnstat(1)" "man:vnstat.conf(5)" ]; - preStart = "chmod 755 /var/lib/vnstat"; serviceConfig = { ExecStart = "${pkgs.vnstat}/bin/vnstatd -n"; ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID"; @@ -52,7 +51,10 @@ in { RestrictNamespaces = true; User = "vnstatd"; + Group = "vnstatd"; }; }; }; + + meta.maintainers = [ maintainers.evils ]; } From a8ed2152a138e47527439716c9c5f7c181f0b888 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Sat, 24 Apr 2021 01:20:19 +0200 Subject: [PATCH 0781/1183] maintainers: change first name and mail of erictapen It's time to make it official :) --- maintainers/maintainer-list.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cdd854ddb335..8962995a357c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3008,13 +3008,13 @@ name = "John Ericson"; }; erictapen = { - email = "justin.humm@posteo.de"; + email = "kerstin@erictapen.name"; github = "erictapen"; githubId = 11532355; - name = "Justin Humm"; + name = "Kerstin Humm"; keys = [{ - longkeyid = "rsa4096/0x438871E000AA178E"; - fingerprint = "984E 4BAD 9127 4D0E AE47 FF03 4388 71E0 00AA 178E"; + longkeyid = "rsa4096/0x40293358C7B9326B"; + fingerprint = "F178 B4B4 6165 6D1B 7C15 B55D 4029 3358 C7B9 326B"; }]; }; erikryb = { From a0d33f244a56b2887e6411c05e712a77890a806f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 23 Apr 2021 18:22:17 -0300 Subject: [PATCH 0782/1183] libnbd: 1.7.5 -> 1.7.7 --- pkgs/development/libraries/libnbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnbd/default.nix b/pkgs/development/libraries/libnbd/default.nix index 2cd634325b28..2254c8241545 100644 --- a/pkgs/development/libraries/libnbd/default.nix +++ b/pkgs/development/libraries/libnbd/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libnbd"; - version = "1.7.5"; + version = "1.7.7"; src = fetchurl { url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-development/${pname}-${version}.tar.gz"; - sha256 = "sha256-UxQx/wnKnCB3uC9xEfq1F0l3kHAJjp9GzbeRugKyFsk="; + hash = "sha256-fNeu1qx+EbKitv2I8nJAmGMF5jxN2RZGPR/LJYnOjG8="; }; nativeBuildInputs = [ From f58f7892d15a04e0f73eaea8c1d6b0218e3b17d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 23 Apr 2021 18:21:51 -0300 Subject: [PATCH 0783/1183] jasper: 2.0.28 -> 2.0.32 --- pkgs/development/libraries/jasper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index fac8a40bb24a..2df3e554c9b6 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jasper"; - version = "2.0.28"; + version = "2.0.32"; src = fetchFromGitHub { owner = "jasper-software"; repo = pname; rev = "version-${version}"; - hash = "sha256-f3UG5w8GbwZcsFBaQN6v8kdEkKIGgizcAgaVZtKwS78="; + hash = "sha256-Uwgtex0MWC/pOmEr8itHMIa4wxd97c/tsTzcLgV8D0I="; }; nativeBuildInputs = [ From d407a38a96d029d7a44df091ac898a27f648b277 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Apr 2021 01:50:09 +0200 Subject: [PATCH 0784/1183] ajour: 1.0.0 -> 1.1.0 --- pkgs/tools/games/ajour/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/games/ajour/default.nix b/pkgs/tools/games/ajour/default.nix index 3bc87680c52f..9cb79ceabe01 100644 --- a/pkgs/tools/games/ajour/default.nix +++ b/pkgs/tools/games/ajour/default.nix @@ -34,16 +34,16 @@ let in rustPlatform.buildRustPackage rec { pname = "Ajour"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "casperstorm"; repo = "ajour"; rev = version; - sha256 = "sha256-u48U4WGlrSl8T3YF7cjApyjNaUI4YyyHEy0TgJw7r/Y="; + sha256 = "1xzsgxkdwdqcr8xs9ajr1ykfjjz95z9k7b7l644yijg31xf1lbq6"; }; - cargoSha256 = "sha256-Hdid70AB4AKtSsQBsr6K/de4nvI3rvghEWIwM7mpRIA="; + cargoSha256 = "02g25wr0f2bjr7zmpll3iicc6i8wk1j9iavagg1vhbpynp6z013x"; nativeBuildInputs = [ autoPatchelfHook From 6a8359a92ab501ae62739e9d3302f48e3e73c750 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 24 Apr 2021 00:42:22 +0000 Subject: [PATCH 0785/1183] nixos/amazon-image: (temporarily) use fixed disk size again As a temporary workaround for #120473 while the image builder is patched to correctly look up disk sizes, partially revert f3aa040bcbf39935e7e9ac7a7296eac9da7623ec for EC2 disk images only. We retain the type allowing "auto" but set the default back to the previous value. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 653744986d13..b05467fb9b89 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -41,7 +41,8 @@ in { sizeMB = mkOption { type = with types; either (enum [ "auto" ]) int; - default = "auto"; + # TODO(lukegb): this should be "auto"; see #120473 + default = if config.ec2.hvm then 2048 else 8192; example = 8192; description = "The size in MB of the image"; }; From 49155acb742d6fcffd7acc971053dfed92b12547 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 24 Apr 2021 01:19:01 +0200 Subject: [PATCH 0786/1183] handlr: 0.5.0 -> 0.6.1 Adds the missing shared-mime-info dependency and fixes tests. --- pkgs/tools/misc/handlr/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix index 1d825c866c47..978168d36764 100644 --- a/pkgs/tools/misc/handlr/default.nix +++ b/pkgs/tools/misc/handlr/default.nix @@ -1,20 +1,23 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, shared-mime-info }: rustPlatform.buildRustPackage rec { pname = "handlr"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "1f4gmlqzgw1r8n0w9dr9lpsn94f2hlnak9bbq5xgf6jwgc9mwqzg"; + sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg"; }; - cargoSha256 = "16d4dywwkgvvxw6ninrx87rqhx0whdq3yy01m27qjy4gz6z6ad8p"; + cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid"; - # Most tests fail (at least some due to directory permissions) - doCheck = false; + nativeBuildInputs = [ shared-mime-info ]; + + preCheck = '' + export HOME=$TEMPDIR + ''; meta = with lib; { description = "Alternative to xdg-open to manage default applications with ease"; From d788c091b6348dd897c438a1ec2ad40822170e3c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 02:50:53 +0200 Subject: [PATCH 0787/1183] common-updater-scripts: remove lib dependency So that the script can be used outside of nixpkgs. --- pkgs/common-updater/scripts/update-source-version | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 90543a9cfc6a..831f65e4d90d 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -99,11 +99,10 @@ if [[ -z "$oldUrl" ]]; then die "Couldn't evaluate source url from '$attr.src'!" fi -drvName=$(nix-instantiate $systemArg --eval -E "with import ./. {}; lib.getName $attr" | tr -d '"') -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (lib.getVersion $attr)" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') -if [[ -z "$drvName" || -z "$oldVersion" ]]; then - die "Couldn't evaluate name and version from '$attr.name'!" +if [[ -z "$oldVersion" ]]; then + die "Couldn't find out the old version of '$attr'!" fi if [[ "$oldVersion" = "$newVersion" ]]; then From ceeaf2d0669cc5a4d86e6313cc0fdb6774659884 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Fri, 23 Apr 2021 00:50:38 -0700 Subject: [PATCH 0788/1183] python3Packages.dask: fix sandboxed builds Importing dask.dataframe in a sandboxed build results in a TypeError like this: File "/nix/store/nv60iri29bia4szhhcvsdxgsci4wxvp6-python3.8-dask-2021.03.0/lib/python3.8/site-packages/dask/dataframe/io/csv.py", line 392, in AUTO_BLOCKSIZE = auto_blocksize(TOTAL_MEM, CPU_COUNT) File "/nix/store/nv60iri29bia4szhhcvsdxgsci4wxvp6-python3.8-dask-2021.03.0/lib/python3.8/site-packages/dask/dataframe/io/csv.py", line 382, in auto_blocksize blocksize = int(total_memory // cpu_count / memory_factor) TypeError: unsupported operand type(s) for //: 'int' and 'NoneType' This occurs because dask.dataframe has a non-deterministic component which generates an automatic chunk-size based on system information. This went unnoticed because the dask tests were disabled. Changes: - add a patch making the chunk-size inference more robust - re-enable the tests Resolves #120307 --- .../python-modules/dask/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 8f3e4d08583b..13c03a1f7968 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -1,6 +1,7 @@ { lib , bokeh , buildPythonPackage +, fetchpatch , fetchFromGitHub , fsspec , pytestCheckHook @@ -42,7 +43,7 @@ buildPythonPackage rec { distributed ]; - doCheck = false; + doCheck = true; checkInputs = [ pytestCheckHook @@ -52,6 +53,16 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; + patches = [ + # dask dataframe cannot be imported in sandboxed builds + # See https://github.com/dask/dask/pull/7601 + (fetchpatch { + url = "https://github.com/dask/dask/commit/9ce5b0d258cecb3ef38fd844135ad1f7ac3cea5f.patch"; + sha256 = "sha256-1EVRYwAdTSEEH9jp+UOnrijzezZN3iYR6q6ieYJM3kY="; + name = "fix-dask-dataframe-imports-in-sandbox.patch"; + }) + ]; + postPatch = '' # versioneer hack to set version of github package echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py @@ -66,8 +77,13 @@ buildPythonPackage rec { disabledTests = [ "test_annotation_pack_unpack" "test_annotations_blockwise_unpack" + # this test requires features of python3Packages.psutil that are + # blocked in sandboxed-builds + "test_auto_blocksize_csv" ]; + pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; + meta = with lib; { description = "Minimal task scheduling abstraction"; homepage = "https://dask.org/"; From cd3f083645d7a074ae9905e81449ba8e1ca330f0 Mon Sep 17 00:00:00 2001 From: lunik1 <13547699+lunik1@users.noreply.github.com> Date: Sat, 24 Apr 2021 01:05:07 +0000 Subject: [PATCH 0789/1183] =?UTF-8?q?fdk-aac-encoder:=201.0.1=20=E2=86=92?= =?UTF-8?q?=201.0.2=20(#120356)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/audio/fdkaac/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/fdkaac/default.nix b/pkgs/applications/audio/fdkaac/default.nix index 31b009c41333..fd6726e9ac26 100644 --- a/pkgs/applications/audio/fdkaac/default.nix +++ b/pkgs/applications/audio/fdkaac/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fdkaac"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "nu774"; repo = pname; rev = "v${version}"; - sha256 = "02mzx4bird2q5chzpavfc9pg259hwfvq6px85xarm59vmj9nryb6"; + sha256 = "tHhICq/FzbkvWkDdNzGqGoo7nIDb+DJXmkFwtPIA89c="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - description = "Command line encoder frontend for libfdk-aac encder"; + description = "Command line encoder frontend for libfdk-aac encoder"; longDescription = '' fdkaac reads linear PCM audio in either WAV, raw PCM, or CAF format, and encodes it into either M4A / AAC file. From 228276fbd0174eb60199b795c369f4363acd6713 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 22 Apr 2021 23:56:11 +0800 Subject: [PATCH 0790/1183] doc/builders/images/*.xml: Convert to markdown --- doc/builders/images.xml | 4 +- doc/builders/images/appimagetools.section.md | 48 +++++++++ doc/builders/images/appimagetools.xml | 102 ------------------- doc/builders/images/snap/example-firefox.nix | 28 ----- doc/builders/images/snap/example-hello.nix | 12 --- doc/builders/images/snaptools.section.md | 71 +++++++++++++ doc/builders/images/snaptools.xml | 59 ----------- 7 files changed, 121 insertions(+), 203 deletions(-) create mode 100644 doc/builders/images/appimagetools.section.md delete mode 100644 doc/builders/images/appimagetools.xml delete mode 100644 doc/builders/images/snap/example-firefox.nix delete mode 100644 doc/builders/images/snap/example-hello.nix create mode 100644 doc/builders/images/snaptools.section.md delete mode 100644 doc/builders/images/snaptools.xml diff --git a/doc/builders/images.xml b/doc/builders/images.xml index d7d250291893..cd10d69a96dd 100644 --- a/doc/builders/images.xml +++ b/doc/builders/images.xml @@ -5,8 +5,8 @@ This chapter describes tools for creating various types of images. - + - + diff --git a/doc/builders/images/appimagetools.section.md b/doc/builders/images/appimagetools.section.md new file mode 100644 index 000000000000..7ab4e4e9d855 --- /dev/null +++ b/doc/builders/images/appimagetools.section.md @@ -0,0 +1,48 @@ +# pkgs.appimageTools {#sec-pkgs-appimageTools} + +`pkgs.appimageTools` is a set of functions for extracting and wrapping [AppImage](https://appimage.org/) files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, `pkgs.appimage-run` can be used as well. + +::: warning +The `appimageTools` API is unstable and may be subject to backwards-incompatible changes in the future. +::: + +## AppImage formats {#ssec-pkgs-appimageTools-formats} + +There are different formats for AppImages, see [the specification](https://github.com/AppImage/AppImageSpec/blob/74ad9ca2f94bf864a4a0dac1f369dd4f00bd1c28/draft.md#image-format) for details. + +- Type 1 images are ISO 9660 files that are also ELF executables. +- Type 2 images are ELF executables with an appended filesystem. + +They can be told apart with `file -k`: + +```ShellSession +$ file -k type1.AppImage +type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, +spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data + +$ file -k type2.AppImage +type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data +``` + +Note how the type 1 AppImage is described as an `ISO 9660 CD-ROM filesystem`, and the type 2 AppImage is not. + +## Wrapping {#ssec-pkgs-appimageTools-wrapping} + +Depending on the type of AppImage you're wrapping, you'll have to use `wrapType1` or `wrapType2`. + +```nix +appimageTools.wrapType2 { # or wrapType1 + name = "patchwork"; + src = fetchurl { + url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; + sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; + }; + extraPkgs = pkgs: with pkgs; [ ]; +} +``` + +- `name` specifies the name of the resulting image. +- `src` specifies the AppImage file to extract. +- `extraPkgs` allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: + - Looking through the extracted AppImage files, reading its scripts and running `patchelf` and `ldd` on its executables. This can also be done in `appimage-run`, by setting `APPIMAGE_DEBUG_EXEC=bash`. + - Running `strace -vfefile` on the wrapped executable, looking for libraries that can't be found. diff --git a/doc/builders/images/appimagetools.xml b/doc/builders/images/appimagetools.xml deleted file mode 100644 index 45c5619abd97..000000000000 --- a/doc/builders/images/appimagetools.xml +++ /dev/null @@ -1,102 +0,0 @@ -
- pkgs.appimageTools - - - pkgs.appimageTools is a set of functions for extracting and wrapping AppImage files. They are meant to be used if traditional packaging from source is infeasible, or it would take too long. To quickly run an AppImage file, pkgs.appimage-run can be used as well. - - - - - The appimageTools API is unstable and may be subject to backwards-incompatible changes in the future. - - - -
- AppImage formats - - - There are different formats for AppImages, see the specification for details. - - - - - - Type 1 images are ISO 9660 files that are also ELF executables. - - - - - Type 2 images are ELF executables with an appended filesystem. - - - - - - They can be told apart with file -k: - - - -$ file -k type1.AppImage -type1.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) ISO 9660 CD-ROM filesystem data 'AppImage' (Lepton 3.x), scale 0-0, -spot sensor temperature 0.000000, unit celsius, color scheme 0, calibration: offset 0.000000, slope 0.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=d629f6099d2344ad82818172add1d38c5e11bc6d, stripped\012- data - -$ file -k type2.AppImage -type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x), scale 232-60668, spot sensor temperature -4.187500, color scheme 15, show scale bar, calibration: offset -0.000000, slope 0.000000 (Lepton 2.x), scale 4111-45000, spot sensor temperature 412442.250000, color scheme 3, minimum point enabled, calibration: offset -75402534979642766821519867692934234112.000000, slope 5815371847733706829839455140374904832.000000, dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.18, BuildID[sha1]=79dcc4e55a61c293c5e19edbd8d65b202842579f, stripped\012- data - - - - Note how the type 1 AppImage is described as an ISO 9660 CD-ROM filesystem, and the type 2 AppImage is not. - -
- -
- Wrapping - - - Depending on the type of AppImage you're wrapping, you'll have to use wrapType1 or wrapType2. - - - -appimageTools.wrapType2 { # or wrapType1 - name = "patchwork"; - src = fetchurl { - url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; - sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; - }; - extraPkgs = pkgs: with pkgs; [ ]; -} - - - - - name specifies the name of the resulting image. - - - - - src specifies the AppImage file to extract. - - - - - extraPkgs allows you to pass a function to include additional packages inside the FHS environment your AppImage is going to run in. There are a few ways to learn which dependencies an application needs: - - - - Looking through the extracted AppImage files, reading its scripts and running patchelf and ldd on its executables. This can also be done in appimage-run, by setting APPIMAGE_DEBUG_EXEC=bash. - - - - - Running strace -vfefile on the wrapped executable, looking for libraries that can't be found. - - - - - - -
-
diff --git a/doc/builders/images/snap/example-firefox.nix b/doc/builders/images/snap/example-firefox.nix deleted file mode 100644 index d58c98a65a2e..000000000000 --- a/doc/builders/images/snap/example-firefox.nix +++ /dev/null @@ -1,28 +0,0 @@ -let - inherit (import { }) snapTools firefox; -in snapTools.makeSnap { - meta = { - name = "nix-example-firefox"; - summary = firefox.meta.description; - architectures = [ "amd64" ]; - apps.nix-example-firefox = { - command = "${firefox}/bin/firefox"; - plugs = [ - "pulseaudio" - "camera" - "browser-support" - "avahi-observe" - "cups-control" - "desktop" - "desktop-legacy" - "gsettings" - "home" - "network" - "mount-observe" - "removable-media" - "x11" - ]; - }; - confinement = "strict"; - }; -} diff --git a/doc/builders/images/snap/example-hello.nix b/doc/builders/images/snap/example-hello.nix deleted file mode 100644 index 123da80c5477..000000000000 --- a/doc/builders/images/snap/example-hello.nix +++ /dev/null @@ -1,12 +0,0 @@ -let - inherit (import { }) snapTools hello; -in snapTools.makeSnap { - meta = { - name = "hello"; - summary = hello.meta.description; - description = hello.meta.longDescription; - architectures = [ "amd64" ]; - confinement = "strict"; - apps.hello.command = "${hello}/bin/hello"; - }; -} diff --git a/doc/builders/images/snaptools.section.md b/doc/builders/images/snaptools.section.md new file mode 100644 index 000000000000..9e1403b88285 --- /dev/null +++ b/doc/builders/images/snaptools.section.md @@ -0,0 +1,71 @@ +# pkgs.snapTools {#sec-pkgs-snapTools} + +`pkgs.snapTools` is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations. + +## The makeSnap Function {#ssec-pkgs-snapTools-makeSnap-signature} + +`makeSnap` takes a single named argument, `meta`. This argument mirrors [the upstream `snap.yaml` format](https://docs.snapcraft.io/snap-format) exactly. + +The `base` should not be specified, as `makeSnap` will force set it. + +Currently, `makeSnap` does not support creating GUI stubs. + +## Build a Hello World Snap {#ssec-pkgs-snapTools-build-a-snap-hello} + +The following expression packages GNU Hello as a Snapcraft snap. + +```{#ex-snapTools-buildSnap-hello .nix} +let + inherit (import { }) snapTools hello; +in snapTools.makeSnap { + meta = { + name = "hello"; + summary = hello.meta.description; + description = hello.meta.longDescription; + architectures = [ "amd64" ]; + confinement = "strict"; + apps.hello.command = "${hello}/bin/hello"; + }; +} +``` + +`nix-build` this expression and install it with `snap install ./result --dangerous`. `hello` will now be the Snapcraft version of the package. + +## Build a Graphical Snap {#ssec-pkgs-snapTools-build-a-snap-firefox} + +Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. + +```{#ex-snapTools-buildSnap-firefox .nix} +let + inherit (import { }) snapTools firefox; +in snapTools.makeSnap { + meta = { + name = "nix-example-firefox"; + summary = firefox.meta.description; + architectures = [ "amd64" ]; + apps.nix-example-firefox = { + command = "${firefox}/bin/firefox"; + plugs = [ + "pulseaudio" + "camera" + "browser-support" + "avahi-observe" + "cups-control" + "desktop" + "desktop-legacy" + "gsettings" + "home" + "network" + "mount-observe" + "removable-media" + "x11" + ]; + }; + confinement = "strict"; + }; +} +``` + +`nix-build` this expression and install it with `snap install ./result --dangerous`. `nix-example-firefox` will now be the Snapcraft version of the Firefox package. + +The specific meaning behind plugs can be looked up in the [Snapcraft interface documentation](https://docs.snapcraft.io/supported-interfaces). diff --git a/doc/builders/images/snaptools.xml b/doc/builders/images/snaptools.xml deleted file mode 100644 index bbe2e3f5e14c..000000000000 --- a/doc/builders/images/snaptools.xml +++ /dev/null @@ -1,59 +0,0 @@ -
- pkgs.snapTools - - - pkgs.snapTools is a set of functions for creating Snapcraft images. Snap and Snapcraft is not used to perform these operations. - - -
- The makeSnap Function - - - makeSnap takes a single named argument, meta. This argument mirrors the upstream snap.yaml format exactly. - - - - The base should not be specified, as makeSnap will force set it. - - - - Currently, makeSnap does not support creating GUI stubs. - -
- -
- Build a Hello World Snap - - - Making a Hello World Snap - - The following expression packages GNU Hello as a Snapcraft snap. - - - - nix-build this expression and install it with snap install ./result --dangerous. hello will now be the Snapcraft version of the package. - - -
- -
- Build a Hello World Snap - - - Making a Graphical Snap - - Graphical programs require many more integrations with the host. This example uses Firefox as an example, because it is one of the most complicated programs we could package. - - - - nix-build this expression and install it with snap install ./result --dangerous. nix-example-firefox will now be the Snapcraft version of the Firefox package. - - - The specific meaning behind plugs can be looked up in the Snapcraft interface documentation. - - -
-
From d385b8f5972d4a0885c29c6bac87471bf622c133 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 24 Apr 2021 01:10:47 +0000 Subject: [PATCH 0791/1183] python3Packages.tensorflow: mark as requiring big-parallel The Bazel build part of tensorflow builds can really use as many cores as is available - to avoid blocking a small machine for literally hours while it churns away, mark the build as big-parallel so we can schedule it to run quickly on a machine with lots of cores. --- pkgs/development/python-modules/tensorflow/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 0e2df1a4678d..0216c05eeacf 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -325,6 +325,10 @@ let addOpenGLRunpath "$lib" done ''; + + requiredSystemFeatures = [ + "big-parallel" + ]; }; meta = with lib; { From 0098f76b1a9035e83f3598e46f169588f6ecb2aa Mon Sep 17 00:00:00 2001 From: Aiken Cairncross Date: Sat, 24 Apr 2021 02:15:14 +0100 Subject: [PATCH 0792/1183] or-tools: fix build (#120441) --- 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 9667b70c1006..a6dfdc166a77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28958,6 +28958,7 @@ in osi = callPackage ../development/libraries/science/math/osi { }; or-tools = callPackage ../development/libraries/science/math/or-tools { + python = python3; abseil-cpp = abseil-cpp.override { static = true; }; }; From 3c781e6d191b716e0f693d6ee214f11a1ae4f832 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 02:56:20 +0200 Subject: [PATCH 0793/1183] common-updater-scripts: handle default.nix without arguments So that the script can be used outside of nixpkgs. For example, the default.nix recommended by flake-compat does not take arguments. --- pkgs/common-updater/scripts/update-source-version | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 831f65e4d90d..0c914ebee2c4 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -59,6 +59,9 @@ newVersion=${args[1]} newHash=${args[2]} newUrl=${args[3]} +# Third-party repositories might not accept arguments in their default.nix. +importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" + if (( "${#args[*]}" < 2 )); then echo "$scriptName: Too few arguments" usage @@ -93,13 +96,13 @@ if [[ $(grep --count "$oldHash" "$nixFile") != 1 ]]; then die "Couldn't locate old source hash '$oldHash' (or it appeared more than once) in '$nixFile'!" fi -oldUrl=$(nix-instantiate $systemArg --eval -E "with import ./. {}; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') +oldUrl=$(nix-instantiate $systemArg --eval -E "with $importTree; builtins.elemAt ($attr.src.drvAttrs.urls or [ $attr.src.url ]) 0" | tr -d '"') if [[ -z "$oldUrl" ]]; then die "Couldn't evaluate source url from '$attr.src'!" fi -oldVersion=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') +oldVersion=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.${versionKey} or (builtins.parseDrvName $attr.name).version" | tr -d '"') if [[ -z "$oldVersion" ]]; then die "Couldn't find out the old version of '$attr'!" @@ -114,7 +117,7 @@ if [[ "$oldVersion" = "$newVersion" ]]; then fi if [[ -n "$newRevision" ]]; then - oldRevision=$(nix-instantiate $systemArg --eval -E "with import ./. {}; $attr.src.rev" | tr -d '"') + oldRevision=$(nix-instantiate $systemArg --eval -E "with $importTree; $attr.src.rev" | tr -d '"') if [[ -z "$oldRevision" ]]; then die "Couldn't evaluate source revision from '$attr.src'!" fi From 38e20a3242a8dbd50d1c7d2dc060232edb7d907f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 03:42:01 +0200 Subject: [PATCH 0794/1183] common-updater-scripts: Replace flake source by local path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When update-source-version is run in a repo with flake-compat, it would find the files in Nix store. Let’s replace them with the local path of the repository. --- pkgs/common-updater/scripts/update-source-version | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 0c914ebee2c4..15792e1502e0 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -83,6 +83,14 @@ if [[ -z "$nixFile" ]]; then if [[ ! -f "$nixFile" ]]; then die "Couldn't evaluate '$attr.meta.position' to locate the .nix file!" fi + + # flake-compat will return paths in the Nix store, we need to correct for that. + possiblyOutPath=$(nix-instantiate $systemArg --eval -E "with $importTree; outPath" | tr -d '"') + if [[ -n "$possiblyOutPath" ]]; then + outPathEscaped=$(echo "$possiblyOutPath" | sed 's#[$^*\\.[|]#\\&#g') + pwdEscaped=$(echo "$PWD" | sed 's#[$^*\\.[|]#\\&#g') + nixFile=$(echo "$nixFile" | sed "s|^$outPathEscaped|$pwdEscaped|") + fi fi oldHashAlgo=$(nix-instantiate $systemArg --eval --strict -A "$attr.src.drvAttrs.outputHashAlgo" | tr -d '"') From 0fffe0ed7ebba191780cc94aa5e16014adf57910 Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 23 Apr 2021 18:47:37 -0700 Subject: [PATCH 0795/1183] just: fix Darwin build --- pkgs/development/tools/just/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index c6863d535dd9..5b3f966399f9 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, coreutils, bash, installShellFiles }: +{ lib, fetchFromGitHub, stdenv, rustPlatform, coreutils, bash, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-YDIGZRbszhgWM7iAc2i89jyndZvZZsg63ADQfqFxfXw="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; postInstall = '' installManPage man/just.1 From 65499c8a82c081d17daecc0663c836d09da7b73d Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Sat, 24 Apr 2021 03:57:36 +0200 Subject: [PATCH 0796/1183] lefthook: 0.7.2 -> 0.7.3 (#120346) Co-authored-by: Louis Bettens Co-authored-by: Sandro --- .../git-and-tools/lefthook/default.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix index 18f2e5ad4871..520f33905c91 100644 --- a/pkgs/applications/version-management/git-and-tools/lefthook/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lefthook/default.nix @@ -1,23 +1,17 @@ { lib, buildGoModule, fetchFromGitHub }: -# Currently `buildGo114Module` is passed as `buildGoModule` from -# `../default.nix`. Please remove the fixed 1.14 once a new release has been -# made and the issue linked below has been closed upstream. - -# https://github.com/Arkweid/lefthook/issues/151 - buildGoModule rec { pname = "lefthook"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; - owner = "Arkweid"; + owner = "evilmartians"; repo = "lefthook"; - sha256 = "1ciyxjx3r3dcl8xas49kqsjshs1bv4pafmfmhdfyfdvlaj374hgj"; + sha256 = "sha256-VrAkmLRsYNDX5VfAxsvjsOv1bv7Nk53OjdaJm/D2GRk="; }; - vendorSha256 = "1pdrw4vwbj9cka2pjbjvxviigfvnrf8sgws27ixwwiblbkj4isc8"; + vendorSha256 = "sha256-XR7xJZfgt0Hx2DccdNlwEmuduuVU8IBR0pcIUyRhdko="; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6dfdc166a77..8ce697d46643 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5949,11 +5949,7 @@ in lbreakout2 = callPackage ../games/lbreakout2 { }; - lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { - # Please use empty attrset once upstream bugs have been fixed - # https://github.com/Arkweid/lefthook/issues/151 - buildGoModule = buildGo114Module; - }; + lefthook = callPackage ../applications/version-management/git-and-tools/lefthook { }; lego = callPackage ../tools/admin/lego { }; From 688ed16f0055dac8c4872205cc1b1d879c614c3b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 24 Apr 2021 02:26:23 +0000 Subject: [PATCH 0797/1183] tboot: 1.9.8 -> 1.10.1 https://sourceforge.net/p/tboot/code/ci/v1.10.1/tree/CHANGELOG --- pkgs/tools/security/tboot/default.nix | 21 ++++---- ...-known-secret-option-to-lcp_writepol.patch | 50 ------------------- 2 files changed, 9 insertions(+), 62 deletions(-) delete mode 100644 pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index bf13fe7822e8..9c5d44c6d607 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -1,27 +1,23 @@ -{ lib, stdenv, fetchurl, trousers, openssl, zlib }: +{ lib, stdenv, fetchurl, openssl, perl, trousers, zlib }: stdenv.mkDerivation rec { pname = "tboot"; - version = "1.9.8"; + version = "1.10.1"; src = fetchurl { url = "mirror://sourceforge/tboot/${pname}-${version}.tar.gz"; - sha256 = "06f0ggl6vrb5ghklblvh2ixgmmjv31rkp1vfj9qm497iqwq9ac00"; + sha256 = "18bnkwnlk16cc20nysqfcjx006idi7jmmhahk8vk09w458bhaajg"; }; - patches = [ ./tboot-add-well-known-secret-option-to-lcp_writepol.patch ]; - - buildInputs = [ trousers openssl zlib ]; + buildInputs = [ openssl trousers zlib ]; enableParallelBuilding = true; - hardeningDisable = [ "pic" "stackprotector" ]; + preConfigure = '' + substituteInPlace tboot/Makefile --replace /usr/bin/perl ${perl}/bin/perl - NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; - - configurePhase = '' - for a in lcptools utils tb_polgen; do - substituteInPlace $a/Makefile --replace /usr/sbin /sbin + for a in lcptools-v2 tb_polgen utils; do + substituteInPlace "$a/Makefile" --replace /usr/sbin /sbin done substituteInPlace docs/Makefile --replace /usr/share /share ''; @@ -31,6 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = "https://sourceforge.net/projects/tboot/"; + changelog = "https://sourceforge.net/p/tboot/code/ci/v${version}/tree/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch b/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch deleted file mode 100644 index a16ba9f4fbab..000000000000 --- a/pkgs/tools/security/tboot/tboot-add-well-known-secret-option-to-lcp_writepol.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -urp tboot-1.8.0.orig/lcptools/writepol.c tboot-1.8.0/lcptools/writepol.c ---- tboot-1.8.0.orig/lcptools/writepol.c 2014-01-30 10:34:57.000000000 +0100 -+++ tboot-1.8.0/lcptools/writepol.c 2014-02-12 01:48:51.523581057 +0100 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #define PRINT printf - #include "../include/uuid.h" -@@ -51,14 +52,15 @@ static uint32_t index_value = 0; - static char *file_arg=NULL; - static uint32_t fLeng; - static unsigned char *policy_data = NULL; --static char *password = NULL; -+static const char *password = NULL; - static uint32_t passwd_length = 0; -+static const char well_known_secret[] = TSS_WELL_KNOWN_SECRET; - static int help_input = 0; - static unsigned char empty_pol_data[] = {0}; - --static const char *short_option = "ehi:f:p:"; -+static const char *short_option = "ehi:f:p:Z"; - static const char *usage_string = "lcp_writepol -i index_value " -- "[-f policy_file] [-e] [-p passwd] [-h]"; -+ "[-f policy_file] [-e] [-p passwd|-Z] [-h]"; - - static const char *option_strings[] = { - "-i index value: uint32/string.\n" -@@ -67,6 +69,7 @@ static const char *option_strings[] = { - "\tINDEX_AUX:0x50000002 or \"aux\"\n", - "-f file_name: string. File name of the policy data is stored. \n", - "-p password: string. \n", -+ "-Z use well known secret as password. \n", - "-e write 0 length data to the index.\n" - "\tIt will be used for some special index.\n" - "\tFor example, the index with permission WRITEDEFINE.\n", -@@ -119,6 +122,11 @@ parse_cmdline(int argc, const char * arg - fLeng = 0; - break; - -+ case 'Z': -+ password = well_known_secret; -+ passwd_length = sizeof(well_known_secret); -+ break; -+ - case 'h': - help_input = 1; - break; From f521b12b0ed0a5ec96153542bea5705cb1a2b470 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 24 Apr 2021 02:38:25 +0000 Subject: [PATCH 0798/1183] Revert "nixos/amazon-image: (temporarily) use fixed disk size again" This reverts commit 6a8359a92ab501ae62739e9d3302f48e3e73c750. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index b05467fb9b89..653744986d13 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -41,8 +41,7 @@ in { sizeMB = mkOption { type = with types; either (enum [ "auto" ]) int; - # TODO(lukegb): this should be "auto"; see #120473 - default = if config.ec2.hvm then 2048 else 8192; + default = "auto"; example = 8192; description = "The size in MB of the image"; }; From 4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 24 Apr 2021 02:38:36 +0000 Subject: [PATCH 0799/1183] Revert "treewide: use auto diskSize for make-disk-image" This reverts commit f3aa040bcbf39935e7e9ac7a7296eac9da7623ec. --- nixos/maintainers/scripts/cloudstack/cloudstack-image.nix | 1 + nixos/maintainers/scripts/ec2/amazon-image.nix | 5 ++--- nixos/maintainers/scripts/openstack/openstack-image.nix | 2 +- nixos/modules/virtualisation/azure-image.nix | 5 ++--- nixos/modules/virtualisation/digital-ocean-image.nix | 5 ++--- nixos/modules/virtualisation/google-compute-image.nix | 5 ++--- nixos/modules/virtualisation/hyperv-image.nix | 5 ++--- nixos/modules/virtualisation/virtualbox-image.nix | 5 ++--- nixos/modules/virtualisation/vmware-image.nix | 5 ++--- 9 files changed, 16 insertions(+), 22 deletions(-) diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix index 005f75476e9a..37b46db059c0 100644 --- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -10,6 +10,7 @@ with lib; system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { inherit lib config pkgs; + diskSize = 8192; format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 653744986d13..0ecf07669a11 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -40,9 +40,8 @@ in { }; sizeMB = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 8192; + type = types.int; + default = if config.ec2.hvm then 2048 else 8192; description = "The size in MB of the image"; }; diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix index 3255e7f3d44d..4c464f43f61d 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -12,8 +12,8 @@ with lib; system.build.openstackImage = import ../../../lib/make-disk-image.nix { inherit lib config; - additionalSpace = "1024M"; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + diskSize = 8192; format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 03dd3c051309..60fed3222ef3 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -9,9 +9,8 @@ in options = { virtualisation.azureImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = with types; int; + default = 2048; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix index 0ff2ee591f24..b582e235d435 100644 --- a/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/nixos/modules/virtualisation/digital-ocean-image.nix @@ -10,9 +10,8 @@ in options = { virtualisation.digitalOceanImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 4096; + type = with types; int; + default = 4096; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 79c3921669ed..e2332df611aa 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -18,9 +18,8 @@ in options = { virtualisation.googleComputeImage.diskSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 1536; + type = with types; int; + default = 1536; description = '' Size of disk image. Unit is MB. ''; diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index 6845d6750092..fabc9113dfc4 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -9,9 +9,8 @@ in { options = { hyperv = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = types.int; + default = 2048; description = '' The size of the hyper-v base image in MiB. ''; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 071edda82693..fa580e8b42d6 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -11,9 +11,8 @@ in { options = { virtualbox = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 50 * 1024; + type = types.int; + default = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix index f6cd12e2bb79..9da9e145f7a9 100644 --- a/nixos/modules/virtualisation/vmware-image.nix +++ b/nixos/modules/virtualisation/vmware-image.nix @@ -18,9 +18,8 @@ in { options = { vmware = { baseImageSize = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 2048; + type = types.int; + default = 2048; description = '' The size of the VMWare base image in MiB. ''; From 3771de8ae019afbf0d37ffe390f3fec92cd2dffd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 24 Apr 2021 04:36:58 +0200 Subject: [PATCH 0800/1183] common-updater-scripts: Support attribute lookup in flake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In flakes, packages are not exposed directly but instead they are declared inside “packages” or “legacyPackages” output under their host platform. flake-compat reflects this. Let’s look for an attribute also in these outputs if the direct lookup fails. --- .../scripts/update-source-version | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/common-updater/scripts/update-source-version b/pkgs/common-updater/scripts/update-source-version index 15792e1502e0..d5c23466ee03 100755 --- a/pkgs/common-updater/scripts/update-source-version +++ b/pkgs/common-updater/scripts/update-source-version @@ -19,6 +19,7 @@ args=() for arg in "$@"; do case $arg in --system=*) + system="${arg#*=}" systemArg="--system ${arg#*=}" ;; --version-key=*) @@ -78,6 +79,26 @@ if [[ -z "$versionKey" ]]; then versionKey=version fi +# Allow finding packages among flake outputs in repos using flake-compat. +pname=$(nix-instantiate $systemArg --eval --strict -A "$attr.name" || echo) +if [[ -z "$pname" ]]; then + if [[ -z "$system" ]]; then + system=$(nix-instantiate --eval -E 'builtins.currentSystem' | tr -d '"') + fi + + pname=$(nix-instantiate $systemArg --eval --strict -A "packages.$system.$attr.name" || echo) + if [[ -n "$pname" ]]; then + attr="packages.$system.$attr" + else + pname=$(nix-instantiate $systemArg --eval --strict -A "legacyPackages.$system.$attr.name" || echo) + if [[ -n "$pname" ]]; then + attr="legacyPackages.$system.$attr" + else + die "Could not find attribute '$attr'!" + fi + fi +fi + if [[ -z "$nixFile" ]]; then nixFile=$(nix-instantiate $systemArg --eval --strict -A "$attr.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') if [[ ! -f "$nixFile" ]]; then From 4e96143fe57ec6f4cd599f71eb713168cf758d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 23 Apr 2021 22:19:21 -0500 Subject: [PATCH 0801/1183] pgsync: init at 0.6.6 --- .../development/tools/database/pgsync/Gemfile | 2 + .../tools/database/pgsync/Gemfile.lock | 23 +++++++ .../tools/database/pgsync/default.nix | 15 +++++ .../tools/database/pgsync/gemset.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 106 insertions(+) create mode 100644 pkgs/development/tools/database/pgsync/Gemfile create mode 100644 pkgs/development/tools/database/pgsync/Gemfile.lock create mode 100644 pkgs/development/tools/database/pgsync/default.nix create mode 100644 pkgs/development/tools/database/pgsync/gemset.nix diff --git a/pkgs/development/tools/database/pgsync/Gemfile b/pkgs/development/tools/database/pgsync/Gemfile new file mode 100644 index 000000000000..f87a033ad7db --- /dev/null +++ b/pkgs/development/tools/database/pgsync/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'pgsync' diff --git a/pkgs/development/tools/database/pgsync/Gemfile.lock b/pkgs/development/tools/database/pgsync/Gemfile.lock new file mode 100644 index 000000000000..5ee736430af5 --- /dev/null +++ b/pkgs/development/tools/database/pgsync/Gemfile.lock @@ -0,0 +1,23 @@ +GEM + remote: https://rubygems.org/ + specs: + parallel (1.20.1) + pg (1.2.3) + pgsync (0.6.6) + parallel + pg (>= 0.18.2) + slop (>= 4.8.2) + tty-spinner + slop (4.8.2) + tty-cursor (0.7.1) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + +PLATFORMS + ruby + +DEPENDENCIES + pgsync + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/development/tools/database/pgsync/default.nix b/pkgs/development/tools/database/pgsync/default.nix new file mode 100644 index 000000000000..f89b25bf0a77 --- /dev/null +++ b/pkgs/development/tools/database/pgsync/default.nix @@ -0,0 +1,15 @@ +{ lib, bundlerApp }: + +bundlerApp rec { + gemdir = ./.; + pname = "pgsync"; + exes = [ "pgsync" ]; + + meta = with lib; { + description = "Sync data from one Postgres database to another (like `pg_dump`/`pg_restore`)"; + homepage = "https://github.com/ankane/pgsync"; + license = with licenses; mit; + maintainers = with maintainers; [ fabianhjr ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/database/pgsync/gemset.nix b/pkgs/development/tools/database/pgsync/gemset.nix new file mode 100644 index 000000000000..18a833970722 --- /dev/null +++ b/pkgs/development/tools/database/pgsync/gemset.nix @@ -0,0 +1,64 @@ +{ + parallel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0055br0mibnqz0j8wvy20zry548dhkakws681bhj3ycb972awkzd"; + type = "gem"; + }; + version = "1.20.1"; + }; + pg = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13mfrysrdrh8cka1d96zm0lnfs59i5x2g6ps49r2kz5p3q81xrzj"; + type = "gem"; + }; + version = "1.2.3"; + }; + pgsync = { + dependencies = ["parallel" "pg" "slop" "tty-spinner"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr"; + type = "gem"; + }; + version = "0.6.6"; + }; + slop = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3"; + type = "gem"; + }; + version = "4.8.2"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-spinner = { + dependencies = ["tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf"; + type = "gem"; + }; + version = "0.9.3"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c974932196..64b5f04dd9fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7481,6 +7481,8 @@ in pgmetrics = callPackage ../tools/misc/pgmetrics { }; + pgsync = callPackage ../development/tools/database/pgsync { }; + pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation ssh = openssh; From 67ace3a32d386ffe7c464b8f43bf662a110ab3d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 24 Apr 2021 04:20:00 +0000 Subject: [PATCH 0802/1183] goaccess: 1.4 -> 1.4.6 --- pkgs/tools/misc/goaccess/default.nix | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 4a02e921f479..5ccf4b96d818 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,36 +1,27 @@ -{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, libmaxminddb, fetchpatch }: +{ lib, stdenv, fetchurl, ncurses, gettext, openssl, withGeolocation ? true, libmaxminddb }: stdenv.mkDerivation rec { - version = "1.4"; + version = "1.4.6"; pname = "goaccess"; src = fetchurl { url = "https://tar.goaccess.io/goaccess-${version}.tar.gz"; - sha256 = "1gkpjg39f3afdwm9128jqjsfap07p8s027czzlnxfmi5hpzvkyz8"; + sha256 = "1l3j3i4vb7ni7i047qvi9a3hs43ym24r6hfcnqsbhgrb731jf3qx"; }; - patches = [ - (fetchpatch { - url = "https://github.com/allinurl/goaccess/commit/514618cdd69453497fbf67913ccb37a0a0b07391.patch"; - sha256 = "11lp7mabfl6ibgzsd9nw10k2xvcm0hrimrwidl06r8dqn2jzjxf6"; - }) - ]; - configureFlags = [ - "--enable-geoip=mmdb" "--enable-utf8" - ]; + "--with-openssl" + ] ++ lib.optionals withGeolocation [ "--enable-geoip=mmdb" ]; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libmaxminddb - ncurses - glib - ]; + buildInputs = [ ncurses openssl ] + ++ lib.optionals withGeolocation [ libmaxminddb ] + ++ lib.optionals stdenv.isDarwin [ gettext ]; meta = { description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = "https://goaccess.io"; + changelog = "https://github.com/allinurl/goaccess/raw/v${version}/ChangeLog"; license = lib.licenses.mit; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ ederoyd46 ]; From 024cf2a8b0fc195553d92e10039877d03d460c7b Mon Sep 17 00:00:00 2001 From: Austin Butler Date: Fri, 23 Apr 2021 21:54:23 -0700 Subject: [PATCH 0803/1183] nodePackages.joplin: fix Darwin build --- pkgs/development/node-packages/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/node-packages/default.nix b/pkgs/development/node-packages/default.nix index 8d00e3595fec..ff9b4747e68b 100644 --- a/pkgs/development/node-packages/default.nix +++ b/pkgs/development/node-packages/default.nix @@ -285,6 +285,9 @@ let libsecret self.node-gyp-build self.node-pre-gyp + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.Security ]; }; From b22752a770847cd8bb6f3396992b7cb373fa45f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Apr 2021 07:27:17 +0200 Subject: [PATCH 0804/1183] gdu: disable tests --- pkgs/tools/system/gdu/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 348d635584fc..787702efff69 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -35,7 +35,14 @@ buildGoModule rec { installManPage gdu.1 ''; - doCheck = !(stdenv.isAarch64 || stdenv.isDarwin); + # tests fail with: + # dir_test.go:76: + # Error Trace: dir_test.go:76 + # Error: Not equal: + # expected: 0 + # actual : 512 + # Test: TestFlags + doCheck = false; meta = with lib; { description = "Disk usage analyzer with console interface"; From 276cb2ad232cdb1bd4f2840051deb964655d9317 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 17 Apr 2021 13:30:20 +0200 Subject: [PATCH 0805/1183] coqPackages_8_13.QuickChick: init at 1.5.0 --- pkgs/development/coq-modules/QuickChick/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 32ef1ad633cf..6490391eb636 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { pname = "QuickChick"; owner = "QuickChick"; defaultVersion = with versions; switch [ coq.coq-version ssreflect.version ] [ + { cases = [ "8.13" pred.true ]; out = "1.5.0"; } { cases = [ "8.12" pred.true ]; out = "1.4.0"; } { cases = [ "8.11" pred.true ]; out = "1.3.2"; } { cases = [ "8.10" pred.true ]; out = "1.2.1"; } @@ -14,6 +15,7 @@ mkCoqDerivation { { cases = [ "8.6" pred.true ]; out = "20171102"; } { cases = [ "8.5" pred.true ]; out = "20170512"; } ] null; + release."1.5.0".sha256 = "1lq8x86vd3vqqh2yq6hvyagpnhfq5wmk5pg2z0xq7b7dcw7hyfkw"; release."1.4.0".sha256 = "068p48pm5yxjc3yv8qwzp25bp9kddvxj81l31mjkyx3sdrsw3kyc"; release."1.3.2".sha256 = "0lciwaqv288dh2f13xk2x0lrn6zyrkqy6g4yy927wwzag2gklfrs"; release."1.2.1".sha256 = "17vz88xjzxh3q7hs6hnndw61r3hdfawxp5awqpgfaxx4w6ni8z46"; From 6d495d51e19fc474aa8b587c4bc09f60ed3cd706 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sat, 24 Apr 2021 08:53:06 +0200 Subject: [PATCH 0806/1183] pixelnuke: init 2019-05-19 (#119709) Co-authored-by: Christoph Neidahl Co-authored-by: Sandro --- .../graphics/pixelnuke/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/graphics/pixelnuke/default.nix diff --git a/pkgs/applications/graphics/pixelnuke/default.nix b/pkgs/applications/graphics/pixelnuke/default.nix new file mode 100644 index 000000000000..4cb2440cb8ee --- /dev/null +++ b/pkgs/applications/graphics/pixelnuke/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, libevent, glew, glfw }: + +stdenv.mkDerivation { + pname = "pixelnuke"; + version = "unstable-2019-05-19"; + + src = fetchFromGitHub { + owner = "defnull"; + repo = "pixelflut"; + rev = "3458157a242ba1789de7ce308480f4e1cbacc916"; + sha256 = "03dp0p00chy00njl4w02ahxqiwqpjsrvwg8j4yi4dgckkc3gbh40"; + }; + + sourceRoot = "source/pixelnuke"; + + buildInputs = [ libevent glew glfw ]; + + installPhase = '' + install -Dm755 ./pixelnuke $out/bin/pixelnuke + ''; + + meta = with lib; { + description = "Multiplayer canvas (C implementation)"; + homepage = "https://cccgoe.de/wiki/Pixelflut"; + license = licenses.unlicense; + platforms = platforms.linux; + maintainers = with maintainers; [ mrVanDalo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f1b7ebc8549..b29088abf31a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23695,6 +23695,8 @@ in '' + (drv.postInstall or ""); }); + pixelnuke = callPackage ../applications/graphics/pixelnuke { }; + slack = callPackage ../applications/networking/instant-messengers/slack { }; slack-cli = callPackage ../tools/networking/slack-cli { }; From d42e8b35d157d4e8ea7112d299aad55554a10ca2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:38 +0200 Subject: [PATCH 0807/1183] python3Packages.archinfo: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index fc83073a3a24..7802df99ebed 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.6790"; + version = "9.0.6852"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk="; + sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo="; }; checkInputs = [ From ac1adaa1848ceecb9048c2f2b913e208c94fce7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:41 +0200 Subject: [PATCH 0808/1183] python3Packages.ailment: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 121182083d35..f7194f8dd2f5 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw="; + sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo="; }; propagatedBuildInputs = [ pyvex ]; From 8533e7d446fccd7d214152d7ded4cc1c3e154501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:43 +0200 Subject: [PATCH 0809/1183] python3Packages.pyvex: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 566cd79b01c1..fa3d2119ae87 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.6790"; + version = "9.0.6852"; src = fetchPypi { inherit pname version; - sha256 = "sha256-bqOLHGlLQ12nYzbv9H9nJ0/Q5APJb/9B82YtHk3IvYQ="; + sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM="; }; propagatedBuildInputs = [ From bad41dc48e4cab66c37dcab30523edb8f6645b97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:46 +0200 Subject: [PATCH 0810/1183] python3Packages.claripy: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 9f077df96f05..c3a715c15274 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE="; + sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng="; }; # Use upstream z3 implementation From c9f255825e8c4e9e5a33d8218112fab7214828c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:49 +0200 Subject: [PATCH 0811/1183] python3Packages.cle: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index feaab56600f1..4daab5059627 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.6790"; + version = "9.0.6852"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM="; + sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs="; }; propagatedBuildInputs = [ From c150ea08736b8bbc4ee950fe41fde743b8a40dd4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:52 +0200 Subject: [PATCH 0812/1183] python3Packages.angr: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1875c1deea06..b67c3524fae8 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc="; + sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8="; }; propagatedBuildInputs = [ From f728aa666bde888473c2979f6797ef6bc576f795 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Apr 2021 09:02:54 +0200 Subject: [PATCH 0813/1183] python3Packages.angrop: 9.0.6790 -> 9.0.6852 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 45c092cf0d66..1237ed6fa46d 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.6790"; + version = "9.0.6852"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy"; + sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo="; }; propagatedBuildInputs = [ From 793562da349112cb3669386d6e800a1e33a41a6a Mon Sep 17 00:00:00 2001 From: hdhog Date: Sat, 24 Apr 2021 11:16:07 +0400 Subject: [PATCH 0814/1183] git-chglog: 0.9.1 -> 0.14.2 (#120097) --- .../git-and-tools/git-chglog/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 05d5dfe96056..8ec57f2e69e8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -1,20 +1,25 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "git-chglog"; - version = "0.9.1"; - - goPackagePath = "github.com/git-chglog/git-chglog"; + version = "0.14.2"; src = fetchFromGitHub { owner = "git-chglog"; repo = "git-chglog"; - rev = version; - sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p"; + rev = "v${version}"; + sha256 = "124bqywkj37gv61fswgrg528bf3rjqms1664x22lkn0sqh22zyv1"; }; + vendorSha256 = "09zjypmcc3ra7sw81q1pbbrlpxxp4k00p1cfkrrih8wvb25z89h5"; + + buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; + + subPackages = [ "cmd/git-chglog" ]; + meta = with lib; { description = "CHANGELOG generator implemented in Go (Golang)"; + homepage = "https://github.com/git-chglog/git-chglog"; license = licenses.mit; maintainers = with maintainers; [ ldenefle ]; }; From 755633ea54894e8f50a038c1e619e509d51bb93f Mon Sep 17 00:00:00 2001 From: midchildan Date: Sat, 24 Apr 2021 16:32:01 +0900 Subject: [PATCH 0815/1183] cryfs: disable tests on Darwin The tests [require macFUSE to be installed][1] on Darwin. This change disable the tests because Hydra doesn't have it installed. [1]: https://github.com/NixOS/nixpkgs/blob/master/doc/builders/packages/fuse.section.md --- pkgs/tools/filesystems/cryfs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index a0dc3124159e..0da6c4c20994 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" ] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; - doCheck = true; + # macFUSE needs to be installed for the test to succeed on Darwin + doCheck = !stdenv.isDarwin; checkPhase = '' # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) From 603707a13707435f130f15bd0265e03fed20734f Mon Sep 17 00:00:00 2001 From: Attila Lendvai Date: Tue, 20 Apr 2021 12:50:08 +0200 Subject: [PATCH 0816/1183] nixos/doc/manual: refine extraLayouts, add warnings an test commands --- nixos/doc/manual/configuration/x-windows.xml | 43 ++++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index a499f0080d70..757174c52632 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -204,18 +204,18 @@ XKB keyboard layouts using the option - . + . + + As a first example, we are going to create a layout based on the basic US layout, with an additional layer to type some greek symbols by pressing the right-alt key. - To do this we are going to create a us-greek file - with a xkb_symbols section. + Create a file called us-greek with the following + content (under a directory called symbols; it's + an XKB peculiarity that will help with testing): xkb_symbols "us-greek" @@ -231,14 +231,13 @@ xkb_symbols "us-greek" }; - To install the layout, the filepath, a description and the list of - languages must be given: + A minimal layout specification must include the following: .us-greek = { description = "US layout with alt-gr greek"; languages = [ "eng" ]; - symbolsFile = /path/to/us-greek; + symbolsFile = /yourpath/symbols/us-greek; } @@ -248,9 +247,27 @@ xkb_symbols "us-greek" - The layout should now be installed and ready to use: try it by - running setxkbmap us-greek and type - <alt>+a. To change the default the usual + Applying this customization requires rebuilding several packages, + and a broken XKB file can lead to the X session crashing at login. + Therefore, you're strongly advised to test + your layout before applying it: + +$ nix-shell -p xorg.xkbcomp +$ setxkbmap -I/yourpath us-greek -print | xkbcomp -I/yourpath - $DISPLAY + + + + You can inspect the predefined XKB files for examples: + +$ echo "$(nix-build --no-out-link '<nixpkgs>' -A xorg.xkeyboardconfig)/etc/X11/xkb/" + + + + Once the configuration is applied, and you did a logout/login + cycle, the layout should be ready to use. You can try it by e.g. + running setxkbmap us-greek and then type + <alt>+a (it may not get applied in your + terminal straight away). To change the default, the usual + + + The babeld service is now being run as an unprivileged user. To achieve that the module configures + skip-kernel-setup true and takes care of setting forwarding and rp_filter sysctls by itself as well + as for each interface in services.babeld.interfaces. + + diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index e16e56121c4c..97dca002a007 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -19,7 +19,10 @@ let "interface ${name} ${paramsString interface}\n"; configFile = with cfg; pkgs.writeText "babeld.conf" ( - (optionalString (cfg.interfaceDefaults != null) '' + '' + skip-kernel-setup true + '' + + (optionalString (cfg.interfaceDefaults != null) '' default ${paramsString cfg.interfaceDefaults} '') + (concatMapStrings interfaceConfig (attrNames cfg.interfaces)) @@ -84,13 +87,22 @@ in config = mkIf config.services.babeld.enable { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = 1; + "net.ipv6.conf.all.accept_redirects" = 0; + "net.ipv4.conf.all.forwarding" = 1; + "net.ipv4.conf.all.rp_filter" = 0; + } // lib.mapAttrs' (ifname: _: lib.nameValuePair "net.ipv4.conf.${ifname}.rp_filter" (lib.mkDefault 0)) config.services.babeld.interfaces; + systemd.services.babeld = { description = "Babel routing daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { ExecStart = "${pkgs.babeld}/bin/babeld -c ${configFile} -I /run/babeld/babeld.pid -S /var/lib/babeld/state"; + AmbientCapabilities = [ "CAP_NET_ADMIN" ]; CapabilityBoundingSet = [ "CAP_NET_ADMIN" ]; + DynamicUser = true; IPAddressAllow = [ "fe80::/64" "ff00::/8" "::1/128" "127.0.0.0/8" ]; IPAddressDeny = "any"; LockPersonality = true; @@ -98,7 +110,7 @@ in MemoryDenyWriteExecute = true; ProtectSystem = "strict"; ProtectClock = true; - ProtectKernelTunables = false; # Couldn't write sysctl: Read-only file system + ProtectKernelTunables = true; ProtectKernelModules = true; ProtectKernelLogs = true; ProtectControlGroups = true; From ceb26b53d817cd60218dc95e00192c20ff0bea54 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 24 Nov 2020 22:45:40 +0100 Subject: [PATCH 0888/1183] nixos/tests/babeld: drop forwarding sysctls They are now set as part of the babeld module. --- nixos/tests/babeld.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/tests/babeld.nix b/nixos/tests/babeld.nix index 5817ea4ce142..d4df6f86d089 100644 --- a/nixos/tests/babeld.nix +++ b/nixos/tests/babeld.nix @@ -25,9 +25,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { { virtualisation.vlans = [ 10 20 ]; - boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - networking = { useDHCP = false; firewall.enable = false; @@ -74,9 +71,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { { virtualisation.vlans = [ 20 30 ]; - boot.kernel.sysctl."net.ipv4.conf.all.forwarding" = 1; - boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; - networking = { useDHCP = false; firewall.enable = false; From 4dee1684ff3a074163c6c8f7e8cdc28895dce77f Mon Sep 17 00:00:00 2001 From: Antonio Yang Date: Sun, 25 Apr 2021 08:06:08 +0800 Subject: [PATCH 0889/1183] himalaya: 0.2.6 -> 0.2.7 --- .../networking/mailreaders/himalaya/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/himalaya/default.nix b/pkgs/applications/networking/mailreaders/himalaya/default.nix index 76f1e92d5f5b..8b601101845e 100644 --- a/pkgs/applications/networking/mailreaders/himalaya/default.nix +++ b/pkgs/applications/networking/mailreaders/himalaya/default.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage rec { pname = "himalaya"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "soywod"; repo = pname; rev = "v${version}"; - sha256 = "1fl3lingb4wdh6bz4calzbibixg44wnnwi1qh0js1ijp8b6ll560"; + sha256 = "0yp3gc5hmlrs5rcmb2qbi4iqb5ndflgqw20qa7ziqayrdd15kzpn"; }; - cargoSha256 = "10p8di71w7hn36b1994wgk33fnj641lsp80zmccinlg5fiwyzncx"; + cargoSha256 = "1abz3s9c3byqc0vaws839hjlf96ivq4zbjyijsbg004ffbmbccpn"; nativeBuildInputs = [ ] ++ lib.optionals (enableCompletions) [ installShellFiles ] @@ -34,9 +34,6 @@ rustPlatform.buildRustPackage rec { openssl ]; - # The completions are correctly installed, and there is issue that himalaya - # generate empty completion files without mail configure. - # This supposed to be fixed in 0.2.7 postInstall = lib.optionalString enableCompletions '' # Install shell function installShellCompletion --cmd himalaya \ From 3f2857f78244798d354519a142b5e9a7fca26e49 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 25 Apr 2021 01:09:01 +0100 Subject: [PATCH 0890/1183] qemu: add patches for many CVEs CVE-2020-27821 CVE-2020-20221 CVE-2020-20181 CVE-2020-35517 CVE-2021-20263 CVE-2021-3416 CVE-2021-3409 CVE-2021-3392 --- .../virtualization/qemu/default.nix | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c04d3b339452..d01af5dddb83 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -84,6 +84,126 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2020-27821.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/memory-clamp-cached-translation-if-points-to-MMIO-region-CVE-2020-27821.patch"; + sha256 = "0sj0kr0g6jalygr5mb9i17fgr491jzaxvk3dvala0268940s01x9"; + }) + (fetchpatch { + name = "CVE-2020-20221.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/arm_gic-fix-interrupt-ID-in-GICD_SGIR-CVE-2021-20221.patch"; + sha256 = "1iyvcw87hzlc57fg5l87vddqmch8iw2yghk0s125hk5shn1bygjq"; + }) + (fetchpatch { + name = "CVE-2020-20181.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/9pfs-Fully-restart-unreclaim-loop-CVE-2021-20181.patch"; + sha256 = "149ifiazj6rn4d4mv2c7lcayq744fijsv5abxlb8bhbkj99wd64f"; + }) + (fetchpatch { + name = "CVE-2020-35517.part-1.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-extract-lo_do_open-from-lo_open.patch"; + sha256 = "0j4waaz6q54by4a7vd5m8s2n8y0an9hqf0ndycxsy03g4ksm669d"; + }) + (fetchpatch { + name = "CVE-2020-35517.part-2.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-optionally-return-inode-pointer-from-lo_do_lookup.patch"; + sha256 = "08bag890r6dx2rhnq58gyvsxvzwqgvn83pjlg95b5ic0z6gyjnsg"; + }) + (fetchpatch { + name = "CVE-2020-35517.part-3.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-prevent-opening-of-special-files-CVE-2020-35517.patch"; + sha256 = "0ziy6638zbkn037l29ywirvgymbqq66l5rngg8iwyky67acilv94"; + }) + (fetchpatch { + name = "CVE-2021-20263.part-1.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-save-error-code-early-at-the-failure-callsite.patch"; + sha256 = "15rwb15yjpclrqaxkhx76npr8zlfm9mj4jb19czg093is2cn4rys"; + }) + (fetchpatch { + name = "CVE-2021-20263.part-2.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/virtiofsd-drop-remapped-security.capability-xattr-as-needed-CVE-2021-20263.patch"; + sha256 = "06ylz80ilg30wlskd4dsjx677fp5qr8cranwlakvjhr88b630xw0"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-1.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-introduce.patch"; + sha256 = "0hcpf00vqpg9rc0wl8cry905w04614843aqifybyv15wbv190gpz"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-2.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-cadence_gem.patch"; + sha256 = "12mjnrvs6p4g5frzqb08k4h86hphdqlka91fcma2a3m4ap98nrxy"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-3.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-dp8393x.patch"; + sha256 = "02z6q0578fj55phjlg2larrsx3psch2ixzy470yf57jl3jq1dy6k"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-4.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-e1000.patch"; + sha256 = "0zzbiz8i9js524mcdi739c7hrsmn82gnafrygi0xrd5sqf1hp08z"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-5.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-lan9118.patch"; + sha256 = "1f44v5znd9s7l7wgc71nbg8jw1bjqiga4wkz7d7cpnkv3l7b9kjj"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-6.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-msf2.patch"; + sha256 = "04n1rzn6gfxdalp34903ysdhlvxqkfndnqayjj3iv1k27i5pcidn"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-7.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-pcnet.patch"; + sha256 = "1p9ls6f8r6hxprj8ha6278fydcxj3av29p1hvszxmabazml2g7l2"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-8.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-rtl8139.patch"; + sha256 = "0lms1zn49kpwblkp54widjjy7fwyhdh1x832l1jvds79l2nm6i04"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-9.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-sungem.patch"; + sha256 = "1mkzyrgsp9ml9yqzjxdfqnwjr7n0fd8vxby4yp4ksrskyni8y0p4"; + }) + (fetchpatch { + name = "CVE-2021-3416.part-10.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/net-qemu_receive_packet-for-loopback-tx_pkt-iov.patch"; + sha256 = "1pwqq8yw06y3p6hah3dgjhsqzk802wbn7zyajla1zwdfpic63jss"; + }) + (fetchpatch { + name = "CVE-2021-3409.part-1.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/dont-transfer-any-data-when-command-time-out.patch"; + sha256 = "0wf1yhb9mqpfgh9rv0hff0v1sw3zl2vsfgjrby4r8jvxdfjrxj8s"; + }) + (fetchpatch { + name = "CVE-2021-3409.part-2.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/dont-write-to-SDHC_SYSAD-register-when-transfer-is-in-progress.patch"; + sha256 = "1dd405dsdc7fbp68yf6f32js1azsv3n595c6nbxh28kfh9lspx4v"; + }) + (fetchpatch { + name = "CVE-2021-3409.part-3.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/correctly-set-the-controller-status-for-ADMA.patch"; + sha256 = "08jk51pfrbn1zfymahgllrzivajh2v2qx0868rv9zmgi0jldbky6"; + }) + (fetchpatch { + name = "CVE-2021-3409.part-4.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/limit-block-size-only-when-SDHC_BLKSIZE-register-is-writable.patch"; + sha256 = "1valfhw3l83br1cny6n4kmrv0f416hl625mggayqfz4prsknyhh7"; + }) + (fetchpatch { + name = "CVE-2021-3409.part-5.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/sdhci/reset-the-data-pointer-of-s-fifo_buffer-when-a-different-block-size-is-programmed.patch"; + sha256 = "01p5qrr00rh3mlwrp3qq56h7yhqv0w7pw2cw035nxw3mnap03v31"; + }) + (fetchpatch { + name = "CVE-2021-3392.patch"; + url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/mptsas-remove-unused-MPTSASState.pending-CVE-2021-3392.patch"; + sha256 = "0n7dn2p102c21mf3ncqrnks0wl5kas6yspafbn8jd03ignjgc4hd"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { From 4f75c6e4386616154914154515d55d53d11e0fe5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 24 Apr 2021 22:18:52 -0400 Subject: [PATCH 0891/1183] drawing: 0.4.13 -> 0.8.0 --- pkgs/applications/graphics/drawing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 0feb72f64aac..a2b4e949499b 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.4.13"; + version = "0.8.0"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53"; + sha256 = "03cx6acb0ph7b3difshjfddi8ld79wp8d12bdp7dp1q1820j5mz0"; }; nativeBuildInputs = [ From 5b6e08ba57ac384c7206e941448746849cf34a51 Mon Sep 17 00:00:00 2001 From: Aksh Gupta Date: Sun, 25 Apr 2021 08:15:50 +0530 Subject: [PATCH 0892/1183] gptman: init at 0.8.0 --- pkgs/tools/system/gptman/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/system/gptman/default.nix diff --git a/pkgs/tools/system/gptman/default.nix b/pkgs/tools/system/gptman/default.nix new file mode 100644 index 000000000000..5209856edeb0 --- /dev/null +++ b/pkgs/tools/system/gptman/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "gptman"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "cecton"; + repo = pname; + rev = "v${version}"; + sha256 = "11zyjrw4f8gi5s4sd2kl3sdiz0avq7clr8zqnwl04y61b3fpg7y1"; + }; + + cargoSha256 = "1cp8cyrd7ab8r2j28b69c2p3ysix5b9hpsqk07cmzgqwwml0qj12"; + + meta = with lib; { + description = "A CLI tool for Linux to copy a partition from one disk to another and more."; + homepage = "https://github.com/cecton/gptman"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ akshgpt7 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 016ffb025a67..19b5940cb651 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5151,6 +5151,8 @@ in gpt2tc = callPackage ../tools/text/gpt2tc { }; + gptman = callPackage ../tools/system/gptman { }; + ldmtool = callPackage ../tools/misc/ldmtool { }; gphotos-sync = callPackage ../tools/backup/gphotos-sync { }; From db381efaff433ea8625527adbe574b8d69d1a2ee Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0893/1183] avfs: 1.1.3 -> 1.1.4 --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 3315085191e1..7ef488f42153 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; + sha256 = "0ax1zbw4pmggx1b784bfabdqyn39k7109cnl22p69y2phnpq2y9s"; }; nativeBuildInputs = [ pkg-config ]; From 097467a5046afcf392904b3d42193074394c7479 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0894/1183] tflint: 0.27.0 -> 0.28.0 https://github.com/terraform-linters/tflint/releases/tag/v0.28.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index d52ac500e80b..9f4efe396c61 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1s49a3yihfkd8ib336a29ch53mpcyxzicglss7bqmqapv6zi37dg"; + sha256 = "1d746016iyswb9kw7gprg32vj5rcfa2y9j11r2hsp61hsjfvmg8c"; }; - vendorSha256 = "1w72n1sprwylaj96aj03h4qq43525q15iwb6vf23gf6913zhvqy3"; + vendorSha256 = "0whd0b9rll0s42hrr2fqp412d5frzmrnqnynpq75wda5rqzmaf8r"; doCheck = false; From 16f68549f2f36420f840811eb9ae604c7393132c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0895/1183] avfs: set license to gpl2Only --- pkgs/tools/filesystems/avfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 7ef488f42153..b4fc7f1e4f6e 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; }; } From 45e0672539a7212b0d3205334065b772842b159f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0896/1183] gcsfuse: 0.34.0 -> 0.34.1 https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v0.34.1 --- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 3891a384bc83..b145d1802a1c 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "gcsfuse"; - version = "0.34.0"; + version = "0.34.1"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - sha256 = "sha256-lnuf2Xvzqy50L2oY3x8Bpvf5GzkRgx2hRbvKGssGTc8="; + sha256 = "16ns04g4cvp6lfhkifgib5rxpbcxy8ghhavi3mv1cvxawpmdrxnq"; }; goPackagePath = "github.com/googlecloudplatform/gcsfuse"; From 24c6999487a5cb4158715c563938911ee6e57340 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0897/1183] postgresqlPackages.pgroonga: 2.2.8 -> 2.2.9 --- pkgs/servers/sql/postgresql/ext/pgroonga.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgroonga.nix b/pkgs/servers/sql/postgresql/ext/pgroonga.nix index b3d0bd5e2e84..fd63d7a0cc7a 100644 --- a/pkgs/servers/sql/postgresql/ext/pgroonga.nix +++ b/pkgs/servers/sql/postgresql/ext/pgroonga.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgroonga"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { url = "https://packages.groonga.org/source/${pname}/${pname}-${version}.tar.gz"; - sha256 = "sha256-YDDO3t6ARbQv72QotjA7DNxOlRo2O5CYzrH+/eEzj3w="; + sha256 = "1dz3800jrq41l833q5ihi511wj5fiyw329g7hbxsbc9whkx7hngn"; }; nativeBuildInputs = [ pkg-config ]; From 0b2034e36ce9c03f941b61062762391d66334e23 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 25 Apr 2021 04:20:00 +0000 Subject: [PATCH 0898/1183] rbw: 1.1.2 -> 1.2.0 --- .../rbw/bump-security-framework-crate.patch | 19 ------------------- pkgs/tools/security/rbw/default.nix | 17 +++++++++++------ 2 files changed, 11 insertions(+), 25 deletions(-) delete mode 100644 pkgs/tools/security/rbw/bump-security-framework-crate.patch diff --git a/pkgs/tools/security/rbw/bump-security-framework-crate.patch b/pkgs/tools/security/rbw/bump-security-framework-crate.patch deleted file mode 100644 index 9074dd925b82..000000000000 --- a/pkgs/tools/security/rbw/bump-security-framework-crate.patch +++ /dev/null @@ -1,19 +0,0 @@ -Bump security-framework from 2.1.1 to 2.1.2 - -security-framework=2.1.1 doesn't build on Darwin 10.12. -https://github.com/kornelski/rust-security-framework/issues/124 - ---- i/Cargo.lock -+++ w/Cargo.lock -@@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - - [[package]] - name = "security-framework" --version = "2.1.1" -+version = "2.1.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166" -+checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" - dependencies = [ - "bitflags", - "core-foundation", diff --git a/pkgs/tools/security/rbw/default.nix b/pkgs/tools/security/rbw/default.nix index c1f99719d76c..96616987510d 100644 --- a/pkgs/tools/security/rbw/default.nix +++ b/pkgs/tools/security/rbw/default.nix @@ -5,6 +5,7 @@ , openssl , pkg-config , makeWrapper +, installShellFiles , Security , libiconv @@ -20,21 +21,20 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.1.2"; + version = "1.2.0"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx"; + sha256 = "14cnqc5cf6qm2g9ypv2pbqbvymawyrqn3fc778labgqg24khqcyq"; }; - cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b"; - - cargoPatches = [ ./bump-security-framework-crate.patch ]; + cargoSha256 = "0izn5bcvk1rx69sjwyfc49nmvw7k0jysqb0bpdpwdliaa06ggl86"; nativeBuildInputs = [ pkg-config makeWrapper + installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; @@ -60,7 +60,12 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR="${openssl.out}/lib" ''; - postInstall = lib.optionalString withFzf '' + postInstall = '' + for shell in bash zsh fish; do + $out/bin/rbw gen-completions $shell > rbw.$shell + installShellCompletion rbw.$shell + done + '' + lib.optionalString withFzf '' cp bin/rbw-fzf $out/bin '' + lib.optionalString withRofi '' cp bin/rbw-rofi $out/bin From 4b7ccb341881d1773f250c2a2e3fa6d5cab6d848 Mon Sep 17 00:00:00 2001 From: Evils Date: Wed, 12 Aug 2020 21:16:20 +0200 Subject: [PATCH 0899/1183] stlink: 1.6.0 -> 1.7.0 --- .../development/tools/misc/stlink/default.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index e67fd9ca7a85..5bad6493c49e 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -9,25 +9,22 @@ let in stdenv.mkDerivation rec { pname = "stlink"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { - owner = "texane"; + owner = "stlink-org"; repo = "stlink"; rev = "v${version}"; - sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; + sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl"; }; buildInputs = [ libusb1' ]; nativeBuildInputs = [ cmake ]; - patchPhase = '' - sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt - sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt - ''; - preInstall = '' - mkdir -p $out/etc/udev/rules.d - mkdir -p $out/etc/modprobe.d - ''; + + cmakeFlags = [ + "-DSTLINK_MODPROBED_DIR=${placeholder "out"}/etc/modprobe.d" + "-DSTLINK_UDEV_RULES_DIR=${placeholder "out"}/lib/udev/rules.d" + ]; meta = with lib; { description = "In-circuit debug and programming for ST-Link devices"; From ab6943a745059a8c177d7512c23ab7af58e822d1 Mon Sep 17 00:00:00 2001 From: Taeer Bar-Yam Date: Sun, 25 Apr 2021 02:43:09 -0400 Subject: [PATCH 0900/1183] macdylibbundler: delete duplicate dylibbundler (#119486) --- pkgs/tools/misc/dylibbundler/default.nix | 22 ---------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 pkgs/tools/misc/dylibbundler/default.nix diff --git a/pkgs/tools/misc/dylibbundler/default.nix b/pkgs/tools/misc/dylibbundler/default.nix deleted file mode 100644 index 7bf93bf88e7c..000000000000 --- a/pkgs/tools/misc/dylibbundler/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation { - name = "dylibbundler"; - - src = fetchFromGitHub { - owner = "auriamg"; - repo = "/macdylibbundler"; - rev = "27923fbf6d1bc4d18c18e118280c4fe51fc41a80"; - sha256 = "1mpd43hvpfp7pskfrjnd6vcmfii9v3p97q0ws50krkdvshp0bv2h"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with lib; { - description = "Small command-line program that aims to make bundling .dylibs as easy as possible"; - homepage = "https://github.com/auriamg/macdylibbundler"; - license = licenses.mit; - maintainers = with maintainers; [ alexfmpe ]; - platforms = with platforms; darwin ++ linux; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 999c26e320bd..d405638a3407 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -176,6 +176,7 @@ mapAliases ({ dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 dwarf_fortress = dwarf-fortress; # added 2016-01-23 dwm-git = throw "dwm-git has been removed from nixpkgs, as it had no updates for 2 years not serving it's purpose."; # added 2021-02-07 + dylibbundler = macdylibbundler; # added 2021-04-24 elasticmq = throw "elasticmq has been removed in favour of elasticmq-server-bin"; # added 2021-01-17 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61b0646ef9a7..dca92c4cc47c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2372,8 +2372,6 @@ in enableSSH = true; }; - dylibbundler = callPackage ../tools/misc/dylibbundler { }; - dynamic-colors = callPackage ../tools/misc/dynamic-colors { }; dyncall = callPackage ../development/libraries/dyncall { }; From e58f896fffcaf2452f3e8ccb724e733b467d8f96 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 25 Apr 2021 09:00:21 +0200 Subject: [PATCH 0901/1183] jellyfin-media-player: 1.4.1 -> 1.5.0 --- pkgs/applications/video/jellyfin-media-player/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/jellyfin-media-player/default.nix b/pkgs/applications/video/jellyfin-media-player/default.nix index 10a3a8cc174b..829cc4835eac 100644 --- a/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/pkgs/applications/video/jellyfin-media-player/default.nix @@ -26,18 +26,18 @@ mkDerivation rec { pname = "jellyfin-media-player"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-media-player"; rev = "v${version}"; - sha256 = "sha256-500Qlxpqkf+9D/jrzkrYkkFwxs0soLG/I5mgFV1UOc8="; + sha256 = "sha256-A3vo6678XFUV2RN1lcGYbIjCbBjR1oeORcidKZVnImg="; }; jmpDist = fetchzip { - url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-2/dist.zip"; - sha256 = "sha256-9oxOcSCV1Gm8WLpwVLanyUlhPx5PWUrkkWvKmwND94g="; + url = "https://github.com/iwalton3/jellyfin-web-jmp/releases/download/jwc-10.7.2-3/dist.zip"; + sha256 = "sha256-Rb0q3NFmnYkueq0JkIWkX0C/oL+gFrNOELCNfh9X/P4="; }; patches = [ From 688990ec8914791628704b445dfefe3f6ae93e3d Mon Sep 17 00:00:00 2001 From: Shamrock Lee <44064051+ShamrockLee@users.noreply.github.com> Date: Sat, 24 Apr 2021 08:09:48 +0800 Subject: [PATCH 0902/1183] libchewing: 0.5.1 -> unstable-2020-06-27 If applied, users will be able to benefit from several bug fixes that stops the program from polluting their vocabulary database. There have been almost 5 years since v0.5.1 was released. Many important bugfix such as https://github.com/chewing/libchewing/pull/277 the fix for https://github.com/chewing/libchewing/issues/232 the error of incorrect phrases being stored into the user vocabulary database. There has almost been a year since the last commit on master, and it is quite stable on my laptop. --- .../development/libraries/libchewing/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 1436d4bd59dc..c6b7841ca400 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchurl, sqlite }: +{ lib, stdenv, fetchFromGitHub, sqlite, cmake }: stdenv.mkDerivation rec { pname = "libchewing"; - version = "0.5.1"; + version = "unstable-2020-06-27"; - src = fetchurl { - url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2"; - sha256 = "0aqp2vqgxczydpn7pxi7r6xf3l1hgl710f0gbi1k8q7s2lscc24p"; + src = fetchFromGitHub { + owner = "chewing"; + repo = "libchewing"; + rev = "452f6221fbad90c0706a3963b17e226216e40dd7"; + sha256 = "sha256-w3/K2O/CU+XVzqzVCYJyq1vLgToN6iIUhJ9J7ia4p9E="; }; buildInputs = [ sqlite ]; + nativeBuildInputs = [ cmake ]; + meta = with lib; { description = "Intelligent Chinese phonetic input method"; homepage = "http://chewing.im/"; - license = licenses.lgpl21; + license = licenses.lgpl21Only; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; }; From 4b3592df70d9ff5c78dbcf50aff4daa645810321 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:05:17 +0200 Subject: [PATCH 0903/1183] python3Packages.libarcus: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/libarcus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 6e5d8f771e8b..edea85876a84 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "libarcus"; - version = "4.8.0"; + version = "4.9.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libArcus"; rev = version; - sha256 = "1dvz1rkvm4309yzvj7vy49v1vskr5yfq4nzqdiydp1jb7zpvhqqm"; + sha256 = "0wq72nf680bwxijjajb4piw563rnvflshmw96kqln4lsny7ydjj2"; }; disabled = pythonOlder "3.4.0"; From 2f7c14899e2e66f1826cd7efd7322d2a3956eb93 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:05:36 +0200 Subject: [PATCH 0904/1183] python3Packages.libsavitar: 4.8.0 -> 4.9.0 --- pkgs/development/python-modules/libsavitar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 7ef22e3f6ee5..f6aa1b378f58 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "libsavitar"; - version = "4.8.0"; + version = "4.9.0"; format = "other"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "libSavitar"; rev = version; - sha256 = "1mxkvnhn8k1a86jlnjnlpf0b8dvrcg3n7pslf60s13cgb7w3sfzh"; + sha256 = "0434cb19v9phc9xicbmgpbig18ivplcpqhnsjgca4p8n8c715k9h"; }; postPatch = '' From 8f5cb6ca60d0a7e0a6314be9f60dbbe48f876867 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:05:51 +0200 Subject: [PATCH 0905/1183] python3Packages.uranium: 4.7.1 -> 4.9.0 --- pkgs/development/python-modules/uranium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 0c068428f6cc..db8c8c8bd23b 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -2,7 +2,7 @@ , pyqt5, numpy, scipy, shapely, libarcus, cryptography, doxygen, gettext, pythonOlder }: buildPythonPackage rec { - version = "4.7.1"; + version = "4.9.0"; pname = "uranium"; format = "other"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "Ultimaker"; repo = "Uranium"; rev = version; - sha256 = "1h5d3scy3cnbyhh0pbavflpqklhn2lbp7hl193rc5gx8yzr3mqbh"; + sha256 = "0bqrc4g4pd7b209swlv06bm5sx7df96h9kjpqpra4mfz469km4nn"; }; disabled = pythonOlder "3.5.0"; From 342d9fd84f54a38b72f6c18af733c18016f99663 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:06:04 +0200 Subject: [PATCH 0906/1183] curaengine: 4.8.0 -> 4.9.0 --- pkgs/applications/misc/curaengine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 4a4558ba2893..76947c1ed946 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "083l327ry6hv3yaa1p8dx1hx7fm12b0lh5nlbshxjyym0vi15rw2"; + sha256 = "0b82hwn7pb73h1azaandq93bkzlzskhgk71pwf4yws0j9bm6z084"; }; nativeBuildInputs = [ cmake ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; homepage = "https://github.com/Ultimaker/CuraEngine"; - license = licenses.agpl3; + license = licenses.agpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; }; From 8563f899cb5dc1ca10c663e69da87f37540fd76e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:06:14 +0200 Subject: [PATCH 0907/1183] cura: 4.8.0 -> 4.9.0 --- pkgs/applications/misc/cura/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index 46143747f6d9..a33cb7b2ce6c 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "cura"; - version = "4.8.0"; + version = "4.9.0"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "Cura"; rev = version; - sha256 = "060fqzspipm93ks0inrj7yrj5wmvkdfv8xaxrv22590yb9f95s9m"; + sha256 = "1q515qwrzla3ikbsjmk91y0nrbwih11jycgmd50lkrmnkh7qj0r2"; }; materials = fetchFromGitHub { @@ -22,7 +22,7 @@ mkDerivation rec { buildInputs = [ qtbase qtquickcontrols2 qtgraphicaleffects ]; propagatedBuildInputs = with python3.pkgs; [ libsavitar numpy-stl pyserial requests uranium zeroconf pynest2d - sentry-sdk trimesh + sentry-sdk trimesh keyring ] ++ plugins; nativeBuildInputs = [ cmake python3.pkgs.wrapPython ]; From 53657d7d25e46174aed04af96b112e8f0f71b861 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 24 Apr 2021 16:06:30 +0200 Subject: [PATCH 0908/1183] curaPlugins.rawmouse: 1.0.13 -> 1.1.0 --- pkgs/applications/misc/cura/plugins.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/cura/plugins.nix b/pkgs/applications/misc/cura/plugins.nix index 4bf7ba8d852a..76a5808963f9 100644 --- a/pkgs/applications/misc/cura/plugins.nix +++ b/pkgs/applications/misc/cura/plugins.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, python3Packages, libspnav, jq }: let @@ -34,18 +34,28 @@ let rawmouse = stdenv.mkDerivation rec { pname = "RawMouse"; - version = "1.0.13"; + version = "1.1.0"; src = fetchFromGitHub { owner = "smartavionics"; repo = pname; rev = version; - sha256 = "1cj40pgsfcwliz47mkiqjbslkwcm34qb1pajc2mcljgflcnickly"; + sha256 = "0hvi7qwd4xfnqnhbj9dgfjmvv9df7s42asf3fdfxv43n6nx74scw"; }; + nativeBuildInputs = [ jq ]; + + propagatedBuildInputs = with python3Packages; [ + hidapi + ]; + buildPhase = '' - substituteInPlace RawMouse/config.json --replace \ - /usr/local/lib/libspnav.so ${libspnav}/lib/libspnav.so + jq 'del(.devices) | .libspnav="${libspnav}/lib/libspnav.so"' \ + RawMouse/config.json.new + mv RawMouse/config.json.new RawMouse/config.json + + # remove prebuilt binaries + rm -r RawMouse/hidapi ''; installPhase = '' From d4f48c85476b2a7227e587c9a9cfb3b9b41af554 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 18 Apr 2021 06:12:16 +0200 Subject: [PATCH 0909/1183] =?UTF-8?q?coqPackages.tlc:=2020200328=20?= =?UTF-8?q?=E2=86=92=2020210316?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/tlc/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/tlc/default.nix b/pkgs/development/coq-modules/tlc/default.nix index 6bbad1c6c2b1..1e212b44e725 100644 --- a/pkgs/development/coq-modules/tlc/default.nix +++ b/pkgs/development/coq-modules/tlc/default.nix @@ -1,23 +1,29 @@ { lib, mkCoqDerivation, coq, version ? null }: -with lib; mkCoqDerivation { +with lib; (mkCoqDerivation { pname = "tlc"; owner = "charguer"; inherit version; displayVersion = { tlc = false; }; defaultVersion = with versions; switch coq.coq-version [ + { case = range "8.12" "8.13"; out = "20210316"; } { case = range "8.10" "8.12"; out = "20200328"; } { case = range "8.6" "8.12"; out = "20181116"; } ] null; + release."20210316".sha256 = "1hlavnx20lxpf2iydbbxqmim9p8wdwv4phzp9ypij93yivih0g4a"; release."20200328".sha256 = "16vzild9gni8zhgb3qhmka47f8zagdh03k6nssif7drpim8233lx"; release."20181116".sha256 = "032lrbkxqm9d3fhf6nv1kq2z0mqd3czv3ijlbsjwnfh12xck4vpl"; - installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; - meta = { homepage = "http://www.chargueraud.org/softs/tlc/"; description = "A non-constructive library for Coq"; license = licenses.free; maintainers = [ maintainers.vbgl ]; }; -} +}).overrideAttrs (x: + if versionAtLeast x.version "20210316" + then {} + else { + installFlags = [ "CONTRIB=$(out)/lib/coq/${coq.coq-version}/user-contrib" ]; + } +) From b8ef16dc1e9d07f14be191d020048630079e5235 Mon Sep 17 00:00:00 2001 From: Jonas Chevalier Date: Sun, 25 Apr 2021 12:11:42 +0200 Subject: [PATCH 0910/1183] treefmt: init at 0.1.1 (#120521) * treefmt: init at 0.1.1 * Update pkgs/top-level/all-packages.nix Co-authored-by: Sandro * Update pkgs/development/tools/treefmt/default.nix Co-authored-by: Sandro Co-authored-by: Sandro --- pkgs/development/tools/treefmt/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/tools/treefmt/default.nix diff --git a/pkgs/development/tools/treefmt/default.nix b/pkgs/development/tools/treefmt/default.nix new file mode 100644 index 000000000000..c90492c6aeca --- /dev/null +++ b/pkgs/development/tools/treefmt/default.nix @@ -0,0 +1,21 @@ +{ lib, rustPlatform, fetchFromGitHub }: +rustPlatform.buildRustPackage rec { + pname = "treefmt"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "treefmt"; + rev = "v${version}"; + sha256 = "0a4yikkqppawii1q0kzsxwfp1aid688wa0lixjwfsl279lr69css"; + }; + + cargoSha256 = "08k60gd23yanfraxpbw9hi7jbqgsxz9mv1ci6q9piis5742zlj9s"; + + meta = { + description = "one CLI to format the code tree"; + homepage = "https://github.com/numtide/treefmt"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da0b9580c1b0..5e915c24aeb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31143,6 +31143,8 @@ in fac-build = callPackage ../development/tools/build-managers/fac {}; + treefmt = callPackage ../development/tools/treefmt { }; + bottom = callPackage ../tools/system/bottom {}; cagebreak = callPackage ../applications/window-managers/cagebreak/default.nix { From c94c1874da67916f5cf0f1ef63c3b92a197b3bd3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 03:18:32 -0700 Subject: [PATCH 0911/1183] influxdb: 1.8.4 -> 1.8.5 (#120207) --- pkgs/servers/nosql/influxdb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index a178d43d231e..98bd45516e27 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "influxdb"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "influxdata"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cL+QaUGMElYd6P+xXkQgRnL8BKo2C95bhCwy59kRnwo="; + sha256 = "sha256-qKkCTsSUejqJhMzAgFJYMGalAUepUaP/caocRwnKflg="; }; - vendorSha256 = "sha256-v4CEkhQiETeU6i186XIE/8z4T71gdKL+6W7sQ7/2RuI="; + vendorSha256 = "sha256-t7uwrsrF4LYdRjOhwdsCouDJXvD9364Ma5gvKezvi5o="; doCheck = false; From 6c04559dae863c4d88078841476a2b629688607f Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 12:19:02 +0200 Subject: [PATCH 0912/1183] zen-kernels: 5.11.15 -> 5.11.16 --- pkgs/os-specific/linux/kernel/linux-lqx.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-zen.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-lqx.nix b/pkgs/os-specific/linux/kernel/linux-lqx.nix index 8662fbbd18bc..8d0333e8fd6c 100644 --- a/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.11.15"; + version = "5.11.16"; suffix = "lqx1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1dwibknj4q8cd3mim679mrb4j8yi7p4q9qjcb4rwvw0yzgxmz3lv"; + sha256 = "1j25r45arikjwyhbr72r1935pr7a8g2j6vshggywdiixvizvrx9b"; }; extraMeta = { diff --git a/pkgs/os-specific/linux/kernel/linux-zen.nix b/pkgs/os-specific/linux/kernel/linux-zen.nix index 92aaa9574580..b28400819d53 100644 --- a/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.11.15"; + version = "5.11.16"; suffix = "zen1"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "0n9wm0lpwkqd79112k03lxp4hc898nvs2jjw3hxzggn5wk4i2dz9"; + sha256 = "0jyicnpqccn194jrm1mc4zq0cil7ls9l57ws3nv783vlk7b0k3gv"; }; extraMeta = { From 4a67076273c8c566f90e3f0caadce941106314d9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Fri, 2 Apr 2021 13:34:15 +0200 Subject: [PATCH 0913/1183] koka: make sure runtime dependencies are host -> target buildPackages.stdenv.cc.cc is a C compiler that runs on the build platform and produces binaries for the host platform. This is not what we want. Also pkgsHostTarget.stdenv.cc is not the compiler we want as stdenv always runs on the previous stage so to say (the stdenv is used to build the package set, in the case of cross compiling this is not done natively). Thus pkgsHostTarget.targetPackages.stdenv.cc is what we want. --- pkgs/development/compilers/koka/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/koka/default.nix b/pkgs/development/compilers/koka/default.nix index 087b0ad1153b..6523dcca2f62 100644 --- a/pkgs/development/compilers/koka/default.nix +++ b/pkgs/development/compilers/koka/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPackages, cmake, gnumake, makeWrapper, mkDerivation, fetchFromGitHub +{ stdenv, pkgsHostTarget, cmake, makeWrapper, mkDerivation, fetchFromGitHub , alex, array, base, bytestring, cond, containers, directory, extra , filepath, haskeline, hpack, hspec, hspec-core, json, lib, mtl , parsec, process, regex-compat, text, time }: @@ -18,11 +18,12 @@ let src = "${src}/kklib"; nativeBuildInputs = [ cmake ]; }; + inherit (pkgsHostTarget.targetPackages.stdenv) cc; runtimeDeps = [ - buildPackages.stdenv.cc - buildPackages.stdenv.cc.bintools.bintools - gnumake - cmake + cc + cc.bintools.bintools + pkgsHostTarget.gnumake + pkgsHostTarget.cmake ]; in mkDerivation rec { @@ -42,7 +43,7 @@ mkDerivation rec { cp -a contrib $out/share/koka/v${version} cp -a kklib $out/share/koka/v${version} wrapProgram "$out/bin/koka" \ - --set CC "${lib.getBin buildPackages.stdenv.cc}/bin/${buildPackages.stdenv.cc.targetPrefix}cc" \ + --set CC "${lib.getBin cc}/bin/${cc.targetPrefix}cc" \ --prefix PATH : "${lib.makeSearchPath "bin" runtimeDeps}" ''; doCheck = false; From 976ca8c8e53c75ef47204f548589a6aec8ef675c Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 12:36:07 +0200 Subject: [PATCH 0914/1183] ethminer: add myself as maintainer --- pkgs/tools/misc/ethminer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 7d2cb5c7ff2c..2c14fab680ce 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { description = "Ethereum miner with OpenCL, CUDA and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ nand0p ]; + maintainers = with maintainers; [ nand0p atemu ]; license = licenses.gpl2; }; } From cc7ee239f786e6ff15e3c11285faf6256da7beed Mon Sep 17 00:00:00 2001 From: "Andy Chun @noneucat" Date: Mon, 18 Jan 2021 13:47:24 -0800 Subject: [PATCH 0915/1183] ethminer: 0.18.0 -> 0.19.0 (cherry picked from commit 3fcdf4ed14d489fa1e96021b037a9910a916535b) --- pkgs/tools/misc/ethminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 2c14fab680ce..c43c66fcc07e 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -23,14 +23,14 @@ let stdenv = clangStdenv; in stdenv.mkDerivation rec { pname = "ethminer"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "ethereum-mining"; repo = "ethminer"; rev = "v${version}"; - sha256 = "10b6s35axmx8kyzn2vid6l5nnzcaf4nkk7f5f7lg3cizv6lsj707"; + sha256 = "1kyff3vx2r4hjpqah9qk99z6dwz7nsnbnhhl6a76mdhjmgp1q646"; fetchSubmodules = true; }; From b5f7ed7cc89ec40a79cc1e0e8fdbe738152822fe Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 29 Mar 2021 21:03:15 +0200 Subject: [PATCH 0916/1183] ocamlPackages.shared-memory-ring(-lwt): init at 3.1.0 --- .../shared-memory-ring/default.nix | 41 +++++++++++++++++++ .../ocaml-modules/shared-memory-ring/lwt.nix | 37 +++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 3 files changed, 82 insertions(+) create mode 100644 pkgs/development/ocaml-modules/shared-memory-ring/default.nix create mode 100644 pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/default.nix b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix new file mode 100644 index 000000000000..3a96d4adee4c --- /dev/null +++ b/pkgs/development/ocaml-modules/shared-memory-ring/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildDunePackage +, fetchurl +, ppx_cstruct +, mirage-profile +, cstruct +, ounit +}: + +buildDunePackage rec { + pname = "shared-memory-ring"; + version = "3.1.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/shared-memory-ring/releases/download/v${version}/shared-memory-ring-v${version}.tbz"; + sha256 = "06350ph3rdfvybi0cgs3h3rdkmjspk3c4375rxvbdg0kza1w22x1"; + }; + + nativeBuildInputs = [ + ppx_cstruct + ]; + + propagatedBuildInputs = [ + mirage-profile + cstruct + ]; + + doCheck = true; + checkInputs = [ + ounit + ]; + + meta = with lib; { + description = "Shared memory rings for RPC and bytestream communications"; + license = licenses.isc; + homepage = "https://github.com/mirage/shared-memory-ring"; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix new file mode 100644 index 000000000000..8f41253bab8e --- /dev/null +++ b/pkgs/development/ocaml-modules/shared-memory-ring/lwt.nix @@ -0,0 +1,37 @@ +{ lib +, buildDunePackage +, shared-memory-ring +, ppx_cstruct +, cstruct +, lwt +, lwt-dllist +, mirage-profile +, ounit +}: + +buildDunePackage { + pname = "shared-memory-ring-lwt"; + + inherit (shared-memory-ring) version src useDune2; + + buildInputs = [ + ppx_cstruct + ]; + + propagatedBuildInputs = [ + shared-memory-ring + cstruct + lwt + lwt-dllist + mirage-profile + ]; + + doCheck = true; + checkInputs = [ + ounit + ]; + + meta = shared-memory-ring.meta // { + description = "Shared memory rings for RPC and bytestream communications using Lwt"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d8c1f2d3e403..5e33c619ca04 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1138,6 +1138,10 @@ let sha = callPackage ../development/ocaml-modules/sha { }; + shared-memory-ring = callPackage ../development/ocaml-modules/shared-memory-ring { }; + + shared-memory-ring-lwt = callPackage ../development/ocaml-modules/shared-memory-ring/lwt.nix { }; + sodium = callPackage ../development/ocaml-modules/sodium { }; spelll = callPackage ../development/ocaml-modules/spelll { }; From 980a2bed3bdb2801d7aee238decdf62c014b56f4 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 29 Mar 2021 21:03:38 +0200 Subject: [PATCH 0917/1183] ocamlPackages.mirage-xen: init at 6.0.0 Unfortunately this requires a bit of trickery with pkg-config to get to work. The root issue is that the mirage-xen assumes that we use the default libdir of dune ($out/lib) whereas we install to an OCaml version-specific site-lib directory. Thus the manually created pkg-config file makes wrong assumptions (which warrants a patch) and the .pc file is installed to the wrong location (which is fixed with a mv invocation). --- .../ocaml-modules/mirage-xen/default.nix | 78 +++++++++++++++++++ .../mirage-xen/makefile-no-opam.patch | 12 +++ .../ocaml-modules/mirage-xen/pkg-config.patch | 13 ++++ pkgs/top-level/ocaml-packages.nix | 2 + 4 files changed, 105 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-xen/default.nix create mode 100644 pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch create mode 100644 pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix new file mode 100644 index 000000000000..0d53d0f9c3b7 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix @@ -0,0 +1,78 @@ +{ lib +, buildDunePackage +, fetchurl +, pkg-config +, cstruct +, lwt +, shared-memory-ring-lwt +, xenstore +, lwt-dllist +, mirage-profile +, mirage-runtime +, logs +, fmt +, ocaml-freestanding +, bheap +, duration +, io-page +}: + +buildDunePackage rec { + pname = "mirage-xen"; + version = "6.0.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-v${version}.tbz"; + sha256 = "f991e972059b27993c287ad010d9281fee061efaa1dd475d0955179f93710fbd"; + }; + + patches = [ + ./makefile-no-opam.patch + ./pkg-config.patch + ]; + + # can't handle OCAMLFIND_DESTDIR with substituteAll + postPatch = '' + substituteInPlace lib/bindings/mirage-xen.pc \ + --replace "@out@" "$out" \ + --replace "@OCAMLFIND_DESTDIR@" "$OCAMLFIND_DESTDIR" + ''; + + minimumOCamlVersion = "4.08"; + + nativeBuildInputs = [ + pkg-config + ]; + + propagatedBuildInputs = [ + cstruct + lwt + shared-memory-ring-lwt + xenstore + lwt-dllist + mirage-profile + mirage-runtime + io-page + logs + fmt + bheap + duration + (ocaml-freestanding.override { target = "xen"; }) + ]; + + # Move pkg-config files into their well-known location. + # This saves us an extra setup hook and causes no issues + # since we patch all relative paths out of the .pc file. + postInstall = '' + mv $OCAMLFIND_DESTDIR/pkgconfig $out/lib/pkgconfig + ''; + + meta = with lib; { + description = "Xen core platform libraries for MirageOS"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/mirage-xen"; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch b/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch new file mode 100644 index 000000000000..905e6efc3f4a --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-xen/makefile-no-opam.patch @@ -0,0 +1,12 @@ +diff --git a/lib/bindings/Makefile b/lib/bindings/Makefile +index 4e413c0..67c7bdc 100644 +--- a/lib/bindings/Makefile ++++ b/lib/bindings/Makefile +@@ -1,4 +1,6 @@ +-PKG_CONFIG_PATH := $(shell opam config var prefix)/lib/pkgconfig ++ifneq (, $(shell command -v opam)) ++ PKG_CONFIG_PATH ?= $(shell opam config var prefix)/lib/pkgconfig ++endif + + CC ?= cc + FREESTANDING_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags ocaml-freestanding) diff --git a/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch b/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch new file mode 100644 index 000000000000..19205cf7ee4d --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-xen/pkg-config.patch @@ -0,0 +1,13 @@ +diff --git a/lib/bindings/mirage-xen.pc b/lib/bindings/mirage-xen.pc +index a03a217..8499aa4 100644 +--- a/lib/bindings/mirage-xen.pc ++++ b/lib/bindings/mirage-xen.pc +@@ -1,6 +1,6 @@ +-prefix=${pcfiledir}/../.. ++prefix=@out@ + exec_prefix=${prefix} +-libdir=${exec_prefix}/lib ++libdir=@OCAMLFIND_DESTDIR@ + + Name: mirage-xen + Version: 6.0.0 diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 5e33c619ca04..66df06b2058b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -739,6 +739,8 @@ let mirage-unix = callPackage ../development/ocaml-modules/mirage-unix { }; + mirage-xen = callPackage ../development/ocaml-modules/mirage-xen { }; + mirage-vnetif = callPackage ../development/ocaml-modules/mirage-vnetif { }; mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; From 2fe8239172c3aeccfd14910638aa74e440516b2a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 20 Apr 2021 13:41:47 +0200 Subject: [PATCH 0918/1183] ocamlPackages.{mirage-net-xen,netchannel}: init at 2.0.0 --- .../ocaml-modules/mirage-net-xen/default.nix | 39 +++++++++++++ .../ocaml-modules/netchannel/default.nix | 55 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++ 3 files changed, 98 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-net-xen/default.nix create mode 100644 pkgs/development/ocaml-modules/netchannel/default.nix diff --git a/pkgs/development/ocaml-modules/mirage-net-xen/default.nix b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix new file mode 100644 index 000000000000..0d7a7e53fb1a --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-net-xen/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildDunePackage +, netchannel +, ppx_sexp_conv +, lwt +, cstruct +, mirage-net +, mirage-xen +, io-page +, lwt-dllist +, logs +}: + +buildDunePackage { + pname = "mirage-net-xen"; + + inherit (netchannel) + src + version + useDune2 + minimumOCamlVersion + meta + ; + + nativeBuildInputs = [ + ppx_sexp_conv + ]; + + propagatedBuildInputs = [ + lwt + cstruct + netchannel + mirage-net + mirage-xen + io-page + lwt-dllist + logs + ]; +} diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix new file mode 100644 index 000000000000..e7b021d6fbe9 --- /dev/null +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildDunePackage +, fetchurl +, ppx_sexp_conv +, ppx_cstruct +, lwt +, mirage-net +, io-page +, mirage-xen +, ipaddr +, mirage-profile +, shared-memory-ring +, sexplib +, logs +, rresult +}: + +buildDunePackage rec { + pname = "netchannel"; + version = "2.0.0"; + + useDune2 = true; + + minimumOCamlVersion = "4.08"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-v${version}.tbz"; + sha256 = "ec3906ef1804ef6a9e36b91f4ae73ce4849e9e0d1d36a80fe66b5f905fab93ad"; + }; + + nativeBuildInputs = [ + ppx_cstruct + ]; + + propagatedBuildInputs = [ + ppx_sexp_conv + lwt + mirage-net + io-page + mirage-xen + ipaddr + mirage-profile + shared-memory-ring + sexplib + logs + rresult + ]; + + meta = with lib; { + description = "Network device for reading and writing Ethernet frames via then Xen netfront/netback protocol"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/mirage-net-xen"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 66df06b2058b..6bbcb9fbc8cd 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -717,6 +717,8 @@ let mirage-net = callPackage ../development/ocaml-modules/mirage-net { }; + mirage-net-xen = callPackage ../development/ocaml-modules/mirage-net-xen { }; + mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { }; mirage-protocols = callPackage ../development/ocaml-modules/mirage-protocols { }; @@ -755,6 +757,8 @@ let mustache = callPackage ../development/ocaml-modules/mustache { }; + netchannel = callPackage ../development/ocaml-modules/netchannel { }; + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; nonstd = callPackage ../development/ocaml-modules/nonstd { }; From 4f7a6610f700bdd1e9dab7b5b3efa125465ae797 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 30 Mar 2021 02:40:43 +0200 Subject: [PATCH 0919/1183] ocamlPackages.mirage-bootvar-xen: init at 0.8.0 --- .../mirage-bootvar-xen/default.nix | 34 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix new file mode 100644 index 000000000000..c280853488de --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildDunePackage +, fetchurl +, mirage-xen +, parse-argv +, lwt +}: + +buildDunePackage rec { + pname = "mirage-bootvar-xen"; + version = "0.8.0"; + + minimumOCamlVersion = "4.08"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz"; + sha256 = "0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; + }; + + propagatedBuildInputs = [ + mirage-xen + lwt + parse-argv + ]; + + meta = with lib; { + description = "Handle boot-time arguments for Xen platform"; + license = licenses.isc; + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://github.com/mirage/mirage-bootvar-xen"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6bbcb9fbc8cd..c7891a1821e8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -675,6 +675,8 @@ let mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; + mirage-bootvar-xen = callPackage ../development/ocaml-modules/mirage-bootvar-xen { }; + mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; From 83452cfd71cd3ce14750b88f661172f24a92257b Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sun, 25 Apr 2021 12:00:45 +0000 Subject: [PATCH 0920/1183] wireshark: 3.4.4 -> 3.4.5 https://www.wireshark.org/docs/relnotes/wireshark-3.4.5.html --- 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 249d58ceb606..230bb2d4fe41 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.4"; + version = "3.4.5"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j"; + sha256 = "sha256-3hqv0QCh4SB8hQ0YDpfdkauNoPXra+7FRfclzbFF0zM="; }; cmakeFlags = [ From f24b888dc2efbd1f23bb6b1f46cee5e94c8fdd63 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 13:27:54 +0200 Subject: [PATCH 0921/1183] soldat-unstable: 2020-11-26 -> 2021-02-09 --- pkgs/games/soldat-unstable/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index d48cf3048ee5..2228b8f35fa1 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -39,14 +39,14 @@ in stdenv.mkDerivation rec { pname = "soldat-unstable"; - version = "2020-11-26"; + version = "2021-02-09"; src = fetchFromGitHub { name = "soldat"; owner = "Soldat"; repo = "soldat"; - rev = "2280296ac56883f6a9cad4da48025af8ae7782e7"; - sha256 = "17i3nlhxm4x4zx00i00aivhxmagbnyizxnpwiqzg57bf23hrvdj3"; + rev = "c304c3912ca7a88461970a859049d217a44c6375"; + sha256 = "09sl2zybfcmnl2n3qghp0gylmr71y01534l6nq0y9llbdy0bf306"; }; nativeBuildInputs = [ fpc makeWrapper autoPatchelfHook ]; @@ -63,13 +63,6 @@ stdenv.mkDerivation rec { }) ]; - postPatch = '' - for f in client/Makefile server/Makefile; do - # fix unportable uname invocation - substituteInPlace "$f" --replace "uname -p" "uname -m" - done - ''; - buildPhase = '' mkdir -p client/build server/build From c41d97c324a187e4a86f414260e034c22db97b92 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 13:28:45 +0200 Subject: [PATCH 0922/1183] soldat-unstable: move unstable into version pname is still soldat, regardless of whether it is stable or unstable, attribute name should keep the suffix for clarity (soldat stable is unfree (?) and not packaged by us atm). --- pkgs/games/soldat-unstable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index 2228b8f35fa1..12799a1e1522 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -38,8 +38,8 @@ let in stdenv.mkDerivation rec { - pname = "soldat-unstable"; - version = "2021-02-09"; + pname = "soldat"; + version = "unstable-2021-02-09"; src = fetchFromGitHub { name = "soldat"; From 5f783493a99a41ba2704541a817bfae21d3dd305 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 13:31:08 +0200 Subject: [PATCH 0923/1183] soldat-unstable: run hooks for build and install phase --- pkgs/games/soldat-unstable/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/games/soldat-unstable/default.nix b/pkgs/games/soldat-unstable/default.nix index 12799a1e1522..19ff4b5c6c0e 100644 --- a/pkgs/games/soldat-unstable/default.nix +++ b/pkgs/games/soldat-unstable/default.nix @@ -64,6 +64,8 @@ stdenv.mkDerivation rec { ]; buildPhase = '' + runHook preBuild + mkdir -p client/build server/build # build .so from stb headers @@ -80,9 +82,13 @@ stdenv.mkDerivation rec { pushd server make mode=release popd + + runHook postBuild ''; installPhase = '' + runHook preInstall + install -Dm644 client/libs/stb/libstb.so -t $out/lib install -Dm755 client/build/soldat_* $out/bin/soldat install -Dm755 server/build/soldatserver_* $out/bin/soldatserver @@ -100,6 +106,8 @@ stdenv.mkDerivation rec { --add-flags "-fs_userpath \"$configDir\"" \ --add-flags "-fs_basepath \"${base}/share/soldat\"" done + + runHook postInstall ''; meta = with lib; { From b929d94a7521d490bd6092e5f9ec34fe4c22b997 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Fri, 16 Apr 2021 14:50:31 +0200 Subject: [PATCH 0924/1183] python3Packages.python-string-utils: init at 1.0.0 --- .../python-string-utils/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/python-string-utils/default.nix diff --git a/pkgs/development/python-modules/python-string-utils/default.nix b/pkgs/development/python-modules/python-string-utils/default.nix new file mode 100644 index 000000000000..d8d1b136fb3e --- /dev/null +++ b/pkgs/development/python-modules/python-string-utils/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytest +}: + +buildPythonPackage rec { + pname = "python-string-utils"; + version = "1.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-3PkGCwPwdkfApgNAjciwP4B/O1SgXG4Z6xRGAlb6wMs="; + }; + + pythonImportsCheck = ["string_utils"]; + + # tests are not available in pypi tarball + doCheck = false; + + meta = with lib; { + description = "A handy Python library to validate, manipulate and generate strings."; + homepage = "https://github.com/daveoncode/python-string-utils"; + license = licenses.mit; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e9626426f30..3e02d8460294 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6359,6 +6359,8 @@ in { pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + python-string-utils = callPackage ../development/python-modules/python-string-utils { }; + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; From b02d4a38d9611ee99fd20aa9fddc6dbfcc555d6c Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 20 Apr 2021 16:44:07 +0200 Subject: [PATCH 0925/1183] python3Packages.openshift: init at 0.12.0 it is used in the kubernetes ansible module Apply suggestions from code review Co-authored-by: Sandro --- .../python-modules/openshift/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/openshift/default.nix diff --git a/pkgs/development/python-modules/openshift/default.nix b/pkgs/development/python-modules/openshift/default.nix new file mode 100644 index 000000000000..052d364982b3 --- /dev/null +++ b/pkgs/development/python-modules/openshift/default.nix @@ -0,0 +1,39 @@ +{ + lib + , buildPythonPackage + , fetchPypi + , jinja2 + , kubernetes + , ruamel-yaml + , six + , python-string-utils +}: + +buildPythonPackage rec { + pname = "openshift"; + version = "0.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-aggRnD4goiZJPp4cngp8AIrJC/V46378cwUSfq8Xml4="; + }; + + propagatedBuildInputs = [ + jinja2 + kubernetes + python-string-utils + ruamel-yaml + six + ]; + + # tries to connect to the network + doCheck = false; + pythonImportsCheck = ["openshift"]; + + meta = with lib; { + description = "Python client for the OpenShift API"; + homepage = "https://github.com/openshift/openshift-restclient-python"; + license = licenses.asl20; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e02d8460294..439d4d8e4a5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4624,6 +4624,8 @@ in { opensensemap-api = callPackage ../development/python-modules/opensensemap-api { }; + openshift = callPackage ../development/python-modules/openshift { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; opentracing = callPackage ../development/python-modules/opentracing { }; From 024b4917eb9cd8ac094a365e724a7e83ea2584bd Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Sun, 25 Apr 2021 15:30:53 +0200 Subject: [PATCH 0926/1183] languagetool: 5.2 -> 5.3 --- pkgs/tools/text/languagetool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 90ddd5b69290..57c46aab3813 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "5.2"; + version = "5.3"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "1fz3rxqg5z2jxbalraz8lwkzj0jh69zzfmf3vpwywilvl7xlhdrd"; + sha256 = "1km20ajqb65vkhkrf94zy5srcss66ix8padp7ng59pa8pj11wmi2"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; From 1690fff4b5908ee6dde84693b16c78ec9f2c7f14 Mon Sep 17 00:00:00 2001 From: olimorris Date: Sun, 25 Apr 2021 14:39:38 +0100 Subject: [PATCH 0927/1183] vls: init at 0.7.2 vue-language-server is now deprecated and should be replaced by vls. See: https://www.npmjs.com/package/vue-language-server --- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 4135 +++++++++-------- 2 files changed, 2220 insertions(+), 1916 deletions(-) diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d8b98ea14428..ab616609c1a5 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -252,6 +252,7 @@ , "vega-cli" , "vega-lite" , "vim-language-server" +, "vls" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" , "vscode-json-languageserver" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 366e04440f98..3b2e68016823 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -49,13 +49,22 @@ let sha512 = "o/xdK8b4P0t/xpCARgWXAeaiWeh9jeua6bP1jrcbfN39+Z4zC4x2jg4NysHNhz6spRG8dJFH3kJIUoIbs0Ckww=="; }; }; - "@angular-devkit/architect-0.1102.9" = { + "@angular-devkit/architect-0.1102.10" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1102.9"; + version = "0.1102.10"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.9.tgz"; - sha512 = "AU7i0VqWUwBc04oyT98Pp6sMDMp67JTZd/Cfrz5AM4MqrCZsDJMsTlWH26fAbESSLHgNst7H91Eq0cnC8rCmOQ=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1102.10.tgz"; + sha512 = "jb/Df6l7XHU7b2hu5gG1WItMo9cDjrqY0i6UzntUQ/QsSMqbnU6yWoRT6orLgN9tGdA4AjIyv+9mfMXHwM2maw=="; + }; + }; + "@angular-devkit/core-11.2.10" = { + name = "_at_angular-devkit_slash_core"; + packageName = "@angular-devkit/core"; + version = "11.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.10.tgz"; + sha512 = "3QBluhsnXsntbl0ybHuXtuH/HBChqibXKmzrENj2n+SKlHFOYhE9PJCSfE6q1kwKN+zg6avOETVziI2pP5xtJQ=="; }; }; "@angular-devkit/core-11.2.4" = { @@ -76,13 +85,13 @@ let sha512 = "3dA0Z6sIIxCDjZS/DucgmIKti7EZ/LgHoHgCO72Q50H5ZXbUSNBz5wGl5hVq2+gzrnFgU/0u40MIs6eptk30ZA=="; }; }; - "@angular-devkit/core-11.2.9" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "11.2.9"; + "@angular-devkit/schematics-11.2.10" = { + name = "_at_angular-devkit_slash_schematics"; + packageName = "@angular-devkit/schematics"; + version = "11.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-11.2.9.tgz"; - sha512 = "TqihgUEKjX4C1hSd8RgUyCwuezFRdput9Ctcq8c4VgOcseEnXq3BkCSJbXtUh4Fln8WPxM7WHM8HClcWya/41g=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.10.tgz"; + sha512 = "T1V6mCwc2GYKAWMtCy2HaCxLw1kydu36tGV+dKjKHEwE+8cDgRRT5FhQ+XZzehVDeK9GvDu8Znur1F6i/WmKgw=="; }; }; "@angular-devkit/schematics-11.2.4" = { @@ -103,15 +112,6 @@ let sha512 = "bhi2+5xtVAjtr3bsXKT8pnoBamQrArd/Y20ueA4Od7cd38YT97nzTA1wyHBFG0vWd0HMyg42ZS0aycNBuOebaA=="; }; }; - "@angular-devkit/schematics-11.2.9" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "11.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-11.2.9.tgz"; - sha512 = "NqcBMK9ZbfXykj+2/cSlZcLVmbep/N+yYb+dUSfvRup3rW3uYSpMMJAnys3ro0m7TnUrI7h7t0UTgX8oxjlCow=="; - }; - }; "@angular-devkit/schematics-cli-0.1102.6" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; @@ -238,22 +238,22 @@ let sha512 = "QdwOGF1+eeyFh+17v2Tz626WX0nucd1iKOm6JUTUvCZdbolblCOOQCxGrQPY0f7jEhn36PiAWqZnsC2r5vmUWg=="; }; }; - "@apollo/protobufjs-1.0.5" = { + "@apollo/protobufjs-1.2.0" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.0.5"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.5.tgz"; - sha512 = "ZtyaBH1icCgqwIGb3zrtopV2D5Q8yxibkJzlaViM08eOhTQc7rACdYu0pfORFfhllvdMZ3aq69vifYHszY4gNA=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.0.tgz"; + sha512 = "TBgsADig/K4Hx71uQO6KPLxgoE/ORhPGh/HgouHru+cum8RLDfAfEY5Dde+cNala+luGI2X4Rs42pLWRud7/WA=="; }; }; - "@apollographql/apollo-tools-0.4.9" = { + "@apollographql/apollo-tools-0.4.12" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.9"; + version = "0.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.9.tgz"; - sha512 = "M50pk8oo3CGTu4waGOklIX3YtTZoPfWG9K/G9WB8NpyQGA1OwYTiBFv94XqUtKElTDoFwoMXpMQd3Wy5dINvxA=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.12.tgz"; + sha512 = "JdC7aBzMUO6SaGH5g6MvIG8TWd+7cU/G9cyjKS/woYVtqyICLamyG21R8SmjiBnd5c1UgPWOxjSIxYBL2ln8Mg=="; }; }; "@apollographql/graphql-playground-html-1.6.27" = { @@ -310,13 +310,13 @@ let sha1 = "e70187f8a862e191b1bce6c0268f13acd3a56b20"; }; }; - "@babel/cli-7.13.14" = { + "@babel/cli-7.13.16" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.13.14"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.13.14.tgz"; - sha512 = "zmEFV8WBRsW+mPQumO1/4b34QNALBVReaiHJOkxhUsdo/AvYM62c+SKSuLi2aZ42t3ocK6OI0uwUXRvrIbREZw=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.13.16.tgz"; + sha512 = "cL9tllhqvsQ6r1+d9Invf7nNXg/3BlfL1vvvL/AdH9fZ2l5j0CeBcoq6UjsqHpvyN1v5nXSZgqJZoGeK+ZOAbw=="; }; }; "@babel/code-frame-7.10.4" = { @@ -364,13 +364,13 @@ let sha512 = "O34LQooYVDXPl7QWCdW9p4NR+QlzOr7xShPPJz8GsuCU3/8ua/wqTr7gmnxXv+WBESiGU/G5s16i6tUvHkNb+w=="; }; }; - "@babel/core-7.13.15" = { + "@babel/core-7.13.16" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.13.15"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.13.15.tgz"; - sha512 = "6GXmNYeNjS2Uz+uls5jalOemgIhnTMeaXo+yBUA72kC2uX/8VW6XyhVIo2L8/q0goKQA3EVKx0KOQpVKSeWadQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.13.16.tgz"; + sha512 = "sXHpixBiWWFti0AV2Zq7avpTasr6sIAu7Y396c608541qAU2ui4a193m0KSQmfPSKFZLnQ3cvlKDOm3XkuXm3Q=="; }; }; "@babel/core-7.9.0" = { @@ -382,13 +382,13 @@ let sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; }; }; - "@babel/generator-7.13.9" = { + "@babel/generator-7.13.16" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.13.9"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz"; - sha512 = "mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.13.16.tgz"; + sha512 = "grBBR75UnKOcUWMp8WoDxNsWCFl//XCK6HWTrBQKTr5SV9f5g0pNOjdyzi/DTBv12S9GnYPInIXQBTky7OXEMg=="; }; }; "@babel/helper-annotate-as-pure-7.12.13" = { @@ -409,13 +409,13 @@ let sha512 = "CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA=="; }; }; - "@babel/helper-compilation-targets-7.13.13" = { + "@babel/helper-compilation-targets-7.13.16" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.13.13"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz"; - sha512 = "q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz"; + sha512 = "3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA=="; }; }; "@babel/helper-create-class-features-plugin-7.13.11" = { @@ -472,13 +472,13 @@ let sha512 = "DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg=="; }; }; - "@babel/helper-hoist-variables-7.13.0" = { + "@babel/helper-hoist-variables-7.13.16" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.13.0"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz"; - sha512 = "0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz"; + sha512 = "1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg=="; }; }; "@babel/helper-member-expression-to-functions-7.13.12" = { @@ -607,13 +607,13 @@ let sha512 = "1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA=="; }; }; - "@babel/helpers-7.13.10" = { + "@babel/helpers-7.13.17" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.13.10"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz"; - sha512 = "4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.17.tgz"; + sha512 = "Eal4Gce4kGijo1/TGJdqp3WuhllaMLSrW6XcL0ulyUAQOuxHcCafZE8KHg9857gcTehsm/v7RcOx2+jp0Ryjsg=="; }; }; "@babel/highlight-7.13.10" = { @@ -625,13 +625,13 @@ let sha512 = "5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg=="; }; }; - "@babel/parser-7.13.15" = { + "@babel/parser-7.13.16" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.13.15"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.15.tgz"; - sha512 = "b9COtcAlVEQljy/9fbcMHpG+UIW9ReF+gpaxDHTlZd0c6/UU9ng8zdySAW9sRTzpvcdCHn6bUcbuYUgGzLAWVQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.13.16.tgz"; + sha512 = "6bAg36mCwuqLO0hbR+z7PHuqWiCeP7Dzg73OpQwsAB1Eb8HnGEz5xYBzCfbu+YjoaJsJs+qheDxVAuqbt3ILEw=="; }; }; "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" = { @@ -994,13 +994,13 @@ let sha512 = "zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg=="; }; }; - "@babel/plugin-transform-block-scoping-7.12.13" = { + "@babel/plugin-transform-block-scoping-7.13.16" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.12.13"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz"; - sha512 = "Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.13.16.tgz"; + sha512 = "ad3PHUxGnfWF4Efd3qFuznEtZKoBp0spS+DgqzVzRPV7urEBvPLue3y2j80w4Jf2YLzZHj8TOv/Lmvdmh3b2xg=="; }; }; "@babel/plugin-transform-classes-7.13.0" = { @@ -1021,13 +1021,13 @@ let sha512 = "RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg=="; }; }; - "@babel/plugin-transform-destructuring-7.13.0" = { + "@babel/plugin-transform-destructuring-7.13.17" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.13.0"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz"; - sha512 = "zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz"; + sha512 = "UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA=="; }; }; "@babel/plugin-transform-dotall-regex-7.12.13" = { @@ -1426,22 +1426,22 @@ let sha512 = "LXJwxrHy0N3f6gIJlYbLta1D9BDtHpQeqwzM0LIfjDlr6UE/D5Mc7W4iDiQzaE+ks0sTjT26ArcHWnJVt0QiHw=="; }; }; - "@babel/register-7.13.14" = { + "@babel/register-7.13.16" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.13.14"; + version = "7.13.16"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.13.14.tgz"; - sha512 = "iyw0hUwjh/fzN8qklVqZodbyWjEBOG0KdDnBOpv3zzIgK3NmuRXBmIXH39ZBdspkn8LTHvSboN+oYb4MT43+9Q=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.13.16.tgz"; + sha512 = "dh2t11ysujTwByQjXNgJ48QZ2zcXKQVdV8s0TbeMI0flmtGWCdTwK9tJiACHXPLmncm5+ktNn/diojA45JE4jg=="; }; }; - "@babel/runtime-7.13.10" = { + "@babel/runtime-7.13.17" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.13.10"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.10.tgz"; - sha512 = "4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.13.17.tgz"; + sha512 = "NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA=="; }; }; "@babel/runtime-7.13.9" = { @@ -1462,22 +1462,22 @@ let sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA=="; }; }; - "@babel/runtime-corejs3-7.13.10" = { + "@babel/runtime-corejs3-7.13.17" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.13.10"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz"; - sha512 = "x/XYVQ1h684pp1mJwOV4CyvqZXqbc8CMsMGUnAbuc82ZCdv1U63w5RSUzgDSXQHG5Rps/kiksH6g2D5BuaKyXg=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.17.tgz"; + sha512 = "RGXINY1YvduBlGrP+vHjJqd/nK7JVpfM4rmZLGMx77WoL3sMrhheA0qxii9VNn1VHnxJLEyxmvCB+Wqc+x/FMw=="; }; }; - "@babel/standalone-7.13.15" = { + "@babel/standalone-7.13.17" = { name = "_at_babel_slash_standalone"; packageName = "@babel/standalone"; - version = "7.13.15"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.13.15.tgz"; - sha512 = "gKEx9cfMLJegKYYVnI1/4swITcWQa2/e0HlAU9S/+h94xGdyXtoYVQiz8gcXabQ/8MMlOwGclkRoTL3cAxplZg=="; + url = "https://registry.npmjs.org/@babel/standalone/-/standalone-7.13.17.tgz"; + sha512 = "Y9P198T45MIIu+AvGOCcjsdKl79+BCL2nA+6ODA5p/DhGzymvzaTgtzvNcjZDcJmbPszcmohjLLgvma3tmvVtg=="; }; }; "@babel/template-7.12.13" = { @@ -1489,22 +1489,22 @@ let sha512 = "/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA=="; }; }; - "@babel/traverse-7.13.15" = { + "@babel/traverse-7.13.17" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.13.15"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.15.tgz"; - sha512 = "/mpZMNvj6bce59Qzl09fHEs8Bt8NnpEDQYleHUPZQ3wXUMvXi+HJPLars68oAbmp839fGoOkv2pSL2z9ajCIaQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.17.tgz"; + sha512 = "BMnZn0R+X6ayqm3C3To7o1j7Q020gWdqdyP50KEoVqaCO2c/Im7sYZSmVgvefp8TTMQ+9CtwuBp0Z1CZ8V3Pvg=="; }; }; - "@babel/types-7.13.14" = { + "@babel/types-7.13.17" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.13.14"; + version = "7.13.17"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz"; - sha512 = "A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.13.17.tgz"; + sha512 = "RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA=="; }; }; "@braintree/sanitize-url-3.1.0" = { @@ -1570,13 +1570,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@cdktf/hcl2json-0.2.2" = { + "@cdktf/hcl2json-0.3.0" = { name = "_at_cdktf_slash_hcl2json"; packageName = "@cdktf/hcl2json"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.2.2.tgz"; - sha512 = "C/IOl8ARTRiafC9mdZiIuJbqys6LRmaVM/grux7OASkVbkyYy2RHKPVXRBsD5mtfLBXQaL/NGjLLJ4aSC7jFZQ=="; + url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.3.0.tgz"; + sha512 = "iZ5eKhlZSpoWM0+ULUEkxY+qzBGhr3EVkXoYdUbNf/nPx8bd2Qqgk87x4uvqFK8+uNMuINR0HCbCdHFgkfho4A=="; }; }; "@chemzqm/neovim-5.2.13" = { @@ -2011,22 +2011,22 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-3.3.36" = { + "@expo/config-3.3.38" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.36"; + version = "3.3.38"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.36.tgz"; - sha512 = "qUaq3Ct3O2uML3ISsjekol3UNTQUvJm2AMrRjlwYXHzxG2EVIHNaWseOZoFtXxrfAj3IqWXEtS9avfho+nbgBg=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.38.tgz"; + sha512 = "0SsvF7yTy+kdJaAc2W75yhwnaXIRasnA1Vygna83tlPhCx6ynIBzTbJAvdkddSk5euUTJpXc5nePaflGvNboXw=="; }; }; - "@expo/config-plugins-1.0.26" = { + "@expo/config-plugins-1.0.28" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "1.0.26"; + version = "1.0.28"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.26.tgz"; - sha512 = "zfdNL7FgM2yCYSX0sq7PUkcE9pk+w6GfgCnnXuYH5JOOi2UYtiOu0FgYc0M+ZmUlhNkTtiBZDt8aPGcikopwpw=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-1.0.28.tgz"; + sha512 = "i5SpC6U3LjRQlwi1xM4SRj8dR2Qm+0dykPo0GeesByB7IvT36AT1ZjI7VjecuoZ6yKbLpaa5tWvU3JGObxIPSw=="; }; }; "@expo/config-types-40.0.0-beta.2" = { @@ -2047,22 +2047,22 @@ let sha512 = "HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw=="; }; }; - "@expo/dev-server-0.1.62" = { + "@expo/dev-server-0.1.64" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.62"; + version = "0.1.64"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.62.tgz"; - sha512 = "ZNBQI/Q9Di19TjU7QT2lNxT+VEf8Aq6puwCNVQx2ohdKQjqh4+YSlvvChXY+x25SG1CorWc8SfLjTtXnIcheJg=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.64.tgz"; + sha512 = "6yRkV0qVyz0bZsfPkpPsDRmMIHQQ9Lw3Nn5BAgCNvo7SzjINeNfcpWJXvwcxrU76kKUS+r5NaXNCRlDUkqGTHg=="; }; }; - "@expo/dev-tools-0.13.92" = { + "@expo/dev-tools-0.13.94" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.92"; + version = "0.13.94"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.92.tgz"; - sha512 = "Fu5Bw5lk3Pl1aj9XMOSNP8trzksrmb4w969qiBzCGxVrrSql93xBPDwpd40oOiAesk+X7Qg6eF/IIJpYNfgUCg=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.94.tgz"; + sha512 = "T3jIIGB1yLk+1JVcOG3VJI5CTFcOoWEOT4e0/3hONp6CnDQG0L2qpuzd4ypWO411iZ5q3aCyYKNN10AIEZLqzA=="; }; }; "@expo/devcert-1.0.0" = { @@ -2074,49 +2074,49 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.12" = { + "@expo/image-utils-0.3.13" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.12"; + version = "0.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.12.tgz"; - sha512 = "QMMAjyCJUFXI8b6AOrVC40gubkt++qYfRJdKgbegf9JHQNul/O4Q1ENWTgid+PH0EUqlMLbv6kJ6ai0ZjO08kw=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.13.tgz"; + sha512 = "BpKoFVJBjG9H5AU040Skrm3R2uDGpWXBU/4TivB5H10cyJphoJKp3GNJVPHYLOVc70OtAxjWDIhLMW6xsWfrgw=="; }; }; - "@expo/json-file-8.2.28" = { + "@expo/json-file-8.2.29" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.28"; + version = "8.2.29"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.28.tgz"; - sha512 = "C28McDuCIOmCmp6e2ZgIpNaT/fZG+L3/WFv5x2DCrooOQmamrkLSH/4Dib0NUmLgWVhgIhXL2hU4RB+LjzVvkQ=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.29.tgz"; + sha512 = "9C8XwpJiJN9fyClnnNDSTh034zJU9hon6MCUqbBa4dZYQN7OZ00KFZEpbtjy+FndE7YD+KagDxRD6O1HS5vU0g=="; }; }; - "@expo/metro-config-0.1.62" = { + "@expo/metro-config-0.1.64" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.62"; + version = "0.1.64"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.62.tgz"; - sha512 = "CvEtzryyLCDky9faY0/+rilkF4wS/KlbdtCbRk5esu5eH3dc0hztEap6TrIP4axQJ481uHRxy/dN2FBivQfLdg=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.64.tgz"; + sha512 = "ooD+XOVGnKPIIZbyfVTvMeQ3p9HpRt4aNCehSM6H1ueQm8+IpVwrhw8sJjL5xr+FVxFqj0+Ga9DI8d0AXS8U4g=="; }; }; - "@expo/osascript-2.0.25" = { + "@expo/osascript-2.0.26" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.25"; + version = "2.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.25.tgz"; - sha512 = "rB+RLHCp72q0OBWmisoBswfTpyzc91OJMs3UQVWJP9mXVNJhemONt7PKjE+FinBm33uH1HCC6U7JPGigpVsJBg=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.26.tgz"; + sha512 = "DJXmVZsAbScxQ3sfSFQrLERwsmJ4x/Tk8yXmtJZKqO4hplcGa2xLwjKUEh8nSRV5RX/v40yWr9J7aK5cHxTy0A=="; }; }; - "@expo/package-manager-0.0.40" = { + "@expo/package-manager-0.0.41" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.40"; + version = "0.0.41"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.40.tgz"; - sha512 = "JE5i/IYQ7ActzugX1MgzK5vUjAJHtEm+btEyNtZyf8SQKOlk+DMeSUdQuC6h07IgTlFIfqFiw1O8GW/x8RD77A=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.41.tgz"; + sha512 = "QkKH2AIwbw3wdmkZpw9DwFBQn1E3w/oDKfwPxFXtrwi+7OWonJXzkmYnj26KnVkh4Ajzu7Cwj/zTQ5aBrhwDfw=="; }; }; "@expo/plist-0.0.12" = { @@ -2137,13 +2137,13 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.27" = { + "@expo/schemer-1.3.28" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.27"; + version = "1.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.27.tgz"; - sha512 = "cuCvSo6qErgK7OOM8CoCtCsVifq+WX1wUCeu+fmSyhnZcqnz45ZTK20Ghk5bT3OrTNQipbTiCjn9RCDrkEMMkg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.28.tgz"; + sha512 = "9wmnhlD1X1ro8FTFzM/J3nSxaFpI9X+bcaimP3hKkc3flIR8cGjQcLmE+MOEgE2LET0ScxRBtM3hteernFI6Ww=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -2164,13 +2164,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.66" = { + "@expo/webpack-config-0.12.68" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.66"; + version = "0.12.68"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.66.tgz"; - sha512 = "8U3m44Q2VMmoOl9Gw9djOsdCIX5yT8yD5ZnVyfyQHMGILz9uXkqn3kM0QNFFWhT8TZN/zCP6YkmYrH8yL3rTkg=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.68.tgz"; + sha512 = "GS15Vd/VkaITWnQYe4qROGHi95R6HF8x8vDZ1msxfYEVSjdXMU9eo8BPiyTtLTIAaCyNUQEOX5N+91mKHXJPeQ=="; }; }; "@expo/xcpretty-2.0.0" = { @@ -2218,13 +2218,13 @@ let sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw=="; }; }; - "@fluentui/keyboard-key-0.2.16" = { + "@fluentui/keyboard-key-0.2.17" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.16"; + version = "0.2.17"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.16.tgz"; - sha512 = "T4eQ0uqhbTScsoXVx10Tlp0C2RgNdAzlbe52qJ0Tn288/Nuztda5Z/aTCRd5Rp5MRYBycjAf4iNot6ZHAP864g=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.17.tgz"; + sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q=="; }; }; "@fluentui/react-7.168.0" = { @@ -2398,13 +2398,13 @@ let sha512 = "ZY76hmcJlF1iyg3Im0sQ3ASRkiShjgv102vLTVcH22lEGJeCaCyyS/GF1eUHom418S60bS8Th6+autRUxfBiBg=="; }; }; - "@graphql-tools/url-loader-6.8.2" = { + "@graphql-tools/url-loader-6.8.3" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.8.2"; + version = "6.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.2.tgz"; - sha512 = "YzsXSCOwlSj8UqOMhQThPzgEChgS/MonyWV7f0WKmN9gAT/f3fPaUcYhVamsH0vGbvTkfNM4JdoZO/39amRs5Q=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.8.3.tgz"; + sha512 = "X1IxyURTbynqBPBJJeSW3hvvc+Pgw/P5IpT/yyTkA7utjRRiNCaGdLbBQO5MaXvD1HpVzBiMgdKG8v7Um3ft7w=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -3109,13 +3109,13 @@ let sha512 = "4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg=="; }; }; - "@jsii/spec-1.28.0" = { + "@jsii/spec-1.29.0" = { name = "_at_jsii_slash_spec"; packageName = "@jsii/spec"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.28.0.tgz"; - sha512 = "5mcupuCCXyhZwNmX/RDBn3WUYtd0oPXEDa3E+qOSjT30vaO8u9ZQ+mxwl4qsecx3m51LhXKnR1C9U9t4VlAmqA=="; + url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.29.0.tgz"; + sha512 = "Y0ouCaYVPy7KjQ8di6Hu4xizKYp4klqqDf08BaEgqd38TzqBuO0abgcd9OJFUQyoDnCCWTdGBfqTo2xfvW9Pbw=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -3694,13 +3694,13 @@ let sha512 = "7AQsO0hMmpqDledV7AhBuSYqYPFsKP9PaltMecX9nlnsyFxqtsqUg9/pvB2L/jxvskrDrNkdKYz2KTbQznCtng=="; }; }; - "@mdn/browser-compat-data-3.1.3" = { + "@mdn/browser-compat-data-3.2.4" = { name = "_at_mdn_slash_browser-compat-data"; packageName = "@mdn/browser-compat-data"; - version = "3.1.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.1.3.tgz"; - sha512 = "Qdqeox4APsYwAQQSO68D1p75DL9an1wS8b/51m+nH98unN4jbS5bvg22WQrg+TMq2/3Mg/E5zprqfUzJD84qgw=="; + url = "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.2.4.tgz"; + sha512 = "jEUurwoeiHOB7SceVnsg3ULxNlf9XxqMfcKNM+eJduPgCcoCnbLi/6og+e764fTAZCcBkqGcWUMhLQXwcqpbJQ=="; }; }; "@mdx-js/util-2.0.0-next.8" = { @@ -3721,13 +3721,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.161" = { + "@microsoft/load-themed-styles-1.10.165" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.161"; + version = "1.10.165"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.161.tgz"; - sha512 = "ReHtvRknb3iYVUPl4c2PDEUWp18Jzh5x5MQE9zqHtSvYzpG6TGCWaqVBHKablshELqHv0dMf69929RB6VXiqyA=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.165.tgz"; + sha512 = "3xMvFn1q27wctE701ZmdKDKgkj4b4DMHaJ8hnKk+c/E3Zvoo/5lviPZ0IGkD+zyfe7GMSp2kONalvX7Ez7HaKA=="; }; }; "@mitmaro/errors-1.0.0" = { @@ -3793,13 +3793,13 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-11.1.0" = { + "@netlify/build-11.2.5" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "11.1.0"; + version = "11.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-11.1.0.tgz"; - sha512 = "544/wWXcFtiOb+XmTUqsn3OFxd/vyeggd2uM8t/V9mWg1PuP5UG4AqubnKglzxiwEHa7KGym8fQCq4HChTtLow=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-11.2.5.tgz"; + sha512 = "VjBtlEnCTjrYN9tTrgJdRjkauqN1gQ+fdtoVsZ0Lyz1Ja1LUnIPkCUHhsOmupMlvW/Yyl/QHTSPojg/wpMf1Zw=="; }; }; "@netlify/cache-utils-1.0.7" = { @@ -3811,13 +3811,13 @@ let sha512 = "yrdrnQkzg/qMovoFYwQ24UVt/OyHtP+t0KpQFd7eBl6gnuuGGgxFocaFFv6eKpMVwzHTsOwx/y9B/FcC3/6cfA=="; }; }; - "@netlify/config-6.0.1" = { + "@netlify/config-6.2.0" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "6.0.1"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-6.0.1.tgz"; - sha512 = "rytv9UUW0QkBqwd0OkNF9SyEZLbGIbLmSms6h2Ob6pGiMUQd1wUwuX0PyS3ueIF/ZFB3PVKE8gUHNBC4wxyUrg=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-6.2.0.tgz"; + sha512 = "CK8GpGf8v10GlY/gLhb27PEc9cWQaVpLi9/KQZhsEiLCmwVV+oLkfev2wOuIuPakTaCWJbwDbNGtCF+o3f3Crg=="; }; }; "@netlify/framework-info-3.3.0" = { @@ -3829,22 +3829,22 @@ let sha512 = "oWlP+sWfnr0tXSqd3nfma9Abq1NvZc4lFbHPMvxU6UhAcrBOpizsMaVT9sUK0UcMwzR8xwESdskZajtFoHA28g=="; }; }; - "@netlify/functions-utils-1.3.25" = { + "@netlify/functions-utils-1.3.28" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.3.25"; + version = "1.3.28"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.25.tgz"; - sha512 = "iCGVHlj6XNqOIQxREDbhfWEs8RBLGpXLrZKNHisG8PnJvRmnlS+EyVb1on2yV7+nvMqoqssNUeDY6tvQmwuPng=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.28.tgz"; + sha512 = "8swtLIVmzsokQfgr/2qZGf8C6GmrhP/okPzFZjmoDbfaHKqkkXthg0G/iY83CwRiofAuwMUkLtsrf1g3+aDiuA=="; }; }; - "@netlify/git-utils-1.0.8" = { + "@netlify/git-utils-1.0.9" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.8"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.8.tgz"; - sha512 = "YWK2H6qjBmspTIibE/ai8YTsSnqROtubqWUuXz/RoQXYf03KWx/F9BFRm1S/TOoQM9v4fozRhVeHyH45Ki0ztA=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.9.tgz"; + sha512 = "qdkbEK3jRhfCbCqHAJGyQmBXxa66Kx1zwkm4dXBS8Wimv0zFGuyWWkMQomo6t2VGGoJyC+Ocy+E4ubTC13MUqA=="; }; }; "@netlify/open-api-1.3.0" = { @@ -3865,13 +3865,13 @@ let sha512 = "7L5pkXlwPfyUrmm9cu2+nOQYW1FMx6waMbl2Uj5SmxjLz5Dvt2zkUYbNU2ImNmJ10mxziv3LABSFn2k2qy2nLw=="; }; }; - "@netlify/plugins-list-2.6.0" = { + "@netlify/plugins-list-2.8.0" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.6.0"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.6.0.tgz"; - sha512 = "XtBrsd4M0OW3RT9O7omqBhWevPoxVfkEX9BJ2Hv5J3gpujTN6IZEYmyprxhQ+Y98r4VvZVUX8dPzR99aF15YcQ=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.8.0.tgz"; + sha512 = "bjmObzm6qrZigS6ht85zgyHGTsk8dk3OspvQ3BED4VWFMDhl323WwswSJIQg2j7EdxEEOvGsM+gbh0FFWl6pqg=="; }; }; "@netlify/run-utils-1.0.7" = { @@ -3919,67 +3919,67 @@ let sha512 = "ea6S9ik5X0TlA2e+jXk5D7lfvArPZjyQoIBEo7G1Tjw/vUU5Fx6KLfXv1iy7eJy+ENTLoyidscAjJ2wXlHI47g=="; }; }; - "@netlify/zip-it-and-ship-it-3.4.0" = { + "@netlify/zip-it-and-ship-it-3.7.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.4.0.tgz"; - sha512 = "/wHeHVcpVyo8nD93VdmluSJeipQrTt4mXp08krqQbPZPgA2HyupyYT4ZgjWKCh00Mrh2/k1XRbbxJYRc70lzkw=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-3.7.0.tgz"; + sha512 = "WPdJ8UulZxv+Niobjp49v8TO2+7V7Kks+1me4Zl4zuv09z8ZTE2/6b8bOCnB+tysTINrmTfi8ZMweB44gyLFLg=="; }; }; - "@node-red/editor-api-1.3.2" = { + "@node-red/editor-api-1.3.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.2.tgz"; - sha512 = "meAJ4n9amAWxoWe5/rdigd8Wa0OKpwaNIn9Vqp+xqV4BqFa9RRe3ttO9FRUOuBeHwplDsMiWNnEVEdE9NCWlig=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.3.3.tgz"; + sha512 = "PafnnsKUYDQy+bQfk7THSCTy0zncDMvbn4HXGkavqN4nEuvm0bdvA6ZhBNa5G/WaKPt0srptl2KKCsavd3O8jA=="; }; }; - "@node-red/editor-client-1.3.2" = { + "@node-red/editor-client-1.3.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.2.tgz"; - sha512 = "9YGb7PeLUmr7bMZYOn08euTOZzy+wIAqTo8R288sjbqLke0NKnFWhZsgl01pqPXv7rNjiyZpxTpU1uZLH49gDg=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.3.3.tgz"; + sha512 = "08vlp1s5yrUSidgjUg6/3sQIZ/c7r08oUNYZaN9kEgKVhYBRizet0fHBev8OWEO7nrMJAs8nQmYQGTRg4P/2uA=="; }; }; - "@node-red/nodes-1.3.2" = { + "@node-red/nodes-1.3.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.2.tgz"; - sha512 = "NAblXeu0/tdVu8lU/gpMDVbclqkbiRGUcUforJSGeTiXod2wk4brGtLjEhAN1ouehUaIGXwiF0QN+KgfXnHg2Q=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.3.3.tgz"; + sha512 = "ztCxN5ZWlUf8YkMD9NZd+izrnFVkIgv1ayzZzwCx8gsqLyGIQkzESgfKnqqU4ID8ih/r5Xs2SNl+XP9+OJEO6w=="; }; }; - "@node-red/registry-1.3.2" = { + "@node-red/registry-1.3.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.2.tgz"; - sha512 = "VB0em51luT17rhTa7tkOXHOQbuEBczUEI2goJaSQSv5c032yPvzh4KyAf3Xa7sDafENg33wfSZfePx2tGrdg+w=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.3.3.tgz"; + sha512 = "JaHsvXxz9/DJ02NwlBLeUTYPGZEpRvOFR99D34YHF753bw8ocROnYAJemNTmNbua/jW4RRL0tCXuJlrOQZNSGA=="; }; }; - "@node-red/runtime-1.3.2" = { + "@node-red/runtime-1.3.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.2.tgz"; - sha512 = "HMrHfkH4wklp0tI3SjZR6Yzdf/swPg7FsYjzikv8HV/KBHV/Oe73gtE8CqXkP+rqUfhqdQC/X97Tq8vD6bC4WQ=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.3.3.tgz"; + sha512 = "+tjva7c1lI+87ho1XTS5Lj0t+OapuA+/W3hRb1zXUTNfflUrkVcMMSujMw5v+V2Z5/cMNJBRgEYj38svj9pG3w=="; }; }; - "@node-red/util-1.3.2" = { + "@node-red/util-1.3.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.2.tgz"; - sha512 = "AHrUP2mYTmy40Q0gP1X4GSwuJ1xWCgUL0RlEA843HpdTi7Gl6WB8xnJvcGFqptiuHiqE6mUFNrRMLmotctZqWg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.3.3.tgz"; + sha512 = "xB76cff/HlXJcbZlOe1duqBiCoqJTHM4KKFElcSJGNVjQSeOhZgxMsuECFHCCCh8Y9TVkL96VFwWybq2fKonew=="; }; }; "@nodelib/fs.scandir-2.1.4" = { @@ -4018,6 +4018,15 @@ let sha512 = "8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow=="; }; }; + "@npmcli/arborist-2.4.0" = { + name = "_at_npmcli_slash_arborist"; + packageName = "@npmcli/arborist"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-2.4.0.tgz"; + sha512 = "rCoRrUSmXdBDBBgL/O0oehIR53ey99Pds8dId7gztARZmx6/NBoeiUOu9RnvXSe15XZLc3JSz9sHPcbQ9NQ53Q=="; + }; + }; "@npmcli/ci-detect-1.3.0" = { name = "_at_npmcli_slash_ci-detect"; packageName = "@npmcli/ci-detect"; @@ -4045,6 +4054,24 @@ let sha512 = "9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw=="; }; }; + "@npmcli/map-workspaces-1.0.3" = { + name = "_at_npmcli_slash_map-workspaces"; + packageName = "@npmcli/map-workspaces"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-1.0.3.tgz"; + sha512 = "SdlRlOoQw4WKD4vtb/n5gUkobEABYBEOo8fRE4L8CtBkyWDSvIrReTfKvQ/Jc/LQqDaaZ5iv1iMSQzKCUr1n1A=="; + }; + }; + "@npmcli/metavuln-calculator-1.1.1" = { + name = "_at_npmcli_slash_metavuln-calculator"; + packageName = "@npmcli/metavuln-calculator"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-1.1.1.tgz"; + sha512 = "9xe+ZZ1iGVaUovBVFI9h3qW+UuECUzhvZPxK9RaEA2mjU26o5D0JloGYWwLYvQELJNmBdQB6rrpuN8jni6LwzQ=="; + }; + }; "@npmcli/move-file-1.1.2" = { name = "_at_npmcli_slash_move-file"; packageName = "@npmcli/move-file"; @@ -4054,6 +4081,15 @@ let sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg=="; }; }; + "@npmcli/name-from-folder-1.0.1" = { + name = "_at_npmcli_slash_name-from-folder"; + packageName = "@npmcli/name-from-folder"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-1.0.1.tgz"; + sha512 = "qq3oEfcLFwNfEYOQ8HLimRGKlD8WSeGEdtUa7hmzpR8Sa7haL1KVQrvgO6wqMjhWFFVjgtrh1gIxDz+P8sjUaA=="; + }; + }; "@npmcli/node-gyp-1.0.2" = { name = "_at_npmcli_slash_node-gyp"; packageName = "@npmcli/node-gyp"; @@ -4072,13 +4108,13 @@ let sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.8.4" = { + "@npmcli/run-script-1.8.5" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.8.4"; + version = "1.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.4.tgz"; - sha512 = "Yd9HXTtF1JGDXZw0+SOn+mWLYS0e7bHBHVC/2C8yqs4wUrs/k8rwBSinD7rfk+3WG/MFGRZKxjyoD34Pch2E/A=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.8.5.tgz"; + sha512 = "NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A=="; }; }; "@oclif/color-0.1.2" = { @@ -4243,13 +4279,13 @@ let sha512 = "2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA=="; }; }; - "@octokit/openapi-types-6.0.0" = { + "@octokit/openapi-types-6.1.1" = { name = "_at_octokit_slash_openapi-types"; packageName = "@octokit/openapi-types"; - version = "6.0.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.0.0.tgz"; - sha512 = "CnDdK7ivHkBtJYzWzZm7gEkanA7gKH6a09Eguz7flHw//GacPJLmkHA3f3N++MJmlxD1Fl+mB7B32EEpSCwztQ=="; + url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-6.1.1.tgz"; + sha512 = "ICBhnEb+ahi/TTdNuYb/kTyKVBgAM0VD4k6JPzlhJyzt3Z+Tq/bynwCD+gpkJP7AEcNnzC8YO5R39trmzEo2UA=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -4297,13 +4333,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/plugin-rest-endpoint-methods-5.0.0" = { + "@octokit/plugin-rest-endpoint-methods-5.0.1" = { name = "_at_octokit_slash_plugin-rest-endpoint-methods"; packageName = "@octokit/plugin-rest-endpoint-methods"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.0.tgz"; - sha512 = "Jc7CLNUueIshXT+HWt6T+M0sySPjF32mSFQAK7UfAg8qGeRI6OM1GSBxDLwbXjkqy2NVdnqCedJcP1nC785JYg=="; + url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz"; + sha512 = "vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg=="; }; }; "@octokit/request-5.4.15" = { @@ -4342,13 +4378,13 @@ let sha512 = "ngDBevLbBTFfrHZeiS7SAMAZ6ssuVmXuya+F/7RaVvlysgGa1JKJkKWY+jV6TCJYcW0OALfJ7nTIGXcBXzycfQ=="; }; }; - "@octokit/rest-18.5.2" = { + "@octokit/rest-18.5.3" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "18.5.2"; + version = "18.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.2.tgz"; - sha512 = "Kz03XYfKS0yYdi61BkL9/aJ0pP2A/WK5vF/syhu9/kY30J8He3P68hv9GRpn8bULFx2K0A9MEErn4v3QEdbZcw=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.5.3.tgz"; + sha512 = "KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA=="; }; }; "@octokit/types-2.16.2" = { @@ -4360,13 +4396,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-6.13.0" = { + "@octokit/types-6.13.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "6.13.0"; + version = "6.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.0.tgz"; - sha512 = "W2J9qlVIU11jMwKHUp5/rbVUeErqelCsO5vW5PKNb7wAXQVUz87Rc+imjlEvpvbH8yUb+KHmv8NEjVZdsdpyxA=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-6.13.2.tgz"; + sha512 = "jN5LImYHvv7W6SZargq1UMJ3EiaqIz5qkpfsv4GAb4b16SGqctxtOU2TQAZxvsKHkOw2A4zxdsi5wR9en1/ezQ=="; }; }; "@open-policy-agent/opa-wasm-1.2.0" = { @@ -5071,13 +5107,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-11.2.9" = { + "@schematics/angular-11.2.10" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "11.2.9"; + version = "11.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.9.tgz"; - sha512 = "yiuWCf+naAaS8cib2a9KKAhkwLx4LVnxE4lpF1Q2mEE5znQ7npYwzQYxgMHD70eMuSrki/L5nM9s7ZdVr5OKyg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-11.2.10.tgz"; + sha512 = "WcqiUl2HcE5E6HbAFKhFOUeqQEqNL++o6UsKcgk8rQkx5RM7ZkT6uksxiwhfpKzSIqUjwx+xe66fP6pweNZ/yQ=="; }; }; "@schematics/schematics-0.1102.6" = { @@ -5089,13 +5125,13 @@ let sha512 = "x77kbJL/HqR4gx0tbt35VCOGLyMvB7jD/x7eB1njhQRF8E/xynEOk3i+7A5VmK67QP5NJxU8BQKlPkJ55tBDmg=="; }; }; - "@schematics/update-0.1102.9" = { + "@schematics/update-0.1102.10" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1102.9"; + version = "0.1102.10"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.9.tgz"; - sha512 = "JIbuvX4a87h7G9d3lsKTUceKXhE/lXtJEkGaQ2jv2sxFRxBkmMO2o2OmsKRDpIMtSRs7VTUTccK6RAOVZJX66w=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1102.10.tgz"; + sha512 = "aU5fUT9ddw3n5ZOzx/x1W4Xo2fz+sDtDnrRdKI0Jip/9HE1PaoKxWT6gB5ouDnKETrvgDOArn68zIM8eOAVarg=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -5125,13 +5161,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.8.3" = { + "@serverless/components-3.9.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.8.3"; + version = "3.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.8.3.tgz"; - sha512 = "rdteMdPgsnJdfL8AcCguB1aFEII3cL2GL5XoOLwYUTJIZyJCC0kCkYl/gbN1H67XDASr5KD0eDyf8Dw0oCyfNA=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.9.0.tgz"; + sha512 = "70RIPd9eW/T6vZ7y4Rn7xVBCqPlN7cPq0NRAkxlT6sa7efgSkVDb+JCtKzST2EJpz7w2V/G+eWZjIbbYw6ueMw=="; }; }; "@serverless/core-1.1.2" = { @@ -5197,22 +5233,22 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-4.0.1" = { + "@serverless/utils-4.1.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "4.0.1"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.0.1.tgz"; - sha512 = "3/+Tw/kcIpBlrPyN244Ci7IZXVhGH9WLiLZcSwL0U96g0QQBofIGbv5v2h3Q6J4rBpPUOiZJcabJc7cIvlcP6Q=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-4.1.0.tgz"; + sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-china-1.0.14" = { + "@serverless/utils-china-1.0.15" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.14"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.14.tgz"; - sha512 = "7ku9ePjb+bneFV1Akmz0t8pU8hhHfPJsBjG/Kf6IjyGAQrEjN/PcY2QUDm0emdCNyCsuido1wp0DWMGiwuhC8Q=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.15.tgz"; + sha512 = "+fSVqyhiITJZ/9wz7fNA6QsJ0XLq3k+UQi8iX7TQNmXdWEtjfslKv2cbnW3A19jbuG2rQ0jzwNShnuLeMuqnSw=="; }; }; "@sideway/address-4.1.1" = { @@ -5296,13 +5332,13 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; - "@sindresorhus/is-4.0.0" = { + "@sindresorhus/is-4.0.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz"; - sha512 = "FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.1.tgz"; + sha512 = "Qm9hBEBu18wt1PO2flE7LPb30BHMQt1eQgbV76YntdNk73XZGpn3izvGTYxbGgzXKgbCjiia0uxTd3aTNQrY/g=="; }; }; "@sindresorhus/slugify-1.1.2" = { @@ -5332,13 +5368,13 @@ let sha512 = "mPZe3gBAV4ZDeYZbEs6WpNZuHHj7Hse9p44z6lrKBcbAMWnvApVOC7zZUpeQsUuWPTOWQRu/QSYElDKNajQ2oA=="; }; }; - "@skorfmann/terraform-cloud-1.9.1" = { + "@skorfmann/terraform-cloud-1.10.0" = { name = "_at_skorfmann_slash_terraform-cloud"; packageName = "@skorfmann/terraform-cloud"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.9.1.tgz"; - sha512 = "R28bedoGjAmDiEYHu2cmeVd3R6vxq6anQQlGCpdjk5oqnSiROFFm8dzywvMon4/9C+CErhgY7fr76NVErS/U2w=="; + url = "https://registry.npmjs.org/@skorfmann/terraform-cloud/-/terraform-cloud-1.10.0.tgz"; + sha512 = "Yd5WWmmUjFYBpQpsAnAntwQMerilNRpHILNPA7x0EkwHhf+5KTSKYZwzYL/bOY1QfGJX6DTnOSHXIRStHZDUgg=="; }; }; "@slack/client-3.16.0" = { @@ -5422,13 +5458,13 @@ let sha512 = "E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg=="; }; }; - "@snyk/fix-1.547.0" = { + "@snyk/fix-1.554.0" = { name = "_at_snyk_slash_fix"; packageName = "@snyk/fix"; - version = "1.547.0"; + version = "1.554.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.547.0.tgz"; - sha512 = "ANTkn8PHsmPelQ8W8aiS+R3JBzUr0fjcHT67eTvr2a0h51qzzgBFEwhd8GH1Wuo0Nmvm3bsKkk5DxkxTtQWPtw=="; + url = "https://registry.npmjs.org/@snyk/fix/-/fix-1.554.0.tgz"; + sha512 = "q2eRVStgspPeI2wZ2EQGLpiWZMRg7o+4tsCk6m/kHZgQGDN4Bb7L3xslFW3OgF0+ZksYSaHl2cW2HmGiLRaYcA=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -5485,13 +5521,13 @@ let sha512 = "NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww=="; }; }; - "@snyk/mix-parser-1.3.1" = { + "@snyk/mix-parser-1.3.2" = { name = "_at_snyk_slash_mix-parser"; packageName = "@snyk/mix-parser"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.3.1.tgz"; - sha512 = "XvANfbbaRkCpmIxYJGa+nSy1hUvGOHPTY+J3lpJrJAsEPB3fCT/z9hMuIJJ2c4RXZ9HndkpoSz2oj27m/DiBKQ=="; + url = "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.3.2.tgz"; + sha512 = "0Aq9vcgmjH0d9Gk5q0k6l4ZOvSHPf6/BCQGDVOpKp0hwOkXWnpDOLLPxL+uBCktuH9zTYQFB0aTk91kQImZqmA=="; }; }; "@snyk/rpm-parser-2.2.1" = { @@ -5521,13 +5557,13 @@ let sha512 = "hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg=="; }; }; - "@snyk/snyk-hex-plugin-1.1.2" = { + "@snyk/snyk-hex-plugin-1.1.4" = { name = "_at_snyk_slash_snyk-hex-plugin"; packageName = "@snyk/snyk-hex-plugin"; - version = "1.1.2"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.1.2.tgz"; - sha512 = "8zj19XxlBqTfe12CoeVgT0WtRBk0HEjJVO8hYB/AM71XVjucFzQT4/e/hR8mCUSA7i+B/F8X8iGPhs7Uj3J+zA=="; + url = "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.1.4.tgz"; + sha512 = "kLfFGckSmyKe667UGPyWzR/H7/Trkt4fD8O/ktElOx1zWgmivpLm0Symb4RCfEmz9irWv+N6zIKRrfSNdytcPQ=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -6799,6 +6835,15 @@ let sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; }; }; + "@types/node-fetch-2.5.8" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.8.tgz"; + sha512 = "fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw=="; + }; + }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -7033,6 +7078,15 @@ let sha512 = "OBsK0KIGUICExQ/ZvnPY4cKx5Kz4NcrVyGTIvOL5y4ajXu7r++RfBajfpGfGDmDVCKcoCDX1dO84/oeyeITnxA=="; }; }; + "@types/structured-source-3.0.0" = { + name = "_at_types_slash_structured-source"; + packageName = "@types/structured-source"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/structured-source/-/structured-source-3.0.0.tgz"; + sha512 = "8u+Wo5+GEXe4jZyQ8TplLp+1A7g32ZcVoE7VZu8VcxnlaEm5I/+T579R7q3qKN76jmK0lRshpo4hl4bj/kEPKA=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -8374,13 +8428,13 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.1.1" = { + "acorn-8.2.1" = { name = "acorn"; packageName = "acorn"; - version = "8.1.1"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.1.1.tgz"; - sha512 = "xYiIVjNuqtKXMxlRMDc6mZUhXehod4a3gbZ1qRlM7icK4EbxUFNLhWoPblCvFtB2Y9CIqHP3CF/rdxLItaQv8g=="; + url = "https://registry.npmjs.org/acorn/-/acorn-8.2.1.tgz"; + sha512 = "z716cpm5TX4uzOzILx8PavOE6C6DKshHDw1aQN52M/yNSqE9s5O8SMfyhCCfCJ3HmTL0NkVOi+8a/55T7YB3bg=="; }; }; "acorn-globals-1.0.9" = { @@ -8518,22 +8572,22 @@ let sha1 = "6a7990437ca736d5e1288db92bd3266d5f5cb2aa"; }; }; - "addons-linter-2.21.0" = { + "addons-linter-3.2.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.21.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.21.0.tgz"; - sha512 = "1XfqeVbvaEpjRlWJq/Ti0W6bH3RszaIDPeKl+4ZmXCx+C8ovRqy4CJmitqNffLr+2KpY4h5ei2eRygbvJYDyrw=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-3.2.0.tgz"; + sha512 = "b6oViLOBgXWsld5L3DJiJSt77DYjVrk2Yam2/gD5e2bsj5xfNvavugwhlJP/MIF0j5yetYT/XFQDXY1Hs0flOA=="; }; }; - "addons-scanner-utils-4.2.0" = { + "addons-scanner-utils-4.4.0" = { name = "addons-scanner-utils"; packageName = "addons-scanner-utils"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.2.0.tgz"; - sha512 = "VKLYNlKg2RCMvmOKmbWlu14hjdyk2vcTHscQGmDlnHfWcf6fAb8E7vY9/ajWdLykVVKZEUiGOoD5EIkIp1FyUA=="; + url = "https://registry.npmjs.org/addons-scanner-utils/-/addons-scanner-utils-4.4.0.tgz"; + sha512 = "fEUGQIqLYeLl5cV6FFSHU+XFlOYETXqm8jxmYGsVayjZaAqWEkIjTXNu4+pDEiqIkrqjPYP2izjrnhBpHRsyog=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -9301,6 +9355,15 @@ let sha512 = "hXI9PjJtzmD34XviBU+4sPMOxnifYrHVmxpjykqI/dUD2G3yTiuRaiQqwRwB2RCdwC1Ug/jBfoQ/NHDTnnjndQ=="; }; }; + "apollo-env-0.9.0" = { + name = "apollo-env"; + packageName = "apollo-env"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.9.0.tgz"; + sha512 = "oMSaFiCYEULXTv1sLhuPpAg0SykJNzEu5QWvCw0844yq14MyETXFERmAYD9b8nNjQLAdpjbbkBGKTWcw5wgd5Q=="; + }; + }; "apollo-graphql-0.6.1" = { name = "apollo-graphql"; packageName = "apollo-graphql"; @@ -9535,15 +9598,6 @@ let sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; }; }; - "archiver-5.2.0" = { - name = "archiver"; - packageName = "archiver"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/archiver/-/archiver-5.2.0.tgz"; - sha512 = "QEAKlgQuAtUxKeZB9w5/ggKXh21bZS+dzzuQ0RPBC20qtDCbTyzqmisoeJP46MP39fg4B4IcyvR+yeyEBdblsQ=="; - }; - }; "archiver-5.3.0" = { name = "archiver"; packageName = "archiver"; @@ -10678,6 +10732,15 @@ let sha512 = "Eh6pW+fRC2/1RxPq3hO8+PkZKv+wujzKky2MP/n69eC8yMkbNFfuEb/riZHqf13M7gr6Hvglpk/kISgBSBb6bQ=="; }; }; + "atomic-file-rw-0.2.1" = { + name = "atomic-file-rw"; + packageName = "atomic-file-rw"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/atomic-file-rw/-/atomic-file-rw-0.2.1.tgz"; + sha512 = "73oEZ7tkhd/7QjvsNts9saHY9BYJQWD4izzI/bKJmwVl/BGT7J6wBFUC5qxNlQZlFORguqfsTQwvJA1lm3RoFw=="; + }; + }; "atomic-sleep-1.0.0" = { name = "atomic-sleep"; packageName = "atomic-sleep"; @@ -10696,15 +10759,6 @@ let sha512 = "Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="; }; }; - "atomically-universal-0.1.1" = { - name = "atomically-universal"; - packageName = "atomically-universal"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/atomically-universal/-/atomically-universal-0.1.1.tgz"; - sha512 = "0bqmz+wKlA9hIiH/C4R3K8dpsVV6mM/X76QZ70LMHW0XzCDXzxdWD5gfkmRXxTM5txlbYE/06iz0IziohUQVzw=="; - }; - }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -10795,13 +10849,13 @@ let sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; - "aws-sdk-2.888.0" = { + "aws-sdk-2.892.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.888.0"; + version = "2.892.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.888.0.tgz"; - sha512 = "9Rg14eneXnrs5Wh5FL42qGEXf7QaqaV/gMHU9SfvAA0SEM390QnwVjCSKF5YAReWjSuJriKJTDiodMI39J+Nrg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.892.0.tgz"; + sha512 = "OOXJ15AnJJMHZYXJQVy22Wjnp5GrZCfvCxmoZuXdsLNs8M+BL4mfBqma82+UkM2NhJgLYuAhDfvFUBob6VGIWw=="; }; }; "aws-sign2-0.6.0" = { @@ -11533,6 +11587,15 @@ let sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; }; }; + "balanced-match-2.0.0" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz"; + sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA=="; + }; + }; "base-0.11.2" = { name = "base"; packageName = "base"; @@ -12073,6 +12136,15 @@ let sha1 = "dd3a862b2fedf66fee8471320069428d0d84427a"; }; }; + "bin-links-2.2.1" = { + name = "bin-links"; + packageName = "bin-links"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bin-links/-/bin-links-2.2.1.tgz"; + sha512 = "wFzVTqavpgCCYAh8SVBdnZdiQMxTkGR+T3b14CNpBXIBe2neJWaMGAZ55XWWHELJJ89dscuq0VCBqcVaIOgCMg=="; + }; + }; "bin-version-2.0.0" = { name = "bin-version"; packageName = "bin-version"; @@ -12145,13 +12217,13 @@ let sha1 = "7dbb3b210fdca082450dad2334c304af39bdc784"; }; }; - "binaryextensions-2.3.0" = { + "binaryextensions-4.15.0" = { name = "binaryextensions"; packageName = "binaryextensions"; - version = "2.3.0"; + version = "4.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz"; - sha512 = "nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg=="; + url = "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.15.0.tgz"; + sha512 = "MkUl3szxXolQ2scI1PM14WOT951KnaTNJ0eMKg7WzOI4kvSxyNo/Cygx4LOBNhwyINhAuSQpJW1rYD9aBSxGaw=="; }; }; "bindings-1.2.1" = { @@ -12244,13 +12316,13 @@ let sha512 = "O1htyufFTYy3EO0JkHg2CLykdXEtV2ssqw47Gq9A0WByp662xpJnMEB9m43LZjsSDjIAOozWRExlFQk2hlV1XQ=="; }; }; - "bipf-1.5.0" = { + "bipf-1.5.1" = { name = "bipf"; packageName = "bipf"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/bipf/-/bipf-1.5.0.tgz"; - sha512 = "EjpRVanEn4/Z2ilD2OeTfkWnogvxe+PZ8Gxzt7m+2xRT9rg6g1pETAdYy2vmJhNNZYX9axiV3Zf8HxuaYb0W3w=="; + url = "https://registry.npmjs.org/bipf/-/bipf-1.5.1.tgz"; + sha512 = "SrLwMzrpETJDiH9z12EMcqtApgcQo9XsPi+S9Aodezu53ALcGjBBQ7+C+IWbsSCBlSvNEec8sqfh3itO/j/QUw=="; }; }; "bitcoin-core-2.3.0" = { @@ -13225,13 +13297,13 @@ let sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw=="; }; }; - "browserslist-4.16.4" = { + "browserslist-4.16.5" = { name = "browserslist"; packageName = "browserslist"; - version = "4.16.4"; + version = "4.16.5"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.4.tgz"; - sha512 = "d7rCxYV8I9kj41RH8UKYnvDYCRENUlHRgyXy/Rhr/1BaeLGfiCptEdFE8MIrvGfWbBFNjVYx76SQWvNX1j+/cQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.5.tgz"; + sha512 = "C2HAjrM1AI/djrpAUU/tr4pml1DqLIzJKSLDBXBrNErl9ZCCTXdhwxdJjYc16953+mBWf7Lw+uUJgpgb8cN71A=="; }; }; "brq-0.1.8" = { @@ -14179,13 +14251,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001209" = { + "caniuse-lite-1.0.30001214" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001209"; + version = "1.0.30001214"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001209.tgz"; - sha512 = "2Ktt4OeRM7EM/JaOZjuLzPYAIqmbwQMNnYbgooT+icoRGrKOyAxA1xhlnotBD1KArRSPsuJp3TdYcZYrL7qNxA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001214.tgz"; + sha512 = "O2/SCpuaU3eASWVaesQirZv1MSjUNOvmugaD8zNSJqw6Vv5SGwoOpA9LJs3pNPfM745nxqPvfZY3MQKY4AKHYg=="; }; }; "canvas-2.7.0" = { @@ -14341,13 +14413,13 @@ let sha512 = "G6SIJSg6mxeEzWEWNY8NAn/jqysTPegV79mOQ6eYj1uyKYggyzP5MzuWt8fKmYShM5BTDadnCRajwDnku9LZeQ=="; }; }; - "cdktf-0.2.2" = { + "cdktf-0.3.0" = { name = "cdktf"; packageName = "cdktf"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf/-/cdktf-0.2.2.tgz"; - sha512 = "SMiDV99ruSGhjBm+dj30XmtV20BKesjY75SGGB3sTcFeaqn5d1Gf8gAaG69QTm3zqI8SbYO12MDslkoX1BY5Zw=="; + url = "https://registry.npmjs.org/cdktf/-/cdktf-0.3.0.tgz"; + sha512 = "+Nk6eKVMjcnIlu5KPZ02vo2VuD1B+wFydGS00BvvpwDjymhNnMTc5ADjPtGhwpi067i30j/HCFRHDKG04dgVbg=="; }; }; "center-align-0.1.3" = { @@ -14476,6 +14548,15 @@ let sha512 = "qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="; }; }; + "chalk-4.1.1" = { + name = "chalk"; + packageName = "chalk"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz"; + sha512 = "diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg=="; + }; + }; "chance-1.0.18" = { name = "chance"; packageName = "chance"; @@ -15826,13 +15907,13 @@ let sha512 = "3WQV/Fpa77nvzjUlc+0u53uIroJyyMB2Qwl++aXpAiDIsrsiAQq4uCURwdRBRX+eLkOTIAmT0L4qna3T7+2pUg=="; }; }; - "codemaker-1.28.0" = { + "codemaker-1.29.0" = { name = "codemaker"; packageName = "codemaker"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/codemaker/-/codemaker-1.28.0.tgz"; - sha512 = "TlpvV3q/68cZk7aljYW6b/5EvyB4uw523xJISTATrCrQu/UTA79/mxpA2ug8uhPcJoGYcfWXH4BHVVLNIuEtrg=="; + url = "https://registry.npmjs.org/codemaker/-/codemaker-1.29.0.tgz"; + sha512 = "dNUTiOhxNYB7MV75bLLCie1gr0SUh6wEOPc5OyZob4mLj51OETYIeRYILEiz39QVKLRx6YSbKoCY/S4PqQ0PNQ=="; }; }; "codepage-1.4.0" = { @@ -16339,6 +16420,15 @@ let sha512 = "ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA=="; }; }; + "commander-7.1.0" = { + name = "commander"; + packageName = "commander"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-7.1.0.tgz"; + sha512 = "pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg=="; + }; + }; "commander-7.2.0" = { name = "commander"; packageName = "commander"; @@ -16366,6 +16456,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "common-ancestor-path-1.0.1" = { + name = "common-ancestor-path"; + packageName = "common-ancestor-path"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz"; + sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w=="; + }; + }; "common-path-prefix-2.0.0" = { name = "common-path-prefix"; packageName = "common-path-prefix"; @@ -16870,6 +16969,15 @@ let sha512 = "3KFtTsA7OV27m/+pJhN4iJkKzHbPIPvyvEX5BQ/JCAWjfCHOQEVpIgxHLpT4i8L1OFta+pJrzcEVAHo6UitwqA=="; }; }; + "constructs-3.3.75" = { + name = "constructs"; + packageName = "constructs"; + version = "3.3.75"; + src = fetchurl { + url = "https://registry.npmjs.org/constructs/-/constructs-3.3.75.tgz"; + sha512 = "q10foASSSfDWmS99OQLfnWDXCzqLvoORISAVWPFg0AmIGlBv2ZdDOtXxLqrJARPxVlOldmW2JzWzdRI+4+0/ZA=="; + }; + }; "consume-http-header-1.0.0" = { name = "consume-http-header"; packageName = "consume-http-header"; @@ -16952,13 +17060,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.15.1" = { + "contentful-management-7.17.1" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.15.1"; + version = "7.17.1"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.15.1.tgz"; - sha512 = "Wk4gpoNDXThkof49W0S3WgdW42T9kKQZj+7V7aDs+VrW0/WfTiNh5fMiMt0rxLqkWjxFrsa1TMAxR0WzT3lLyQ=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.17.1.tgz"; + sha512 = "t2stBJNvvY347d84GuNoHxPvPMGKQHAIC/2CwEL0y47yas+30A4jkbTugqermgZS2l52gnasjo6xBTE27Rqb0w=="; }; }; "contentful-sdk-core-6.7.0" = { @@ -17375,13 +17483,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-3.10.1" = { + "core-js-3.11.0" = { name = "core-js"; packageName = "core-js"; - version = "3.10.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.10.1.tgz"; - sha512 = "pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.11.0.tgz"; + sha512 = "bd79DPpx+1Ilh9+30aT5O1sgpQd4Ttg8oqkqi51ZzhedMM1omD2e6IOF48Z/DzDCZ2svp49tN/3vneTK6ZBkXw=="; }; }; "core-js-3.8.3" = { @@ -17393,22 +17501,22 @@ let sha512 = "KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q=="; }; }; - "core-js-compat-3.10.1" = { + "core-js-compat-3.11.0" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.10.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.1.tgz"; - sha512 = "ZHQTdTPkqvw2CeHiZC970NNJcnwzT6YIueDMASKt+p3WbZsLXOcoD392SkcWhkC0wBBHhlfhqGKKsNCQUozYtg=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.11.0.tgz"; + sha512 = "3wsN9YZJohOSDCjVB0GequOyHax8zFiogSX3XWLE28M1Ew7dTU57tgHjIylSBKSIouwmLBp3g61sKMz/q3xEGA=="; }; }; - "core-js-pure-3.10.1" = { + "core-js-pure-3.11.0" = { name = "core-js-pure"; packageName = "core-js-pure"; - version = "3.10.1"; + version = "3.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.10.1.tgz"; - sha512 = "PeyJH2SE0KuxY5eCGNWA+W+CeDpB6M1PN3S7Am7jSv/Ttuxz2SnWbIiVQOn/TDaGaGtxo8CRWHkXwJscbUHtVw=="; + url = "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.11.0.tgz"; + sha512 = "PxEiQGjzC+5qbvE7ZIs5Zn6BynNeZO9zHhrrWmkRff2SZLq0CE/H5LuZOJHhmOQ8L38+eMzEHAmPYWrUtDfuDQ=="; }; }; "core-util-is-1.0.2" = { @@ -17726,15 +17834,6 @@ let sha512 = "KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ=="; }; }; - "cross-fetch-3.1.1" = { - name = "cross-fetch"; - packageName = "cross-fetch"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.1.tgz"; - sha512 = "eIF+IHQpRzoGd/0zPrwQmHwDC90mdvjk+hcbYhKoaRrEk4GEIDqdjs/MljmdPPoHTQudbmWS+f0hZsEpFaEvWw=="; - }; - }; "cross-fetch-3.1.4" = { name = "cross-fetch"; packageName = "cross-fetch"; @@ -18284,13 +18383,13 @@ let sha1 = "d1cfd8743c2f849a0abb2fd544db56695d19a490"; }; }; - "csv-parse-4.15.3" = { + "csv-parse-4.15.4" = { name = "csv-parse"; packageName = "csv-parse"; - version = "4.15.3"; + version = "4.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.3.tgz"; - sha512 = "jlTqDvLdHnYMSr08ynNfk4IAUSJgJjTKy2U5CQBSu4cN9vQOJonLVZP4Qo4gKKrIgIQ5dr07UwOJdi+lRqT12w=="; + url = "https://registry.npmjs.org/csv-parse/-/csv-parse-4.15.4.tgz"; + sha512 = "OdBbFc0yZhOm17lSxqkirrHlFFVpKRT0wp4DAGoJelsP3LbGzV9LNr7XmM/lrr0uGkCtaqac9UhP8PDHXOAbMg=="; }; }; "csv-parser-1.12.1" = { @@ -18914,15 +19013,6 @@ let sha512 = "JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug=="; }; }; - "dargs-6.1.0" = { - name = "dargs"; - packageName = "dargs"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dargs/-/dargs-6.1.0.tgz"; - sha512 = "5dVBvpBLBnPwSsYXqfybFyehMmC/EenKEcf23AhCTgTf48JFBbmJKqoZBsERDnjL0FyiVTYWdFsRfTLHxLyKdQ=="; - }; - }; "dargs-7.0.0" = { name = "dargs"; packageName = "dargs"; @@ -19175,6 +19265,15 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; + "dateformat-4.5.1" = { + name = "dateformat"; + packageName = "dateformat"; + version = "4.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-4.5.1.tgz"; + sha512 = "OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q=="; + }; + }; "dayjs-1.10.4" = { name = "dayjs"; packageName = "dayjs"; @@ -20561,13 +20660,13 @@ let sha512 = "EAyaxl8hy4Ph07kzlzGTfpbZMNAAAHXSZtNEMwdlnSd1noHzvA6HsgKt4fEMSvaEXQYLSphe5rPMxN4WOj0hcQ=="; }; }; - "dispensary-0.61.0" = { + "dispensary-0.62.0" = { name = "dispensary"; packageName = "dispensary"; - version = "0.61.0"; + version = "0.62.0"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.61.0.tgz"; - sha512 = "5BK13jrYQ+0bHgZBv7IOQsff5ydeNcnp87w3c7T8x5im21RDFQyiHrTlH0DoouZDyAVHILpat4Ytf7gRuhMRgw=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.62.0.tgz"; + sha512 = "x8vqPX7owhzDp3Y6t/iOuTuNoWx5hlZKITlzlybETsZoY05cYDubGpwt0soLfRLAWLuxX1lq0lTc/vXtk/CDCw=="; }; }; "diveSync-0.3.0" = { @@ -21173,15 +21272,6 @@ let sha512 = "N8hWXD4hXqmEcNoR8TBYFntaOcYvEQ7Bz90mgm3bZRTuteGQqwT32VDMnTyD0KTEvb8BWrMc1tVmzuV9u/WrAg=="; }; }; - "download-stats-0.3.4" = { - name = "download-stats"; - packageName = "download-stats"; - version = "0.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/download-stats/-/download-stats-0.3.4.tgz"; - sha512 = "ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA=="; - }; - }; "draftlog-1.0.13" = { name = "draftlog"; packageName = "draftlog"; @@ -21389,13 +21479,13 @@ let sha1 = "94a44248bb87da35db0eff7af0aa576168117f59"; }; }; - "editions-2.3.1" = { + "editions-6.1.0" = { name = "editions"; packageName = "editions"; - version = "2.3.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/editions/-/editions-2.3.1.tgz"; - sha512 = "ptGvkwTvGdGfC0hfhKg0MT+TRLRKGtUiWGBInxOm5pz7ssADezahjCUaYuZ8Dr+C05FW0AECIIPt4WBxVINEhA=="; + url = "https://registry.npmjs.org/editions/-/editions-6.1.0.tgz"; + sha512 = "h6nWEyIocfgho9J3sTSuhU/WoFOu1hTX75rPBebNrbF38Y9QFDjCDizYXdikHTySW7Y3mSxli8bpDz9RAtc7rA=="; }; }; "editor-1.0.0" = { @@ -21497,13 +21587,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.717" = { + "electron-to-chromium-1.3.720" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.717"; + version = "1.3.720"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.717.tgz"; - sha512 = "OfzVPIqD1MkJ7fX+yTl2nKyOE4FReeVfMCzzxQS+Kp43hZYwHwThlGP+EGIZRXJsxCM7dqo8Y65NOX/HP12iXQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.720.tgz"; + sha512 = "B6zLTxxaOFP4WZm6DrvgRk8kLFYWNhQ5TrHMC0l5WtkMXhU5UbnvWoTfeEwqOruUSlNMhVLfYak7REX6oC5Yfw=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -21949,13 +22039,13 @@ let sha512 = "Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg=="; }; }; - "enhanced-resolve-5.7.0" = { + "enhanced-resolve-5.8.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz"; - sha512 = "6njwt/NsZFUKhM6j9U8hzVyD4E4r0x7NQzhTCbcWOJ0IQjNSAoalWmb0AE51Wn+fwan5qVESWi7t2ToBxs9vrw=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.8.0.tgz"; + sha512 = "Sl3KRpJA8OpprrtaIswVki3cWPiPKxXuFxJXBp+zNb6s6VwNWwFRUdtmzd2ReUut8n+sCPx7QCtQ7w5wfJhSgQ=="; }; }; "enquirer-2.3.6" = { @@ -22147,13 +22237,13 @@ let sha512 = "GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA=="; }; }; - "errlop-2.2.0" = { + "errlop-4.1.0" = { name = "errlop"; packageName = "errlop"; - version = "2.2.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-2.2.0.tgz"; - sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw=="; + url = "https://registry.npmjs.org/errlop/-/errlop-4.1.0.tgz"; + sha512 = "vul6gGBuVt0M2TPi1/WrcL86+Hb3Q2Tpu3TME3sbVhZrYf7J1ZMHCodI25RQKCVurh56qTfvgM0p3w5cT4reSQ=="; }; }; "errno-0.1.8" = { @@ -22165,6 +22255,15 @@ let sha512 = "dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A=="; }; }; + "error-10.4.0" = { + name = "error"; + packageName = "error"; + version = "10.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/error/-/error-10.4.0.tgz"; + sha512 = "YxIFEJuhgcICugOUvRx5th0UM+ActZ9sjY0QJmeVwsQdvosZ7kYzc9QqS0Da3R5iUmgU5meGIxh0xBeZpMVeLw=="; + }; + }; "error-7.0.2" = { name = "error"; packageName = "error"; @@ -22174,15 +22273,6 @@ let sha1 = "a5f75fff4d9926126ddac0ea5dc38e689153cb02"; }; }; - "error-7.2.1" = { - name = "error"; - packageName = "error"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error/-/error-7.2.1.tgz"; - sha512 = "fo9HBvWnx3NGUKMvMwB/CBCMMrfEJgbDTVDEkPygA3Bdd3lM1OyCd+rbQ8BwnpF6GdVeOLDNmyL4N5Bg80ZvdA=="; - }; - }; "error-ex-1.3.2" = { name = "error-ex"; packageName = "error-ex"; @@ -22381,13 +22471,13 @@ let sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA=="; }; }; - "esbuild-0.11.12" = { + "esbuild-0.11.14" = { name = "esbuild"; packageName = "esbuild"; - version = "0.11.12"; + version = "0.11.14"; src = fetchurl { - url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.12.tgz"; - sha512 = "c8cso/1RwVj+fbDvLtUgSG4ZJQ0y9Zdrl6Ot/GAjyy4pdMCHaFnDMts5gqFnWRPLajWtEnI+3hlET4R9fVoZng=="; + url = "https://registry.npmjs.org/esbuild/-/esbuild-0.11.14.tgz"; + sha512 = "ejheEPkqhq5y0LM9rG9e+3yDihPtqeeE4NZmG7VQiSGJ3CjO4HvPOHmhhttSksfSztjLAGo2+0/zSIvlqj4JOQ=="; }; }; "esc-exit-2.0.2" = { @@ -22561,15 +22651,6 @@ let sha512 = "S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg=="; }; }; - "eslint-7.21.0" = { - name = "eslint"; - packageName = "eslint"; - version = "7.21.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.21.0.tgz"; - sha512 = "W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg=="; - }; - }; "eslint-7.24.0" = { name = "eslint"; packageName = "eslint"; @@ -22579,6 +22660,15 @@ let sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; }; }; + "eslint-7.25.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.25.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; + sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; + }; + }; "eslint-import-resolver-node-0.3.4" = { name = "eslint-import-resolver-node"; packageName = "eslint-import-resolver-node"; @@ -23227,15 +23317,6 @@ let sha512 = "Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g=="; }; }; - "events-to-array-1.1.2" = { - name = "events-to-array"; - packageName = "events-to-array"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/events-to-array/-/events-to-array-1.1.2.tgz"; - sha1 = "2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6"; - }; - }; "events.node-0.4.9" = { name = "events.node"; packageName = "events.node"; @@ -23533,13 +23614,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.72" = { + "expo-pwa-0.0.74" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.72"; + version = "0.0.74"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.72.tgz"; - sha512 = "Mhyl8aqUwncBDo+zBWpqoXIFe38cfK0A4axKmJaiy8IIZd+ficVqo4zXrYVeuKpBY+P+eqEbXLbhTJlktkMhow=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.74.tgz"; + sha512 = "Y3lzJl9Q+0KuYt6003eacwpfoEYzO+w2R3oBDtfwGU16KbQkm2O6zGAYluBGnlPoph+fCUmyi2mT2ucd5KSlDQ=="; }; }; "express-2.5.11" = { @@ -24046,13 +24127,13 @@ let sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; }; }; - "fast-equals-2.0.0" = { + "fast-equals-2.0.1" = { name = "fast-equals"; packageName = "fast-equals"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.0.tgz"; - sha512 = "u6RBd8cSiLLxAiC04wVsLV6GBFDOXcTCgWkd3wEoFXgidPSoAJENqC9m7Jb2vewSvjBIfXV6icKeh3GTKfIaXA=="; + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-2.0.1.tgz"; + sha512 = "jIHAbyu5Txdi299DitHXr4wuvw7ajz8S4xVgShJmQOUD6TovsKzvMoHoq9G8+dO6xeKWrwH3DURT+ZDKnwjSsA=="; }; }; "fast-glob-2.2.7" = { @@ -24658,13 +24739,13 @@ let sha512 = "LpCHtPQ3sFx67z+uh2HnSyWSLLu5Jxo21795uRDuar/EOuYWXib5EmPaGIBuSnRqH2IODiKA2k5re/K9OnN/Yg=="; }; }; - "filesize-6.2.5" = { + "filesize-6.3.0" = { name = "filesize"; packageName = "filesize"; - version = "6.2.5"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/filesize/-/filesize-6.2.5.tgz"; - sha512 = "JkM1y2+IpnEwp3pbXOUXR+9ytuZE07ZnWb/OR0H/WOSkjWASpmXgC0ZBIs4/SAYq9wHqExeQxcYNoJKf6s0RCg=="; + url = "https://registry.npmjs.org/filesize/-/filesize-6.3.0.tgz"; + sha512 = "ytx0ruGpDHKWVoiui6+BY/QMNngtDQ/pJaFwfBpQif0J63+E8DLdFyqS3NkKQn7vIruUEpoGD9JUJSg7Kp+I0g=="; }; }; "filestream-5.0.0" = { @@ -24838,6 +24919,15 @@ let sha512 = "1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ=="; }; }; + "find-yarn-workspace-root2-1.2.16" = { + name = "find-yarn-workspace-root2"; + packageName = "find-yarn-workspace-root2"; + version = "1.2.16"; + src = fetchurl { + url = "https://registry.npmjs.org/find-yarn-workspace-root2/-/find-yarn-workspace-root2-1.2.16.tgz"; + sha512 = "hr6hb1w8ePMpPVUK39S4RlwJzi+xPLuVuG8XlwXU3KD5Yn3qgBWVfy3AzNlDhWvE1EORCE65/Qm26rFQt3VLVA=="; + }; + }; "findit-1.2.0" = { name = "findit"; packageName = "findit"; @@ -24892,13 +24982,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-4.1.0" = { + "firefox-profile-4.2.0" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.1.0.tgz"; - sha512 = "n+0jsWhW57i7cAmdHg67W6u5vVSoIJN9D+d7M3w1MzhFLE5X/QxBfP80ksjNvNQDFXGdJQAnW9YupLkzgCxaFQ=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-4.2.0.tgz"; + sha512 = "Z+/6GQ0JEW2eqgj63EYNbgKSgoIz7w1yXlkOWAIRkCNnj50rkfnQIz8uYwJkobxwYQM8vjFIbYiVtYuQV8US2A=="; }; }; "first-chunk-stream-2.0.0" = { @@ -25018,15 +25108,6 @@ let sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }; }; - "flatmap-0.0.3" = { - name = "flatmap"; - packageName = "flatmap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/flatmap/-/flatmap-0.0.3.tgz"; - sha1 = "1f18a4d938152d495965f9c958d923ab2dd669b4"; - }; - }; "flatstr-1.0.12" = { name = "flatstr"; packageName = "flatstr"; @@ -25531,13 +25612,13 @@ let sha512 = "wJaE62fLaB3jCYvY2ZHjZvmKK2iiLiiehX38rz5QZxtdN8fVPJDeZUiVvJrHStdTc+23LHlyZuSEKgFc0pxi2g=="; }; }; - "fp-ts-2.10.2" = { + "fp-ts-2.10.4" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.10.2"; + version = "2.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.2.tgz"; - sha512 = "YB/FSwESW8C3kVCbbyFiZSXXoQEJ/SaeHHorL6KCKHoPIPV6v/hyfMiXBPMjW7O7D9jfxlRs6VeCRonfqi1Tcg=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.10.4.tgz"; + sha512 = "vMTB5zNc9PnE20q145PNbkiL9P9WegwmKVOFloi/NfHnPdAlcob6I3AKqlH/9u3k3/M/GOftZhcJdBrb+NtnDA=="; }; }; "fragment-cache-0.2.1" = { @@ -26044,13 +26125,13 @@ let sha1 = "979e22f9451b4b38f051f7937c919dbacc692958"; }; }; - "fx-runner-1.0.13" = { + "fx-runner-1.1.0" = { name = "fx-runner"; packageName = "fx-runner"; - version = "1.0.13"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.0.13.tgz"; - sha512 = "Ces2bm+LNuXehkvmN1/Z+oEDkI/jHBp9xdyBtBy7hcgvF18/pv/D8F6A6kQgNkMZsnBgLEv+VvdDxyqkfkYycw=="; + url = "https://registry.npmjs.org/fx-runner/-/fx-runner-1.1.0.tgz"; + sha512 = "v/Eo69DDFW30zPdvjCYVXddjVvLy2xGeRbg0S18bPd8kEc0q9VsDoDkjyOxY5lTZsAqcQGy0OWjs3HCfRVBNSg=="; }; }; "galactus-0.2.1" = { @@ -26485,15 +26566,6 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "gh-got-5.0.0" = { - name = "gh-got"; - packageName = "gh-got"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gh-got/-/gh-got-5.0.0.tgz"; - sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; - }; - }; "gh-release-fetch-1.1.0" = { name = "gh-release-fetch"; packageName = "gh-release-fetch"; @@ -26701,15 +26773,6 @@ let sha1 = "f985fedcc0a9aa579dc88d7aff068d55cc6251a0"; }; }; - "github-username-3.0.0" = { - name = "github-username"; - packageName = "github-username"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/github-username/-/github-username-3.0.0.tgz"; - sha1 = "0a772219b3130743429f2456d0bdd3db55dce7b1"; - }; - }; "gl-matrix-2.8.1" = { name = "gl-matrix"; packageName = "gl-matrix"; @@ -27566,13 +27629,13 @@ let sha512 = "zsrDtu5gCbQFDWsNa5bMB4nf1LpKX9KDgh+f8oL1288ijV4RxeckhVozAjqjXAfRpxOHD1xOESsh6zq8SjdgjA=="; }; }; - "graphql-ws-4.2.2" = { + "graphql-ws-4.4.2" = { name = "graphql-ws"; packageName = "graphql-ws"; - version = "4.2.2"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.2.2.tgz"; - sha512 = "b6TLtWLAmKunD72muL9EeItRGpio9+V3Cx4zJsBkRA+3wxzTWXDvQr9/3qSwJ3D/2abz0ys2KHTM6lB1uH7KIQ=="; + url = "https://registry.npmjs.org/graphql-ws/-/graphql-ws-4.4.2.tgz"; + sha512 = "Cz+t1w+8+tiHIKzcz45tMwrxJpPSQ7KNjQrfN8ADAELECkkBB7aSvAgpShWz0Tne8teH/UxzJsULObLVq5eMvQ=="; }; }; "gray-matter-2.1.1" = { @@ -27593,13 +27656,13 @@ let sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; }; }; - "grouped-queue-1.1.0" = { + "grouped-queue-2.0.0" = { name = "grouped-queue"; packageName = "grouped-queue"; - version = "1.1.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.1.0.tgz"; - sha512 = "rZOFKfCqLhsu5VqjBjEWiwrYqJR07KxIkH4mLZlNlGDfntbb4FbMyGFP14TlvRPrU9S3Hnn/sgxbC5ZeN0no3Q=="; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-2.0.0.tgz"; + sha512 = "/PiFUa7WIsl48dUeCvhIHnwNmAAzlI/eHoJl0vu3nsFA366JleY7Ff8EVTplZu5kO0MIdZjKTTnzItL61ahbnw=="; }; }; "growl-1.10.5" = { @@ -28142,6 +28205,15 @@ let sha512 = "WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg=="; }; }; + "hash-wasm-4.6.0" = { + name = "hash-wasm"; + packageName = "hash-wasm"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.6.0.tgz"; + sha512 = "Wi96tJDftxUQciCUi2Vs/Nw8al3psRATe/FhyezrajJKCXKRHvpiFARTZuUgdlGB7825LiN+FluH7SFoGdiGRA=="; + }; + }; "hash.js-1.1.7" = { name = "hash.js"; packageName = "hash.js"; @@ -28214,6 +28286,15 @@ let sha512 = "JQMW+TJe0UAIXZMjCJ4Wf6ayDV9Yv3PBDPsHD4ExBpAspJ6MOcCX+nzVF+UJVv7OqPcg852WEMSHQPoRA+FVSw=="; }; }; + "hast-util-from-parse5-5.0.3" = { + name = "hast-util-from-parse5"; + packageName = "hast-util-from-parse5"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz"; + sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; + }; + }; "hast-util-from-parse5-6.0.1" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; @@ -28295,6 +28376,15 @@ let sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; }; }; + "hastscript-5.1.2" = { + name = "hastscript"; + packageName = "hastscript"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz"; + sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; + }; + }; "hastscript-6.0.0" = { name = "hastscript"; packageName = "hastscript"; @@ -29034,13 +29124,13 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; - "http-proxy-middleware-1.1.2" = { + "http-proxy-middleware-1.2.1" = { name = "http-proxy-middleware"; packageName = "http-proxy-middleware"; - version = "1.1.2"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.1.2.tgz"; - sha512 = "YRFUeOG3q85FJjAaYVJUoNRW9a73SDlOtAyQOS5PHLr18QeZ/vEhxywNoOPiEO8BxCegz4RXzTHcvyLEGB78UA=="; + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.2.1.tgz"; + sha512 = "mxqwEC+IOneTLuYz1B7fmLUmXXkVWfcbiXe8LsCctIX12vxfJU1Uj9HJD/G9MwK4HvgEdgKI8NZySM3uheC2JQ=="; }; }; "http-signature-0.11.0" = { @@ -29466,6 +29556,15 @@ let sha1 = "09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"; }; }; + "image-size-0.9.7" = { + name = "image-size"; + packageName = "image-size"; + version = "0.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/image-size/-/image-size-0.9.7.tgz"; + sha512 = "KRVgLNZkr00YGN0qn9MlIrmlxbRhsCcEb1Byq3WKGnIV4M48iD185cprRtaoK4t5iC+ym2Q5qlArxZ/V1yzDgA=="; + }; + }; "image-type-3.1.0" = { name = "image-type"; packageName = "image-type"; @@ -30312,6 +30411,15 @@ let sha512 = "AMCHpf/7sJOjeRbTgCLLvhH41ZnUv0D809ZFJRhR2dGOfp8GxJHzfnNqtgYGxQiW0+dVK2ooBVyR+dqoEQs6mw=="; }; }; + "invoices-1.2.0" = { + name = "invoices"; + packageName = "invoices"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invoices/-/invoices-1.2.0.tgz"; + sha512 = "x9jMmN/afPZkeL7qwMj15r+RSV7ztPsfxKgByD3bXR/WhmjrlfU+zwfliohScW/UV1b0FUSq6A7DgTME4tdMSQ=="; + }; + }; "iota-array-1.0.0" = { name = "iota-array"; packageName = "iota-array"; @@ -30681,13 +30789,13 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; - "is-core-module-2.2.0" = { + "is-core-module-2.3.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.2.0.tgz"; - sha512 = "XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.3.0.tgz"; + sha512 = "xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw=="; }; }; "is-data-descriptor-0.1.4" = { @@ -31545,15 +31653,6 @@ let sha512 = "AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg=="; }; }; - "is-scoped-1.0.0" = { - name = "is-scoped"; - packageName = "is-scoped"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-scoped/-/is-scoped-1.0.0.tgz"; - sha1 = "449ca98299e713038256289ecb2b540dc437cb30"; - }; - }; "is-scoped-2.1.0" = { name = "is-scoped"; packageName = "is-scoped"; @@ -32049,13 +32148,13 @@ let sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; }; }; - "istextorbinary-2.6.0" = { + "istextorbinary-5.12.0" = { name = "istextorbinary"; packageName = "istextorbinary"; - version = "2.6.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.6.0.tgz"; - sha512 = "+XRlFseT8B3L9KyjxxLjfXSLMuErKDsd8DBNrsaxoViABMEZlOSCstwmw0qpoFX3+U6yWU1yhLudAe6/lETGGA=="; + url = "https://registry.npmjs.org/istextorbinary/-/istextorbinary-5.12.0.tgz"; + sha512 = "wLDRWD7qpNTYubk04+q3en1+XZGS4vYWK0+SxNSXJLaITMMEK+J3o/TlOMyULeH1qozVZ9uUkKcyMA8odyxz8w=="; }; }; "isuri-2.0.3" = { @@ -32283,13 +32382,13 @@ let sha512 = "0soPJif+yjmzmOF+4cF2hyhxUWWpXpQntsm2joJXFFoRcQiPzsG4dbLKYqYPT3Fc6PjZ8MaLtCkDqqckVSfmRw=="; }; }; - "jitdb-3.0.3" = { + "jitdb-3.1.3" = { name = "jitdb"; packageName = "jitdb"; - version = "3.0.3"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/jitdb/-/jitdb-3.0.3.tgz"; - sha512 = "BTXAauBdig83EUkBFdWY9dzdf8wB5DlJ4aa/uCMwmf2eki7DhQBT7rrJFuscR/Mkmqt00G1oxiqa4gnA+oPJ6Q=="; + url = "https://registry.npmjs.org/jitdb/-/jitdb-3.1.3.tgz"; + sha512 = "g9RdoIzb2h9fkXKJVVQqQSU6U2XG4VrR6hsGjTGTha4rI+zNGBkIclhfrWAgTrW0ofjOIcMfgGWeIOLBTJLULw=="; }; }; "jju-1.4.0" = { @@ -32409,13 +32508,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.22.0" = { + "jquery.terminal-2.23.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.22.0"; + version = "2.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.22.0.tgz"; - sha512 = "0VDAqWMrqIcI7Mduqkgw/SM9G8aTMJUx/Lu8rxHVPfn10wkHZmaVywczVQgQWRCSdGa+/hy/qZEdaVPPmLyplw=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.23.2.tgz"; + sha512 = "C92ZOquPhjGcB0PAEUHPlnkEycgtQoCoiCYZ3d7FyuK7z/JDSIXuNk5kosaVn3/NwFZ7jlFgy+s3kksHI0aFHg=="; }; }; "js-base64-2.6.4" = { @@ -32706,49 +32805,49 @@ let sha512 = "xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g=="; }; }; - "jsii-1.28.0" = { + "jsii-1.29.0" = { name = "jsii"; packageName = "jsii"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii/-/jsii-1.28.0.tgz"; - sha512 = "B6CbHi60fabeQZJYNea8wSUsrILJzN7ng+yx69GmMJ4C6NtCVt7Oc/CITfhY/cYTwdhN3FAJf01e5/v8qj6bUA=="; + url = "https://registry.npmjs.org/jsii/-/jsii-1.29.0.tgz"; + sha512 = "7o1yE/si/nbGsNquSejwxaiPq0iDSTPfDENd7ZyO3xzGIROV8UZSs+VhGyys9t/VF4og8p9s2olkajEN60fzMw=="; }; }; - "jsii-pacmak-1.28.0" = { + "jsii-pacmak-1.29.0" = { name = "jsii-pacmak"; packageName = "jsii-pacmak"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.28.0.tgz"; - sha512 = "QAW8rq7M9rA/QSXwaJKMVpttkNW/BJgE9GT6i9UahobQMkmp+zsXCJUENeRg2mndLqX0DDyxO1in/fuIeCeR3A=="; + url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.29.0.tgz"; + sha512 = "wpVDrvh+hClB4Y68v/sYCcRnXlXoDwEUTC0X+uz9o5xUHs/WfuDglS5AAhq6g51INAQc0ed3anrkqmFcDK6QPw=="; }; }; - "jsii-reflect-1.28.0" = { + "jsii-reflect-1.29.0" = { name = "jsii-reflect"; packageName = "jsii-reflect"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.28.0.tgz"; - sha512 = "jFu9dUy5D0PrxVnaDilb50agbSr0wZRya6StwHyw8Wly3ruzS8uuSB1aWmEwN371m5ewDD4m9nPEQ9zMmKFvMQ=="; + url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.29.0.tgz"; + sha512 = "r1XpKsnaMTaI0B2XXJ4rF1rbufqFDThASrArE+SyuuGeWTJxWQ4UtIzvXNVFLbZba0A5hX4K0JxiMIfaRFCEEg=="; }; }; - "jsii-rosetta-1.28.0" = { + "jsii-rosetta-1.29.0" = { name = "jsii-rosetta"; packageName = "jsii-rosetta"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.28.0.tgz"; - sha512 = "lttDhXiBuWaN0DwsWakD5o7GxyVP8yMCRvpmpXOqz1eK+MMlZp654R6o39M7RksXhhxipCNwfbIY3T7Y7N85qQ=="; + url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.29.0.tgz"; + sha512 = "WhTlFFm/xp2ictShT7XreBoqNpFj/U4MK4VyHyzYV1jS58uvJJMkwifMz/MOqciqRtWIAvGM3Ria4EB3VqmTfA=="; }; }; - "jsii-srcmak-0.1.255" = { + "jsii-srcmak-0.1.257" = { name = "jsii-srcmak"; packageName = "jsii-srcmak"; - version = "0.1.255"; + version = "0.1.257"; src = fetchurl { - url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.255.tgz"; - sha512 = "vWIcR+z9HmqHX4lwJI9TFkGhBsZK2tPlgnvANJ09+SwrrLdBFOBFOJB298U5vMyQ/2mf0VFGlFFoJO9mA/6B4A=="; + url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.257.tgz"; + sha512 = "Nfym9T84GR8kMjx6Lcah/RhIW8c38BEt/nltagrf9wnBhXWPgQoIP9f6nSsKaGHy2srI6gNSNFFR7sSIS90TyA=="; }; }; "json-bigint-0.2.3" = { @@ -33003,6 +33102,15 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; + "json-stringify-nice-1.1.3" = { + name = "json-stringify-nice"; + packageName = "json-stringify-nice"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.3.tgz"; + sha512 = "w8+cZZFgcPtFkZTmkA1UpRH0GXXfpeuc/cClNkQjLt9JoQd8cBFSyB8J1WWjJrthIYViHobwnh3jA4z5X2LdGA=="; + }; + }; "json-stringify-pretty-compact-3.0.0" = { name = "json-stringify-pretty-compact"; packageName = "json-stringify-pretty-compact"; @@ -33039,13 +33147,13 @@ let sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A=="; }; }; - "json2jsii-0.1.188" = { + "json2jsii-0.1.219" = { name = "json2jsii"; packageName = "json2jsii"; - version = "0.1.188"; + version = "0.1.219"; src = fetchurl { - url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.188.tgz"; - sha512 = "XeUcBQl0rngTFmiSIx0XNW+g0QgAJcqwsUYzvGcDPPSvPngIGmJ/X6d0UH/nDmSVyEilYyKnVP7iYh3y9by9fA=="; + url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.219.tgz"; + sha512 = "0KTPGNsHxvtKodkvymWSAg0HAMpcAUPcyk1wYEpWJJC3k3Zkeun/dGBeP4X7DjByZ4AcUMJMSPqlJy67f/3Cyg=="; }; }; "json3-3.2.6" = { @@ -33399,6 +33507,24 @@ let sha512 = "xtgnwBBZaLtKspGo6jDX/H0FDsHrn41mQVWhNHge7pZe6Nj2gU2izfC09O0rPU/i97iMcJFVjbecFiTAvmNhLQ=="; }; }; + "just-diff-3.1.1" = { + name = "just-diff"; + packageName = "just-diff"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/just-diff/-/just-diff-3.1.1.tgz"; + sha512 = "sdMWKjRq8qWZEjDcVA6llnUT8RDEBIfOiGpYFPYa9u+2c39JCsejktSP7mj5eRid5EIvTzIpQ2kDOCw1Nq9BjQ=="; + }; + }; + "just-diff-apply-3.0.0" = { + name = "just-diff-apply"; + packageName = "just-diff-apply"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-3.0.0.tgz"; + sha512 = "K2MLc+ZC2DVxX4V61bIKPeMUUfj1YYZ3h0myhchDXOW1cKoPZMnjIoNCqv9bF2n5Oob1PFxuR2gVJxkxz4e58w=="; + }; + }; "jwa-1.4.1" = { name = "jwa"; packageName = "jwa"; @@ -33994,15 +34120,6 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; - "lazy-cache-2.0.2" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; - sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; - }; - }; "lazyness-1.2.0" = { name = "lazyness"; packageName = "lazyness"; @@ -34309,13 +34426,13 @@ let sha512 = "IR5ASkAU4NHTN1JFeP9bYvhARhaBg8VD8yUcmvNIvFWg6L3dsM2yK1A9EM6MpPvWYKH9SEiljB59ZUa5s2pYnA=="; }; }; - "libnpmaccess-4.0.1" = { + "libnpmaccess-4.0.2" = { name = "libnpmaccess"; packageName = "libnpmaccess"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.1.tgz"; - sha512 = "ZiAgvfUbvmkHoMTzdwmNWCrQRsDkOC+aM5BDfO0C9aOSwF3R1LdFDBD+Rer1KWtsoQYO35nXgmMR7OUHpDRxyA=="; + url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-4.0.2.tgz"; + sha512 = "avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w=="; }; }; "libnpmconfig-1.2.1" = { @@ -34327,13 +34444,13 @@ let sha512 = "9esX8rTQAHqarx6qeZqmGQKBNZR5OIbl/Ayr0qQDy3oXja2iFVQQI81R6GZ2a02bSNZ9p3YOGX1O6HHCb1X7kA=="; }; }; - "libnpmpublish-4.0.0" = { + "libnpmpublish-4.0.1" = { name = "libnpmpublish"; packageName = "libnpmpublish"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.0.tgz"; - sha512 = "2RwYXRfZAB1x/9udKpZmqEzSqNd7ouBRU52jyG14/xG8EF+O9A62d7/XVR3iABEQHf1iYhkm0Oq9iXjrL3tsXA=="; + url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-4.0.1.tgz"; + sha512 = "hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA=="; }; }; "libsodium-0.7.9" = { @@ -34669,6 +34786,15 @@ let sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; }; }; + "load-yaml-file-0.2.0" = { + name = "load-yaml-file"; + packageName = "load-yaml-file"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-yaml-file/-/load-yaml-file-0.2.0.tgz"; + sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -37657,13 +37783,13 @@ let sha512 = "Ci6bIfq/UgcxPTYa8dQQ5FY3BzKkT894bwXWXxC/zqs0XgMO2cT20CGkOqda7gZNkmK5VP4x89IGZ6K7hfbn3Q=="; }; }; - "mem-8.1.0" = { + "mem-8.1.1" = { name = "mem"; packageName = "mem"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-8.1.0.tgz"; - sha512 = "FIkgXo0kTi3XpvaznV5Muk6Y6w8SkdmRXcY7ZLonQesuYezp59UooLxAVBcGuN6PH2tXN84mR3vyzSc6oSMUfA=="; + url = "https://registry.npmjs.org/mem/-/mem-8.1.1.tgz"; + sha512 = "qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA=="; }; }; "mem-fs-1.2.0" = { @@ -37675,22 +37801,13 @@ let sha512 = "b8g0jWKdl8pM0LqAPdK9i8ERL7nYrzmJfRhxMiWH2uYdfYnb7uXnmwVb0ZGe7xyEl4lj+nLIU3yf4zPUT+XsVQ=="; }; }; - "mem-fs-editor-6.0.0" = { + "mem-fs-editor-8.1.2" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "6.0.0"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-6.0.0.tgz"; - sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; - }; - }; - "mem-fs-editor-7.1.0" = { - name = "mem-fs-editor"; - packageName = "mem-fs-editor"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.1.0.tgz"; - sha512 = "BH6QEqCXSqGeX48V7zu+e3cMwHU7x640NB8Zk8VNvVZniz+p4FK60pMx/3yfkzo6miI6G3a8pH6z7FeuIzqrzA=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-8.1.2.tgz"; + sha512 = "owE6PKMRegrYb37Lsar3yLSwK9wLGvHkNIOzBO3ycFeoOwshdF8j593EqjU7ucFAf3ZvcFVwfpo8Q8LqgFQg0A=="; }; }; "memfs-3.2.2" = { @@ -37711,6 +37828,15 @@ let sha512 = "HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA=="; }; }; + "memoize-one-5.2.1" = { + name = "memoize-one"; + packageName = "memoize-one"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"; + sha512 = "zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="; + }; + }; "memoizeasync-1.1.0" = { name = "memoizeasync"; packageName = "memoizeasync"; @@ -38863,13 +38989,13 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-6.2.0" = { + "mobx-6.3.0" = { name = "mobx"; packageName = "mobx"; - version = "6.2.0"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-6.2.0.tgz"; - sha512 = "j5f16JIq2v4flvYCqaAB9tMtJt/y5efR2OO5Xy+w4/MBMeQ1WeGR0T8BtiNgmxM/OQzPFUKb5DTex9Y8a/yk+g=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.3.0.tgz"; + sha512 = "Aa1+VXsg4WxqJMTQfWoYuJi5UD10VZhiobSmcs5kcmI3BIT0aVtn7DysvCeDADCzl7dnbX+0BTHUj/v7gLlZpQ=="; }; }; "mobx-react-7.1.0" = { @@ -38980,13 +39106,13 @@ let sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; }; }; - "moize-6.0.1" = { + "moize-6.0.2" = { name = "moize"; packageName = "moize"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/moize/-/moize-6.0.1.tgz"; - sha512 = "Bl91P98A6Xba35mn9XoAW9DuGoQb3HyoY888TxrvQbMr9+1v3dzBzi9n4Guh5Lne8ENdqbXjQ0a8mf7UUvZ9wg=="; + url = "https://registry.npmjs.org/moize/-/moize-6.0.2.tgz"; + sha512 = "94jF5aP4ul90e24fFe+covFPp4u5bGzlcGUsn0u6fZgKcnQpJ9e1nX75vxqtlyOUr92ww3DPMF+ziE4OQOkkkA=="; }; }; "mold-source-map-0.4.0" = { @@ -39403,13 +39529,13 @@ let sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"; }; }; - "multiserver-3.7.0" = { + "multiserver-3.7.1" = { name = "multiserver"; packageName = "multiserver"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.0.tgz"; - sha512 = "70SSDMNT+e3VsDG4x7OKFW8+UqyZsBWfKD9rAvsRWCbMe9ySODheJCZ91Xyha5FrA32UtWIHGSY3m5jATfEmVQ=="; + url = "https://registry.npmjs.org/multiserver/-/multiserver-3.7.1.tgz"; + sha512 = "wc+s3NNXjYEFT6AmeW8fVVBTZWhfwwbFU0M0KurZH6jAbsnWYQnEsnN90iqFkSmHkAnPW2hvT4O+lAfWsf/lVQ=="; }; }; "multiserver-address-1.0.1" = { @@ -40124,22 +40250,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-6.1.18" = { + "netlify-6.1.20" = { name = "netlify"; packageName = "netlify"; - version = "6.1.18"; + version = "6.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-6.1.18.tgz"; - sha512 = "hVOf6l67ldiVfJPsMp4Ztunvv81hbGr5RGw2WUlR6b7Hp1bM1oaydEx/MrsLtVVDwy2KEYxkwcMY3m7CiHnh5g=="; + url = "https://registry.npmjs.org/netlify/-/netlify-6.1.20.tgz"; + sha512 = "a0WYQIcJIIEmK7MxUWD/4awyBeGTukolaTgl84SILrnT6WC/HQqK8bIEPVJ5IhmbZioJIcl4UZMaDyWuPin6Kw=="; }; }; - "netlify-redirect-parser-3.0.15" = { + "netlify-redirect-parser-3.0.17" = { name = "netlify-redirect-parser"; packageName = "netlify-redirect-parser"; - version = "3.0.15"; + version = "3.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.15.tgz"; - sha512 = "AWciaJpE83idl6VRPkZBW0TIOUZIPL30poFfruo/xMUJJuvgHw+wfExBnEpgXQ1sAdIWcZajhfKeLEXl1jWDLw=="; + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-3.0.17.tgz"; + sha512 = "tKAVgpZg2CmNi9QMmdeoN10FTvsXKX5m+dw+ytdN9hVXGy+CWeCN5d0jqIL7wPl6iCXu3MXIIQGC78Q6BB8WJw=="; }; }; "netlify-redirector-0.2.1" = { @@ -40349,13 +40475,13 @@ let sha512 = "zPpIr24OdcdM6lbg9QbFUGaLx9RueAkg1I4ZueuuB5452ZrxYfdwaBkhLGFCgpy3AaQ1w8HaY/8k2HmeyD9FXw=="; }; }; - "node-abi-2.21.0" = { + "node-abi-2.26.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.21.0"; + version = "2.26.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.21.0.tgz"; - sha512 = "smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.26.0.tgz"; + sha512 = "ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ=="; }; }; "node-addon-api-1.7.2" = { @@ -41169,22 +41295,13 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-api-1.0.1" = { - name = "npm-api"; - packageName = "npm-api"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.1.tgz"; - sha512 = "4sITrrzEbPcr0aNV28QyOmgn6C9yKiF8k92jn4buYAK8wmA5xo1qL3II5/gT1r7wxbXBflSduZ2K3FbtOrtGkA=="; - }; - }; - "npm-bundled-1.1.1" = { + "npm-bundled-1.1.2" = { name = "npm-bundled"; packageName = "npm-bundled"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz"; - sha512 = "gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA=="; + url = "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz"; + sha512 = "x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ=="; }; }; "npm-conf-1.1.3" = { @@ -41349,6 +41466,15 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; + "npm-registry-fetch-10.1.1" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "10.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz"; + sha512 = "F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg=="; + }; + }; "npm-registry-fetch-9.0.0" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; @@ -42169,13 +42295,13 @@ let sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; - "oo-ascii-tree-1.28.0" = { + "oo-ascii-tree-1.29.0" = { name = "oo-ascii-tree"; packageName = "oo-ascii-tree"; - version = "1.28.0"; + version = "1.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.28.0.tgz"; - sha512 = "lCeBgtQutG2+K7BOJDurYNfCepvckj7jWtq2VVP1kseLry/VbLzE/oLiXEeK6iWUXJbBE2IzmxwGuUwee293yw=="; + url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.29.0.tgz"; + sha512 = "DUwUL3Yc3lS2znWBlOi5eEU4pKoGGK2IaB/S7XygSBzmSS2jJE6+waAip17FNeNXfC4aXClr95HxZXamCLtYqQ=="; }; }; "opal-runtime-1.0.11" = { @@ -43375,13 +43501,13 @@ let sha512 = "HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ=="; }; }; - "packet-stream-2.0.5" = { + "packet-stream-2.0.6" = { name = "packet-stream"; packageName = "packet-stream"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.5.tgz"; - sha512 = "+4S+qBUdqD57ka5MDd6nAYGBPril5eyLpbga2y0kPyYhrKvjb8CYTP9r40WLbSxgT/qEGmvgWOrvQe+FYtCI7w=="; + url = "https://registry.npmjs.org/packet-stream/-/packet-stream-2.0.6.tgz"; + sha512 = "kSxHpoTqlgNEetMp77snCTVILwLw4dJX6pB/z1g1PRG5xylH8cf9upIPygt+epBC3l14XrcZH4/kQYSrzp2Ijg=="; }; }; "packet-stream-codec-1.1.3" = { @@ -43402,13 +43528,13 @@ let sha512 = "GfTeVQGJ6WyBQbQD4t3ocHbyOmTQLmWjkCKSZPmKiGFKYKNUaM5U2gbLzUW8WG1XmS9yQFnsTFA0k3o1+q4klQ=="; }; }; - "pacote-11.3.1" = { + "pacote-11.3.3" = { name = "pacote"; packageName = "pacote"; - version = "11.3.1"; + version = "11.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.3.1.tgz"; - sha512 = "TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.3.3.tgz"; + sha512 = "GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew=="; }; }; "pad-0.0.5" = { @@ -43429,15 +43555,6 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; - "paged-request-2.0.2" = { - name = "paged-request"; - packageName = "paged-request"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.2.tgz"; - sha512 = "NWrGqneZImDdcMU/7vMcAOo1bIi5h/pmpJqe7/jdsy85BA/s5MSaU/KlpxwW/IVPmIwBcq2uKPrBWWhEWhtxag=="; - }; - }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -43564,6 +43681,15 @@ let sha512 = "bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="; }; }; + "parse-conflict-json-1.1.1" = { + name = "parse-conflict-json"; + packageName = "parse-conflict-json"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-1.1.1.tgz"; + sha512 = "4gySviBiW5TRl7XHvp1agcS7SOe0KZOjC//71dzZVWJrY9hCrgtvl5v3SyIxCZ4fZF47TxD9nfzmxcx76xmbUw=="; + }; + }; "parse-english-4.2.0" = { name = "parse-english"; packageName = "parse-english"; @@ -43870,6 +43996,15 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; + "parse5-5.1.1" = { + name = "parse5"; + packageName = "parse5"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; + sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + }; + }; "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; @@ -44680,31 +44815,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-6.11.1" = { + "pino-6.11.2" = { name = "pino"; packageName = "pino"; - version = "6.11.1"; + version = "6.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.11.1.tgz"; - sha512 = "PoDR/4jCyaP1k2zhuQ4N0NuhaMtei+C9mUHBRRJQujexl/bq3JkeL2OC23ada6Np3zeUMHbO4TGzY2D/rwZX3w=="; - }; - }; - "pino-6.9.0" = { - name = "pino"; - packageName = "pino"; - version = "6.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-6.9.0.tgz"; - sha512 = "9RrRJsKOsgj50oGoR/y4EEVyUjMb/eRu8y4hjwPqM6q214xsxSxY/IKB+aEEv0slqNd4U0RVRfivKfy83UxgUQ=="; - }; - }; - "pino-std-serializers-2.5.0" = { - name = "pino-std-serializers"; - packageName = "pino-std-serializers"; - version = "2.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz"; - sha512 = "wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg=="; + url = "https://registry.npmjs.org/pino/-/pino-6.11.2.tgz"; + sha512 = "bmzxwbrIPxQUlAuMkF4PWVErUGERU4z37HazlhflKFg08crsNE3fACGN6gPwg5xtKOK47Ux5cZm8YCuLV4wWJg=="; }; }; "pino-std-serializers-3.2.0" = { @@ -44725,6 +44842,15 @@ let sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg=="; }; }; + "pipeline-pipe-0.1.5" = { + name = "pipeline-pipe"; + packageName = "pipeline-pipe"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/pipeline-pipe/-/pipeline-pipe-0.1.5.tgz"; + sha512 = "HFub9yAfxEWBZZmsA12dWiFpg9+er8Sp7bpVwKP41AsAeO6570PVhU2Ckkt8fMnHBwm1edLLg2wIfpNGCDvI0Q=="; + }; + }; "pipeworks-1.3.1" = { name = "pipeworks"; packageName = "pipeworks"; @@ -45149,13 +45275,13 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; - "postcss-8.2.7" = { + "postcss-8.2.10" = { name = "postcss"; packageName = "postcss"; - version = "8.2.7"; + version = "8.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-8.2.7.tgz"; - sha512 = "DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw=="; + url = "https://registry.npmjs.org/postcss/-/postcss-8.2.10.tgz"; + sha512 = "b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw=="; }; }; "postcss-calc-7.0.5" = { @@ -45653,13 +45779,13 @@ let sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg=="; }; }; - "postcss-selector-parser-6.0.4" = { + "postcss-selector-parser-6.0.5" = { name = "postcss-selector-parser"; packageName = "postcss-selector-parser"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; - sha512 = "gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw=="; + url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz"; + sha512 = "aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg=="; }; }; "postcss-svgo-4.0.3" = { @@ -45815,13 +45941,13 @@ let sha512 = "s8Aai8++QQGi4sSbs/M1Qku62PFK49Jm1CbgXklGz4nmHveDq0wzJkg7Na5QbnO1uNH8K7iqx2EQ/mV0MZEmOg=="; }; }; - "prebuild-install-6.1.1" = { + "prebuild-install-6.1.2" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "6.1.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.1.tgz"; - sha512 = "M+cKwofFlHa5VpTWub7GLg5RLcunYIcLqtY5pKcls/u7xaAb8FrXZ520qY8rkpYy5xw90tYCyMO0MP5ggzR3Sw=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-6.1.2.tgz"; + sha512 = "PzYWIKZeP+967WuKYXlTOhYBgGOvTRSfaKI89XnfJ0ansRAH7hDU45X+K+FZeI1Wb/7p/NnuctPH3g0IqKUuSQ=="; }; }; "precinct-6.3.1" = { @@ -45842,6 +45968,15 @@ let sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac"; }; }; + "preferred-pm-3.0.3" = { + name = "preferred-pm"; + packageName = "preferred-pm"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.0.3.tgz"; + sha512 = "+wZgbxNES/KlJs9q40F/1sfOd/j7f1O9JaHcW5Dsn3aUUOZg3L2bjpVUcKV2jvtElYfoTuQiNeMfQJ4kwUAhCQ=="; + }; + }; "prelude-ls-1.1.2" = { name = "prelude-ls"; packageName = "prelude-ls"; @@ -46328,6 +46463,15 @@ let sha512 = "W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q=="; }; }; + "promise-all-reject-late-1.0.1" = { + name = "promise-all-reject-late"; + packageName = "promise-all-reject-late"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz"; + sha512 = "vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw=="; + }; + }; "promise-breaker-5.0.0" = { name = "promise-breaker"; packageName = "promise-breaker"; @@ -46337,6 +46481,15 @@ let sha512 = "mgsWQuG4kJ1dtO6e/QlNDLFtMkMzzecsC69aI5hlLEjGHFNpHrvGhFi4LiK5jg2SMQj74/diH+wZliL9LpGsyA=="; }; }; + "promise-call-limit-1.0.1" = { + name = "promise-call-limit"; + packageName = "promise-call-limit"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-1.0.1.tgz"; + sha512 = "3+hgaa19jzCGLuSCbieeRsu5C2joKfYn8pY6JAuXFRVfF4IO+L7UPpFWNTeWT9pM7uhskvbPPd/oEOktCn317Q=="; + }; + }; "promise-deferred-2.0.3" = { name = "promise-deferred"; packageName = "promise-deferred"; @@ -47651,13 +47804,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.132" = { + "pyright-1.1.134" = { name = "pyright"; packageName = "pyright"; - version = "1.1.132"; + version = "1.1.134"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.132.tgz"; - sha512 = "quvG9Ip2NwKEShsLJ7eLlkQ/ST5SX84QCgO/k7gGqlCHwuifn9/v7LrzdpdFbkVnQR51egUNWwwLQRoIBT6vUA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.134.tgz"; + sha512 = "wQSdU6X3olAwCZy3tSA0fn8nMQGEwm01rm1dHM+aN2crzXIcUQ9sLOf+wCn5PFlLGsm/CXH7ROYmeMs3jXQ8Rw=="; }; }; "q-0.9.7" = { @@ -47939,13 +48092,13 @@ let sha512 = "NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A=="; }; }; - "quick-format-unescaped-4.0.3" = { + "quick-format-unescaped-4.0.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "4.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.3.tgz"; - sha512 = "MaL/oqh02mhEo5m5J2rwsVL23Iw2PEaGVHgT2vFt8AAsr0lfvQA5dpXo9TPu0rz7tSBdUPgkbam0j/fj5ZM8yg=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz"; + sha512 = "RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A=="; }; }; "quick-lru-1.1.0" = { @@ -48407,13 +48560,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.12.2" = { + "react-devtools-core-4.12.4" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.12.2"; + version = "4.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.12.2.tgz"; - sha512 = "cvAiJCSIIan2A22o4j4Twc7PdDrwqiAQVBeZ+osS2T/wv2Ua3a0J8Sgx4pTH5Y7VoWn5WiGCHkAW4S1lYl3kcA=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.12.4.tgz"; + sha512 = "hVCT7wRtA5xWclgLb3oA51RNBAlbuTauEYkqFX+qRAkPLVJoX8qdJnO7r+47SSUckD5vkBm3kaAhg6597m7gDA=="; }; }; "react-dom-16.14.0" = { @@ -48722,15 +48875,6 @@ let sha512 = "6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA=="; }; }; - "read-pkg-up-5.0.0" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-5.0.0.tgz"; - sha512 = "XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg=="; - }; - }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -49055,13 +49199,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redis-3.1.1" = { + "redis-3.1.2" = { name = "redis"; packageName = "redis"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-3.1.1.tgz"; - sha512 = "QhkKhOuzhogR1NDJfBD34TQJz2ZJwDhhIC6ZmvpftlmfYShHHQXjjNspAJ+Z2HH5NwSBVYBVganbiZ8bgFMHjg=="; + url = "https://registry.npmjs.org/redis/-/redis-3.1.2.tgz"; + sha512 = "grn5KoZLr/qrRQVwoSkmzdbw6pwF+/rwODtrOr6vuBRiR/f3rjSTGupbF90Zpqm2oenix8Do6RV7pYEkGwlKkw=="; }; }; "redis-commands-1.7.0" = { @@ -49127,13 +49271,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "redux-4.0.5" = { + "redux-4.1.0" = { name = "redux"; packageName = "redux"; - version = "4.0.5"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/redux/-/redux-4.0.5.tgz"; - sha512 = "VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w=="; + url = "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz"; + sha512 = "uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g=="; }; }; "reflect-metadata-0.1.13" = { @@ -49334,6 +49478,15 @@ let sha512 = "ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ=="; }; }; + "rehype-parse-6.0.2" = { + name = "rehype-parse"; + packageName = "rehype-parse"; + version = "6.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz"; + sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; + }; + }; "rehype-parse-7.0.1" = { name = "rehype-parse"; packageName = "rehype-parse"; @@ -50990,13 +51143,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.32.10" = { + "sass-1.32.11" = { name = "sass"; packageName = "sass"; - version = "1.32.10"; + version = "1.32.11"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.10.tgz"; - sha512 = "Nx0pcWoonAkn7CRp0aE/hket1UP97GiR1IFw3kcjV3pnenhWgZEWUf0ZcfPOV2fK52fnOcK3JdC/YYZ9E47DTQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz"; + sha512 = "O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw=="; }; }; "sax-0.5.8" = { @@ -51116,15 +51269,6 @@ let sha512 = "6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA=="; }; }; - "scoped-regex-1.0.0" = { - name = "scoped-regex"; - packageName = "scoped-regex"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz"; - sha1 = "a346bb1acd4207ae70bd7c0c7ca9e566b6baddb8"; - }; - }; "scoped-regex-2.1.0" = { name = "scoped-regex"; packageName = "scoped-regex"; @@ -51665,15 +51809,6 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "set-getter-0.1.0" = { - name = "set-getter"; - packageName = "set-getter"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; - sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; - }; - }; "set-immediate-shim-1.0.1" = { name = "set-immediate-shim"; packageName = "set-immediate-shim"; @@ -52574,13 +52709,13 @@ let sha512 = "1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q=="; }; }; - "snyk-gradle-plugin-3.14.0" = { + "snyk-gradle-plugin-3.14.2" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.14.0"; + version = "3.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz"; - sha512 = "2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.2.tgz"; + sha512 = "l/nivKDZz7e2wymrwP6g2WQD8qgaYeE22SnbZrfIpwGolif81U28A9FsRedwkxKyB/shrM0vGEoD3c3zI8NLBw=="; }; }; "snyk-module-3.1.0" = { @@ -52619,13 +52754,13 @@ let sha512 = "FdYa/7NibnJPqBfobyw5jgI1/rd0LpMZf2W4WYYLRc2Hz7LZjKAByPjIX6qoA+lB9SC7yk5HYwWj2n4Fbg/DDw=="; }; }; - "snyk-nuget-plugin-1.21.0" = { + "snyk-nuget-plugin-1.21.1" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.21.0"; + version = "1.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz"; - sha512 = "c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.1.tgz"; + sha512 = "nRtedIvrow5ODqOKkQWolKrxn8ZoNL3iNJGuW0jNhwv+/9K0XE1UORM5F1ENAsd+nzCSO/kiYAXCc5CNK8HWEw=="; }; }; "snyk-paket-parser-1.6.0" = { @@ -53636,13 +53771,13 @@ let sha1 = "475393ff9e91479aea62dcaf0ca3d14983a7fb40"; }; }; - "srcset-3.0.0" = { + "srcset-3.0.1" = { name = "srcset"; packageName = "srcset"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/srcset/-/srcset-3.0.0.tgz"; - sha512 = "D59vF08Qzu/C4GAOXVgMTLfgryt5fyWo93FZyhEWANo0PokFz/iWdDe13mX3O5TRf6l8vMTqckAfR4zPiaH0yQ=="; + url = "https://registry.npmjs.org/srcset/-/srcset-3.0.1.tgz"; + sha512 = "MM8wDGg5BQJEj94tDrZDrX9wrC439/Eoeg3sgmVLPMjHgrAFeXAKk3tmFlCbKw5k+yOEhPXRpPlRcisQmqWVSQ=="; }; }; "srt2vtt-1.3.1" = { @@ -53717,13 +53852,13 @@ let sha512 = "pJAFizB6OcuJLX4RJJuU9HWyPwM2CqLi/vs08lhVIR3TGxacxpavvK5LzbxT+Y3iWkBchOTKS5hHCigA5aaung=="; }; }; - "ssb-db2-2.0.2" = { + "ssb-db2-2.1.1" = { name = "ssb-db2"; packageName = "ssb-db2"; - version = "2.0.2"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.0.2.tgz"; - sha512 = "ylN4uqh18gJjDrkaYWsuEEMV4rCLcKuYIkL26hgtAVJm9AfuOTBIdhZZHdfeAMd2ZkcqAmIR62XUeQL3czvOsA=="; + url = "https://registry.npmjs.org/ssb-db2/-/ssb-db2-2.1.1.tgz"; + sha512 = "6A2vLmDpz454ttFV3iVEI0qCIPYgsOlBtM3PCKn0arRvBKQ86e3Grr1/gCcx68fz8yT4fTC1o9ikWiZ/uUGIdg=="; }; }; "ssb-ebt-5.6.7" = { @@ -55337,13 +55472,13 @@ let sha512 = "7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g=="; }; }; - "stylelint-13.12.0" = { + "stylelint-13.13.0" = { name = "stylelint"; packageName = "stylelint"; - version = "13.12.0"; + version = "13.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz"; - sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.0.tgz"; + sha512 = "jvkM1iuH88vAvjdKPwPm6abiMP2/D/1chbfb+4GVONddOOskHuCXc0loyrLdxO1AwwH6jdnjYskkTKHQD7cXwQ=="; }; }; "stylelint-8.4.0" = { @@ -55661,13 +55796,13 @@ let sha512 = "SROWH0rB0DJ+0Ii264cprmNu/NJyZacs5wFD71ya93Cg/oA2lKHgQm4F6j0EWA4ktFMzeuJJm/eX6fka39hEHA=="; }; }; - "svelte2tsx-0.1.186" = { + "svelte2tsx-0.1.188" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.1.186"; + version = "0.1.188"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.186.tgz"; - sha512 = "E4BmTNmIg6yHEqazhcQ8S60GI7AaV2JKf2y5deOyr3o2zpow4gGyz7yE0uSnFDdqp2iafCD7PImWZ/v1R6uQVw=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.1.188.tgz"; + sha512 = "+clvG/h9Z02fhx8sxDruKppheCcAXWhkKNjz9f3R4jdwVJgTHbr66qgewIjN1i2Id3D9tBKnKgaghm8H1W55sA=="; }; }; "sver-compat-1.5.0" = { @@ -55985,13 +56120,22 @@ let sha512 = "F3cLs9a3hL1Z7N4+EkSscsel3z55XT950AvB05bwayrNg5T1/gykXtigioTAjbltvbMSJvvhFCbnf6mX+ntnJQ=="; }; }; - "table-6.1.0" = { + "table-6.4.0" = { name = "table"; packageName = "table"; - version = "6.1.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-6.1.0.tgz"; - sha512 = "T4G5KMmqIk6X87gLKWyU5exPpTjLjY5KyrFWaIjv3SvgaIUGXV7UEzGEnZJdTA38/yUS6f9PlKezQ0bYXG3iIQ=="; + url = "https://registry.npmjs.org/table/-/table-6.4.0.tgz"; + sha512 = "/Vfr23BDjJT2kfsCmYtnJqEPdD/8Dh/MDIQxfcbe+09lZUel6gluquwdMTrLERBw623Nv34DLGZ11krWn5AAqw=="; + }; + }; + "table-6.5.1" = { + name = "table"; + packageName = "table"; + version = "6.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/table/-/table-6.5.1.tgz"; + sha512 = "xGDXWTBJxahkzPQCsn1S9ESHEenU7TbMD5Iv4FeopXv/XwJyWatFjfbor+6ipI10/MNPXBYUamYukOrbPZ9L/w=="; }; }; "table-layout-0.4.5" = { @@ -56076,24 +56220,6 @@ let sha1 = "b4d4f0deed206ae7df775b129ea2ca6de52f26dd"; }; }; - "tap-bail-1.0.0" = { - name = "tap-bail"; - packageName = "tap-bail"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tap-bail/-/tap-bail-1.0.0.tgz"; - sha1 = "c5a8cc71191f037938cd567f97bda3ca9700199a"; - }; - }; - "tap-parser-5.4.0" = { - name = "tap-parser"; - packageName = "tap-parser"; - version = "5.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tap-parser/-/tap-parser-5.4.0.tgz"; - sha512 = "BIsIaGqv7uTQgTW1KLTMNPSEQf4zDDPgYOBRdgOfuB+JFOLRBfEu6cLa/KvMvmqggu1FKXDfitjLwsq4827RvA=="; - }; - }; "tapable-0.2.9" = { name = "tapable"; packageName = "tapable"; @@ -56580,13 +56706,13 @@ let sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; }; }; - "textextensions-2.6.0" = { + "textextensions-5.12.0" = { name = "textextensions"; packageName = "textextensions"; - version = "2.6.0"; + version = "5.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/textextensions/-/textextensions-2.6.0.tgz"; - sha512 = "49WtAWS+tcsy93dRt6P0P3AMD2m5PvXRhuEA0kaXos5ZLlujtYmpmFsB+QvWUSxE1ZsstmYXfQ7L40+EcQgpAQ=="; + url = "https://registry.npmjs.org/textextensions/-/textextensions-5.12.0.tgz"; + sha512 = "IYogUDaP65IXboCiPPC0jTLLBzYlhhw2Y4b0a2trPgbHNGGGEfuHE6tds+yDcCf4mpNDaGISFzwSSezcXt+d6w=="; }; }; "textlint-rule-helper-1.2.0" = { @@ -56616,6 +56742,15 @@ let sha512 = "PW6rXqLNGL3xZ6d5/INrX+pt8qbffmeDPLcvkBOlfNpDRFhVvNNjFmZXH86ZQjrOz9t/nNZDBXqnzqJuioJbSQ=="; }; }; + "textlint-util-to-string-3.1.1" = { + name = "textlint-util-to-string"; + packageName = "textlint-util-to-string"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/textlint-util-to-string/-/textlint-util-to-string-3.1.1.tgz"; + sha512 = "mHE7/pDw/Hk+Q6YdSMNRrZPl5bCuWnFLbF+bxW+MsWQ64dw+Ia9irkammYbH5I0hVMMcfwb0MQc5nbsjqgWeyQ=="; + }; + }; "then-fs-2.0.0" = { name = "then-fs"; packageName = "then-fs"; @@ -57660,6 +57795,15 @@ let sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A=="; }; }; + "treeverse-1.0.4" = { + name = "treeverse"; + packageName = "treeverse"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/treeverse/-/treeverse-1.0.4.tgz"; + sha512 = "whw60l7r+8ZU8Tu/Uc2yxtc4ZTZbR/PF3u1IPNKGQ6p8EICLb3Z2lAgoqw9bqYd8IkgnsaOcLzYHFckjqNsf0g=="; + }; + }; "trim-0.0.1" = { name = "trim"; packageName = "trim"; @@ -58371,13 +58515,13 @@ let sha512 = "7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g=="; }; }; - "typegram-3.2.3" = { + "typegram-3.2.4" = { name = "typegram"; packageName = "typegram"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/typegram/-/typegram-3.2.3.tgz"; - sha512 = "zlkY7vNTLcwQhLUyYXAUzRelzH752LBFl8m4u04d5g5P7lM9bGegeIRwzd3mVCHJH6R3s48pKeFTVSdVlN+omg=="; + url = "https://registry.npmjs.org/typegram/-/typegram-3.2.4.tgz"; + sha512 = "UkWgXIXZYwXK0q6zyZ4xtlETAmmgAt1Y4EFL5Ia87bIort1HHBw+RAMnO7eC1PYogCAKPSCeCSBAZVIoxQ/Dvw=="; }; }; "typescript-2.9.2" = { @@ -59082,13 +59226,13 @@ let sha512 = "uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg=="; }; }; - "unist-util-filter-0.2.1" = { + "unist-util-filter-2.0.3" = { name = "unist-util-filter"; packageName = "unist-util-filter"; - version = "0.2.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-filter/-/unist-util-filter-0.2.1.tgz"; - sha1 = "e2f7876828903a6a9308e362051f86b14f35b545"; + url = "https://registry.npmjs.org/unist-util-filter/-/unist-util-filter-2.0.3.tgz"; + sha512 = "8k6Jl/KLFqIRTHydJlHh6+uFgqYHq66pV75pZgr1JwfyFSjbWb12yfb0yitW/0TbHXjr9U4G9BQpOvMANB+ExA=="; }; }; "unist-util-find-1.0.2" = { @@ -59136,15 +59280,6 @@ let sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; }; }; - "unist-util-is-1.0.0" = { - name = "unist-util-is"; - packageName = "unist-util-is"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-1.0.0.tgz"; - sha1 = "4c7b3c5c0f6aa963640056fe4af7b5fcfdbb8ef0"; - }; - }; "unist-util-is-2.1.3" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -59811,13 +59946,13 @@ let sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; }; }; - "url-toolkit-2.2.1" = { + "url-toolkit-2.2.2" = { name = "url-toolkit"; packageName = "url-toolkit"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.1.tgz"; - sha512 = "8+DzgrtDZYZGhHaAop5WGVghMdCfOLGbhcArsJD0qDll71FXa7EeKxi2hilPIscn2nwMz4PRjML32Sz4JTN0Xw=="; + url = "https://registry.npmjs.org/url-toolkit/-/url-toolkit-2.2.2.tgz"; + sha512 = "l25w6Sy+Iy3/IbogunxhWwljPaDnqpiKvrQRoLBm6DfISco7NyRIS7Zf6+Oxhy1T8kHxWdwLND7ZZba6NjXMug=="; }; }; "urlencode-1.1.0" = { @@ -60748,6 +60883,24 @@ let sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5"; }; }; + "version-compare-1.1.0" = { + name = "version-compare"; + packageName = "version-compare"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/version-compare/-/version-compare-1.1.0.tgz"; + sha512 = "zVKtPOJTC9x23lzS4+4D7J+drq80BXVYAmObnr5zqxxFVH7OffJ1lJlAS7LYsQNV56jx/wtbw0UV7XHLrvd6kQ=="; + }; + }; + "version-range-1.1.0" = { + name = "version-range"; + packageName = "version-range"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/version-range/-/version-range-1.1.0.tgz"; + sha512 = "R1Ggfg2EXamrnrV3TkZ6yBNgITDbclB3viwSjbZ3+eK0VVNK4ajkYJTnDz5N0bIMYDtK9MUBvXJUnKO5RWWJ6w=="; + }; + }; "vfile-1.4.0" = { name = "vfile"; packageName = "vfile"; @@ -61081,22 +61234,22 @@ let sha512 = "DTMa8QbVmujFPvD3NxoC5jjIXCyCG+cvn3hNzwQRhvhsk8LblNymBZBwzfcDdgEtqsi4O/2AB5HnMIRzxhzEzg=="; }; }; - "vscode-debugadapter-testsupport-1.46.0" = { + "vscode-debugadapter-testsupport-1.47.0" = { name = "vscode-debugadapter-testsupport"; packageName = "vscode-debugadapter-testsupport"; - version = "1.46.0"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.46.0.tgz"; - sha512 = "6n+uu4+Q5sZvN2FgFLNJkyaE6AECYzFh+Hfv+IeJoVKA7KNiQ1SNd3yTsvSFxkS00LmVU6V00XGaqZRlwM15Jg=="; + url = "https://registry.npmjs.org/vscode-debugadapter-testsupport/-/vscode-debugadapter-testsupport-1.47.0.tgz"; + sha512 = "zhEuaMt2RCOcJoTZ5p35k2WhCzk51UN1PlrtwfWJ8fiFhjDvXIG+682Wkq1VyL12EhTf4qOLMLn0X4JlX7eJ6g=="; }; }; - "vscode-debugprotocol-1.46.0" = { + "vscode-debugprotocol-1.47.0" = { name = "vscode-debugprotocol"; packageName = "vscode-debugprotocol"; - version = "1.46.0"; + version = "1.47.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.46.0.tgz"; - sha512 = "V10u1L679DJZfOtQXhKylJPMqNbhazav4mRxPrBE8/Jpznow1b1j1EGDDvJ4prQ623CLAnvpFfVkVQ+CX3xdtg=="; + url = "https://registry.npmjs.org/vscode-debugprotocol/-/vscode-debugprotocol-1.47.0.tgz"; + sha512 = "ii7oCz3Wfr/SGtFr5AYop5dJm0dUmpg0hq2lTzTBdaht8nSheYMMjPntxULBR+2TUxXLcCKFZkF2UEJQduYsIQ=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -61144,13 +61297,13 @@ let sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA=="; }; }; - "vscode-json-languageservice-4.0.2" = { + "vscode-json-languageservice-4.1.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.0.2.tgz"; - sha512 = "d8Ahw990Cq/G60CzN26rehXcbhbMgMGMmXeN6C/V/RYZUhfs16EELRK+EL7b/3Y8ZGshtKqboePSeDVa94qqFg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.0.tgz"; + sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -61666,6 +61819,15 @@ let sha512 = "ttGcuHA/OBnN2pcM6johpYlEms7XpO5/fyKIr48541xXedan4roO8cS1Q2S/zbbjGH/BarYDAMeS2Mi9HE5Tig=="; }; }; + "walk-up-path-1.0.0" = { + name = "walk-up-path"; + packageName = "walk-up-path"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/walk-up-path/-/walk-up-path-1.0.0.tgz"; + sha512 = "hwj/qMDUEjCU5h0xr90KGCf0tg0/LgJbmOWgrWKYlcJZM7XvquvUJZ0G/HMGr7F7OQMOUuPHWP9JpriinkAlkg=="; + }; + }; "walker-1.0.7" = { name = "walker"; packageName = "walker"; @@ -62071,13 +62233,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.117.0" = { + "webtorrent-0.118.0" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.117.0"; + version = "0.118.0"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.117.0.tgz"; - sha512 = "CeBZP6rr1n0qAq747YjXZcDwMmUIi0d3x38qtEb8zrjjURSDd81vmtT1Y9LPJoYsY55jaYtUHGp4Ht6agQ3vWg=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.118.0.tgz"; + sha512 = "xXwwM2P+vtDsMRx9eRPNQqHD+6E7Zz7OTZqWAr2XDXg3TWGCf9HmwpgV53+F9H0oqw+l4j7vR9DRjAjChPQpZA=="; }; }; "well-known-symbols-2.0.0" = { @@ -62242,6 +62404,15 @@ let sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; }; }; + "which-pm-2.0.0" = { + name = "which-pm"; + packageName = "which-pm"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/which-pm/-/which-pm-2.0.0.tgz"; + sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w=="; + }; + }; "which-pm-runs-1.0.0" = { name = "which-pm-runs"; packageName = "which-pm-runs"; @@ -63088,13 +63259,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.32" = { + "xdl-59.0.34" = { name = "xdl"; packageName = "xdl"; - version = "59.0.32"; + version = "59.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.32.tgz"; - sha512 = "BY6tKRFueOlyua1btLEhdO5O7HdR/JfbCkMnRN9/slqHSPt7riL2maCKYYeT/HtvEXiww8Wrj0g6sJ97gqG/7g=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.34.tgz"; + sha512 = "gcnWDPydwr/0JAwTv0vbWU8PaYjiRWSSjwzsIcnqlh5aZZdMfEle+TwfXRhPwJm5jut4BgnzOfQqMV8CfXKbXQ=="; }; }; "xenvar-0.5.1" = { @@ -63782,13 +63953,13 @@ let sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; - "yargs-7.1.1" = { + "yargs-7.1.2" = { name = "yargs"; packageName = "yargs"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-7.1.1.tgz"; - sha512 = "huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g=="; + url = "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz"; + sha512 = "ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA=="; }; }; "yargs-parser-10.1.0" = { @@ -63872,13 +64043,13 @@ let sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; }; }; - "yargs-parser-5.0.0-security.0" = { + "yargs-parser-5.0.1" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "5.0.0-security.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz"; - sha512 = "T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz"; + sha512 = "wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA=="; }; }; "yargs-parser-7.0.0" = { @@ -63989,22 +64160,13 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.10.3" = { + "yeoman-environment-3.2.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.10.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.10.3.tgz"; - sha512 = "pLIhhU9z/G+kjOXmJ2bPFm3nejfbH+f1fjYRSOteEXDBrv1EoJE/e+kuHixSXfCYfTkxjYsvRaDX+1QykLCnpQ=="; - }; - }; - "yeoman-generator-4.13.0" = { - name = "yeoman-generator"; - packageName = "yeoman-generator"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.13.0.tgz"; - sha512 = "f2/5N5IR3M2Ozm+QocvZQudlQITv2DwI6Mcxfy7R7gTTzaKgvUpgo/pQMJ+WQKm0KN0YMWCFOZpj0xFGxevc1w=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-3.2.0.tgz"; + sha512 = "Z2G4qgbjSLQ0BOiPQ4PCbqSYNhOP/HeWItu/hrlBv1gtBK6c3vkHSLioX8SduVYOKrn04X4H7cIG7hXpD3RsOQ=="; }; }; "yn-3.1.1" = { @@ -64088,13 +64250,13 @@ let sha512 = "Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg=="; }; }; - "zeromq-5.2.7" = { + "zeromq-5.2.8" = { name = "zeromq"; packageName = "zeromq"; - version = "5.2.7"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.7.tgz"; - sha512 = "z0R3qtmy4SFgYa/oDjxWFAAGjQb0IU1sJ0XVLflp3W72f2ALXHJzKPgcyCdgMQZTnvSULpZP2HbIYdemLtbBiQ=="; + url = "https://registry.npmjs.org/zeromq/-/zeromq-5.2.8.tgz"; + sha512 = "bXzsk7KOmgLSv1tC0Ms1VXBy90+Rz27ZYf27cLuldRYbpqYpuWJfxxHFhO710t22zgWBnmdUP0m3SKFpLI0u5g=="; }; }; "zerr-1.0.4" = { @@ -64175,15 +64337,15 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "11.2.9"; + version = "11.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.9.tgz"; - sha512 = "jSX8HFRYSbbamKLhzgPZ2zEsXDtJzspwnzFROJfOpe9fQkMFo8wiOkmY2amyaNzAMyooHXerRcRDWkRTyQj3Jg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-11.2.10.tgz"; + sha512 = "x7u36KmX1iiyDZhkeB6yXRrNj1no+mf6arnAvJYXH2JxqsZDqp19hP8b1QcGVMSl9CZUT/vA0KT3XuI4aJ6TfQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1102.9" - sources."@angular-devkit/core-11.2.9" - sources."@angular-devkit/schematics-11.2.9" + sources."@angular-devkit/architect-0.1102.10" + sources."@angular-devkit/core-11.2.10" + sources."@angular-devkit/schematics-11.2.10" sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.8" // { dependencies = [ @@ -64198,13 +64360,13 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - (sources."@npmcli/run-script-1.8.4" // { + (sources."@npmcli/run-script-1.8.5" // { dependencies = [ sources."read-package-json-fast-2.0.2" ]; }) - sources."@schematics/angular-11.2.9" - sources."@schematics/update-0.1102.9" + sources."@schematics/angular-11.2.10" + sources."@schematics/update-0.1102.10" sources."@tootallnate/once-1.1.2" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" @@ -64238,7 +64400,7 @@ in sources."builtins-1.0.3" sources."cacache-15.0.6" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."clean-stack-2.2.0" @@ -64313,7 +64475,7 @@ in sources."ini-2.0.0" sources."inquirer-7.3.3" sources."ip-1.1.5" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" @@ -64358,7 +64520,7 @@ in sources."mute-stream-0.0.8" sources."node-gyp-7.1.2" sources."nopt-5.0.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" @@ -65000,7 +65162,7 @@ in sources."@angular-devkit/core-11.2.6" (sources."@angular-devkit/schematics-11.2.6" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."ora-5.3.0" ]; }) @@ -65021,7 +65183,7 @@ in dependencies = [ sources."@angular-devkit/core-11.2.4" sources."@angular-devkit/schematics-11.2.4" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."ora-5.3.0" ]; }) @@ -65050,7 +65212,7 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.1.1" + sources."acorn-8.2.1" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" sources."ansi-colors-4.1.1" @@ -65065,11 +65227,11 @@ in sources."bl-4.1.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."buffer-5.7.1" sources."buffer-from-1.1.1" sources."callsites-3.1.0" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."chalk-3.0.0" sources."chardet-0.7.0" sources."chokidar-3.5.1" @@ -65089,10 +65251,10 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - (sources."enhanced-resolve-5.7.0" // { + (sources."enhanced-resolve-5.8.0" // { dependencies = [ sources."tapable-2.2.0" ]; @@ -65117,7 +65279,7 @@ in sources."fill-range-7.0.1" (sources."fork-ts-checker-webpack-plugin-6.2.0" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."fs-extra-9.1.0" @@ -65140,7 +65302,7 @@ in sources."inherits-2.0.4" (sources."inquirer-7.3.3" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" ]; @@ -65148,7 +65310,7 @@ in sources."interpret-1.4.0" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -65171,7 +65333,7 @@ in sources."lodash.toarray-4.4.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."lru-cache-6.0.0" @@ -65195,7 +65357,7 @@ in sources."onetime-5.1.2" (sources."ora-5.4.0" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."os-name-4.0.0" @@ -65269,7 +65431,7 @@ in sources."tsconfig-paths-3.9.0" (sources."tsconfig-paths-webpack-plugin-3.5.1" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."tslib-1.14.1" @@ -65319,28 +65481,28 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - (sources."@apollo/protobufjs-1.0.5" // { + (sources."@apollo/protobufjs-1.2.0" // { dependencies = [ sources."@types/node-10.17.58" ]; }) - sources."@apollographql/apollo-tools-0.4.9" + sources."@apollographql/apollo-tools-0.4.12" sources."@apollographql/graphql-playground-html-1.6.27" sources."@apollographql/graphql-upload-8-fork-8.1.3" sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.15" - sources."@babel/generator-7.13.9" + sources."@babel/core-7.13.16" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.13.13" + sources."@babel/helper-compilation-targets-7.13.16" sources."@babel/helper-create-class-features-plugin-7.13.11" sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-define-polyfill-provider-0.2.0" sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -65354,9 +65516,9 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" sources."@babel/plugin-proposal-class-properties-7.13.0" @@ -65388,10 +65550,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -65423,17 +65585,17 @@ in sources."@babel/preset-flow-7.13.13" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.13.0" - (sources."@babel/register-7.13.14" // { + (sources."@babel/register-7.13.16" // { dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.13.10" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" @@ -65487,7 +65649,7 @@ in sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.4" sources."@types/node-14.14.41" - (sources."@types/node-fetch-2.5.7" // { + (sources."@types/node-fetch-2.5.8" // { dependencies = [ sources."form-data-3.0.1" ]; @@ -65532,8 +65694,14 @@ in sources."ansi-styles-3.2.1" sources."apollo-cache-control-0.12.0" sources."apollo-datasource-0.8.0" - sources."apollo-env-0.6.6" - sources."apollo-graphql-0.6.1" + sources."apollo-env-0.9.0" + (sources."apollo-graphql-0.6.1" // { + dependencies = [ + sources."@types/node-fetch-2.5.7" + sources."apollo-env-0.6.6" + sources."form-data-3.0.1" + ]; + }) sources."apollo-link-1.2.14" sources."apollo-reporting-protobuf-0.6.2" (sources."apollo-server-caching-0.6.0" // { @@ -65616,7 +65784,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -65636,7 +65804,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."caseless-0.12.0" sources."caw-2.0.1" sources."chalk-2.4.2" @@ -65666,6 +65834,7 @@ in sources."clipboard-2.0.8" sources."cliui-7.0.4" sources."clone-1.0.4" + sources."clone-deep-4.0.1" sources."clone-response-1.0.2" sources."cmd-shim-3.0.3" sources."collection-visit-1.0.0" @@ -65693,8 +65862,8 @@ in sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.10.1" - (sources."core-js-compat-3.10.1" // { + sources."core-js-3.11.0" + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -65765,7 +65934,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -65941,7 +66110,7 @@ in (sources."inquirer-7.3.3" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -65960,7 +66129,7 @@ in sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -66280,6 +66449,7 @@ in sources."set-value-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shell-quote-1.7.2" @@ -66664,12 +66834,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - sources."@babel/generator-7.13.9" + sources."@babel/generator-7.13.16" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/template-7.12.13" - sources."@babel/types-7.13.14" + sources."@babel/types-7.13.17" sources."@webassemblyjs/ast-1.11.0" sources."@webassemblyjs/floating-point-hex-parser-1.11.0" sources."@webassemblyjs/helper-api-error-1.11.0" @@ -66690,7 +66860,6 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.21" sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -66746,17 +66915,17 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.9" // { + (sources."@babel/generator-7.13.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-compilation-targets-7.13.13" + sources."@babel/helper-compilation-targets-7.13.16" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-member-expression-to-functions-7.13.12" @@ -66768,20 +66937,20 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" sources."async-3.2.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.4" - sources."caniuse-lite-1.0.30001209" + sources."browserslist-4.16.5" + sources."caniuse-lite-1.0.30001214" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -66792,7 +66961,7 @@ in sources."convert-source-map-1.7.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -66819,7 +66988,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.8" sources."is-3.3.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" (sources."jake-10.8.2" // { @@ -66932,7 +67101,7 @@ in sources."tslib-2.2.0" ]; }) - (sources."aws-sdk-2.888.0" // { + (sources."aws-sdk-2.892.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -66952,7 +67121,7 @@ in sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."bytes-3.1.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.5" sources."cheerio-select-tmp-0.1.1" @@ -67121,10 +67290,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "8.0.6"; + version = "8.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.6.tgz"; - sha512 = "sl/gbf3fqpdnbzeBxlxN8epCQfYbTTMAj0Pix721LC0OGmLq0ePeXJIPvLrObYTU2AB57p0jV6NEWWf9eVKkcQ=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-8.0.8.tgz"; + sha512 = "v52KtlVv4Sdp0GaqH9vPYSwOCgIvTruMX0yv8ev+GguqY1kV+mCykCIFW3++ysu97pog00LhImvFbxndAU68rA=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -67255,7 +67424,7 @@ in dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."is-fullwidth-code-point-3.0.0" sources."string-width-4.2.2" sources."strip-ansi-6.0.0" @@ -67335,7 +67504,7 @@ in sources."create-hmac-1.1.7" sources."crypto-js-4.0.0" sources."crypto-random-string-2.0.0" - sources."csv-parse-4.15.3" + sources."csv-parse-4.15.4" sources."cycle-1.0.3" sources."dashdash-1.14.1" sources."debug-2.6.9" @@ -67447,7 +67616,7 @@ in sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."external-editor-3.1.0" @@ -67462,7 +67631,7 @@ in sources."tmp-0.0.33" ]; }) - (sources."invoices-1.1.7" // { + (sources."invoices-1.2.0" // { dependencies = [ sources."bech32-2.0.0" sources."bn.js-5.2.0" @@ -67538,8 +67707,10 @@ in sources."@grpc/proto-loader-0.6.0" sources."@types/node-14.14.37" sources."@types/ws-7.4.1" + sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."bolt09-0.1.4" + sources."invoices-1.1.7" sources."lightning-3.3.4" ]; }) @@ -67550,15 +67721,25 @@ in }) (sources."ln-telegram-3.2.2" // { dependencies = [ + sources."ajv-8.1.0" + sources."ansi-regex-5.0.0" sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" sources."bolt07-1.7.1" + sources."bolt09-0.1.4" + sources."invoices-1.1.7" + sources."is-fullwidth-code-point-3.0.0" + sources."json-schema-traverse-1.0.0" (sources."ln-service-51.5.0" // { dependencies = [ + sources."bolt09-0.1.3" sources."invoices-1.1.6" ]; }) + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."table-6.0.9" ]; }) sources."lodash-4.17.21" @@ -67638,9 +67819,12 @@ in sources."asyncjs-util-1.2.4" sources."bech32-2.0.0" sources."bn.js-5.2.0" + sources."bolt09-0.1.4" + sources."invoices-1.1.7" (sources."ln-service-51.5.0" // { dependencies = [ sources."bolt07-1.7.1" + sources."bolt09-0.1.3" sources."invoices-1.1.6" ]; }) @@ -67718,7 +67902,7 @@ in sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - (sources."table-6.0.9" // { + (sources."table-6.4.0" // { dependencies = [ sources."ajv-8.1.0" sources."ansi-regex-5.0.0" @@ -67760,13 +67944,13 @@ in sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typeforce-1.18.0" - sources."typegram-3.2.3" + sources."typegram-3.2.4" sources."unique-string-2.0.0" sources."unpipe-1.0.0" (sources."update-notifier-5.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."import-lazy-2.1.0" sources."semver-7.3.5" sources."supports-color-7.2.0" @@ -68036,7 +68220,7 @@ in sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -68239,7 +68423,7 @@ in sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-callable-1.2.3" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.8" sources."is-negative-zero-2.0.1" @@ -68357,17 +68541,17 @@ in btc-rpc-explorer = nodeEnv.buildNodePackage { name = "btc-rpc-explorer"; packageName = "btc-rpc-explorer"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.1.0.tgz"; - sha512 = "LKY3+CWOAe6A7SaXRYHZSu27TNeBrUl3LkYTOvRZAIatNNwaM1dTCxUjNRBsnsHCp0Tp9/UGLncLaf2wJ1BLcg=="; + url = "https://registry.npmjs.org/btc-rpc-explorer/-/btc-rpc-explorer-3.1.1.tgz"; + sha512 = "QHoiW1H2P6Sx7L5IEvbZnnQsfy7eaibY/KS2UAX9VINXNdGS9RxqEdLOe9yTdcy5pzIFpQKIBspOnHcBOjVa8A=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/parser-7.13.16" + sources."@babel/types-7.13.17" sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@types/minimist-1.2.1" @@ -68566,7 +68750,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-expression-4.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-plain-obj-1.1.0" @@ -68696,7 +68880,7 @@ in }) sources."readable-stream-3.6.0" sources."redent-3.0.0" - sources."redis-3.1.1" + sources."redis-3.1.2" sources."redis-commands-1.7.0" sources."redis-errors-1.2.0" sources."redis-parser-3.0.0" @@ -68967,7 +69151,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -69237,7 +69421,7 @@ in sha512 = "Oo/tO5aqmjsBORN93dSnidF7+2u77Q9zwUn9VbCQkZqCNfeZZcwIV9AG108hMYwtcXqtKQC7wevX6rmi9l8lng=="; }; dependencies = [ - sources."@jsii/spec-1.28.0" + sources."@jsii/spec-1.29.0" sources."@types/node-10.17.58" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -69250,7 +69434,7 @@ in sources."cdk8s-1.0.0-beta.11" sources."cliui-7.0.4" sources."clone-2.1.2" - (sources."codemaker-1.28.0" // { + (sources."codemaker-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" ]; @@ -69308,37 +69492,37 @@ in sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."isarray-2.0.5" - (sources."jsii-1.28.0" // { + (sources."jsii-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.28.0" // { + (sources."jsii-pacmak-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.28.0" // { + (sources."jsii-reflect-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.28.0" // { + (sources."jsii-rosetta-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.255" // { + (sources."jsii-srcmak-0.1.257" // { dependencies = [ sources."fs-extra-9.1.0" ]; }) sources."json-schema-0.2.5" - sources."json2jsii-0.1.188" + sources."json2jsii-0.1.219" sources."jsonfile-6.1.0" sources."jsonschema-1.4.0" sources."locate-path-5.0.0" @@ -69354,7 +69538,7 @@ in sources."object-is-1.1.5" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."oo-ascii-tree-1.28.0" + sources."oo-ascii-tree-1.29.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -69424,18 +69608,19 @@ in cdktf-cli = nodeEnv.buildNodePackage { name = "cdktf-cli"; packageName = "cdktf-cli"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.2.2.tgz"; - sha512 = "tkUGs4+739C+3lklwQQM/wLgp41maVlJUK/2cCzuNxVBgobLXBxn55lHxbmEuh2Ddc8PtNV31uzHzn1f2ZzdfQ=="; + url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.3.0.tgz"; + sha512 = "8ZICMcjBkKMBzzyVQfa3CGb/kkxBfvr7nxvOLpyEO1ecJt4E1gkrAwsKb8oVX/zfQ371UJqrqJxwBwb+OUT5Wg=="; }; dependencies = [ - sources."@cdktf/hcl2json-0.2.2" - sources."@jsii/spec-1.28.0" + sources."@cdktf/hcl2json-0.3.0" + sources."@jsii/spec-1.29.0" sources."@skorfmann/ink-confirm-input-3.0.0" - sources."@skorfmann/terraform-cloud-1.9.1" + sources."@skorfmann/terraform-cloud-1.10.0" sources."@types/node-14.14.41" sources."@types/node-fetch-2.5.10" + sources."@types/yauzl-2.9.1" sources."@types/yoga-layout-1.9.2" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -69468,8 +69653,8 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."case-1.6.3" - sources."cdktf-0.2.2" - sources."chalk-4.1.0" + sources."cdktf-0.3.0" + sources."chalk-4.1.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" sources."cli-cursor-3.1.0" @@ -69490,7 +69675,7 @@ in sources."commonmark-0.29.3" sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - sources."constructs-3.3.71" + sources."constructs-3.3.75" sources."convert-to-spaces-1.0.2" sources."core-util-is-1.0.2" sources."crc-32-1.2.0" @@ -69521,6 +69706,8 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-2.0.0" sources."exit-on-epipe-1.0.1" + sources."extract-zip-2.0.1" + sources."fd-slicer-1.1.0" sources."find-up-4.1.0" sources."flatted-2.0.2" sources."follow-redirects-1.13.3" @@ -69532,6 +69719,7 @@ in sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" + sources."get-stream-5.2.0" sources."glob-7.1.6" sources."graceful-fs-4.2.6" sources."has-1.0.3" @@ -69570,7 +69758,7 @@ in sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."js-tokens-4.0.0" - (sources."jsii-1.28.0" // { + (sources."jsii-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69578,10 +69766,10 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-pacmak-1.28.0" // { + (sources."jsii-pacmak-1.29.0" // { dependencies = [ sources."camelcase-6.2.0" - sources."codemaker-1.28.0" + sources."codemaker-1.29.0" sources."decamelize-5.0.0" sources."escape-string-regexp-4.0.0" sources."fs-extra-9.1.0" @@ -69590,7 +69778,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-reflect-1.28.0" // { + (sources."jsii-reflect-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69598,7 +69786,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-rosetta-1.28.0" // { + (sources."jsii-rosetta-1.29.0" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69606,7 +69794,7 @@ in sources."yargs-16.2.0" ]; }) - (sources."jsii-srcmak-0.1.255" // { + (sources."jsii-srcmak-0.1.257" // { dependencies = [ sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" @@ -69648,7 +69836,7 @@ in sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-5.1.2" - sources."oo-ascii-tree-1.28.0" + sources."oo-ascii-tree-1.29.0" sources."open-7.4.2" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -69656,12 +69844,14 @@ in sources."patch-console-1.0.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" + sources."pend-1.2.0" sources."printj-1.1.2" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" + sources."pump-3.0.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.2" + sources."react-devtools-core-4.12.4" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -69739,6 +69929,7 @@ in ]; }) sources."yargs-parser-20.2.7" + sources."yauzl-2.10.0" sources."yn-3.1.1" sources."yoga-layout-prebuilt-1.10.0" sources."zip-stream-4.1.0" @@ -69928,10 +70119,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.18.2"; + version = "0.18.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.2.tgz"; - sha512 = "uiWZlGLle3EXfC+1AmYmPrQfYeL2gY1BKpROBr5BWgT2+1W21gAlY1mziopAk0AmCNA8M4wgvfgc+CC3KVYkjQ=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.18.3.tgz"; + sha512 = "VL6XhOU9roM9wKcDZrJ+MeabNDXI9vb2aUinDHOJx+7e19MIbACfFgMJfVxOkSWNRrTHyOlElnHCcYzS8gk2qQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -70260,10 +70451,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.3.tgz"; - sha512 = "7mIC/YiAYNS9kzv0tPi6IcKTWRDRAwjKbot4g/RwBxpyGAzTBvsfmpqnWvHiZbk4kd8mKG2qmWR9OEy7CNzNEQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-1.0.4.tgz"; + sha512 = "nMarefi4Y2ReRiKa/GpyJRKMyF+J+cT3pc1mw6MvmuhpkhrQtf/feMYJ+7/h7l38NqAxjHkBvAiHZqDpWB675Q=="; }; dependencies = [ sources."@chemzqm/neovim-5.2.13" @@ -70310,7 +70501,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.3" - sources."fp-ts-2.10.2" + sources."fp-ts-2.10.4" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -70548,15 +70739,14 @@ in sources."isobject-3.0.1" ]; }) - sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."capture-stack-trace-1.0.1" sources."ccount-1.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -70615,7 +70805,7 @@ in ]; }) sources."copy-descriptor-0.1.1" - sources."core-js-3.10.1" + sources."core-js-3.11.0" sources."cosmiconfig-3.1.0" sources."create-error-class-3.0.2" sources."cross-spawn-7.0.3" @@ -70651,14 +70841,14 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."entities-1.1.2" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.24.0" // { + (sources."eslint-7.25.0" // { dependencies = [ sources."eslint-visitor-keys-2.0.0" ]; @@ -70778,7 +70968,6 @@ in sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.1" sources."get-stdin-5.0.1" sources."get-stream-3.0.0" sources."get-value-2.0.6" @@ -70814,7 +71003,6 @@ in ]; }) sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" (sources."has-value-1.0.0" // { dependencies = [ sources."isobject-3.0.1" @@ -70853,10 +71041,9 @@ in sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-boolean-object-1.1.0" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -70880,7 +71067,6 @@ in sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-number-2.1.0" - sources."is-number-object-1.0.4" sources."is-obj-2.0.0" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" @@ -70895,7 +71081,6 @@ in sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" - sources."is-string-1.0.5" sources."is-supported-regexp-flag-1.0.1" sources."is-utf8-0.2.1" sources."is-whitespace-character-1.0.4" @@ -71319,7 +71504,7 @@ in sources."sugarss-1.0.1" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -71451,13 +71636,13 @@ in coc-pyright = nodeEnv.buildNodePackage { name = "coc-pyright"; packageName = "coc-pyright"; - version = "1.1.129"; + version = "1.1.134"; src = fetchurl { - url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.129.tgz"; - sha512 = "XlybP7uY9BgkeGKCFhIxnmpos3rYJ8wIB+MW4w0Fyu51Ap2fxamU7FDmOcOIbjmp1tglldSZm2+A+KloHDuUgw=="; + url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.134.tgz"; + sha512 = "UUtG3a+ATo6B/B3LbU6PvXzFE8XznGyoyeg9DAeCxT2PpZjdq0HAXjwnqnt7ekhr2q5oA1ERbLM0jQXoxj117g=="; }; dependencies = [ - sources."pyright-1.1.132" + sources."pyright-1.1.134" ]; buildInputs = globalBuildInputs; meta = { @@ -71531,10 +71716,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.42.0"; + version = "0.43.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.42.0.tgz"; - sha512 = "H6/r68GvhIMWDZWWFtOUsyRNxaVlMRLrS+uMqcipxfkx+Pl1pWfnfsmymjd9okbtrWiKWgG6G63v7T2rVl4+YA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.43.1.tgz"; + sha512 = "NWuXDc9NrqVN1HO7NTUfH68Xr05yJA5bJXfQOSasOxxjsMyijL/aYwmlflSV93DO0zzWmsBPBTmBjBXxAms0cQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -71609,9 +71794,9 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.15" - sources."@babel/generator-7.13.9" - sources."@babel/helper-compilation-targets-7.13.13" + sources."@babel/core-7.13.16" + sources."@babel/generator-7.13.16" + sources."@babel/helper-compilation-targets-7.13.16" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-member-expression-to-functions-7.13.12" @@ -71623,16 +71808,16 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -71651,16 +71836,19 @@ in sources."astral-regex-2.0.0" sources."autoprefixer-9.8.6" sources."bail-1.0.5" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" + sources."balanced-match-2.0.0" + (sources."brace-expansion-1.1.11" // { + dependencies = [ + sources."balanced-match-1.0.2" + ]; + }) sources."braces-3.0.2" - sources."browserslist-4.16.4" - sources."call-bind-1.0.2" + sources."browserslist-4.16.5" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001209" - (sources."chalk-4.1.0" // { + sources."caniuse-lite-1.0.30001214" + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -71697,7 +71885,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -71718,7 +71906,6 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.1" sources."get-stdin-8.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" @@ -71731,7 +71918,6 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" sources."hosted-git-info-4.0.2" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" @@ -71744,26 +71930,22 @@ in sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-boolean-object-1.1.0" sources."is-buffer-2.0.5" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-hexadecimal-1.0.4" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" sources."is-regexp-2.1.0" - sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" @@ -71841,7 +72023,7 @@ in sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.0.4" + sources."postcss-selector-parser-6.0.5" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" @@ -71898,11 +72080,11 @@ in sources."strip-ansi-6.0.0" sources."strip-indent-3.0.0" sources."style-search-0.1.0" - sources."stylelint-13.12.0" + sources."stylelint-13.13.0" sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.1.0" + sources."table-6.5.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -71910,7 +72092,6 @@ in sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" sources."unified-9.2.1" - sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -72014,7 +72195,7 @@ in sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" sources."minimatch-3.0.4" @@ -72129,9 +72310,8 @@ in sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."builtin-modules-1.1.1" - sources."call-bind-1.0.2" sources."callsites-3.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -72152,7 +72332,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.24.0" + sources."eslint-7.25.0" sources."eslint-plugin-vue-7.9.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -72188,7 +72368,6 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" (sources."globals-13.8.0" // { @@ -72198,19 +72377,15 @@ in }) sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-boolean-object-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-number-object-1.0.4" - sources."is-string-1.0.5" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -72257,7 +72432,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -72569,13 +72744,12 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.0.8" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.4" + sources."@npmcli/run-script-1.8.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -72860,7 +73034,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" @@ -72947,13 +73121,13 @@ in ]; }) sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.5" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-9.0.0" + sources."npm-registry-fetch-10.1.1" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -72984,7 +73158,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.1" + sources."pacote-11.3.3" sources."parent-module-1.0.1" sources."parseurl-1.3.3" sources."path-exists-3.0.0" @@ -73320,7 +73494,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -74653,10 +74827,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.68.1"; + version = "6.69.2"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.68.1.tgz"; - sha512 = "OGsAZGrhHIJw4koiMJ1U80eVJIcpKsN6u7Iq+d1Tu3TJvBSvYHShM3SllYbsbFzIdt8kBNj3XWsogajUpeX0+w=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.69.2.tgz"; + sha512 = "HvwyYhkQ1Sw/eGCJkgNHEdPHy9W15WNeON35kzYeuQvY46df2W/p/L8Lik13iyWUMW7ky+v1qm9sGBhs40D/OQ=="; }; dependencies = [ sources."@fast-csv/format-4.3.5" @@ -74847,7 +75021,7 @@ in ]; }) sources."@malept/cross-spawn-promise-1.1.1" - sources."@sindresorhus/is-4.0.0" + sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/glob-7.1.3" @@ -74905,7 +75079,7 @@ in sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."chownr-1.1.4" sources."chromium-pickle-js-0.2.0" @@ -74930,7 +75104,7 @@ in sources."concat-map-0.0.1" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."core-js-3.10.1" + sources."core-js-3.11.0" sources."core-util-is-1.0.2" sources."cross-spawn-7.0.3" sources."currently-unhandled-0.4.1" @@ -75081,7 +75255,7 @@ in ]; }) sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-docker-2.2.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -75161,7 +75335,7 @@ in ]; }) sources."nice-try-1.0.5" - (sources."node-abi-2.21.0" // { + (sources."node-abi-2.26.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -75187,7 +75361,7 @@ in ]; }) sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" (sources."npm-conf-1.1.3" // { dependencies = [ sources."pify-3.0.0" @@ -75431,14 +75605,14 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.9" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75455,19 +75629,19 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-proposal-object-rest-spread-7.13.8" sources."@babel/plugin-syntax-jsx-7.12.13" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-react-jsx-7.13.12" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" - sources."@sindresorhus/is-4.0.0" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" + sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" @@ -75492,7 +75666,7 @@ in sources."auto-bind-4.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."cacheable-lookup-5.0.4" (sources."cacheable-request-7.0.1" // { dependencies = [ @@ -75508,7 +75682,7 @@ in sources."quick-lru-4.0.1" ]; }) - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."chalk-2.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -75545,7 +75719,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -75578,7 +75752,7 @@ in (sources."ink-3.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -75588,7 +75762,7 @@ in (sources."ink-text-input-4.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -75598,7 +75772,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-docker-2.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -75679,7 +75853,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.12.2" + sources."react-devtools-core-4.12.4" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -75805,7 +75979,7 @@ in }) sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.16" + sources."@fluentui/keyboard-key-0.2.17" sources."@fluentui/react-7.168.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" @@ -75820,7 +75994,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.161" + sources."@microsoft/load-themed-styles-1.10.165" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -76550,7 +76724,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" @@ -76819,7 +76993,7 @@ in sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -77074,7 +77248,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - (sources."sass-1.32.10" // { + (sources."sass-1.32.11" // { dependencies = [ sources."anymatch-3.1.2" sources."binary-extensions-2.2.0" @@ -77349,7 +77523,7 @@ in }) sources."url-join-4.0.1" sources."url-parse-lax-3.0.0" - sources."url-toolkit-2.2.1" + sources."url-toolkit-2.2.2" sources."use-3.1.1" sources."util-0.11.1" sources."util-deprecate-1.0.2" @@ -77449,13 +77623,13 @@ in sources."xtend-4.0.2" sources."y18n-3.2.2" sources."yallist-4.0.0" - (sources."yargs-7.1.1" // { + (sources."yargs-7.1.2" // { dependencies = [ sources."is-fullwidth-code-point-1.0.0" sources."string-width-1.0.2" ]; }) - sources."yargs-parser-5.0.0-security.0" + sources."yargs-parser-5.0.1" sources."yeast-0.1.2" sources."yocto-queue-0.1.0" ]; @@ -77490,10 +77664,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.24.0"; + version = "7.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz"; - sha512 = "k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.25.0.tgz"; + sha512 = "TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -77518,9 +77692,8 @@ in sources."astral-regex-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" sources."callsites-3.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -77571,9 +77744,7 @@ in sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" (sources."globals-13.8.0" // { @@ -77581,20 +77752,15 @@ in sources."type-fest-0.20.2" ]; }) - sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-boolean-object-1.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-number-object-1.0.4" - sources."is-string-1.0.5" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -77636,7 +77802,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -77695,9 +77861,8 @@ in sources."astral-regex-2.0.0" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."call-bind-1.0.2" sources."callsites-3.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -77716,7 +77881,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.24.0" + sources."eslint-7.25.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -77749,9 +77914,7 @@ in sources."flat-cache-3.0.4" sources."flatted-3.1.1" sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" (sources."globals-13.8.0" // { @@ -77759,20 +77922,15 @@ in sources."type-fest-0.20.2" ]; }) - sources."has-1.0.3" sources."has-flag-4.0.0" - sources."has-symbols-1.0.2" sources."ignore-4.0.6" sources."import-fresh-3.3.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-boolean-object-1.1.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-number-object-1.0.4" - sources."is-string-1.0.5" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.1" @@ -77815,7 +77973,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-8.1.1" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -77861,10 +78019,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.4.1"; + version = "4.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.4.1.tgz"; - sha512 = "yJS0aHxzkaKmd55hppBxn+s7KCxRXFbqlZF5r2v2eE3vmLlDEnPWI8WQ//algAZO52nYCJtZBOa2EswESdK66g=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.4.3.tgz"; + sha512 = "wSap0vOOFRgg+SUrB4QPNdJH7FeTZAXgEIdrQIayoliRe+e/466Buh1j9v5g0CE6INhRjX+Ak2u9z5pVJxa4MQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -77874,10 +78032,10 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.13.9" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -77892,7 +78050,7 @@ in sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -77906,13 +78064,13 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" sources."@babel/plugin-proposal-class-properties-7.12.13" sources."@babel/plugin-proposal-dynamic-import-7.13.8" @@ -77946,10 +78104,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -77994,14 +78152,14 @@ in }) sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.17" - sources."@babel/runtime-7.13.10" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@expo/apple-utils-0.0.0-alpha.17" sources."@expo/bunyan-4.0.0" - sources."@expo/config-3.3.36" - sources."@expo/config-plugins-1.0.26" + sources."@expo/config-3.3.38" + sources."@expo/config-plugins-1.0.28" sources."@expo/config-types-40.0.0-beta.2" (sources."@expo/configure-splash-screen-0.3.4" // { dependencies = [ @@ -78009,7 +78167,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.62" // { + (sources."@expo/dev-server-0.1.64" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -78024,7 +78182,7 @@ in sources."statuses-1.5.0" ]; }) - sources."@expo/dev-tools-0.13.92" + sources."@expo/dev-tools-0.13.94" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -78032,20 +78190,20 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.12" // { + (sources."@expo/image-utils-0.3.13" // { dependencies = [ sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.28" // { + (sources."@expo/json-file-8.2.29" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.62" - sources."@expo/osascript-2.0.25" - (sources."@expo/package-manager-0.0.40" // { + sources."@expo/metro-config-0.1.64" + sources."@expo/osascript-2.0.26" + (sources."@expo/package-manager-0.0.41" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -78058,7 +78216,7 @@ in ]; }) sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.27" // { + (sources."@expo/schemer-1.3.28" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" @@ -78067,7 +78225,7 @@ in }) sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.66" // { + (sources."@expo/webpack-config-0.12.68" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" @@ -78128,7 +78286,6 @@ in sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/ci-detect-1.3.0" (sources."@npmcli/git-2.0.8" // { dependencies = [ sources."mkdirp-1.0.4" @@ -78145,7 +78302,7 @@ in }) sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.4" + sources."@npmcli/run-script-1.8.5" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.13.1" (sources."@react-native-community/cli-server-api-4.9.0" // { @@ -78169,7 +78326,7 @@ in ]; }) sources."@segment/loosely-validate-event-2.0.0" - sources."@sindresorhus/is-4.0.0" + sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."@tootallnate/once-1.1.2" sources."@types/anymatch-1.3.1" @@ -78384,7 +78541,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."buffer-5.7.1" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" @@ -78415,9 +78572,9 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."caseless-0.12.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -78548,8 +78705,8 @@ in sources."semver-6.3.0" ]; }) - sources."core-js-3.10.1" - (sources."core-js-compat-3.10.1" // { + sources."core-js-3.11.0" + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -78688,7 +78845,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -78770,7 +78927,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.72" // { + (sources."expo-pwa-0.0.74" // { dependencies = [ sources."commander-2.20.0" ]; @@ -79006,7 +79163,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -79307,7 +79464,7 @@ in sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" (sources."npm-package-arg-6.1.0" // { @@ -79324,7 +79481,7 @@ in sources."semver-7.3.5" ]; }) - (sources."npm-registry-fetch-9.0.0" // { + (sources."npm-registry-fetch-10.1.1" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" @@ -79421,7 +79578,7 @@ in sources."semver-6.3.0" ]; }) - (sources."pacote-11.3.1" // { + (sources."pacote-11.3.3" // { dependencies = [ sources."hosted-git-info-4.0.2" sources."minipass-3.1.3" @@ -79617,7 +79774,7 @@ in ]; }) sources."postcss-safe-parser-4.0.2" - sources."postcss-selector-parser-6.0.4" + sources."postcss-selector-parser-6.0.5" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -80332,7 +80489,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.32" // { + (sources."xdl-59.0.34" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -80453,7 +80610,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -80596,7 +80753,7 @@ in sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-4.0.0" @@ -81433,7 +81590,7 @@ in sources."fecha-4.2.1" sources."figures-2.0.0" sources."file-uri-to-path-2.0.0" - sources."filesize-6.2.5" + sources."filesize-6.3.0" sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ @@ -82047,7 +82204,7 @@ in sources."astral-regex-2.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" @@ -82084,7 +82241,7 @@ in sources."inquirer-7.3.3" sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -82229,7 +82386,7 @@ in sources."buffer-to-arraybuffer-0.0.5" sources."camelcase-5.3.1" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" @@ -82408,10 +82565,10 @@ in flood = nodeEnv.buildNodePackage { name = "flood"; packageName = "flood"; - version = "4.5.3"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/flood/-/flood-4.5.3.tgz"; - sha512 = "V/hB+D7kjqtSZTnFR05ZMP59x6vpVh75LDT2nAfwfVL9zVpyjynyK6abFzkMYydtGcKGPwvSqG0gYL8Tqh19sQ=="; + url = "https://registry.npmjs.org/flood/-/flood-4.5.4.tgz"; + sha512 = "3fDbGf4fUWsF6Si60EezRNZEBK3gz6y/IofZ10pyq4yl88hATkWyrvG3xHVdP1cfyKZzV1D4uiLStkLzKbpOWQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -82821,7 +82978,7 @@ in sources."@medv/blessed-2.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."emoji-regex-8.0.0" @@ -82877,19 +83034,19 @@ in }) sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.9" // { + (sources."@babel/generator-7.13.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -82907,13 +83064,13 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-proposal-object-rest-spread-7.10.4" sources."@babel/plugin-proposal-optional-chaining-7.13.12" sources."@babel/plugin-syntax-jsx-7.12.13" @@ -82921,11 +83078,11 @@ in sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-transform-parameters-7.13.0" sources."@babel/plugin-transform-react-jsx-7.13.12" - sources."@babel/runtime-7.13.10" - sources."@babel/standalone-7.13.15" + sources."@babel/runtime-7.13.17" + sources."@babel/standalone-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@graphql-tools/schema-7.1.3" (sources."@graphql-tools/utils-7.7.3" // { dependencies = [ @@ -82974,7 +83131,7 @@ in sources."@types/yargs-parser-20.2.0" sources."@types/yoga-layout-1.9.2" sources."accepts-1.3.7" - sources."acorn-8.1.1" + sources."acorn-8.2.1" sources."acorn-jsx-5.3.1" sources."address-1.1.2" (sources."ansi-align-3.0.0" // { @@ -83022,7 +83179,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ @@ -83034,9 +83191,9 @@ in sources."call-bind-1.0.2" sources."camel-case-4.1.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."ccount-1.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -83084,7 +83241,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.15.1" + sources."contentful-management-7.17.1" sources."contentful-sdk-core-6.7.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.7.0" // { @@ -83134,7 +83291,7 @@ in sources."dotenv-8.2.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -83277,7 +83434,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-decimal-1.0.4" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" @@ -83454,7 +83611,7 @@ in sources."readable-stream-3.6.0" sources."readable-web-to-node-stream-3.0.1" sources."readdirp-3.5.0" - sources."redux-4.0.5" + sources."redux-4.1.0" sources."regenerator-runtime-0.13.8" sources."registry-auth-token-4.2.1" sources."registry-url-5.1.0" @@ -83552,7 +83709,6 @@ in sources."strtok3-6.0.8" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" - sources."symbol-observable-1.2.0" sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" @@ -83755,7 +83911,7 @@ in sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" - sources."multiserver-3.7.0" + sources."multiserver-3.7.1" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.2" @@ -83765,7 +83921,7 @@ in sources."non-private-ip-1.4.4" sources."options-0.0.6" sources."os-homedir-1.0.2" - sources."packet-stream-2.0.5" + sources."packet-stream-2.0.6" sources."packet-stream-codec-1.1.3" sources."pako-1.0.11" sources."private-box-0.3.1" @@ -83908,10 +84064,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.3.1"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.3.1.tgz"; - sha512 = "wsCS8L8QTb9ghnJJpn1qKj+LokhGQ7OlKSM/n6/LhB8E4w/Pn4hiSgqcBthaL5J6CwJiWjpbNSA4t3sE0yqEPw=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.4.1.tgz"; + sha512 = "FbNXUYEfnLjtjGovvCT0gegtJRpp2bRjjnP9rI2WXN4j7Sn6L63jSnlCB47iLU28PuUjxCpSAwpFaR0ykdQZMQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -83963,7 +84119,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" @@ -84034,7 +84190,7 @@ in sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.4.0" sources."is-interactive-1.0.0" @@ -84282,16 +84438,12 @@ in sources."tslib-2.1.0" ]; }) - (sources."@graphql-tools/url-loader-6.8.2" // { + (sources."@graphql-tools/url-loader-6.8.3" // { dependencies = [ - (sources."@graphql-tools/utils-7.7.3" // { - dependencies = [ - sources."tslib-2.2.0" - ]; - }) - sources."cross-fetch-3.1.1" + sources."@graphql-tools/utils-7.7.3" + sources."cross-fetch-3.1.4" sources."form-data-4.0.0" - sources."tslib-2.1.0" + sources."tslib-2.2.0" ]; }) (sources."@graphql-tools/utils-6.2.4" // { @@ -84473,7 +84625,7 @@ in sources."graphql-subscriptions-1.2.1" sources."graphql-type-json-0.3.2" sources."graphql-upload-11.0.0" - sources."graphql-ws-4.2.2" + sources."graphql-ws-4.4.2" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -84769,7 +84921,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.4.4" + sources."ws-7.4.5" sources."y18n-5.0.8" sources."yallist-4.0.0" sources."yaml-1.10.2" @@ -84817,7 +84969,7 @@ in sources."ini-1.3.8" sources."interpret-1.1.0" sources."is-absolute-1.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -85052,7 +85204,7 @@ in (sources."marked-terminal-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."supports-color-7.2.0" ]; }) @@ -85313,7 +85465,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -85553,8 +85705,8 @@ in sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-3.2.2" - sources."yargs-7.1.1" - sources."yargs-parser-5.0.0-security.0" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -85715,7 +85867,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -85922,8 +86074,8 @@ in sources."which-module-1.0.0" sources."wrap-ansi-2.1.0" sources."y18n-3.2.2" - sources."yargs-7.1.1" - sources."yargs-parser-5.0.0-security.0" + sources."yargs-7.1.2" + sources."yargs-parser-5.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -86304,7 +86456,7 @@ in sources."nel-1.2.0" sources."node-gyp-build-4.2.3" sources."uuid-3.4.0" - sources."zeromq-5.2.7" + sources."zeromq-5.2.8" ]; buildInputs = globalBuildInputs; meta = { @@ -86660,7 +86812,7 @@ in sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."jquery-3.6.0" - sources."jquery.terminal-2.22.0" + sources."jquery.terminal-2.23.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -86820,7 +86972,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."cli-cursor-3.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -87022,7 +87174,7 @@ in (sources."@ot-builder/cli-help-shower-1.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -87032,7 +87184,7 @@ in (sources."@ot-builder/cli-proc-1.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -87042,7 +87194,7 @@ in (sources."@ot-builder/cli-shared-1.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -87167,7 +87319,7 @@ in (sources."otb-ttc-bundle-1.0.4" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" @@ -87231,7 +87383,7 @@ in (sources."verda-1.2.2" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -87451,7 +87603,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.888.0" // { + (sources."aws-sdk-2.892.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -87483,7 +87635,7 @@ in sources."camel-case-3.0.0" sources."camelcase-4.1.0" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."charenc-0.0.2" sources."chokidar-3.5.1" sources."chownr-1.1.4" @@ -87834,7 +87986,7 @@ in sources."needle-2.6.0" sources."nextgen-events-1.3.4" sources."no-case-2.3.2" - (sources."node-abi-2.21.0" // { + (sources."node-abi-2.26.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -87865,7 +88017,7 @@ in sources."noop-logger-0.1.1" sources."nopt-4.0.3" sources."normalize-path-3.0.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -87900,7 +88052,7 @@ in sources."pipe-functions-1.3.0" sources."pn-1.1.0" sources."pngjs-5.0.0" - sources."prebuild-install-6.1.1" + sources."prebuild-install-6.1.2" sources."prelude-ls-1.1.2" sources."process-nextick-args-2.0.1" sources."promise-7.3.1" @@ -88196,7 +88348,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -88419,7 +88571,7 @@ in ]; }) sources."camelcase-6.2.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."ci-info-2.0.0" sources."cli-boxes-2.2.1" (sources."cliui-7.0.4" // { @@ -88715,7 +88867,7 @@ in sources."braces-3.0.2" sources."call-bind-1.0.2" sources."cardinal-2.1.1" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -88911,10 +89063,10 @@ in katex = nodeEnv.buildNodePackage { name = "katex"; packageName = "katex"; - version = "0.13.2"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/katex/-/katex-0.13.2.tgz"; - sha512 = "u/KhjFDhyPr+70aiBn9SL/9w/QlLagIXBi2NZSbNnBUp2tR8dCjQplyEMkEzniem5gOeSCBjlBUg4VaiWs1JJg=="; + url = "https://registry.npmjs.org/katex/-/katex-0.13.3.tgz"; + sha512 = "/w0eycuK1xh201T0uFXYOZWPDoeqDHqR+6SLLKsYvNtUCYtmRjq8F+M74sdpzs+dJZYWv2eUsSW0r1AJfhZOCw=="; }; dependencies = [ sources."commander-6.2.1" @@ -89749,7 +89901,11 @@ in sources."pify-5.0.0" ]; }) - sources."@lerna/npm-dist-tag-4.0.0" + (sources."@lerna/npm-dist-tag-4.0.0" // { + dependencies = [ + sources."npm-registry-fetch-9.0.0" + ]; + }) sources."@lerna/npm-install-4.0.0" (sources."@lerna/npm-publish-4.0.0" // { dependencies = [ @@ -89768,7 +89924,11 @@ in sources."@lerna/profiler-4.0.0" sources."@lerna/project-4.0.0" sources."@lerna/prompt-4.0.0" - sources."@lerna/publish-4.0.0" + (sources."@lerna/publish-4.0.0" // { + dependencies = [ + sources."npm-registry-fetch-9.0.0" + ]; + }) sources."@lerna/pulse-till-done-4.0.0" sources."@lerna/query-graph-4.0.0" sources."@lerna/resolve-symlink-4.0.0" @@ -89795,7 +89955,7 @@ in sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.4" + sources."@npmcli/run-script-1.8.5" sources."@octokit/auth-token-2.4.5" sources."@octokit/core-3.4.0" (sources."@octokit/endpoint-6.0.11" // { @@ -89804,19 +89964,19 @@ in ]; }) sources."@octokit/graphql-4.6.1" - sources."@octokit/openapi-types-6.0.0" + sources."@octokit/openapi-types-6.1.1" sources."@octokit/plugin-enterprise-rest-6.0.1" sources."@octokit/plugin-paginate-rest-2.13.3" sources."@octokit/plugin-request-log-1.0.3" - sources."@octokit/plugin-rest-endpoint-methods-5.0.0" + sources."@octokit/plugin-rest-endpoint-methods-5.0.1" (sources."@octokit/request-5.4.15" // { dependencies = [ sources."is-plain-object-5.0.0" ]; }) sources."@octokit/request-error-2.0.5" - sources."@octokit/rest-18.5.2" - sources."@octokit/types-6.13.0" + sources."@octokit/rest-18.5.3" + sources."@octokit/types-6.13.2" sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" sources."@types/minimist-1.2.1" @@ -89871,7 +90031,7 @@ in sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."chownr-2.0.0" sources."ci-info-2.0.0" @@ -90085,7 +90245,7 @@ in sources."is-boolean-object-1.1.0" sources."is-callable-1.2.3" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" @@ -90121,8 +90281,8 @@ in sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."kind-of-6.0.3" - sources."libnpmaccess-4.0.1" - (sources."libnpmpublish-4.0.0" // { + sources."libnpmaccess-4.0.2" + (sources."libnpmpublish-4.0.1" // { dependencies = [ sources."normalize-package-data-3.0.2" ]; @@ -90206,7 +90366,7 @@ in ]; }) sources."normalize-url-3.3.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" (sources."npm-lifecycle-3.1.5" // { dependencies = [ @@ -90229,7 +90389,7 @@ in sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.5" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-9.0.0" + sources."npm-registry-fetch-10.1.1" sources."npm-run-path-4.0.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" @@ -90255,7 +90415,7 @@ in sources."p-timeout-3.2.0" sources."p-try-2.2.0" sources."p-waterfall-2.1.1" - sources."pacote-11.3.1" + sources."pacote-11.3.3" sources."parent-module-1.0.1" sources."parse-github-repo-url-1.4.1" sources."parse-json-5.2.0" @@ -91364,18 +91524,18 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.15" - sources."@babel/generator-7.13.9" + sources."@babel/core-7.13.16" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - sources."@babel/helper-compilation-targets-7.13.13" + sources."@babel/helper-compilation-targets-7.13.16" sources."@babel/helper-create-class-features-plugin-7.13.11" sources."@babel/helper-create-regexp-features-plugin-7.12.17" sources."@babel/helper-define-polyfill-provider-0.2.0" sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -91389,13 +91549,13 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" @@ -91428,10 +91588,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -91461,10 +91621,10 @@ in sources."@babel/preset-env-7.13.15" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.13.10" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -91642,7 +91802,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -91658,7 +91818,7 @@ in sources."cached-path-relative-1.0.2" sources."call-bind-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -91730,7 +91890,7 @@ in }) sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.10.1" // { + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -91782,7 +91942,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -91957,7 +92117,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" @@ -92553,7 +92713,7 @@ in sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" @@ -92768,7 +92928,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -92916,10 +93076,10 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.2.tgz"; - sha512 = "BojKspBv4nNWzO1wC6VEI+g9gHDOhkaGHGgLxXkasdU4pwjdO5AXD5M/wcLPkXYPjZ/N+6sU8rjQTlyvN2cWiQ=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.4.tgz"; + sha512 = "Okmc+F3l7vRWNMALbH0HMMoTJWVn1cbeDbybHppCeophIGdFS+xxD/OffYpZirUOHzesZostpzEwsLSst+4W8w=="; }; buildInputs = globalBuildInputs; meta = { @@ -92990,7 +93150,7 @@ in sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" sources."camel-case-3.0.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chownr-1.1.4" sources."clean-css-4.2.3" sources."color-convert-2.0.1" @@ -93135,12 +93295,12 @@ in dependencies = [ sources."@fluentui/date-time-utilities-7.9.1" sources."@fluentui/dom-utilities-1.1.2" - sources."@fluentui/keyboard-key-0.2.16" + sources."@fluentui/keyboard-key-0.2.17" sources."@fluentui/react-7.168.0" sources."@fluentui/react-focus-7.17.6" sources."@fluentui/react-window-provider-1.0.2" sources."@fluentui/theme-1.7.4" - sources."@microsoft/load-themed-styles-1.10.161" + sources."@microsoft/load-themed-styles-1.10.165" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@uifabric/foundation-7.9.26" @@ -93417,7 +93577,7 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-6.2.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."supports-color-7.2.0" ]; @@ -93652,23 +93812,23 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "3.18.3"; + version = "3.21.9"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.18.3.tgz"; - sha512 = "VonzQOBohu/+G++NiVIwoyrwDaGo7VV4kzqrJr9pc7KWm95iBT+4FBvlzAk4VYg6vU5/3WYcOIwQTNSOZKcJiA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-3.21.9.tgz"; + sha512 = "GRdQHPz8gVmU1Gy6ZWv/B2t3MjQN2hLHBG4yRY6S7DbRQc8XaY9PLJPrmodycumFdzx6Da+SMmhZrzkKfZ/xSg=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.9" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -93683,7 +93843,7 @@ in sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -93697,9 +93857,9 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" sources."@babel/plugin-proposal-class-properties-7.13.0" @@ -93729,10 +93889,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -93764,10 +93924,10 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.13.10" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@bugsnag/browser-7.9.2" sources."@bugsnag/core-7.9.2" sources."@bugsnag/cuid-3.0.0" @@ -93777,11 +93937,12 @@ in sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-11.1.0" // { + (sources."@netlify/build-11.2.5" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" + sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" sources."semver-6.3.0" @@ -93792,20 +93953,22 @@ in sources."locate-path-5.0.0" ]; }) - (sources."@netlify/config-6.0.1" // { + (sources."@netlify/config-6.2.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."execa-3.4.0" + sources."is-plain-obj-2.1.0" ]; }) (sources."@netlify/framework-info-3.3.0" // { dependencies = [ + sources."is-plain-obj-2.1.0" sources."locate-path-5.0.0" ]; }) - sources."@netlify/functions-utils-1.3.25" - (sources."@netlify/git-utils-1.0.8" // { + sources."@netlify/functions-utils-1.3.28" + (sources."@netlify/git-utils-1.0.9" // { dependencies = [ sources."braces-3.0.2" sources."execa-3.4.0" @@ -93835,7 +93998,7 @@ in sources."to-regex-range-5.0.1" ]; }) - sources."@netlify/plugins-list-2.6.0" + sources."@netlify/plugins-list-2.8.0" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ sources."execa-3.4.0" @@ -93845,7 +94008,7 @@ in sources."@netlify/traffic-mesh-agent-darwin-x64-0.27.10" sources."@netlify/traffic-mesh-agent-linux-x64-0.27.10" sources."@netlify/traffic-mesh-agent-win32-x64-0.27.10" - (sources."@netlify/zip-it-and-ship-it-3.4.0" // { + (sources."@netlify/zip-it-and-ship-it-3.7.0" // { dependencies = [ sources."locate-path-5.0.0" sources."resolve-2.0.0-next.3" @@ -93882,7 +94045,7 @@ in sources."@oclif/plugin-help-3.2.2" sources."ansi-regex-3.0.0" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."is-fullwidth-code-point-2.0.0" @@ -93915,10 +94078,8 @@ in }) (sources."@oclif/errors-1.3.4" // { dependencies = [ - sources."ansi-styles-4.3.0" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" - sources."wrap-ansi-7.0.0" ]; }) sources."@oclif/linewrap-1.0.0" @@ -93966,7 +94127,7 @@ in (sources."@oclif/plugin-plugins-1.10.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."fs-extra-9.1.0" sources."jsonfile-6.1.0" sources."tslib-2.2.0" @@ -93981,7 +94142,7 @@ in sources."universal-user-agent-6.0.0" ]; }) - sources."@octokit/openapi-types-6.0.0" + sources."@octokit/openapi-types-6.1.1" (sources."@octokit/plugin-paginate-rest-1.1.2" // { dependencies = [ sources."@octokit/types-2.16.2" @@ -94006,7 +94167,7 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-6.13.0" + sources."@octokit/types-6.13.2" sources."@rollup/plugin-babel-5.3.0" (sources."@rollup/plugin-commonjs-17.1.0" // { dependencies = [ @@ -94115,7 +94276,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.888.0" // { + (sources."aws-sdk-2.892.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -94139,6 +94300,7 @@ in }) sources."base64-js-1.5.1" sources."before-after-hook-2.2.1" + sources."better-opn-2.1.1" sources."binary-extensions-2.2.0" sources."bl-4.1.0" (sources."body-parser-1.19.0" // { @@ -94160,7 +94322,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."btoa-lite-1.0.0" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" @@ -94189,7 +94351,7 @@ in sources."call-bind-1.0.2" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."cardinal-2.1.1" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -94248,7 +94410,7 @@ in dependencies = [ sources."ansi-styles-4.3.0" sources."argparse-1.0.10" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."clean-stack-3.0.1" sources."escape-string-regexp-4.0.0" sources."extract-stack-2.0.0" @@ -94258,7 +94420,12 @@ in ]; }) sources."cli-width-2.2.1" - sources."cliui-6.0.0" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."wrap-ansi-6.2.0" + ]; + }) sources."clone-1.0.4" sources."clone-response-1.0.2" sources."code-point-at-1.1.0" @@ -94316,7 +94483,7 @@ in sources."safe-buffer-5.1.2" ]; }) - (sources."core-js-compat-3.10.1" // { + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -94439,7 +94606,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -94450,7 +94617,7 @@ in sources."envinfo-7.8.1" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."esbuild-0.11.12" + sources."esbuild-0.11.14" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-html-1.0.3" @@ -94522,7 +94689,7 @@ in sources."extract-stack-1.0.0" sources."fast-deep-equal-3.1.3" sources."fast-diff-1.2.0" - sources."fast-equals-2.0.0" + sources."fast-equals-2.0.1" sources."fast-glob-2.2.7" sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" @@ -94543,7 +94710,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."cacheable-request-7.0.1" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" sources."got-10.7.0" @@ -94705,12 +94872,11 @@ in ]; }) sources."http-proxy-1.18.1" - (sources."http-proxy-middleware-1.1.2" // { + (sources."http-proxy-middleware-1.2.1" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" sources."is-number-7.0.0" - sources."is-plain-obj-3.0.0" sources."micromatch-4.0.4" sources."to-regex-range-5.0.1" ]; @@ -94749,7 +94915,7 @@ in (sources."inquirer-autocomplete-prompt-1.3.0" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."into-stream-3.1.0" @@ -94763,7 +94929,7 @@ in sources."ci-info-2.0.0" ]; }) - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-2.2.1" @@ -94786,13 +94952,14 @@ in sources."is-observable-1.1.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.3" - sources."is-plain-obj-2.1.0" + sources."is-plain-obj-3.0.0" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" sources."is-reference-1.2.1" sources."is-retry-allowed-1.2.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" sources."is-wsl-2.2.0" @@ -94907,7 +95074,12 @@ in sources."moize-5.4.7" ]; }) - sources."log-symbols-3.0.0" + (sources."log-symbols-4.1.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.1" + ]; + }) (sources."log-update-2.3.0" // { dependencies = [ sources."ansi-escapes-3.2.0" @@ -94944,9 +95116,13 @@ in sources."md5-hex-2.0.0" sources."md5-o-matic-0.1.1" sources."media-typer-0.3.0" - sources."memoize-one-5.1.1" + sources."memoize-one-5.2.1" sources."merge-descriptors-1.0.1" - sources."merge-options-3.0.4" + (sources."merge-options-3.0.4" // { + dependencies = [ + sources."is-plain-obj-2.1.0" + ]; + }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -94967,7 +95143,7 @@ in }) sources."mkdirp-0.5.5" sources."module-definition-3.3.1" - sources."moize-6.0.1" + sources."moize-6.0.2" (sources."move-file-1.2.0" // { dependencies = [ (sources."cp-file-6.2.0" // { @@ -94991,12 +95167,12 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-6.1.18" // { + (sources."netlify-6.1.20" // { dependencies = [ sources."qs-6.10.1" ]; }) - sources."netlify-redirect-parser-3.0.15" + sources."netlify-redirect-parser-3.0.17" sources."netlify-redirector-0.2.1" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" @@ -95086,8 +95262,18 @@ in sources."ansi-styles-4.3.0" sources."chalk-3.0.0" sources."cli-cursor-3.1.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + (sources."log-symbols-3.0.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + ]; + }) sources."mute-stream-0.0.8" sources."restore-cursor-3.1.0" + sources."supports-color-5.5.0" ]; }) sources."os-name-3.1.0" @@ -95574,7 +95760,7 @@ in ]; }) sources."word-wrap-1.2.3" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-7.0.0" // { dependencies = [ sources."ansi-styles-4.3.0" ]; @@ -95866,7 +96052,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -96096,7 +96282,7 @@ in sources."ms-2.1.3" sources."needle-2.6.0" sources."nopt-4.0.3" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -96140,16 +96326,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.3.2"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.3.2.tgz"; - sha512 = "tOtD5Z8l4WNuGNfUp/LFSC/ou74LfKhIWSgT4i9WTTUxUvSlWCBu8TsPNbjl9yM17Ox2ebe57mEnOHvTjQlEyA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.3.3.tgz"; + sha512 = "byKE+FxquGqaZ8HOCaZ6iz7CUwhJeBCfNqsuOCpUDxOa/Zqg2vh0OnZBv3W2DburZq/hEy2/LZxpXPg6iYSh4A=="; }; dependencies = [ - sources."@babel/runtime-7.13.10" - sources."@node-red/editor-api-1.3.2" - sources."@node-red/editor-client-1.3.2" - (sources."@node-red/nodes-1.3.2" // { + sources."@babel/runtime-7.13.17" + sources."@node-red/editor-api-1.3.3" + sources."@node-red/editor-client-1.3.3" + (sources."@node-red/nodes-1.3.3" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -96163,9 +96349,9 @@ in }) ]; }) - sources."@node-red/registry-1.3.2" - sources."@node-red/runtime-1.3.2" - sources."@node-red/util-1.3.2" + sources."@node-red/registry-1.3.3" + sources."@node-red/runtime-1.3.3" + sources."@node-red/util-1.3.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.2" // { @@ -96473,7 +96659,7 @@ in sources."node-red-node-rbe-0.5.0" sources."node-red-node-tail-0.3.1" sources."nopt-5.0.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -96695,7 +96881,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -96982,10 +97168,10 @@ in np = nodeEnv.buildNodePackage { name = "np"; packageName = "np"; - version = "7.4.0"; + version = "7.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/np/-/np-7.4.0.tgz"; - sha512 = "woJn5Bodg0/VDyUWx5EHIsi+8QlKSows0AVRBt47PG++cJAVE6jQFXcXDFDBMqY5PueFc4w0SA3gxqPklk6oGg=="; + url = "https://registry.npmjs.org/np/-/np-7.5.0.tgz"; + sha512 = "CdpgqtO6JpDKJjQ2gueY0jnbz6APWA9wFXSwPv5bXg4seSBibHqQ8JyWxYlS8YRfVbpeDtj582wcAWTlfy5qNA=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" @@ -97056,7 +97242,7 @@ in sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chardet-0.7.0" sources."ci-info-2.0.0" sources."clean-stack-2.2.0" @@ -97195,7 +97381,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-docker-2.2.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -97338,7 +97524,7 @@ in sources."os-tmpdir-1.0.2" (sources."ow-0.21.0" // { dependencies = [ - sources."@sindresorhus/is-4.0.0" + sources."@sindresorhus/is-4.0.1" sources."type-fest-0.20.2" ]; }) @@ -97518,10 +97704,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.10.0"; + version = "7.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.10.0.tgz"; - sha512 = "DD4eEB71HGVt6pS6n4LmFD4eHsrglJ+QtLhv/kP2UWNKkJalL8TPfsiw9p8LmWKa6ed61LHPw5FE6krS3aGv0A=="; + url = "https://registry.npmjs.org/npm/-/npm-7.11.1.tgz"; + sha512 = "F9dUPQQBm5me6t74m63CrrBSzUcLART9BmsxiJU3jZK8SBnxiqzxvsU70/uqY0cjYSoYP7AuZ2w8YfGUwhcf6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -97536,22 +97722,21 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "11.4.1"; + version = "11.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.4.1.tgz"; - sha512 = "bWElM5CeJ9gA/wvtqB4ljcKzAZ3BlPM2g/7mVi8mPdCR2N6dhgS4q5GCzQn4ZvpeKSFll3bUGkiR/lgSQOlN8Q=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-11.5.1.tgz"; + sha512 = "4b12O2ioGKbS/4a3i/QfHNIMkNEEq7LtngUSFPatJ3FURIjGT13N/glKO/g2tPmuOtuaTXCnTJlyWBLnf+A//g=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" - sources."@npmcli/ci-detect-1.3.0" sources."@npmcli/git-2.0.8" sources."@npmcli/installed-package-contents-1.0.7" sources."@npmcli/move-file-1.1.2" sources."@npmcli/node-gyp-1.0.2" sources."@npmcli/promise-spawn-1.3.2" - sources."@npmcli/run-script-1.8.4" + sources."@npmcli/run-script-1.8.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -97602,7 +97787,7 @@ in }) sources."camelcase-6.2.0" sources."caseless-0.12.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" @@ -97740,7 +97925,7 @@ in }) sources."make-fetch-happen-8.0.14" sources."map-age-cleaner-0.1.3" - sources."mem-8.1.0" + sources."mem-8.1.1" sources."merge2-1.4.1" sources."micromatch-4.0.4" sources."mime-db-1.47.0" @@ -97762,13 +97947,13 @@ in sources."node-gyp-7.1.2" sources."nopt-5.0.0" sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.2" sources."npm-packlist-2.1.5" sources."npm-pick-manifest-6.1.1" - sources."npm-registry-fetch-9.0.0" + sources."npm-registry-fetch-10.1.1" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -97785,7 +97970,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.3.1" + sources."pacote-11.3.3" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -98122,21 +98307,21 @@ in dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."json5-2.2.0" sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.13.9" // { + (sources."@babel/generator-7.13.16" // { dependencies = [ sources."source-map-0.5.7" ]; }) sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -98151,7 +98336,7 @@ in sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -98165,9 +98350,9 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" sources."@babel/plugin-proposal-class-properties-7.13.0" @@ -98199,10 +98384,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -98236,10 +98421,10 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.13.10" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -98344,7 +98529,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -98361,7 +98546,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -98388,7 +98573,7 @@ in sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.10.1" // { + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -98500,7 +98685,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -98642,7 +98827,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -98863,7 +99048,7 @@ in sources."postcss-ordered-values-4.1.2" sources."postcss-reduce-initial-4.0.3" sources."postcss-reduce-transforms-4.0.2" - sources."postcss-selector-parser-6.0.4" + sources."postcss-selector-parser-6.0.5" sources."postcss-svgo-4.0.3" sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" @@ -98995,7 +99180,7 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."srcset-3.0.0" + sources."srcset-3.0.1" sources."sshpk-1.16.1" sources."stable-0.1.8" (sources."static-eval-2.1.0" // { @@ -99609,7 +99794,7 @@ in sources."ipaddr.js-2.0.0" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -100278,7 +100463,7 @@ in sources."ini-1.3.8" sources."ip-1.1.5" sources."is-binary-path-2.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -100388,10 +100573,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.0.2"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.0.2.tgz"; - sha512 = "Zg1wbTjGu2dcQKzKq4IZSshK6zIEedEvlmE/EpujnFcbzJHXCAuyHZR2GuhR1887qc41dHs/bxnXEOol2/sapQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.2.1.tgz"; + sha512 = "aSrlGL3703pXhMaxFpFLAFakvpla0PaGN2/zOh5oG2qbvJ+jKuGkpHPhpLyAnhs/z+Je3wBaYA7vETu1f1xwqQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -100464,7 +100649,7 @@ in sources."binary-extensions-2.2.0" sources."braces-3.0.2" sources."callsites-3.1.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."chokidar-3.5.1" sources."cliui-7.0.4" sources."color-convert-2.0.1" @@ -100735,7 +100920,7 @@ in ]; }) sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -100940,10 +101125,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.132"; + version = "1.1.134"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.132.tgz"; - sha512 = "quvG9Ip2NwKEShsLJ7eLlkQ/ST5SX84QCgO/k7gGqlCHwuifn9/v7LrzdpdFbkVnQR51egUNWwwLQRoIBT6vUA=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.134.tgz"; + sha512 = "wQSdU6X3olAwCZy3tSA0fn8nMQGEwm01rm1dHM+aN2crzXIcUQ9sLOf+wCn5PFlLGsm/CXH7ROYmeMs3jXQ8Rw=="; }; buildInputs = globalBuildInputs; meta = { @@ -101023,7 +101208,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-1.0.0" sources."is-stream-1.1.0" sources."is-url-1.2.4" @@ -101292,18 +101477,18 @@ in sha512 = "coA9MuNPfN+8TyFj7aOycw2e5W9t+sSgFOUyK30oDrh2MWWWHLjY0I4V1puyCconC2arggfDE2GYXvqOTCGv9Q=="; }; dependencies = [ - sources."@babel/cli-7.13.14" + sources."@babel/cli-7.13.16" sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - (sources."@babel/core-7.13.15" // { + (sources."@babel/core-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.13.9" + sources."@babel/generator-7.13.16" sources."@babel/helper-annotate-as-pure-7.12.13" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.12.13" - (sources."@babel/helper-compilation-targets-7.13.13" // { + (sources."@babel/helper-compilation-targets-7.13.16" // { dependencies = [ sources."semver-6.3.0" ]; @@ -101318,7 +101503,7 @@ in sources."@babel/helper-explode-assignable-expression-7.13.0" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" - sources."@babel/helper-hoist-variables-7.13.0" + sources."@babel/helper-hoist-variables-7.13.16" sources."@babel/helper-member-expression-to-functions-7.13.12" sources."@babel/helper-module-imports-7.13.12" sources."@babel/helper-module-transforms-7.13.14" @@ -101332,9 +101517,9 @@ in sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" sources."@babel/helper-wrap-function-7.13.0" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12" sources."@babel/plugin-proposal-async-generator-functions-7.13.15" sources."@babel/plugin-proposal-class-properties-7.13.0" @@ -101367,10 +101552,10 @@ in sources."@babel/plugin-transform-arrow-functions-7.13.0" sources."@babel/plugin-transform-async-to-generator-7.13.0" sources."@babel/plugin-transform-block-scoped-functions-7.12.13" - sources."@babel/plugin-transform-block-scoping-7.12.13" + sources."@babel/plugin-transform-block-scoping-7.13.16" sources."@babel/plugin-transform-classes-7.13.0" sources."@babel/plugin-transform-computed-properties-7.13.0" - sources."@babel/plugin-transform-destructuring-7.13.0" + sources."@babel/plugin-transform-destructuring-7.13.17" sources."@babel/plugin-transform-dotall-regex-7.12.13" sources."@babel/plugin-transform-duplicate-keys-7.12.13" sources."@babel/plugin-transform-exponentiation-operator-7.12.13" @@ -101413,11 +101598,11 @@ in sources."@babel/preset-modules-0.1.4" sources."@babel/preset-react-7.13.13" sources."@babel/preset-stage-0-7.8.3" - sources."@babel/register-7.13.14" - sources."@babel/runtime-7.13.10" + sources."@babel/register-7.13.16" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@reach/router-1.3.4" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" @@ -101577,7 +101762,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."buffer-5.7.1" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -101611,7 +101796,7 @@ in sources."camel-case-3.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."case-sensitive-paths-webpack-plugin-2.4.0" sources."caw-2.0.1" (sources."chalk-2.4.2" // { @@ -101661,6 +101846,7 @@ in sources."string-width-3.1.0" ]; }) + sources."clone-deep-4.0.1" sources."clone-response-1.0.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" @@ -101695,7 +101881,7 @@ in sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.12" - (sources."core-js-compat-3.10.1" // { + (sources."core-js-compat-3.11.0" // { dependencies = [ sources."semver-7.0.0" ]; @@ -101835,7 +102021,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -102106,7 +102292,7 @@ in dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-styles-4.3.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."figures-3.2.0" @@ -102131,7 +102317,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.3" sources."is-color-stop-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-deflate-1.0.0" @@ -102493,7 +102679,7 @@ in sources."postcss-value-parser-3.3.1" ]; }) - sources."postcss-selector-parser-6.0.4" + sources."postcss-selector-parser-6.0.5" (sources."postcss-svgo-4.0.3" // { dependencies = [ sources."postcss-value-parser-3.3.1" @@ -102652,6 +102838,7 @@ in sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."sha.js-2.4.11" + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shorthash-0.0.2" @@ -103083,7 +103270,7 @@ in dependencies = [ sources."@mozilla/readability-0.4.1" sources."abab-2.0.5" - sources."acorn-8.1.1" + sources."acorn-8.2.1" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -103232,7 +103419,7 @@ in }; dependencies = [ sources."@babel/code-frame-7.12.13" - (sources."@babel/generator-7.13.9" // { + (sources."@babel/generator-7.13.16" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -103244,11 +103431,11 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/highlight-7.13.10" - sources."@babel/parser-7.13.15" - sources."@babel/runtime-7.13.10" + sources."@babel/parser-7.13.16" + sources."@babel/runtime-7.13.17" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" @@ -103328,7 +103515,7 @@ in sources."concat-map-0.0.1" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."core-js-3.10.1" + sources."core-js-3.11.0" sources."core-util-is-1.0.2" (sources."create-ecdh-4.0.4" // { dependencies = [ @@ -103431,7 +103618,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-6.2.0" + sources."mobx-6.3.0" sources."mobx-react-7.1.0" sources."mobx-react-lite-3.2.0" sources."ms-2.1.2" @@ -103632,7 +103819,7 @@ in sources."ink-2.7.1" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."js-tokens-4.0.0" @@ -103869,11 +104056,10 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."builtin-modules-3.2.0" - sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-6.2.0" sources."chainsaw-0.1.0" - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -103923,7 +104109,7 @@ in sources."entities-2.2.0" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.24.0" // { + (sources."eslint-7.25.0" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -103977,7 +104163,6 @@ in sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" sources."glob-7.1.6" sources."glob-parent-5.1.2" (sources."globals-13.8.0" // { @@ -103990,7 +104175,6 @@ in sources."growl-1.10.5" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" sources."he-1.2.0" sources."htmlparser2-6.1.0" sources."http-proxy-agent-4.0.1" @@ -104001,17 +104185,14 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" - sources."is-boolean-object-1.1.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" sources."is-reference-1.2.1" - sources."is-string-1.0.5" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -104138,7 +104319,7 @@ in sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-5.5.0" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" sources."json-schema-traverse-1.0.0" @@ -104349,10 +104530,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.32.10"; + version = "1.32.11"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.32.10.tgz"; - sha512 = "Nx0pcWoonAkn7CRp0aE/hket1UP97GiR1IFw3kcjV3pnenhWgZEWUf0ZcfPOV2fK52fnOcK3JdC/YYZ9E47DTQ=="; + url = "https://registry.npmjs.org/sass/-/sass-1.32.11.tgz"; + sha512 = "O9tRcob/fegUVSIV1ihLLZcftIOh0AF1VpKgusUfLqnb2jQ0GLDwI5ivv1FYWivGv8eZ/AwntTyTzjcHu0c/qw=="; }; dependencies = [ sources."anymatch-3.1.2" @@ -104512,10 +104693,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.35.0"; + version = "2.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.35.0.tgz"; - sha512 = "qtPKwZ3bSO/PB9sshKlTO0lgSvk8m0B21XQ3myxr27vVgyF5AL/NKnKDYkEOutFMAWXp5eJS/3OUqaO5uXlq+A=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.38.0.tgz"; + sha512 = "M/PAO3e3XoAdWvAd02iq+K4KkWmdxx8hLMCPg4tne0XZaLF5pTOvBWTdACgkuuikQDdo+Px8dl4idsIciEGezQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -104547,7 +104728,7 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.8.3" // { + (sources."@serverless/components-3.9.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."js-yaml-3.14.1" @@ -104576,13 +104757,13 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-4.0.1" // { + (sources."@serverless/utils-4.1.0" // { dependencies = [ sources."jwt-decode-3.1.2" sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.14" + sources."@serverless/utils-china-1.0.15" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.8" @@ -104653,7 +104834,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.888.0" // { + (sources."aws-sdk-2.892.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -104722,7 +104903,7 @@ in sources."traverse-0.3.9" ]; }) - (sources."chalk-4.1.0" // { + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -104888,7 +105069,7 @@ in sources."file-uri-to-path-1.0.0" sources."filename-reserved-regex-2.0.0" sources."filenamify-3.0.0" - sources."filesize-6.2.5" + sources."filesize-6.3.0" sources."fill-range-7.0.1" sources."find-requires-1.0.0" sources."flat-5.0.2" @@ -104929,7 +105110,7 @@ in sources."globby-11.0.3" (sources."got-11.8.2" // { dependencies = [ - sources."@sindresorhus/is-4.0.0" + sources."@sindresorhus/is-4.0.1" sources."@szmarczak/http-timer-4.0.5" sources."cacheable-request-7.0.1" sources."decompress-response-6.0.0" @@ -105102,7 +105283,7 @@ in sources."nested-error-stacks-2.1.0" sources."next-tick-1.0.0" sources."nice-try-1.0.5" - (sources."node-abi-2.21.0" // { + (sources."node-abi-2.26.0" // { dependencies = [ sources."semver-5.7.1" ]; @@ -105128,7 +105309,6 @@ in sources."p-event-2.3.1" sources."p-finally-1.0.0" sources."p-is-promise-1.1.0" - sources."p-limit-3.1.0" sources."p-timeout-2.0.1" (sources."package-json-6.5.0" // { dependencies = [ @@ -105382,7 +105562,6 @@ in sources."yamljs-0.3.0" sources."yauzl-2.10.0" sources."yeast-0.1.2" - sources."yocto-queue-0.1.0" sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; @@ -106022,10 +106201,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.551.0"; + version = "1.563.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.551.0.tgz"; - sha512 = "Z2fh6n/EGO/2ILLOeFvJpWAHSZjOtKDACtfK+Xm/ob+SoAOjEPGdGlFt0RmCUV/VGxfP1aRZ8zkxnj573OmPPA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.563.0.tgz"; + sha512 = "o0Cb8JR70NzR4OLDKJDx04zj9Cq4gKhFLvQxU1MxZv0Hko7K6FmMDxdgyljd3nU5wl1QyVNdnug1H4XaHfhhvA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" @@ -106052,7 +106231,7 @@ in }) sources."@snyk/docker-registry-v2-client-1.13.9" sources."@snyk/fast-glob-3.2.6-patch" - (sources."@snyk/fix-1.547.0" // { + (sources."@snyk/fix-1.554.0" // { dependencies = [ sources."chalk-4.1.0" sources."strip-ansi-6.0.0" @@ -106064,7 +106243,7 @@ in (sources."@snyk/inquirer-7.3.3-patch" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."strip-ansi-6.0.0" ]; }) @@ -106074,7 +106253,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."@snyk/mix-parser-1.3.1" // { + (sources."@snyk/mix-parser-1.3.2" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -106090,7 +106269,7 @@ in sources."tmp-0.1.0" ]; }) - (sources."@snyk/snyk-hex-plugin-1.1.2" // { + (sources."@snyk/snyk-hex-plugin-1.1.4" // { dependencies = [ sources."tslib-2.2.0" ]; @@ -106118,7 +106297,7 @@ in sources."@types/uuid-8.3.0" (sources."@yarnpkg/core-2.4.0" // { dependencies = [ - sources."@sindresorhus/is-4.0.0" + sources."@sindresorhus/is-4.0.1" sources."chalk-3.0.0" sources."cross-spawn-7.0.3" sources."got-11.8.2" @@ -106225,7 +106404,7 @@ in sources."color-name-1.1.4" sources."concat-map-0.0.1" sources."configstore-5.0.1" - sources."core-js-3.10.1" + sources."core-js-3.11.0" sources."core-util-is-1.0.2" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -106408,7 +106587,7 @@ in sources."lodash.values-4.3.0" (sources."log-symbols-4.1.0" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" ]; }) sources."lowercase-keys-2.0.0" @@ -106448,7 +106627,7 @@ in sources."open-7.4.2" (sources."ora-5.3.0" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."strip-ansi-6.0.0" ]; }) @@ -106540,7 +106719,7 @@ in sources."snyk-config-4.0.0" (sources."snyk-cpp-plugin-2.2.1" // { dependencies = [ - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."tslib-2.2.0" ]; }) @@ -106561,7 +106740,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.14.0" // { + (sources."snyk-gradle-plugin-3.14.2" // { dependencies = [ sources."chalk-3.0.0" sources."rimraf-3.0.2" @@ -106592,7 +106771,7 @@ in sources."uuid-8.3.2" ]; }) - (sources."snyk-nuget-plugin-1.21.0" // { + (sources."snyk-nuget-plugin-1.21.1" // { dependencies = [ sources."jszip-3.4.0" sources."pako-1.0.11" @@ -106856,7 +107035,7 @@ in sources."ini-1.3.8" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -106987,7 +107166,6 @@ in sources."ansi-styles-2.2.1" sources."anymatch-1.3.2" sources."append-batch-0.0.2" - sources."argparse-1.0.10" sources."arr-diff-2.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -107008,8 +107186,7 @@ in sources."async-write-2.1.0" sources."atob-2.1.2" sources."atomic-file-1.1.5" - sources."atomically-1.7.0" - sources."atomically-universal-0.1.1" + sources."atomic-file-rw-0.2.1" sources."attach-ware-1.1.1" sources."available-typed-arrays-1.0.2" sources."bail-1.0.5" @@ -107027,7 +107204,7 @@ in sources."binary-search-1.3.6" sources."binary-search-bounds-2.0.5" sources."bindings-1.5.0" - sources."bipf-1.5.0" + sources."bipf-1.5.1" sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" @@ -107146,8 +107323,6 @@ in }) sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" - sources."esprima-4.0.1" - sources."events-to-array-1.1.2" (sources."execa-4.1.0" // { dependencies = [ sources."cross-spawn-7.0.3" @@ -107250,6 +107425,7 @@ in sources."kind-of-4.0.0" ]; }) + sources."hash-wasm-4.6.0" sources."hashlru-2.3.0" sources."he-0.5.0" sources."heap-0.2.6" @@ -107325,14 +107501,13 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-2.1.0" - (sources."jitdb-3.0.3" // { + (sources."jitdb-3.1.3" // { dependencies = [ sources."mkdirp-1.0.4" sources."push-stream-11.0.0" sources."typedarray-to-buffer-4.0.0" ]; }) - sources."js-yaml-3.14.1" sources."jsesc-3.0.2" sources."json-buffer-2.0.11" sources."kind-of-3.2.2" @@ -107401,7 +107576,7 @@ in sources."arrify-2.0.1" ]; }) - sources."multiserver-3.7.0" + sources."multiserver-3.7.1" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."mutexify-1.3.1" @@ -107483,7 +107658,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."packet-stream-2.0.5" + sources."packet-stream-2.0.6" sources."packet-stream-codec-1.1.3" sources."parse-entities-1.2.2" sources."parse-glob-3.0.4" @@ -107753,13 +107928,12 @@ in sources."source-map-url-0.4.1" sources."split-buffer-1.0.0" sources."split-string-3.1.0" - sources."sprintf-js-1.0.3" sources."ssb-blobs-1.2.2" sources."ssb-caps-1.1.0" sources."ssb-client-4.9.0" sources."ssb-config-3.4.5" sources."ssb-db-19.2.0" - (sources."ssb-db2-2.0.2" // { + (sources."ssb-db2-2.1.1" // { dependencies = [ sources."abstract-leveldown-6.2.3" (sources."flumecodec-0.0.1" // { @@ -107856,8 +108030,6 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" - sources."tap-bail-1.0.0" - sources."tap-parser-5.4.0" (sources."tape-4.13.3" // { dependencies = [ sources."glob-7.1.6" @@ -108029,7 +108201,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.888.0" // { + (sources."aws-sdk-2.892.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -108281,7 +108453,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -108799,17 +108971,17 @@ in stylelint = nodeEnv.buildNodePackage { name = "stylelint"; packageName = "stylelint"; - version = "13.12.0"; + version = "13.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/stylelint/-/stylelint-13.12.0.tgz"; - sha512 = "P8O1xDy41B7O7iXaSlW+UuFbE5+ZWQDb61ndGDxKIt36fMH50DtlQTbwLpFLf8DikceTAb3r6nPrRv30wBlzXw=="; + url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.0.tgz"; + sha512 = "jvkM1iuH88vAvjdKPwPm6abiMP2/D/1chbfb+4GVONddOOskHuCXc0loyrLdxO1AwwH6jdnjYskkTKHQD7cXwQ=="; }; dependencies = [ sources."@babel/code-frame-7.12.13" sources."@babel/compat-data-7.13.15" - sources."@babel/core-7.13.15" - sources."@babel/generator-7.13.9" - sources."@babel/helper-compilation-targets-7.13.13" + sources."@babel/core-7.13.16" + sources."@babel/generator-7.13.16" + sources."@babel/helper-compilation-targets-7.13.16" sources."@babel/helper-function-name-7.12.13" sources."@babel/helper-get-function-arity-7.12.13" sources."@babel/helper-member-expression-to-functions-7.13.12" @@ -108821,16 +108993,16 @@ in sources."@babel/helper-split-export-declaration-7.12.13" sources."@babel/helper-validator-identifier-7.12.11" sources."@babel/helper-validator-option-7.12.17" - sources."@babel/helpers-7.13.10" + sources."@babel/helpers-7.13.17" (sources."@babel/highlight-7.13.10" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.13.15" + sources."@babel/parser-7.13.16" sources."@babel/template-7.12.13" - sources."@babel/traverse-7.13.15" - sources."@babel/types-7.13.14" + sources."@babel/traverse-7.13.17" + sources."@babel/types-7.13.17" sources."@nodelib/fs.scandir-2.1.4" sources."@nodelib/fs.stat-2.0.4" sources."@nodelib/fs.walk-1.2.6" @@ -108849,16 +109021,19 @@ in sources."astral-regex-2.0.0" sources."autoprefixer-9.8.6" sources."bail-1.0.5" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" + sources."balanced-match-2.0.0" + (sources."brace-expansion-1.1.11" // { + dependencies = [ + sources."balanced-match-1.0.2" + ]; + }) sources."braces-3.0.2" - sources."browserslist-4.16.4" - sources."call-bind-1.0.2" + sources."browserslist-4.16.5" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001209" - (sources."chalk-4.1.0" // { + sources."caniuse-lite-1.0.30001214" + (sources."chalk-4.1.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -108895,7 +109070,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.717" + sources."electron-to-chromium-1.3.720" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -108915,7 +109090,6 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.2" - sources."get-intrinsic-1.1.1" sources."get-stdin-8.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.2" @@ -108928,7 +109102,6 @@ in sources."hard-rejection-2.1.0" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" sources."hosted-git-info-4.0.2" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" @@ -108941,26 +109114,22 @@ in sources."import-lazy-4.0.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" - sources."indexes-of-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-alphabetical-1.0.4" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-boolean-object-1.1.0" sources."is-buffer-2.0.5" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-hexadecimal-1.0.4" sources."is-number-7.0.0" - sources."is-number-object-1.0.4" sources."is-plain-obj-2.1.0" sources."is-regexp-2.1.0" - sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."is-unicode-supported-0.1.0" sources."isexe-2.0.0" @@ -109037,7 +109206,7 @@ in sources."postcss-safe-parser-4.0.2" sources."postcss-sass-0.4.4" sources."postcss-scss-2.1.1" - sources."postcss-selector-parser-6.0.4" + sources."postcss-selector-parser-6.0.5" sources."postcss-syntax-0.36.2" sources."postcss-value-parser-4.1.0" sources."punycode-2.1.1" @@ -109097,7 +109266,7 @@ in sources."sugarss-2.0.0" sources."supports-color-5.5.0" sources."svg-tags-1.0.0" - sources."table-6.1.0" + sources."table-6.5.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."trim-newlines-3.0.0" @@ -109105,7 +109274,6 @@ in sources."type-fest-0.18.1" sources."typedarray-to-buffer-3.1.5" sources."unified-9.2.1" - sources."uniq-1.0.1" sources."unist-util-find-all-after-3.0.2" sources."unist-util-is-4.1.0" sources."unist-util-stringify-position-2.0.3" @@ -109136,10 +109304,10 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.13.0"; + version = "0.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.13.0.tgz"; - sha512 = "ov9SZmsCdfy3GcyvrlulEkYnkCc1EK/Qoety+xLsIZtVLMBitudp0OmHx5AWHk+FF2+78A0PYL2z8PEBX6UPjA=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.13.2.tgz"; + sha512 = "mOcSqZUM9zJORyl1FbODC4TSvlYgOgQmlEKzDj77D1JyuXfYD+XSnqxJufwa0DqI05y8uKMBKj0AWWeTu1OZjw=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" @@ -109188,7 +109356,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.35.0" sources."svelte-preprocess-4.6.9" - sources."svelte2tsx-0.1.186" + sources."svelte2tsx-0.1.188" sources."to-regex-range-5.0.1" sources."tslib-2.2.0" sources."typescript-4.2.4" @@ -109226,7 +109394,7 @@ in sources."@trysound/sax-0.1.1" sources."ansi-styles-4.3.0" sources."boolbase-1.0.0" - sources."chalk-4.1.0" + sources."chalk-4.1.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-7.2.0" @@ -110059,7 +110227,7 @@ in sources."minimist-1.2.5" sources."mkdirp-classic-0.5.3" sources."napi-build-utils-1.0.2" - sources."node-abi-2.21.0" + sources."node-abi-2.26.0" sources."node-addon-api-3.0.2" sources."noop-logger-0.1.1" sources."npmlog-4.1.2" @@ -110240,7 +110408,7 @@ in sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -110453,7 +110621,7 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."acorn-8.1.1" + sources."acorn-8.2.1" sources."acorn-jsx-5.3.1" sources."alex-9.1.0" (sources."ansi-align-3.0.0" // { @@ -110590,7 +110758,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -110951,29 +111119,50 @@ in textlint-rule-max-comma = nodeEnv.buildNodePackage { name = "textlint-rule-max-comma"; packageName = "textlint-rule-max-comma"; - version = "1.0.4"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-max-comma/-/textlint-rule-max-comma-1.0.4.tgz"; - sha1 = "f555c97e0d3039ca7da06cfd1afad0e5f5899a37"; + url = "https://registry.npmjs.org/textlint-rule-max-comma/-/textlint-rule-max-comma-2.0.2.tgz"; + sha512 = "t4twAgEZWWMhIYH3xURZr/A1EcAUKiC10/N0EU6RG+ZBa9+FB5HDhMdQMS5wHqEI1FopWHTYYv/sC2PGEtvyLg=="; }; dependencies = [ + sources."@textlint/ast-node-types-4.4.2" + sources."@types/structured-source-3.0.0" + sources."@types/unist-2.0.3" + sources."bail-1.0.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" - sources."concat-stream-1.6.2" - sources."core-util-is-1.0.2" - sources."flatmap-0.0.3" + sources."ccount-1.1.0" + sources."comma-separated-tokens-1.0.8" + sources."concat-stream-2.0.0" + sources."extend-3.0.2" + sources."hast-util-from-parse5-5.0.3" + sources."hast-util-parse-selector-2.2.5" + sources."hastscript-5.1.2" sources."inherits-2.0.4" - sources."isarray-1.0.0" - sources."process-nextick-args-2.0.1" - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - sources."sentence-splitter-2.3.2" - sources."string_decoder-1.1.1" + sources."is-buffer-2.0.5" + sources."is-plain-obj-2.1.0" + sources."object_values-0.1.2" + sources."parse5-5.1.1" + sources."property-information-5.6.0" + sources."readable-stream-3.6.0" + sources."rehype-parse-6.0.2" + sources."safe-buffer-5.2.1" + sources."sentence-splitter-3.2.1" + sources."space-separated-tokens-1.1.5" + sources."string_decoder-1.3.0" sources."structured-source-3.0.2" + sources."textlint-util-to-string-3.1.1" + sources."trough-1.0.5" sources."typedarray-0.0.6" - sources."unist-util-filter-0.2.1" - sources."unist-util-is-1.0.0" + sources."unified-8.4.2" + sources."unist-util-filter-2.0.3" + sources."unist-util-is-4.1.0" + sources."unist-util-stringify-position-2.0.3" sources."util-deprecate-1.0.2" + sources."vfile-4.2.1" + sources."vfile-message-2.0.4" + sources."web-namespaces-1.1.4" + sources."xtend-4.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -111315,7 +111504,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.10.1" + sources."core-js-3.11.0" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -111493,7 +111682,7 @@ in }) sources."nopt-4.0.3" sources."normalize-url-4.5.0" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -111673,10 +111862,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.127.0"; + version = "0.128.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.127.0.tgz"; - sha512 = "wtgrn+mhYUbobxT7QN3GPdu3SRpSBQvwY6uOzLChWS7QE//f7paDU/+wlzbg+ngeIvBBqjBHSRuywTh8A99Jng=="; + url = "https://registry.npmjs.org/three/-/three-0.128.0.tgz"; + sha512 = "i0ap/E+OaSfzw7bD1TtYnPo3VEplkl70WX5fZqZnfZsE3k3aSFudqrrC9ldFZfYFkn1zwDmBcdGfiIm/hnbyZA=="; }; buildInputs = globalBuildInputs; meta = { @@ -112553,7 +112742,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.8" sources."internmap-1.0.1" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -112568,7 +112757,7 @@ in sources."node-fetch-2.6.1" sources."node-pre-gyp-0.15.0" sources."nopt-4.0.3" - sources."npm-bundled-1.1.1" + sources."npm-bundled-1.1.2" sources."npm-normalize-package-bin-1.0.1" sources."npm-packlist-1.4.8" sources."npmlog-4.1.2" @@ -112729,6 +112918,201 @@ in bypassCache = true; reconstructLock = true; }; + vls = nodeEnv.buildNodePackage { + name = "vls"; + packageName = "vls"; + version = "0.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vls/-/vls-0.7.2.tgz"; + sha512 = "9nKgSPtNxQlc32K5GgZV++MdsCpNuac/SfxnEmVI0DCF4E0Uekj+RUo7Zk6NnA4veiNMN+AEjAIlbXYWPHgX6Q=="; + }; + dependencies = [ + sources."@babel/code-frame-7.12.11" + sources."@babel/helper-validator-identifier-7.12.11" + (sources."@babel/highlight-7.13.10" // { + dependencies = [ + sources."chalk-2.4.2" + ]; + }) + (sources."@eslint/eslintrc-0.4.0" // { + dependencies = [ + sources."globals-12.4.0" + ]; + }) + sources."acorn-7.4.1" + sources."acorn-jsx-5.3.1" + sources."ajv-6.12.6" + sources."ansi-colors-4.1.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-3.2.1" + sources."argparse-1.0.10" + sources."astral-regex-2.0.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."builtin-modules-1.1.1" + sources."callsites-3.1.0" + (sources."chalk-4.1.1" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."commander-2.20.3" + sources."concat-map-0.0.1" + sources."cross-spawn-7.0.3" + sources."debug-4.3.2" + sources."deep-is-0.1.3" + sources."diff-4.0.2" + sources."doctrine-3.0.0" + sources."emoji-regex-8.0.0" + sources."enquirer-2.3.6" + sources."escape-string-regexp-1.0.5" + sources."eslint-7.25.0" + sources."eslint-plugin-vue-7.9.0" + sources."eslint-scope-5.1.1" + (sources."eslint-utils-2.1.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."eslint-visitor-keys-2.0.0" + (sources."espree-7.3.1" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + ]; + }) + sources."esprima-4.0.1" + (sources."esquery-1.4.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + (sources."esrecurse-4.3.0" // { + dependencies = [ + sources."estraverse-5.2.0" + ]; + }) + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."fast-deep-equal-3.1.3" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."file-entry-cache-6.0.1" + sources."flat-cache-3.0.4" + sources."flatted-3.1.1" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."functional-red-black-tree-1.0.1" + sources."glob-7.1.6" + sources."glob-parent-5.1.2" + (sources."globals-13.8.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) + sources."has-1.0.3" + sources."has-flag-3.0.0" + sources."ignore-4.0.6" + sources."import-fresh-3.3.0" + sources."imurmurhash-0.1.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-core-module-2.3.0" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" + sources."json-schema-traverse-0.4.1" + sources."json-stable-stringify-without-jsonify-1.0.1" + sources."levn-0.4.1" + sources."lodash-4.17.21" + sources."lodash.clonedeep-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.truncate-4.4.2" + sources."lru-cache-6.0.0" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + sources."mkdirp-0.5.5" + sources."ms-2.1.2" + sources."natural-compare-1.4.0" + sources."once-1.4.0" + sources."optionator-0.9.1" + sources."parent-module-1.0.1" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.6" + sources."prelude-ls-1.2.1" + sources."prettier-2.2.1" + sources."progress-2.0.3" + sources."punycode-2.1.1" + sources."regexpp-3.1.0" + sources."require-from-string-2.0.2" + sources."resolve-1.20.0" + sources."resolve-from-4.0.0" + sources."rimraf-3.0.2" + sources."semver-7.3.5" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + (sources."slice-ansi-4.0.0" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) + sources."sprintf-js-1.0.3" + sources."string-width-4.2.2" + sources."strip-ansi-6.0.0" + sources."strip-json-comments-3.1.1" + sources."supports-color-5.5.0" + (sources."table-6.5.1" // { + dependencies = [ + sources."ajv-8.1.0" + sources."json-schema-traverse-1.0.0" + ]; + }) + sources."text-table-0.2.0" + sources."tslib-1.14.1" + (sources."tslint-6.1.3" // { + dependencies = [ + sources."chalk-2.4.2" + sources."semver-5.7.1" + ]; + }) + sources."tsutils-2.29.0" + sources."type-check-0.4.0" + sources."type-fest-0.8.1" + sources."typescript-4.2.4" + sources."uri-js-4.4.1" + sources."v8-compile-cache-2.3.0" + (sources."vue-eslint-parser-7.6.0" // { + dependencies = [ + sources."eslint-visitor-keys-1.3.0" + sources."espree-6.2.1" + ]; + }) + sources."which-2.0.2" + sources."word-wrap-1.2.3" + sources."wrappy-1.0.2" + sources."yallist-4.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Vue Language Server"; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; vscode-css-languageserver-bin = nodeEnv.buildNodePackage { name = "vscode-css-languageserver-bin"; packageName = "vscode-css-languageserver-bin"; @@ -112805,15 +113189,19 @@ in }; dependencies = [ sources."agent-base-4.3.0" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."jsonc-parser-3.0.0" + sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.0.2" // { + (sources."vscode-json-languageservice-4.1.0" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -113619,8 +114007,8 @@ in sources."v8-compile-cache-2.3.0" sources."vm-browserify-1.1.2" sources."vsce-1.87.1" - sources."vscode-debugadapter-testsupport-1.46.0" - sources."vscode-debugprotocol-1.46.0" + sources."vscode-debugadapter-testsupport-1.47.0" + sources."vscode-debugprotocol-1.47.0" (sources."watchpack-1.7.5" // { dependencies = [ sources."chokidar-3.5.1" @@ -114357,7 +114745,7 @@ in sources."is-binary-path-2.1.0" sources."is-buffer-2.0.5" sources."is-ci-2.0.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -114917,10 +115305,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "6.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-6.0.0.tgz"; - sha512 = "djjTY89kM5ULdKYQo+6TYJSlT+0zNkanW5hQJNybOqGyovUYpH7C3Ns9Pd1cy6ApbmG2VV4Gds9u4yCSuRfHUw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-6.1.0.tgz"; + sha512 = "f9sBuysFoCJAuS03wRtSBH8dPKQUZvCVT+AoqBW3tBBN6a92P0PyGF2lTwZJ5wrOOvXu7w2DvuAFOU6CnBugFw=="; }; dependencies = [ sources."@babel/code-frame-7.12.11" @@ -114942,10 +115330,11 @@ in (sources."@eslint/eslintrc-0.4.0" // { dependencies = [ sources."debug-4.3.2" + sources."globals-12.4.0" sources."ms-2.1.2" ]; }) - sources."@mdn/browser-compat-data-3.1.3" + sources."@mdn/browser-compat-data-3.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.4" @@ -114953,8 +115342,8 @@ in sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."addons-linter-2.21.0" - sources."addons-scanner-utils-4.2.0" + sources."addons-linter-3.2.0" + sources."addons-scanner-utils-4.4.0" sources."adm-zip-0.5.5" sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" @@ -114971,17 +115360,6 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" sources."any-promise-1.3.0" - (sources."archiver-5.2.0" // { - dependencies = [ - sources."async-3.2.0" - ]; - }) - (sources."archiver-utils-2.1.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) sources."argparse-1.0.10" sources."array-differ-3.0.0" sources."array-filter-0.0.1" @@ -114999,9 +115377,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.11.0" sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" sources."bcrypt-pbkdf-1.0.2" - sources."bl-4.1.0" sources."bluebird-2.9.34" sources."boolbase-1.0.0" (sources."boxen-5.0.1" // { @@ -115010,7 +115386,6 @@ in ]; }) sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" @@ -115025,8 +115400,8 @@ in sources."camelcase-6.2.0" sources."caseless-0.12.0" sources."chalk-4.1.0" - sources."cheerio-1.0.0-rc.5" - sources."cheerio-select-tmp-0.1.1" + sources."cheerio-1.0.0-rc.6" + sources."cheerio-select-1.4.0" (sources."chrome-launcher-0.13.4" // { dependencies = [ sources."mkdirp-0.5.5" @@ -115049,23 +115424,15 @@ in sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."common-tags-1.8.0" - sources."compress-commons-4.1.0" sources."concat-map-0.0.1" - (sources."concat-stream-1.6.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) + sources."concat-stream-1.6.2" sources."configstore-5.0.1" sources."core-js-3.8.3" sources."core-util-is-1.0.2" - sources."crc-32-1.2.0" - sources."crc32-stream-4.0.2" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" - sources."css-select-3.1.2" - sources."css-what-4.0.0" + sources."css-select-4.1.2" + sources."css-what-5.0.0" sources."dashdash-1.14.1" sources."debounce-1.2.0" sources."debug-2.6.9" @@ -115080,14 +115447,13 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - (sources."dispensary-0.61.0" // { + (sources."dispensary-0.62.0" // { dependencies = [ sources."async-3.2.0" - sources."pino-6.9.0" ]; }) sources."doctrine-3.0.0" - sources."dom-serializer-1.2.0" + sources."dom-serializer-1.3.1" sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.6.0" @@ -115099,14 +115465,14 @@ in sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" - sources."entities-2.1.0" + sources."entities-2.2.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" sources."es6-promisify-6.1.1" sources."escalade-3.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.21.0" // { + (sources."eslint-7.24.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.2" @@ -115142,7 +115508,6 @@ in sources."esutils-2.0.3" sources."event-to-promise-0.8.0" sources."execa-4.1.0" - sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" @@ -115157,10 +115522,9 @@ in sources."fast-safe-stringify-2.0.7" sources."fd-slicer-1.1.0" sources."file-entry-cache-6.0.1" - (sources."firefox-profile-4.1.0" // { + (sources."firefox-profile-4.2.0" // { dependencies = [ sources."fs-extra-9.0.1" - sources."uuid-8.3.2" ]; }) sources."first-chunk-stream-3.0.0" @@ -115170,17 +115534,15 @@ in sources."fluent-syntax-0.13.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fs-constants-1.0.0" (sources."fs-extra-9.1.0" // { dependencies = [ sources."universalify-2.0.0" ]; }) sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" - (sources."fx-runner-1.0.13" // { + (sources."fx-runner-1.1.0" // { dependencies = [ sources."commander-2.9.0" sources."isexe-1.1.2" @@ -115195,7 +115557,11 @@ in sources."glob-parent-5.1.2" sources."glob-to-regexp-0.4.1" sources."global-dirs-3.0.0" - sources."globals-12.4.0" + (sources."globals-13.8.0" // { + dependencies = [ + sources."type-fest-0.20.2" + ]; + }) (sources."got-9.6.0" // { dependencies = [ sources."get-stream-4.1.0" @@ -115214,9 +115580,8 @@ in sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" sources."ignore-4.0.6" + sources."image-size-0.9.7" sources."immediate-3.0.6" sources."import-fresh-3.3.0" sources."import-lazy-2.1.0" @@ -115228,7 +115593,6 @@ in sources."is-absolute-0.1.7" sources."is-arguments-1.1.0" sources."is-arrayish-0.2.1" - sources."is-boolean-object-1.1.0" sources."is-ci-2.0.0" sources."is-date-object-1.0.2" sources."is-docker-2.2.1" @@ -115238,13 +115602,11 @@ in sources."is-installed-globally-0.4.0" sources."is-mergeable-object-1.1.1" sources."is-npm-5.0.0" - sources."is-number-object-1.0.4" sources."is-obj-2.0.0" sources."is-path-inside-3.0.3" sources."is-regex-1.1.2" sources."is-relative-0.1.3" sources."is-stream-2.0.0" - sources."is-string-1.0.5" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-wsl-2.2.0" @@ -115276,22 +115638,11 @@ in ]; }) sources."jsprim-1.4.1" - (sources."jszip-3.6.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) + sources."jszip-3.6.0" sources."jwa-1.4.1" sources."jws-3.2.2" sources."keyv-3.1.0" sources."latest-version-5.1.0" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."safe-buffer-5.1.2" - ]; - }) sources."lcid-3.1.1" sources."levn-0.4.1" sources."lie-3.3.0" @@ -115299,8 +115650,6 @@ in sources."lines-and-columns-1.1.6" sources."lodash-4.17.21" sources."lodash.clonedeep-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" @@ -115310,7 +115659,6 @@ in sources."lodash.isstring-4.0.1" sources."lodash.once-4.1.1" sources."lodash.truncate-4.4.2" - sources."lodash.union-4.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -115345,19 +115693,12 @@ in sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" sources."ncp-2.0.0" - (sources."needle-2.6.0" // { - dependencies = [ - sources."debug-3.2.7" - sources."ms-2.1.3" - ]; - }) sources."node-forge-0.10.0" (sources."node-notifier-9.0.0" // { dependencies = [ sources."uuid-8.3.2" ]; }) - sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."nth-check-2.0.0" @@ -115388,17 +115729,11 @@ in sources."path-key-3.1.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - (sources."pino-6.11.1" // { - dependencies = [ - sources."pino-std-serializers-3.2.0" - ]; - }) - sources."pino-std-serializers-2.5.0" - sources."postcss-8.2.7" + sources."pino-6.11.2" + sources."pino-std-serializers-3.2.0" + sources."postcss-8.2.10" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" - sources."printj-1.1.2" - sources."probe-image-size-6.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."psl-1.8.0" @@ -115406,15 +115741,19 @@ in sources."punycode-2.1.1" sources."pupa-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-4.0.3" + sources."queue-6.0.2" + sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { dependencies = [ sources."ini-1.3.8" sources."strip-json-comments-2.0.1" ]; }) - sources."readable-stream-3.6.0" - sources."readdir-glob-1.1.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) sources."regenerator-runtime-0.13.8" sources."regexp.prototype.flags-1.3.1" sources."regexpp-3.1.0" @@ -115440,7 +115779,7 @@ in sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.3.4" + sources."semver-7.3.5" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -115462,7 +115801,6 @@ in sources."split-0.3.3" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" - sources."stream-parser-0.3.1" sources."stream-to-array-2.3.0" sources."stream-to-promise-3.0.0" (sources."string-width-4.2.2" // { @@ -115483,13 +115821,14 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" - (sources."table-6.1.0" // { + (sources."table-6.5.1" // { dependencies = [ sources."ajv-8.1.0" + sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" + sources."strip-ansi-6.0.0" ]; }) - sources."tar-stream-2.2.0" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -115544,7 +115883,6 @@ in sources."async-3.2.0" ]; }) - sources."zip-stream-4.1.0" ]; buildInputs = globalBuildInputs; meta = { @@ -115559,15 +115897,15 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.33.2"; + version = "5.35.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.33.2.tgz"; - sha512 = "X4b7F1sYBmJx8mlh2B7mV5szEkE0jYNJ2y3akgAP0ERi0vLCG1VvdsIxt8lFd4st6SUy0lf7W0CCQS566MBpJg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.35.1.tgz"; + sha512 = "uWKYStqJ23+N6/EnMEwUjPSSKUG1tFmcuKhALEh/QXoUxwN8eb3ATNIZB38A+fO6QZ0xfc7Cu7KNV9LXNhDCsw=="; }; dependencies = [ sources."@types/eslint-7.2.10" sources."@types/eslint-scope-3.7.0" - sources."@types/estree-0.0.46" + sources."@types/estree-0.0.47" sources."@types/json-schema-7.0.7" sources."@types/node-14.14.41" sources."@webassemblyjs/ast-1.11.0" @@ -115587,17 +115925,17 @@ in sources."@webassemblyjs/wast-printer-1.11.0" sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" - sources."acorn-8.1.1" + sources."acorn-8.2.1" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.16.4" + sources."browserslist-4.16.5" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001209" + sources."caniuse-lite-1.0.30001214" sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.717" - sources."enhanced-resolve-5.7.0" + sources."electron-to-chromium-1.3.720" + sources."enhanced-resolve-5.8.0" sources."es-module-lexer-0.4.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" @@ -115683,7 +116021,7 @@ in sources."human-signals-2.1.0" sources."import-local-3.0.2" sources."interpret-2.2.0" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-plain-object-2.0.4" sources."is-stream-2.0.0" sources."isexe-2.0.0" @@ -116659,7 +116997,7 @@ in sources."utp-native-2.4.0" sources."videostream-3.2.2" sources."vlc-command-1.2.0" - (sources."webtorrent-0.117.0" // { + (sources."webtorrent-0.118.0" // { dependencies = [ sources."debug-4.3.2" sources."decompress-response-6.0.0" @@ -116715,8 +117053,8 @@ in sha512 = "P1Ct7+DNrOcr2JAxDZ3Q5i5sx2LSveu7iLaoUL0A+YiG0GKf0l5+9j3rwMeyh6JeTL1+HfQV1rnwEvzhNIvpFw=="; }; dependencies = [ - sources."@babel/runtime-7.13.10" - sources."@babel/runtime-corejs3-7.13.10" + sources."@babel/runtime-7.13.17" + sources."@babel/runtime-corejs3-7.13.17" sources."@types/json5-0.0.29" sources."adverb-where-0.2.2" sources."aria-query-4.2.2" @@ -116732,7 +117070,7 @@ in sources."commander-2.20.3" sources."concat-map-0.0.1" sources."contains-path-0.1.0" - sources."core-js-pure-3.10.1" + sources."core-js-pure-3.11.0" sources."damerau-levenshtein-1.0.6" sources."debug-2.6.9" sources."define-properties-1.1.3" @@ -116767,7 +117105,7 @@ in sources."is-bigint-1.0.1" sources."is-boolean-object-1.1.0" sources."is-callable-1.2.3" - sources."is-core-module-2.2.0" + sources."is-core-module-2.3.0" sources."is-date-object-1.0.2" sources."is-negative-zero-2.0.1" sources."is-number-object-1.0.4" @@ -116850,6 +117188,9 @@ in dependencies = [ sources."agent-base-4.3.0" sources."argparse-1.0.10" + sources."balanced-match-1.0.2" + sources."brace-expansion-1.1.11" + sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -116858,10 +117199,11 @@ in sources."https-proxy-agent-2.2.4" sources."js-yaml-3.14.1" sources."jsonc-parser-2.3.1" + sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-4.0.2" // { + (sources."vscode-json-languageservice-4.1.0" // { dependencies = [ sources."jsonc-parser-3.0.0" sources."vscode-nls-5.0.0" @@ -116907,24 +117249,60 @@ in yo = nodeEnv.buildNodePackage { name = "yo"; packageName = "yo"; - version = "3.1.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/yo/-/yo-3.1.1.tgz"; - sha512 = "GFg4QC1xi3gkbHGGUFme8/8XPg3kDISu/qJfx56X207yuv1FSevGY/eKuym7kh0bniCB4n3rseWW+QZXPH8LIw=="; + url = "https://registry.npmjs.org/yo/-/yo-4.0.0.tgz"; + sha512 = "u4nr6946GQ1HXrX0K9YAHK8wJmvVNIAYIsC/NSTIXOSK61N400UCY1HLQr5oo7TJcpZAe7aO3k3jFJXIvRb6Qw=="; }; dependencies = [ - sources."@babel/code-frame-7.12.13" - sources."@babel/helper-validator-identifier-7.12.11" - sources."@babel/highlight-7.13.10" - sources."@babel/runtime-7.13.10" - sources."@mrmlnc/readdir-enhanced-2.2.1" - sources."@nodelib/fs.stat-1.1.3" + sources."@babel/runtime-7.13.17" + sources."@nodelib/fs.scandir-2.1.4" + sources."@nodelib/fs.stat-2.0.4" + sources."@nodelib/fs.walk-1.2.6" + (sources."@npmcli/arborist-2.4.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + (sources."@npmcli/git-2.0.8" // { + dependencies = [ + sources."mkdirp-1.0.4" + sources."semver-7.3.5" + sources."which-2.0.2" + ]; + }) + sources."@npmcli/installed-package-contents-1.0.7" + sources."@npmcli/map-workspaces-1.0.3" + (sources."@npmcli/metavuln-calculator-1.1.1" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + (sources."@npmcli/move-file-1.1.2" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) + sources."@npmcli/name-from-folder-1.0.1" + sources."@npmcli/node-gyp-1.0.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.8.5" sources."@sindresorhus/is-0.7.0" - sources."@types/glob-7.1.3" + sources."@tootallnate/once-1.1.2" sources."@types/minimatch-3.0.4" - sources."@types/node-14.14.41" - sources."@types/normalize-package-data-2.4.0" - sources."JSONStream-1.3.5" + sources."abbrev-1.1.1" + (sources."agent-base-6.0.2" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + (sources."agentkeepalive-4.1.4" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."aggregate-error-3.1.0" sources."ajv-6.12.6" sources."ansi-0.3.1" @@ -116932,40 +117310,41 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" + sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."array-differ-3.0.0" sources."array-find-index-1.0.2" - sources."array-union-1.0.2" + sources."array-union-2.1.0" sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" sources."arrify-1.0.1" + sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" - sources."assign-symbols-1.0.0" sources."astral-regex-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.11.0" - sources."axios-0.21.1" sources."balanced-match-1.0.2" - (sources."base-0.11.2" // { + sources."bcrypt-pbkdf-1.0.2" + (sources."bin-links-2.2.1" // { dependencies = [ - sources."define-property-1.0.0" + sources."mkdirp-1.0.4" + sources."write-file-atomic-3.0.3" ]; }) - sources."bcrypt-pbkdf-1.0.2" (sources."bin-version-2.0.0" // { dependencies = [ sources."execa-0.1.1" ]; }) sources."bin-version-check-3.0.0" - sources."binaryextensions-2.3.0" + sources."binaryextensions-4.15.0" sources."boolean-3.0.3" (sources."boxen-1.3.0" // { dependencies = [ @@ -116973,44 +117352,28 @@ in ]; }) sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { + sources."braces-3.0.2" + sources."buffer-from-1.1.1" + sources."builtins-1.0.3" + (sources."cacache-15.0.6" // { dependencies = [ - sources."extend-shallow-2.0.1" + sources."mkdirp-1.0.4" ]; }) - sources."buffer-from-1.1.1" - sources."cache-base-1.0.1" (sources."cacheable-request-2.1.4" // { dependencies = [ sources."get-stream-3.0.0" sources."lowercase-keys-1.0.0" ]; }) - sources."call-me-maybe-1.0.1" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chardet-0.7.0" + sources."chownr-2.0.0" sources."ci-info-1.6.0" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" @@ -117019,26 +117382,26 @@ in sources."cli-width-2.2.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" - sources."clone-deep-4.0.1" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-1.0.0" sources."cloneable-readable-1.1.3" + sources."cmd-shim-4.1.0" sources."code-point-at-1.1.0" - sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."colors-1.0.3" sources."combined-stream-1.0.8" + sources."commander-7.1.0" + sources."common-ancestor-path-1.0.1" sources."commondir-1.0.1" - sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" sources."conf-1.4.0" sources."config-chain-1.1.12" sources."configstore-3.1.5" - sources."copy-descriptor-0.1.1" - sources."core-js-3.10.1" + sources."console-control-strings-1.1.0" + sources."core-js-3.11.0" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -117050,127 +117413,83 @@ in }) sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."dargs-6.1.0" + sources."cyclist-1.0.1" sources."dashdash-1.14.1" - sources."dateformat-3.0.3" + sources."dateformat-4.5.1" sources."debug-2.6.9" + sources."debuglog-1.0.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."default-uid-1.0.0" sources."define-properties-1.1.3" - sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" + sources."depd-1.1.2" sources."detect-node-2.0.5" - sources."diff-3.5.0" - (sources."dir-glob-2.0.0" // { + sources."dezalgo-1.0.3" + sources."diff-5.0.0" + (sources."dir-glob-3.0.1" // { dependencies = [ - sources."path-type-3.0.0" + sources."path-type-4.0.0" ]; }) sources."dot-prop-4.2.1" sources."downgrade-root-1.2.2" - sources."download-stats-0.3.4" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" - (sources."editions-2.3.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."ejs-2.7.4" + sources."editions-6.1.0" + sources."ejs-3.1.6" sources."emoji-regex-8.0.0" sources."encodeurl-1.0.2" + (sources."encoding-0.1.13" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."end-of-stream-1.4.4" sources."env-paths-1.0.0" - sources."errlop-2.2.0" - sources."error-7.2.1" + sources."err-code-2.0.3" + sources."errlop-4.1.0" + sources."error-10.4.0" sources."error-ex-1.3.2" sources."es6-error-4.1.1" sources."es6-promise-4.2.8" sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" sources."execa-1.0.0" sources."execall-1.0.0" sources."exit-hook-1.1.1" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) sources."external-editor-3.1.0" - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) sources."extsprintf-1.3.0" sources."fast-deep-equal-3.1.3" - sources."fast-glob-2.2.7" + sources."fast-glob-3.2.5" sources."fast-json-stable-stringify-2.1.0" + sources."fastq-1.11.0" sources."figures-2.0.0" sources."filelist-1.0.2" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) + sources."fill-range-7.0.1" sources."filter-obj-2.0.2" sources."find-up-2.1.0" sources."find-versions-2.0.0" + sources."find-yarn-workspace-root2-1.2.16" sources."first-chunk-stream-2.0.0" - sources."follow-redirects-1.13.3" - sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" - sources."fragment-cache-0.2.1" sources."from2-2.3.0" + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" - sources."get-value-2.0.6" sources."getpass-0.1.7" - (sources."gh-got-5.0.0" // { - dependencies = [ - sources."get-stream-3.0.0" - sources."got-6.7.1" - sources."prepend-http-1.0.4" - sources."url-parse-lax-1.0.0" - ]; - }) - sources."github-username-3.0.0" sources."glob-7.1.6" - (sources."glob-parent-3.1.0" // { - dependencies = [ - sources."is-glob-3.1.0" - ]; - }) - sources."glob-to-regexp-0.3.0" + sources."glob-parent-5.1.2" (sources."global-agent-2.2.0" // { dependencies = [ sources."semver-7.3.5" @@ -117179,7 +117498,7 @@ in sources."global-dirs-0.1.1" sources."global-tunnel-ng-2.7.1" sources."globalthis-1.0.2" - sources."globby-8.0.2" + sources."globby-11.0.3" (sources."got-8.3.2" // { dependencies = [ sources."get-stream-3.0.0" @@ -117187,7 +117506,7 @@ in ]; }) sources."graceful-fs-4.2.6" - sources."grouped-queue-1.1.0" + sources."grouped-queue-2.0.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" sources."has-1.0.3" @@ -117200,94 +117519,95 @@ in sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-unicode-2.0.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) sources."hosted-git-info-2.8.9" sources."http-cache-semantics-3.8.1" + (sources."http-proxy-agent-4.0.1" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) sources."http-signature-1.2.0" - sources."human-signals-1.1.1" + (sources."https-proxy-agent-5.0.0" // { + dependencies = [ + sources."debug-4.3.2" + sources."ms-2.1.2" + ]; + }) + sources."human-signals-2.1.0" + sources."humanize-ms-1.2.1" sources."humanize-string-1.0.2" sources."iconv-lite-0.4.24" - sources."ignore-3.3.10" + sources."ignore-5.1.8" + sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."inquirer-6.5.2" sources."insight-0.10.3" - sources."interpret-1.4.0" (sources."into-stream-3.1.0" // { dependencies = [ sources."p-is-promise-1.1.0" ]; }) + sources."ip-1.1.5" sources."ip-regex-2.1.0" - sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" - sources."is-buffer-1.1.6" sources."is-ci-1.2.1" - sources."is-core-module-2.2.0" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" + sources."is-core-module-2.3.0" sources."is-docker-1.1.0" - sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.1.0" + sources."is-lambda-1.0.1" sources."is-npm-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) + sources."is-number-7.0.0" sources."is-obj-1.0.1" sources."is-object-1.0.2" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" - sources."is-plain-object-2.0.4" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-root-1.0.0" - sources."is-scoped-1.0.0" + sources."is-scoped-2.1.0" sources."is-stream-1.1.0" sources."is-supported-regexp-flag-1.0.1" sources."is-typedarray-1.0.0" + sources."is-unicode-supported-0.1.0" sources."is-utf8-0.2.1" - sources."is-windows-1.0.2" sources."is-wsl-1.1.0" sources."isarray-1.0.0" sources."isbinaryfile-4.0.6" sources."isexe-2.0.0" - sources."isobject-3.0.1" sources."isstream-0.1.2" - sources."istextorbinary-2.6.0" + sources."istextorbinary-5.12.0" sources."isurl-1.0.0" (sources."jake-10.8.2" // { dependencies = [ sources."async-0.9.2" ]; }) - sources."js-tokens-4.0.0" + sources."js-yaml-3.14.1" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" + sources."json-stringify-nice-1.1.3" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" + sources."just-diff-3.1.1" + sources."just-diff-apply-3.0.0" sources."keyv-3.0.0" - sources."kind-of-6.0.3" (sources."latest-version-3.1.0" // { dependencies = [ sources."get-stream-3.0.0" @@ -117297,13 +117617,17 @@ in sources."url-parse-lax-1.0.0" ]; }) - sources."lazy-cache-2.0.2" - sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ sources."pify-2.3.0" ]; }) + (sources."load-yaml-file-0.2.0" // { + dependencies = [ + sources."pify-4.0.1" + sources."strip-bom-3.0.0" + ]; + }) sources."locate-path-2.0.0" sources."locutus-2.0.14" sources."lodash-4.17.21" @@ -117317,31 +117641,25 @@ in sources."lru-cache-6.0.0" sources."macos-release-2.4.1" sources."make-dir-1.3.0" + (sources."make-fetch-happen-8.0.14" // { + dependencies = [ + sources."http-cache-semantics-4.1.0" + ]; + }) sources."map-age-cleaner-0.1.3" - sources."map-cache-0.2.2" sources."map-obj-1.0.1" - sources."map-visit-1.0.0" (sources."matcher-3.0.0" // { dependencies = [ sources."escape-string-regexp-4.0.0" ]; }) sources."mem-5.1.1" - sources."mem-fs-1.2.0" - (sources."mem-fs-editor-6.0.0" // { + (sources."mem-fs-1.2.0" // { dependencies = [ - sources."dir-glob-2.2.2" - sources."globby-9.2.0" - sources."ignore-4.0.6" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."slash-2.0.0" + sources."through2-3.0.2" ]; }) + sources."mem-fs-editor-8.1.2" (sources."meow-3.7.0" // { dependencies = [ sources."find-up-1.1.2" @@ -117351,35 +117669,59 @@ in }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-3.1.10" + sources."micromatch-4.0.4" sources."mime-db-1.47.0" sources."mime-types-2.1.30" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { + sources."minipass-3.1.3" + sources."minipass-collect-1.0.2" + sources."minipass-fetch-1.3.3" + sources."minipass-flush-1.0.5" + sources."minipass-json-stream-1.0.1" + sources."minipass-pipeline-1.2.4" + sources."minipass-sized-1.0.3" + sources."minizlib-2.1.2" + sources."mkdirp-0.5.5" + (sources."mkdirp-infer-owner-2.0.0" // { dependencies = [ - sources."is-extendable-1.0.1" + sources."mkdirp-1.0.4" ]; }) - sources."mkdirp-0.5.5" - sources."moment-2.29.1" sources."ms-2.0.0" - (sources."multimatch-4.0.0" // { + (sources."multimatch-5.0.0" // { dependencies = [ - sources."array-union-2.1.0" sources."arrify-2.0.1" ]; }) sources."mute-stream-0.0.7" - sources."nanomatch-1.2.13" sources."nice-try-1.0.5" - sources."node-fetch-2.6.1" + (sources."node-gyp-7.1.2" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."env-paths-2.2.1" + sources."gauge-2.7.4" + sources."is-fullwidth-code-point-1.0.0" + sources."npmlog-4.1.2" + sources."semver-7.3.5" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + sources."which-2.0.2" + ]; + }) + sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" + sources."normalize-path-3.0.0" sources."normalize-url-2.0.1" - sources."npm-api-1.0.1" + sources."npm-bundled-1.1.2" sources."npm-conf-1.1.3" + (sources."npm-install-checks-4.0.0" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) (sources."npm-keyword-5.0.0" // { dependencies = [ sources."get-stream-3.0.0" @@ -117390,27 +117732,26 @@ in sources."url-parse-lax-1.0.0" ]; }) + sources."npm-normalize-package-bin-1.0.1" + (sources."npm-package-arg-8.1.2" // { + dependencies = [ + sources."hosted-git-info-4.0.2" + sources."semver-7.3.5" + ]; + }) + sources."npm-packlist-2.1.5" + (sources."npm-pick-manifest-6.1.1" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."npm-registry-fetch-10.1.1" sources."npm-run-path-2.0.2" sources."npmlog-2.0.4" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.pick-1.3.0" sources."once-1.4.0" (sources."onetime-2.0.1" // { dependencies = [ @@ -117429,17 +117770,21 @@ in sources."p-is-promise-2.1.0" sources."p-limit-1.3.0" sources."p-locate-2.0.0" + sources."p-map-4.0.0" sources."p-some-4.1.0" sources."p-timeout-2.0.1" sources."p-try-1.0.0" sources."package-json-5.0.0" + (sources."pacote-11.3.3" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) sources."pad-component-0.0.1" - sources."paged-request-2.0.2" + sources."parse-conflict-json-1.1.1" sources."parse-help-1.0.0" sources."parse-json-2.2.0" - sources."pascalcase-0.1.1" sources."passwd-user-3.0.0" - sources."path-dirname-1.0.2" sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-is-inside-1.0.2" @@ -117451,14 +117796,42 @@ in ]; }) sources."performance-now-2.1.0" + sources."picomatch-2.2.3" sources."pify-3.0.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" + (sources."pipeline-pipe-0.1.5" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."path-exists-4.0.0" + ]; + }) sources."pkg-up-2.0.0" - sources."posix-character-classes-0.1.1" + (sources."preferred-pm-3.0.3" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" + ]; + }) sources."prepend-http-2.0.0" sources."pretty-bytes-5.6.0" sources."process-nextick-args-2.0.1" + sources."promise-all-reject-late-1.0.1" + sources."promise-call-limit-1.0.1" + sources."promise-inflight-1.0.1" + sources."promise-retry-2.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."psl-1.8.0" @@ -117466,12 +117839,15 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."query-string-5.1.1" + sources."queue-microtask-1.2.3" sources."rc-1.2.8" (sources."read-chunk-3.2.0" // { dependencies = [ sources."pify-4.0.1" ]; }) + sources."read-cmd-shim-2.0.0" + sources."read-package-json-fast-2.0.2" sources."read-pkg-1.1.0" (sources."read-pkg-up-4.0.0" // { dependencies = [ @@ -117492,19 +117868,16 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."rechoir-0.6.2" + sources."readdir-scoped-modules-1.1.0" (sources."redent-1.0.0" // { dependencies = [ sources."indent-string-2.1.0" ]; }) sources."regenerator-runtime-0.13.8" - sources."regex-not-1.0.2" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.4" - sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.1" (sources."request-2.88.2" // { @@ -117513,20 +117886,20 @@ in ]; }) sources."resolve-1.20.0" - sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" - sources."ret-0.1.15" - sources."rimraf-2.7.1" + sources."retry-0.12.0" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" sources."roarr-2.15.4" sources."root-check-1.0.0" sources."run-async-2.4.1" + sources."run-parallel-1.2.0" sources."rx-4.1.0" sources."rxjs-6.6.7" sources."safe-buffer-5.2.1" - sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."scoped-regex-1.0.0" + sources."scoped-regex-2.1.0" sources."semver-5.7.1" sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" @@ -117537,83 +117910,35 @@ in sources."type-fest-0.13.1" ]; }) - sources."set-getter-0.1.0" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."shallow-clone-3.0.1" + sources."set-blocking-2.0.0" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shelljs-0.8.4" sources."signal-exit-3.0.3" - sources."slash-1.0.0" - (sources."snapdragon-0.8.2" // { + sources."slash-3.0.0" + sources."smart-buffer-4.1.0" + sources."socks-2.6.1" + (sources."socks-proxy-agent-5.0.0" // { dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" + sources."debug-4.3.2" + sources."ms-2.1.2" ]; }) sources."sort-keys-2.0.0" sources."sort-on-3.0.0" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.1" sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.7" - sources."split-string-3.1.0" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) + sources."ssri-8.0.1" sources."strict-uri-encode-1.1.0" (sources."string-length-2.0.0" // { dependencies = [ sources."strip-ansi-4.0.0" ]; }) - sources."string-template-0.2.1" (sources."string-width-2.1.1" // { dependencies = [ sources."strip-ansi-4.0.0" @@ -117667,6 +117992,11 @@ in ]; }) sources."taketalk-1.0.0" + (sources."tar-6.1.0" // { + dependencies = [ + sources."mkdirp-1.0.4" + ]; + }) (sources."term-size-1.2.0" // { dependencies = [ sources."cross-spawn-5.1.0" @@ -117677,20 +118007,19 @@ in ]; }) sources."text-table-0.2.0" - sources."textextensions-2.6.0" + sources."textextensions-5.12.0" sources."through-2.3.8" - sources."through2-3.0.2" + (sources."through2-4.0.2" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."timed-out-4.0.1" sources."titleize-1.0.1" sources."tmp-0.0.33" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" + sources."to-regex-range-5.0.1" sources."tough-cookie-3.0.1" + sources."treeverse-1.0.4" sources."trim-newlines-1.0.0" sources."tslib-1.14.1" sources."tunnel-0.0.6" @@ -117699,31 +118028,24 @@ in sources."twig-1.15.4" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."union-value-1.0.1" + sources."typedarray-to-buffer-3.1.5" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" sources."unique-string-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."untildify-3.0.3" + sources."untildify-4.0.0" sources."unzip-response-2.0.1" sources."update-notifier-2.5.0" sources."uri-js-4.4.1" - sources."urix-0.1.0" sources."url-parse-lax-3.0.0" sources."url-to-options-1.0.1" - sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" sources."verror-1.10.0" + sources."version-compare-1.1.0" + sources."version-range-1.1.0" sources."vinyl-2.2.1" (sources."vinyl-file-3.0.0" // { dependencies = [ @@ -117731,7 +118053,14 @@ in ]; }) sources."walk-2.3.14" + sources."walk-up-path-1.0.0" sources."which-1.3.1" + (sources."which-pm-2.0.0" // { + dependencies = [ + sources."path-exists-4.0.0" + ]; + }) + sources."wide-align-1.1.3" sources."widest-line-2.0.1" sources."windows-release-3.3.3" (sources."with-open-file-0.1.7" // { @@ -117759,46 +118088,58 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.10.3" // { + (sources."yeoman-environment-3.2.0" // { dependencies = [ sources."ansi-escapes-4.3.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-4.3.0" + sources."arrify-2.0.1" + sources."chalk-4.1.1" sources."cli-cursor-3.1.0" sources."cli-width-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.3" - sources."debug-3.2.7" - sources."execa-4.1.0" - sources."figures-3.2.0" - sources."get-stream-5.2.0" - sources."has-flag-4.0.0" - (sources."inquirer-7.3.3" // { + sources."debug-4.3.2" + sources."escape-string-regexp-4.0.0" + sources."execa-5.0.0" + (sources."figures-3.2.0" // { dependencies = [ - sources."chalk-4.1.0" - sources."strip-ansi-6.0.0" + sources."escape-string-regexp-1.0.5" ]; }) + sources."find-up-5.0.0" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) + sources."get-stream-6.0.1" + sources."has-flag-4.0.0" + sources."inquirer-8.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-2.0.0" - sources."ms-2.1.3" + sources."locate-path-6.0.0" + sources."log-symbols-4.1.0" + sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" + sources."npmlog-4.1.2" sources."onetime-5.1.2" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" sources."semver-7.3.5" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - (sources."string-width-4.2.2" // { + sources."string-width-4.2.2" + (sources."strip-ansi-6.0.0" // { dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) - (sources."strip-ansi-4.0.0" // { - dependencies = [ - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" ]; }) sources."supports-color-7.2.0" @@ -117806,45 +118147,7 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.13.0" // { - dependencies = [ - sources."debug-4.3.2" - sources."diff-4.0.2" - sources."dir-glob-2.2.2" - sources."ejs-3.1.6" - sources."find-up-3.0.0" - sources."globby-9.2.0" - sources."ignore-4.0.6" - sources."locate-path-3.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."mem-fs-editor-7.1.0" // { - dependencies = [ - sources."rimraf-3.0.2" - ]; - }) - sources."mkdirp-1.0.4" - sources."ms-2.1.2" - sources."p-limit-2.3.0" - sources."p-locate-3.0.0" - sources."p-try-2.2.0" - sources."parse-json-5.2.0" - (sources."path-type-3.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."pify-4.0.1" - sources."read-pkg-5.2.0" - sources."read-pkg-up-5.0.0" - sources."semver-7.3.5" - sources."slash-2.0.0" - sources."type-fest-0.6.0" - ]; - }) + sources."yocto-queue-0.1.0" (sources."yosay-2.0.2" // { dependencies = [ sources."ansi-regex-2.1.1" From 093b2f8b2608fe6600c1b510088de9418238547e Mon Sep 17 00:00:00 2001 From: sophrosyne97 Date: Wed, 21 Apr 2021 20:40:24 -0400 Subject: [PATCH 0928/1183] termsyn: init at 1.8.7 --- pkgs/data/fonts/termsyn/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/data/fonts/termsyn/default.nix diff --git a/pkgs/data/fonts/termsyn/default.nix b/pkgs/data/fonts/termsyn/default.nix new file mode 100644 index 000000000000..50450a04e2d8 --- /dev/null +++ b/pkgs/data/fonts/termsyn/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchurl, mkfontscale }: + +stdenv.mkDerivation rec { + pname = "termsyn"; + version = "1.8.7"; + + src = fetchurl { + url = "mirror://sourceforge/termsyn/termsyn-${version}.tar.gz"; + sha256 = "15vsmc3nmzl0pkgdpr2993da7p38fiw2rvcg01pwldzmpqrmkpn6"; + }; + + nativeBuildInputs = [ mkfontscale ]; + + installPhase = '' + install -m 644 -D *.pcf -t "$out/share/fonts" + install -m 644 -D *.psfu -t "$out/share/kbd/consolefonts" + mkfontdir "$out/share/fonts" + ''; + + meta = with lib; { + description = "Monospaced font based on terminus and tamsyn"; + homepage = "https://sourceforge.net/projects/termsyn/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ sophrosyne ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05ec02277c53..6d27a4c0f75e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -910,6 +910,8 @@ in inherit (haskellPackages) ghcWithPackages; }; + termsyn = callPackage ../data/fonts/termsyn { }; + tilda = callPackage ../applications/terminal-emulators/tilda { gtk = gtk3; }; From 303e476a6e28b371d47e0884baea59bff2f26d45 Mon Sep 17 00:00:00 2001 From: Maxim Zhukov Date: Sun, 25 Apr 2021 13:53:37 +0300 Subject: [PATCH 0929/1183] simple-http-server: init at 0.6.1 Co-authored-by: Fabian Affolter Signed-off-by: Maxim Zhukov --- pkgs/servers/simple-http-server/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/simple-http-server/default.nix diff --git a/pkgs/servers/simple-http-server/default.nix b/pkgs/servers/simple-http-server/default.nix new file mode 100644 index 000000000000..d93b4664019e --- /dev/null +++ b/pkgs/servers/simple-http-server/default.nix @@ -0,0 +1,29 @@ +{ lib, rustPlatform, fetchFromGitHub, pkg-config, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "simple-http-server"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "TheWaWaR"; + repo = pname; + rev = "v${version}"; + sha256 = "01a129i1ph3m8k6zkdcqnnkqbhlqpk7qvvdsz2i2kas54csbgsww"; + }; + + cargoSha256 = "050avk6wff8v1dlsfvxwvldmmgfakdxmhglv2bhvc2f3q8cf1d5d"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # Currently no tests are implemented, so we avoid building the package twice + doCheck = false; + + meta = with lib; { + description = "Simple HTTP server in Rust"; + homepage = "https://github.com/TheWaWaR/simple-http-server"; + license = licenses.mit; + maintainers = with maintainers; [ mephistophiles ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e915c24aeb9..88e41e284546 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31003,6 +31003,8 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; + simple-http-server = callPackage ../servers/simple-http-server { }; + diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc; From 42cca18c8c2eb4c29f448e755b1b7d810ed84c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 16:01:46 +0200 Subject: [PATCH 0930/1183] streamlink: 2.0.0 -> 2.1.1 --- .../applications/video/streamlink/default.nix | 23 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 97607f939fdd..94bd0877a7d1 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,30 +1,29 @@ { lib -, pythonPackages +, python3 , fetchFromGitHub , rtmpdump -, ffmpeg_3 +, ffmpeg }: -pythonPackages.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "streamlink"; - version = "2.0.0"; - disabled = pythonPackages.pythonOlder "3.5.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "+W9Nu5Ze08r7IlUZOkkVOz582E1Bbj0a3qIQHwxSmj8="; + sha256 = "14vqh4pck3q766qln7c57n9bz8zrlgfqrpkdn8x0ac9zhlhfn1zm"; }; - checkInputs = with pythonPackages; [ - pytest + checkInputs = with python3.pkgs; [ + pytestCheckHook mock requests-mock freezegun ]; - propagatedBuildInputs = (with pythonPackages; [ + propagatedBuildInputs = (with python3.pkgs; [ pycryptodome requests iso-639 @@ -33,7 +32,11 @@ pythonPackages.buildPythonApplication rec { isodate ]) ++ [ rtmpdump - ffmpeg_3 + ffmpeg + ]; + + disabledTests = [ + "test_plugin_not_in_removed_list" ]; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d168499a145..ffc23374a749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17621,7 +17621,7 @@ in stlport = callPackage ../development/libraries/stlport { }; - streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; + streamlink = callPackage ../applications/video/streamlink { }; streamlink-twitch-gui-bin = callPackage ../applications/video/streamlink-twitch-gui/bin.nix {}; sub-batch = callPackage ../applications/video/sub-batch { }; From 6b9e396a071f10119c12f9f8b249d2b17aeb23ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 25 Apr 2021 16:13:35 +0200 Subject: [PATCH 0931/1183] qalculate-gtk: 3.17.0 -> 3.18.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7ee867930895..56b6df94e8fb 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.17.0"; + version = "3.18.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "sha256-Nxe1DZL8mh9aBWXQdlp5wC1l5b9mchlrRyE+LKC+yLI="; + sha256 = "sha256-hE0di7B6dCnMmMBLgFkb6vPS4hS/7zD6BbviIucrn1I="; }; hardeningDisable = [ "format" ]; From 9db80bb156c3745695df1ebea0887d642f24cb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 Apr 2021 16:22:36 +0200 Subject: [PATCH 0932/1183] python3Packages.robotframework: 4.0 -> 4.0.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index 04e8ccf0bcf8..c61fbc21d6b0 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "robotframework"; - version = "4.0"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "a02a6f4af3b0830e4396058694c333cb63eb47f50acf6723be34f0f7a4d73ad7"; + sha256 = "9fa609ceb78f67b1476edce8a7011b16bf3ab41c0fb8c211de6c99955eaf9fde"; extension = "zip"; }; From ee01b57e35e510d83b6492072448ad986885d77f Mon Sep 17 00:00:00 2001 From: Akshat Agarwal Date: Sun, 25 Apr 2021 20:28:20 +0530 Subject: [PATCH 0933/1183] tremor-rs: 0.11.0 -> 0.11.1 --- pkgs/tools/misc/tremor-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index ca3f3058755f..73640de76bff 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tremor"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "tremor-rs"; repo = "tremor-runtime"; rev = "v${version}"; - sha256 = "19g0ijkclrza6s0qcbwwh3lhlkisy00ffcl0c0d7dfqwrcisgz57"; + sha256 = "0aw6m5gklpgv1frrviv1v1ky898dwbcc1crd65d3gldcmnhvg6ap"; }; - cargoSha256 = "1xv205czb2z6qpqi6vslyrx2n21510qqa11i2hwya3jdcc9lkrsd"; + cargoSha256 = "1lks3xgnzcccv3hiqgxjpfm4v4g97an8yzfnb2kakw7jkfli6kvi"; nativeBuildInputs = [ cmake pkg-config installShellFiles ]; From ed85d8cdfb705f8f1d350bdc6f51e0dfbca2015d Mon Sep 17 00:00:00 2001 From: Robbert Gurdeep Singh Date: Sun, 25 Apr 2021 17:01:20 +0200 Subject: [PATCH 0934/1183] languagetool: add preInstall and postInstall runhooks --- pkgs/tools/text/languagetool/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 57c46aab3813..810e3feaa228 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ jre ]; installPhase = '' + runHook preInstall + mkdir -p $out/share mv -- * $out/share/ @@ -22,6 +24,8 @@ stdenv.mkDerivation rec { makeWrapper ${jre}/bin/java $out/bin/languagetool-http-server \ --add-flags "-cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer" + + runHook postInstall ''; meta = with lib; { From 468926cba4d5ff826ea0caa408d836636bbeaeef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 17:03:06 +0200 Subject: [PATCH 0935/1183] sigal: 2.1.1 -> 2.2 --- pkgs/applications/misc/sigal/default.nix | 25 +++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index f2333aa99420..860e8f8adb59 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -1,33 +1,40 @@ -{ lib, python3Packages, ffmpeg_3 }: +{ lib, python3Packages, ffmpeg }: python3Packages.buildPythonApplication rec { - version = "2.1.1"; + version = "2.2"; pname = "sigal"; src = python3Packages.fetchPypi { inherit version pname; - sha256 = "0l07p457svznirz7qllgyl3qbhiisv7klhz7cbdw6417hxf9bih8"; + sha256 = "sha256-49XsNdZuicsiYJZuF1UdqMA4q33Ly/Ug/Hc4ybJKmPo="; }; disabled = !(python3Packages.pythonAtLeast "3.6"); - checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = with python3Packages; [ + # install_requires jinja2 markdown pillow pilkit - clint click blinker natsort - setuptools_scm + # extras_require + boto + brotli + feedgenerator + zopfli + cryptography ]; - makeWrapperArgs = [ "--prefix PATH : ${ffmpeg_3}/bin" ]; + checkInputs = [ + ffmpeg + ] ++ (with python3Packages; [ + pytestCheckHook + ]); - # No tests included - doCheck = false; + makeWrapperArgs = [ "--prefix PATH : ${ffmpeg}/bin" ]; meta = with lib; { description = "Yet another simple static gallery generator"; From 8e2d3f941e2878e2c666de9c5b131ffb15ff2665 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Thu, 22 Apr 2021 18:32:55 +0300 Subject: [PATCH 0936/1183] teleport: 5.2.1 -> 6.1.2 --- pkgs/servers/teleport/default.nix | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 2350311b9db2..c9ace581c7e1 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,27 +1,27 @@ # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev -{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }: +{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }: let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106"; - sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA="; + rev = "cf396f868aebb8ba654ea2398c25f033181e7114"; + sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk="; }; in -buildGoPackage rec { +buildGoModule rec { pname = "teleport"; - version = "5.2.1"; + version = "6.1.2"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08="; + sha256 = "sha256-4ZaebTTgGrGRQbMfDw1PL/qtDKmHbSY6kPmWyFeIcAU="; }; - goPackagePath = "github.com/gravitational/teleport"; + vendorSha256 = null; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; @@ -29,7 +29,6 @@ buildGoPackage rec { postBuild = '' pushd . - cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport mkdir -p build echo "making webassets" cp -r ${webassets}/* webassets/ @@ -41,13 +40,21 @@ buildGoPackage rec { popd ''; + # Do not strip the embedded web assets + dontStrip = true; + # Reduce closure size for client machines outputs = [ "out" "client" ]; buildTargets = [ "full" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + postInstall = '' install -Dm755 -t $client/bin $out/bin/tsh + wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin ''; @@ -62,7 +69,7 @@ buildGoPackage rec { meta = with lib; { description = "A SSH CA management suite"; - homepage = "https://gravitational.com/teleport/"; + homepage = "https://goteleport.com/"; license = licenses.asl20; maintainers = with maintainers; [ sigma tomberek freezeboy ]; platforms = platforms.unix; From df86e6fb0e0cd9601fa53b33b886c7e350fd71bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Sun, 25 Apr 2021 18:51:35 +0200 Subject: [PATCH 0937/1183] mpfi: fix download URL The `file_nr` value was wrong, so it was downloading version 1.5.3 instead of 1.5.4. --- pkgs/development/libraries/mpfi/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index 399c5416d781..db36ed38a953 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -1,16 +1,24 @@ -{lib, stdenv, fetchurl, mpfr}: +{lib, stdenv, fetchurl, autoconf, automake, libtool, texinfo, mpfr}: stdenv.mkDerivation rec { pname = "mpfi"; version = "1.5.4"; - file_nr = "37331"; + file_nr = "38111"; + src = fetchurl { # NOTE: the file_nr is whats important here. The actual package name (including the version) # is ignored. To find out the correct file_nr, go to https://gforge.inria.fr/projects/mpfi/ # and click on Download in the section "Latest File Releases". - url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tar.bz2"; - sha256 = "sha256-I4PUV7IIxs088uZracTOR0d7Kg2zH77AzUseuqJHGS8="; + url = "https://gforge.inria.fr/frs/download.php/file/${file_nr}/mpfi-${version}.tgz"; + sha256 = "sha256-Ozk4WV1yCvF5c96vcnz8DdQcixbCCtwQOpcPSkOuOlY="; }; - buildInputs = [mpfr]; + + nativeBuildInputs = [ autoconf automake libtool texinfo ]; + buildInputs = [ mpfr ]; + + preConfigure = '' + ./autogen.sh + ''; + meta = { inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; From bc1cd4f3b3d2039e78977f8e2a3c292b15336d6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Apr 2021 18:54:57 +0200 Subject: [PATCH 0938/1183] python3Packages.pynx584: init at 0.6 --- .../python-modules/pynx584/default.nix | 48 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/pynx584/default.nix diff --git a/pkgs/development/python-modules/pynx584/default.nix b/pkgs/development/python-modules/pynx584/default.nix new file mode 100644 index 000000000000..0f2fc2e7c0b2 --- /dev/null +++ b/pkgs/development/python-modules/pynx584/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, mock +, prettytable +, pyserial +, pytestCheckHook +, pythonOlder +, requests +, stevedore +}: + +buildPythonPackage rec { + pname = "pynx584"; + version = "0.6"; + disabled = pythonOlder "3.6"; + + + src = fetchFromGitHub { + owner = "kk7ds"; + repo = pname; + rev = version; + sha256 = "0if1jq8qiqp4w4zhf2xzzcb8y70hr5pxqzh96i008p6izjha89y6"; + }; + + propagatedBuildInputs = [ + flask + prettytable + pyserial + requests + stevedore + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + pythonImportsCheck = [ "nx584" ]; + + meta = with lib; { + description = "Python package for communicating to NX584/NX8E interfaces"; + homepage = "https://github.com/kk7ds/pynx584"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f22df1c35d93..bf4ac5a9f53d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5263,6 +5263,8 @@ in { pynws = callPackage ../development/python-modules/pynws { }; + pynx584 = callPackage ../development/python-modules/pynx584 { }; + pysbd = callPackage ../development/python-modules/pysbd { }; pyshark = callPackage ../development/python-modules/pyshark { }; From 5cd12de25c44c6f7dad3a1460f5e236074dcc12b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 23:03:35 +0200 Subject: [PATCH 0939/1183] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 4d86e743d151..52bc57fe98ae 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -573,7 +573,7 @@ "number" = ps: with ps; [ ]; "nut" = ps: with ps; [ ]; # missing inputs: pynut2 "nws" = ps: with ps; [ pynws ]; - "nx584" = ps: with ps; [ ]; # missing inputs: pynx584 + "nx584" = ps: with ps; [ pynx584 ]; "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai From 3e1f41395b608ce999184b5f0d824211f05b1386 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 23:03:54 +0200 Subject: [PATCH 0940/1183] home-assistant: enable nx584 tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index ea9a7f5d150c..c9706a7b6044 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -308,6 +308,7 @@ in with py.pkgs; buildPythonApplication rec { "notify" "notion" "number" + "nx584" "omnilogic" "ozw" "panel_custom" From 2756b33d07ced66570bb584b8fe9398ee3179ab8 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 13:46:05 -0300 Subject: [PATCH 0941/1183] ftgl: 2.1.3-rc5 -> 2.4.0 --- pkgs/development/libraries/ftgl/default.nix | 33 ++++++++++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 5588e27356f0..466ffcbb73a0 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,28 +1,42 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub +, autoreconfHook +, doxygen +, freeglut , freetype +, GLUT , libGL , libGLU , OpenGL +, pkg-config }: stdenv.mkDerivation rec { pname = "ftgl"; - version = "2.1.3-rc5"; + version = "2.4.0"; - src = fetchurl { - url = "mirror://sourceforge/${pname}-${version}.tar.gz"; - hash = "sha256-VFjWISJFSGlXLTn4qoV0X8BdVRgAG876Y71su40mVls="; + src = fetchFromGitHub { + owner = "frankheckenbach"; + repo = "ftgl"; + rev = "v${version}"; + hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; }; + nativeBuildInputs = [ + autoreconfHook + doxygen + pkg-config + ]; buildInputs = [ freetype ] ++ (if stdenv.isDarwin then [ OpenGL + GLUT ] else [ libGL libGLU + freeglut ]); configureFlags = [ @@ -31,8 +45,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + postInstall = '' + install -Dm644 src/FTSize.h -t ${placeholder "out"}/include/FTGL + install -Dm644 src/FTFace.h -t ${placeholder "out"}/include/FTGL + ''; + meta = with lib; { - homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; + homepage = "https://github.com/frankheckenbach/ftgl"; description = "Font rendering library for OpenGL applications"; longDescription = '' FTGL is a free cross-platform Open Source C++ library that uses Freetype2 @@ -40,7 +59,7 @@ stdenv.mkDerivation rec { pixmaps, texture maps, outlines, polygon mesh, and extruded polygon rendering modes. ''; - license = licenses.gpl3Plus; + license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1da1e9d34577..62d644faad88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4639,7 +4639,7 @@ in frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { }; ftgl = callPackage ../development/libraries/ftgl { - inherit (darwin.apple_sdk.frameworks) OpenGL; + inherit (darwin.apple_sdk.frameworks) OpenGL GLUT; }; ftop = callPackage ../os-specific/linux/ftop { }; From 963a8cfe25b4df70330495b01fa970516cc54b3d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:13:49 -0300 Subject: [PATCH 0942/1183] cimg: 2.9.6 -> 2.9.7 --- pkgs/development/libraries/cimg/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 9c89279cd51f..f70513e0cd00 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -1,28 +1,33 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib +, stdenv +, fetchFromGitHub +}: stdenv.mkDerivation rec { pname = "cimg"; - version = "2.9.6"; + version = "2.9.7"; src = fetchFromGitHub { owner = "dtschump"; repo = "CImg"; rev = "v.${version}"; - sha256 = "sha256-RdOfog5FOw5XESyDFX68Lb2MUyCeUuPaq/0UVNTjNKo="; + sha256 = "sha256-cR2wvGtomT1cZh8wKMCfYDNuP3d1gKhHJavVnvuQ8Mc="; }; installPhase = '' + runHook preInstall install -dm 755 $out/include/CImg/plugins $doc/share/doc/cimg/examples - install -m 644 CImg.h $out/include/ cp -dr --no-preserve=ownership examples/* $doc/share/doc/cimg/examples/ cp -dr --no-preserve=ownership plugins/* $out/include/CImg/plugins/ cp README.txt $doc/share/doc/cimg/ + runHook postInstall ''; outputs = [ "out" "doc" ]; meta = with lib; { + homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; longDescription = '' CImg stands for Cool Image. It is easy to use, efficient and is intended @@ -30,7 +35,6 @@ stdenv.mkDerivation rec { C++. Due to its generic conception, it can cover a wide range of image processing applications. ''; - homepage = "http://cimg.eu/"; license = licenses.cecill-c; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; From 3a7af6de81eedf4de73b6487e92a88babcb03f6b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:38:31 -0300 Subject: [PATCH 0943/1183] dialog: 1.3-2210306 -> 1.3-2210324 --- pkgs/{development => }/tools/misc/dialog/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) rename pkgs/{development => }/tools/misc/dialog/default.nix (88%) diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/tools/misc/dialog/default.nix similarity index 88% rename from pkgs/development/tools/misc/dialog/default.nix rename to pkgs/tools/misc/dialog/default.nix index dca8d9666af5..744f55aed10b 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/tools/misc/dialog/default.nix @@ -12,14 +12,16 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null; stdenv.mkDerivation rec { pname = "dialog"; - version = "1.3-20210306"; + version = "1.3-20210324"; src = fetchurl { url = "ftp://ftp.invisible-island.net/dialog/${pname}-${version}.tgz"; - hash = "sha256-pz57YHtjX2PAICuzMTEG5wD5H+Sp9NJspwA/brK5yw8="; + hash = "sha256-AcLR4umvmwg+ogDKrQhP39pVF41bv05Cyf/0STUVFlM="; }; - buildInputs = [ ncurses ]; + buildInputs = [ + ncurses + ]; configureFlags = [ "--disable-rpath-hacks" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62d644faad88..c8a494924816 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2264,7 +2264,7 @@ in inherit (haskellPackages) ghcWithPackages diagrams-builder; }; - dialog = callPackage ../development/tools/misc/dialog { }; + dialog = callPackage ../tools/misc/dialog { }; dibbler = callPackage ../tools/networking/dibbler { }; From 738e8eb967783b0bda4d3548cd775556d7b5e9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 25 Apr 2021 19:44:27 +0200 Subject: [PATCH 0944/1183] python3Packages.robotframework: run the unit tests The zip-file from PyPI lacks a few directories, notably the one containing the unit tests. So switch from fetchPypi to fetchFromGitHub. --- .../python-modules/robotframework/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index c61fbc21d6b0..027d0af303ea 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -1,15 +1,22 @@ -{ lib, fetchPypi, buildPythonPackage }: +{ lib, fetchFromGitHub, buildPythonPackage, jsonschema }: buildPythonPackage rec { pname = "robotframework"; version = "4.0.1"; - src = fetchPypi { - inherit pname version; - sha256 = "9fa609ceb78f67b1476edce8a7011b16bf3ab41c0fb8c211de6c99955eaf9fde"; - extension = "zip"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1nkph0slrhss6y52y8jgbdc6m8hbqjilrwp3r00wwyqdifrfa1i6"; }; + checkInputs = [ jsonschema ]; + + checkPhase = '' + python3 utest/run.py + ''; + meta = with lib; { description = "Generic test automation framework"; homepage = "https://robotframework.org/"; From 8a4abd956fff6a5d9cbc2282469478ca88f3fd33 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 24 Apr 2021 19:14:44 +0200 Subject: [PATCH 0945/1183] protoc-gen-go-grpc: init at 1.1.0 Using buildGoModule did not work for this package, and produced the error "main module (google.golang.org/grpc) does not contain package google.golang.org/grpc/cmd/protoc-gen-go-grpc". Since buildGoModule and buildGoPackage both seem in common use and both have their advantages (https://github.com/NixOS/nixpkgs/issues/84826) just using buildGoPackage seems like a neat solution here. --- .../tools/protoc-gen-go-grpc/default.nix | 29 ++ .../tools/protoc-gen-go-grpc/deps.nix | 333 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 364 insertions(+) create mode 100644 pkgs/development/tools/protoc-gen-go-grpc/default.nix create mode 100644 pkgs/development/tools/protoc-gen-go-grpc/deps.nix diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/development/tools/protoc-gen-go-grpc/default.nix new file mode 100644 index 000000000000..40aa45a30085 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -0,0 +1,29 @@ +{ buildGoPackage +, fetchFromGitHub +, lib +}: + +buildGoPackage rec { + pname = "protoc-gen-go-grpc"; + version = "1.1.0"; + + goPackagePath = "google.golang.org/grpc"; + + src = fetchFromGitHub { + owner = "grpc"; + repo = "grpc-go"; + rev = "cmd/protoc-gen-go-grpc/v${version}"; + sha256 = "14rjb8j6fm07rnns3dpwgkzf3y6rmia6i9n7ns6cldc5mbf7nwi3"; + }; + + subPackages = [ "cmd/protoc-gen-go-grpc" ]; + + goDeps = ./deps.nix; + + meta = with lib; { + description = "The Go language implementation of gRPC. HTTP/2 based RPC"; + license = licenses.asl20; + maintainers = [ maintainers.raboof ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/protoc-gen-go-grpc/deps.nix b/pkgs/development/tools/protoc-gen-go-grpc/deps.nix new file mode 100644 index 000000000000..d559989244d9 --- /dev/null +++ b/pkgs/development/tools/protoc-gen-go-grpc/deps.nix @@ -0,0 +1,333 @@ +# file generated from go.mod using vgo2nix (https://github.com/nix-community/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.26.0"; + sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/cncf/udpa/go"; + fetch = { + type = "git"; + url = "https://github.com/cncf/udpa"; + rev = "5459f2c99403"; + sha256 = "0i3al193dsp91j7iywqrm6fr56y2sz51ci4vf19mb3j4n2x44gsi"; + moduleDir = "go"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.0"; + sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "668b12f5399d"; + sha256 = "0vmhc8ii081x1k2qw4kji7wjyg6l25zp1y6qxi27wq8m341i4rzb"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.1.1"; + sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.4.2"; + sha256 = "0m5z81im4nsyfgarjhppayk4hqnrwswr3nix9mj8pff8x9jvcjqw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.5.0"; + sha256 = "04pzp583p6b32y34c6jygfxarff9qjs39rarvfh6467z24sdd9k4"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.2"; + sha256 = "1rbpfa0v0ly9sdnixcxhf79swki54ikgm1zkwwkj64p1ws66syqd"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + moduleDir = ""; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d8887717615a"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + moduleDir = ""; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/go-genproto"; + rev = "cb27e3aa2013"; + sha256 = "0ml73ghqcwbz7ipfk8fnxb5indcml49b5p7vp1fsyny0abyyrmxf"; + moduleDir = ""; + }; + } + { + goPackagePath = "google.golang.org/protobuf"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/protobuf"; + rev = "v1.25.0"; + sha256 = "0apfl42x166dh96zfq5kvv4b4ax9xljik6bq1mnvn2240ir3mc23"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + moduleDir = ""; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + moduleDir = ""; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; + moduleDir = ""; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d6ba1556197d..6e5b860d8eb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -265,6 +265,8 @@ in protoc-gen-go = callPackage ../development/tools/protoc-gen-go { }; + protoc-gen-go-grpc = callPackage ../development/tools/protoc-gen-go-grpc { }; + protoc-gen-twirp = callPackage ../development/tools/protoc-gen-twirp { }; protoc-gen-twirp_php = callPackage ../development/tools/protoc-gen-twirp_php { }; From 5b0b678a31100332903324f434e1d4f053a5f404 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 25 Apr 2021 19:09:36 +0100 Subject: [PATCH 0946/1183] qemu: patches: use correct CVE numbers for CVE-2021-20221 & CVE-2021-20181 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index d01af5dddb83..a10b8bd4b287 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -90,12 +90,12 @@ stdenv.mkDerivation rec { sha256 = "0sj0kr0g6jalygr5mb9i17fgr491jzaxvk3dvala0268940s01x9"; }) (fetchpatch { - name = "CVE-2020-20221.patch"; + name = "CVE-2021-20221.patch"; url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/arm_gic-fix-interrupt-ID-in-GICD_SGIR-CVE-2021-20221.patch"; sha256 = "1iyvcw87hzlc57fg5l87vddqmch8iw2yghk0s125hk5shn1bygjq"; }) (fetchpatch { - name = "CVE-2020-20181.patch"; + name = "CVE-2021-20181.patch"; url = "https://sources.debian.org/data/main/q/qemu/1:5.2+dfsg-10/debian/patches/9pfs-Fully-restart-unreclaim-loop-CVE-2021-20181.patch"; sha256 = "149ifiazj6rn4d4mv2c7lcayq744fijsv5abxlb8bhbkj99wd64f"; }) From ddbd4d4749b0fd4d236d2d495e154615d508edd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 20:42:56 +0200 Subject: [PATCH 0947/1183] simplescreenrecorder: 0.3.11 -> 0.4.3 --- .../video/simplescreenrecorder/default.nix | 20 +++++++++-------- .../simplescreenrecorder/fix-paths.patch | 22 +++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 939ae7c44400..14575a88dc17 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, mkDerivation, fetchurl, alsaLib, ffmpeg_3, libjack2, libX11, libXext, qtx11extras -, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, qtbase, cmake, ninja +{ lib, stdenv, mkDerivation, fetchFromGitHub, alsaLib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras +, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja }: mkDerivation rec { pname = "simplescreenrecorder"; - version = "0.3.11"; + version = "0.4.3"; - src = fetchurl { - url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz"; - sha256 = "0l6irdadqpajvv0dj3ngs1231n559l0y1pykhs2h7526qm4w7xal"; + src = fetchFromGitHub { + owner = "MaartenBaert"; + repo = "ssr"; + rev = version; + sha256 = "0mrx8wprs8bi42fwwvk6rh634ic9jnn0gkfpd6q9pcawnnbz3vq8"; }; cmakeFlags = [ "-DWITH_QT5=TRUE" ]; @@ -25,14 +27,14 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config cmake ninja ]; buildInputs = [ - alsaLib ffmpeg_3 libjack2 libX11 libXext libXfixes libGLU libGL - libpulseaudio qtbase qtx11extras + alsaLib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL + libpulseaudio libv4l qtbase qttools qtx11extras ]; meta = with lib; { description = "A screen recorder for Linux"; homepage = "https://www.maartenbaert.be/simplescreenrecorder"; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch b/pkgs/applications/video/simplescreenrecorder/fix-paths.patch index ba02240ce1f2..9cf634285fcb 100644 --- a/pkgs/applications/video/simplescreenrecorder/fix-paths.patch +++ b/pkgs/applications/video/simplescreenrecorder/fix-paths.patch @@ -12,10 +12,19 @@ index 48be48d..5038d4c 100755 -LD_PRELOAD="$LD_PRELOAD:libssr-glinject.so" "$@" +LD_PRELOAD="$LD_PRELOAD:@out@/lib/libssr-glinject.so" "$@" diff --git a/src/AV/Input/GLInjectInput.cpp b/src/AV/Input/GLInjectInput.cpp -index 6b378f8..cbcf82b 100644 +index fc98f31..18f5196 100644 --- a/src/AV/Input/GLInjectInput.cpp +++ b/src/AV/Input/GLInjectInput.cpp -@@ -96,7 +96,7 @@ void GLInjectInput::SetCapturing(bool capturing) { +@@ -113,7 +113,7 @@ bool ExecuteDetached(const char* command, const char* working_directory) { + + // try to execute command + do { +- res = execl("/bin/sh", "/bin/sh", "-c", command, (char*) NULL); ++ res = execl("@sh@", "@sh@", "-c", command, (char*) NULL); + } while(res == -1 and errno == EINTR); + + // failed, send feedback +@@ -207,7 +207,7 @@ void GLInjectInput::SetCapturing(bool capturing) { bool GLInjectInput::LaunchApplication(const QString& channel, bool relax_permissions, const QString& command, const QString& working_directory) { // prepare command @@ -24,12 +33,3 @@ index 6b378f8..cbcf82b 100644 full_command += "SSR_CHANNEL=\"" + ShellEscape(channel) + "\" "; if(relax_permissions) full_command += "SSR_STREAM_RELAX_PERMISSIONS=1 "; -@@ -106,7 +106,7 @@ bool GLInjectInput::LaunchApplication(const QString& channel, bool relax_permiss - QStringList args; - args.push_back("-c"); - args.push_back(full_command); -- return QProcess::startDetached("/bin/sh", args, working_directory); -+ return QProcess::startDetached("@sh@", args, working_directory); - - } - From 9a29b3479e26bfd8bc892a390288da7b401b2c99 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 25 Apr 2021 15:16:52 -0400 Subject: [PATCH 0948/1183] qogir-theme: 2021-02-09 -> 2021-04-20 --- pkgs/data/themes/qogir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index 3f87473a4a15..a1011fa0a159 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2021-02-09"; + version = "2021-04-20"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1pilq939bqzxysw4ixd279c49bp7l74bykpprrhgc5f2klpjg1zn"; + sha256 = "17ajrg5safnb6b1jbwvnysc4rvl6gkpnqdf89bammlrpkj6fr3ip"; }; buildInputs = [ gdk-pixbuf librsvg ]; From 7b8b3fab6dce5357c14fc435b436514fc985f0f7 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 25 Apr 2021 15:24:45 -0400 Subject: [PATCH 0949/1183] make-disk-image: Round image size to the next mebibyte This ensures the following gptfdisk warning won't happen: ``` Warning: File size is not a multiple of 512 bytes! Misbehavior is likely! ``` Additionally, helps towards aligning the partition to be more optimal for the underlying storage. It is actually impossible to align for the actual underlying storage optimally because we don't know what the block device will be! But aligning on 1MiB should help. --- nixos/lib/make-disk-image.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 26a591646e21..d87b3ef8da0c 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -188,6 +188,8 @@ let format' = format; in let echo "$acc" } + mebibyte=$(( 1024 * 1024 )) + # Approximative percentage of reserved space in an ext4 fs over 512MiB. # 0.05208587646484375 # × 1000, integer part: 52 @@ -266,10 +268,10 @@ let format' = format; in let # Add the GPT at the end gptSpace=$(( 512 * 34 * 1 )) # And include the bios_grub partition; the ext4 partition starts at 2MB exactly. - reservedSpace=$(( gptSpace + 2 * 1024*1024 )) + reservedSpace=$(( gptSpace + 2 * mebibyte )) '' else if partitionTableType == "legacy" then '' # Add the 1MiB aligned reserved space (includes MBR) - reservedSpace=$(( 1024*1024 )) + reservedSpace=$(( mebibyte )) '' else '' reservedSpace=0 ''} @@ -286,6 +288,14 @@ let format' = format; in let requiredFilesystemSpace=$(( diskUsage + fudge )) diskSize=$(( requiredFilesystemSpace + additionalSpace )) + + # Round up to the nearest mebibyte. + # This ensures whole 512 bytes sector sizes in the disk image + # and helps towards aligning partitions optimally. + if (( diskSize % mebibyte )); then + diskSize=$(( ( diskSize / mebibyte + 1) * mebibyte )) + fi + truncate -s "$diskSize" $diskImage printf "Automatic disk size...\n" From cdd61f4b713c6e923159646641928ec015bf0d85 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Sun, 25 Apr 2021 22:38:08 +0300 Subject: [PATCH 0950/1183] sonarr: 3.0.5.1144 -> 3.0.6.1196 --- pkgs/servers/sonarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index cdaa96464e7b..2ffbbb270237 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sonarr"; - version = "3.0.5.1144"; + version = "3.0.6.1196"; src = fetchurl { url = "https://download.sonarr.tv/v3/main/${version}/Sonarr.main.${version}.linux.tar.gz"; - sha256 = "1ajqh3hvjfsbs6rb2f8dnndxsycmlzamp0cwjwkh1j2dinbzdbvp"; + sha256 = "10fm5s1ayjmj0ip5510rb0nfh08gdaxin0xf2f3qw1z5kxys88fm"; }; nativeBuildInputs = [ makeWrapper ]; From 7b7ef90b2aeb2b2c38fb78f3ecb82ad62cc8a213 Mon Sep 17 00:00:00 2001 From: Andrei Pampu Date: Sun, 25 Apr 2021 22:43:59 +0300 Subject: [PATCH 0951/1183] bazarr: 0.9.2 -> 0.9.4 --- pkgs/servers/bazarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 1356f1c7a07c..24da18c4a877 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.9.2"; + version = "0.9.4"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "16mh7v8z5ijr75pvavcj6225w6bg12qy1d1w9vm2d5axnfm3wfbk"; + sha256 = "1qnzjqpwsvanfhd1yn5789yx4d3ijk9983llm0w5xnjz6rmcxrw5"; }; nativeBuildInputs = [ makeWrapper ]; From 43b9727a5506f202351b36242731d8d49a4ba5fa Mon Sep 17 00:00:00 2001 From: fortuneteller2k Date: Mon, 26 Apr 2021 02:30:35 +0800 Subject: [PATCH 0952/1183] kile-wl: init at unstable-2021-04-22 --- pkgs/applications/misc/kile-wl/default.nix | 26 +++ .../misc/kile-wl/update-Cargo-lock.diff | 153 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 181 insertions(+) create mode 100644 pkgs/applications/misc/kile-wl/default.nix create mode 100644 pkgs/applications/misc/kile-wl/update-Cargo-lock.diff diff --git a/pkgs/applications/misc/kile-wl/default.nix b/pkgs/applications/misc/kile-wl/default.nix new file mode 100644 index 000000000000..333f008fedc1 --- /dev/null +++ b/pkgs/applications/misc/kile-wl/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchFromGitLab, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kile-wl"; + version = "unstable-2021-04-22"; + + src = fetchFromGitLab { + owner = "snakedye"; + repo = "kile"; + rev = "b97b9f1e5b33862b33918efaf23fd1c0c5d7058a"; + sha256 = "sha256-97qJd3o8nJt8IX5tyGWtAmJsIv5Gcw1xoBFwxAqk7I8="; + }; + + # Upstream has Cargo.lock gitignored + cargoPatches = [ ./update-Cargo-lock.diff ]; + + cargoSha256 = "sha256-TEgIiw/XTDUOe9K7agHWI86f88w+eDJ332V0CgNHtfo="; + + meta = with lib; { + description = "A tiling layout generator for river"; + homepage = "https://gitlab.com/snakedye/kile"; + license = licenses.mit; + platforms = platforms.linux; # It's meant for river, a wayland compositor + maintainers = with maintainers; [ fortuneteller2k ]; + }; +} diff --git a/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff b/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff new file mode 100644 index 000000000000..8fc9fc555e83 --- /dev/null +++ b/pkgs/applications/misc/kile-wl/update-Cargo-lock.diff @@ -0,0 +1,153 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..05cf87b +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,147 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "cc" ++version = "1.0.67" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "downcast-rs" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" ++ ++[[package]] ++name = "kile" ++version = "0.1.0" ++dependencies = [ ++ "wayland-client", ++ "wayland-commons", ++ "wayland-scanner", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.93" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" ++ ++[[package]] ++name = "nix" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" ++dependencies = [ ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.19" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.26" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "smallvec" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "wayland-client" ++version = "0.28.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "06ca44d86554b85cf449f1557edc6cc7da935cc748c8e4bf1c507cbd43bae02c" ++dependencies = [ ++ "bitflags", ++ "downcast-rs", ++ "libc", ++ "nix", ++ "wayland-commons", ++ "wayland-scanner", ++ "wayland-sys", ++] ++ ++[[package]] ++name = "wayland-commons" ++version = "0.28.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8bd75ae380325dbcff2707f0cd9869827ea1d2d6d534cff076858d3f0460fd5a" ++dependencies = [ ++ "nix", ++ "once_cell", ++ "smallvec", ++ "wayland-sys", ++] ++ ++[[package]] ++name = "wayland-scanner" ++version = "0.28.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "389d680d7bd67512dc9c37f39560224327038deb0f0e8d33f870900441b68720" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "xml-rs", ++] ++ ++[[package]] ++name = "wayland-sys" ++version = "0.28.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2907bd297eef464a95ba9349ea771611771aa285b932526c633dc94d5400a8e2" ++dependencies = [ ++ "pkg-config", ++] ++ ++[[package]] ++name = "xml-rs" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b07db065a5cf61a7e4ba64f29e67db906fb1787316516c4e6e5ff0fea1efcd8a" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b7420896f8e..58dd7c1b43a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24194,6 +24194,8 @@ in linkerd = callPackage ../applications/networking/cluster/linkerd { }; + kile-wl = callPackage ../applications/misc/kile-wl { }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; wrapHelm = callPackage ../applications/networking/cluster/helm/wrapper.nix { }; From 4b0bde3b42552485f1e4283a950fcdc51ad4cb1c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 19:44:22 +0000 Subject: [PATCH 0953/1183] agi: 1.1.0-dev-20210421 -> 1.1.0-dev-20210423 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index aca53c254619..5fb1881eff9a 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "1.1.0-dev-20210421"; + version = "1.1.0-dev-20210423"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-2IgGvQy6omDEwrzQDfa/OLi3f+Q2zarvJVGk6ZhsjSA="; + sha256 = "sha256-49ZKqG+CiQkdoBMLdYrN5fMnJH5TtXdUknQLQB2UG04="; }; nativeBuildInputs = [ From bf4c2036af4f53d8a0906b6785d49038a7b8bec1 Mon Sep 17 00:00:00 2001 From: Amanjeev Sethi Date: Sun, 25 Apr 2021 15:49:26 -0400 Subject: [PATCH 0954/1183] maintainers: add Amanjeev Sethi --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36140b3889bd..cfa59864b960 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -492,6 +492,12 @@ fingerprint = "B422 CFB1 C9EF 73F7 E1E2 698D F53E 3233 42F7 A6D3A"; }]; }; + amanjeev = { + email = "aj@amanjeev.com"; + github = "amanjeev"; + githubId = 160476; + name = "Amanjeev Sethi"; + }; amar1729 = { email = "amar.paul16@gmail.com"; github = "amar1729"; From bc66efc5db51b57cafea2ae73c7ec46cf07dd75a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 20:22:31 +0000 Subject: [PATCH 0955/1183] bazelisk: 1.7.5 -> 1.8.0 --- pkgs/development/tools/bazelisk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index f9b4c3ea724f..ab73b8cd8f31 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.7.5"; + version = "1.8.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jXRTj/7GJO6rSueOmw8aNg69w43lxiDbSeZR802+kws="; + sha256 = "sha256-bD04wqmtBgdNlPGXz7/4kYQ97r9EthFfGExxOjt8u7k="; }; - vendorSha256 = "sha256-fW7KHsxhBfz947Tg+O5bdtiH6xMeKmLRHX9FWQSyxVQ="; + vendorSha256 = "sha256-IkW13y51NhKflAeHLu8k7DxRqYVnfMHSnfFuT6H/flo="; doCheck = false; From 78459891186af7cc32b0257c7abed69b59340ed9 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 16:54:13 -0300 Subject: [PATCH 0956/1183] docutils: 0.16 -> 0.17.1 --- pkgs/development/python-modules/docutils/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index bae0acc1d45d..0ccd53a9cbdc 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -3,17 +3,16 @@ , fetchPypi , buildPythonPackage , isPy3k -, isPy38 , python }: buildPythonPackage rec { pname = "docutils"; - version = "0.16"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"; + hash = "sha256-aGV30uTDI4C7UMuyL1de10LVgWjO436ZEXqFS82I8SU="; }; # Only Darwin needs LANG, but we could set it in general. @@ -30,8 +29,8 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python Documentation Utilities"; homepage = "http://docutils.sourceforge.net/"; + description = "Python Documentation Utilities"; license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; maintainers = with maintainers; [ AndersonTorres ]; }; From 9066cb97fe27a09423db8e285fe96b875980de53 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 25 Apr 2021 14:48:35 -0300 Subject: [PATCH 0957/1183] fme: refactor --- pkgs/applications/misc/fme/default.nix | 47 +++++++++++++++++++------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 52ba2927fd46..6f6a143ae8e0 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,33 +1,56 @@ -{ lib, stdenv, fetchurl, pkg-config, autoconf, automake, gettext -, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: +{ lib +, stdenv +, fetchurl +, autoconf +, automake +, bc +, fluxbox +, gettext +, glibmm +, gtkmm2 +, libglademm +, libsigcxx +, pkg-config +}: stdenv.mkDerivation rec { - pname = "fme"; version = "1.1.3"; src = fetchurl { url = "https://github.com/rdehouss/fme/archive/v${version}.tar.gz"; - sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; + hash = "sha256-0cgaajjA+q0ClDrWXW0DFL0gXG3oQWaaLv5D5MUD5j0="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; + nativeBuildInputs = [ + autoconf + automake + gettext + pkg-config + ]; + buildInputs = [ + bc + fluxbox + glibmm + gtkmm2 + libglademm + libsigcxx + ]; preConfigure = '' ./autogen.sh ''; meta = with lib; { + homepage = "https://github.com/rdehouss/fme/"; description = "Editor for Fluxbox menus"; longDescription = '' - Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox written in C++ - with the libraries Gtkmm, Glibmm, libglademm and gettext for internationalization. - Its user-friendly interface will help you to edit, delete, move (Drag and Drop) - a row, a submenu, etc very easily. + Fluxbox Menu Editor is a menu editor for the Window Manager Fluxbox + written in C++ with the libraries Gtkmm, Glibmm, libglademm and gettext + for internationalization. Its user-friendly interface will help you to + edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. ''; - homepage = "https://github.com/rdehouss/fme/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; }; From 383a3d41a112b0b35feaae6cfdf613750a703d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 25 Apr 2021 22:50:05 +0200 Subject: [PATCH 0958/1183] mplayer: use ffmpeg instead of ffmpeg_3 --- pkgs/applications/video/mplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index 4e245b70d4f8..0162a9997097 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,4 +1,4 @@ -{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg_3 +{ config, lib, stdenv, fetchurl, pkg-config, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config yasm ]; buildInputs = with lib; - [ freetype ffmpeg_3 ] + [ freetype ffmpeg ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi From e1ad2f5aa42283e79d33f8c6c8bbc20927fc68fe Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Sun, 25 Apr 2021 18:21:36 -0300 Subject: [PATCH 0959/1183] sage: remove cypari2 override This reverts commit c12ef05bda5bf3d31918ee97d717cd3221926e8c. --- pkgs/applications/science/math/sage/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index ef89caef4d7b..e39db4b1ac2d 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -11,14 +11,6 @@ let python3 = pkgs.python3.override { packageOverrides = self: super: { - cypari2 = super.cypari2.overridePythonAttrs (oldAttrs: rec { - version = "2.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db"; - }; - }); - # `sagelib`, i.e. all of sage except some wrappers and runtime dependencies sagelib = self.callPackage ./sagelib.nix { inherit flint arb; From 73c8614a07cd5201c30d0eea5c14f79f5fdd577f Mon Sep 17 00:00:00 2001 From: con-f-use Date: Sun, 25 Apr 2021 23:32:44 +0200 Subject: [PATCH 0960/1183] mcomix3: 2020-11-23 -> 2021-04-23 closes #119936 --- pkgs/applications/graphics/mcomix3/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/mcomix3/default.nix b/pkgs/applications/graphics/mcomix3/default.nix index add40043c0fa..db777b3bd77d 100644 --- a/pkgs/applications/graphics/mcomix3/default.nix +++ b/pkgs/applications/graphics/mcomix3/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { pname = "mcomix3"; - version = "unstable-2020-11-23"; + version = "unstable-2021-04-23"; # no official release on pypi/github and no build system src = fetchFromGitHub { repo = "${pname}"; owner = "multiSnow"; - rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"; + rev = "139344e23898c28484328fc29fd0c6659affb12d"; sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; }; @@ -46,6 +46,8 @@ python3.pkgs.buildPythonApplication rec { installPhase = '' runHook preInstall + substituteInPlace mime/*.desktop \ + --replace "Exec=mcomix" "Exec=mcomix3" ${python3.executable} installer.py --srcdir=mcomix --target=$libdir mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb From 11c7219d4df364da63fa12dd727c6f7b8daf8725 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Apr 2021 07:03:59 +1000 Subject: [PATCH 0961/1183] youtube-dl: 2021.04.07 -> 2021.04.26 https://github.com/ytdl-org/youtube-dl/releases/tag/2021.04.26 --- 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 fa17bea85852..3baad9f939b0 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,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 = "2021.04.07"; + version = "2021.04.26"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "02d51l6gdjr3zhhi7ydf5kzv8dv4jzq0ygja7zb2h9k7hnl0l27m"; + sha256 = "0jpa65jr5djn9175p6a8j9i1zgarshfwfsgmprc0vvnsl3s23ksc"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 68c34de775c6025d01acfb783bb0f583de5fc522 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 21:52:07 +0000 Subject: [PATCH 0962/1183] dnsproxy: 0.37.1 -> 0.37.2 --- pkgs/tools/networking/dnsproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 4c784d005426..a6e767c6bf6f 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zenVgWVzKnq9WzJFC6vpE5Gwbv3lJC7aIe3xBQGeWr8="; + sha256 = "sha256-pzE0nhL6Dqa9AfB2EGxETOo+BnTzzPnu8ANfbu1vfyI="; }; vendorSha256 = null; From fe8de6564ddce3ce80e6ca11aeab2e3c043cf021 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 25 Apr 2021 22:43:21 +0200 Subject: [PATCH 0963/1183] linuxPackages.usbip: clarify license --- pkgs/os-specific/linux/usbip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index d98559c46001..43c22a8fd12a 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip"; description = "allows to pass USB device from server to client over the network"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only gpl2Plus ]; platforms = platforms.linux; broken = kernelOlder "4.10"; }; From 0e431818caf169d1eb24cd8772e814786a915747 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 17 Apr 2021 23:09:59 +0200 Subject: [PATCH 0964/1183] python.pkgs.btrfs: 11 -> 12 and switch to fetchFromGithub as it's not published on pypi --- .../development/python-modules/btrfs/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/btrfs/default.nix b/pkgs/development/python-modules/btrfs/default.nix index adaf1f610e35..ff21d5670d72 100644 --- a/pkgs/development/python-modules/btrfs/default.nix +++ b/pkgs/development/python-modules/btrfs/default.nix @@ -1,17 +1,23 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub }: buildPythonPackage rec { pname = "btrfs"; - version = "11"; + version = "12"; - src = fetchPypi { - inherit pname version; - sha256 = "1w92sj47wy53ygz725xr613k32pk5khi0g9lrpp6img871241hrx"; + src = fetchFromGitHub { + owner = "knorrie"; + repo = "python-btrfs"; + rev = "v${version}"; + sha256 = "sha256-ZQSp+pbHABgBTrCwC2YsUUXAf/StP4ny7MEhBgCRqgE="; }; + # no tests (in v12) + doCheck = false; + pythonImportsCheck = [ "btrfs" ]; + meta = with lib; { description = "Inspect btrfs filesystems"; homepage = "https://github.com/knorrie/python-btrfs"; From e49b28b77c79e000510c4ef90b86bd078616642c Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 17 Apr 2021 22:50:04 +0200 Subject: [PATCH 0965/1183] btrfs-heatmap: 8 -> 9 --- .../filesystems/btrfs-heatmap/default.nix | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-heatmap/default.nix b/pkgs/tools/filesystems/btrfs-heatmap/default.nix index 04d74d78cfde..9de91738e74d 100644 --- a/pkgs/tools/filesystems/btrfs-heatmap/default.nix +++ b/pkgs/tools/filesystems/btrfs-heatmap/default.nix @@ -2,25 +2,17 @@ , fetchFromGitHub , python3 , installShellFiles -, fetchurl }: stdenv.mkDerivation rec { pname = "btrfs-heatmap"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "knorrie"; repo = "btrfs-heatmap"; rev = "v${version}"; - sha256 = "035frvk3s7g18y81srssvm550nfq7jylr7w60nvixidxvrc0yrnh"; - }; - - # man page is currently only in the debian branch - # https://github.com/knorrie/btrfs-heatmap/issues/11 - msrc = fetchurl { - url = "https://raw.githubusercontent.com/knorrie/btrfs-heatmap/45d844e12d7f5842ebb99e65d7b968a5e1a89066/debian/man/btrfs-heatmap.8"; - sha256 = "1md7xc426sc8lq4w29gjd6gv7vjqhcwrqqcr6z39kihvi04d5f6q"; + sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg="; }; buildInputs = [ python3 ]; @@ -29,11 +21,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; installPhase = '' - install -Dm 0755 heatmap.py $out/sbin/btrfs-heatmap - installManPage ${msrc} + runHook preInstall + + install -Dm 0755 btrfs-heatmap $out/sbin/btrfs-heatmap + installManPage man/btrfs-heatmap.1 buildPythonPath ${python3.pkgs.btrfs} patchPythonScript $out/sbin/btrfs-heatmap + + runHook postInstall ''; meta = with lib; { From 249d9041be040934ff7aa1edeee0cc406b33a338 Mon Sep 17 00:00:00 2001 From: Ivar Scholten Date: Mon, 26 Apr 2021 00:32:06 +0200 Subject: [PATCH 0966/1183] imagelol: init at 0.2 --- pkgs/tools/compression/imagelol/default.nix | 29 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/tools/compression/imagelol/default.nix diff --git a/pkgs/tools/compression/imagelol/default.nix b/pkgs/tools/compression/imagelol/default.nix new file mode 100644 index 000000000000..d54d2da2f90e --- /dev/null +++ b/pkgs/tools/compression/imagelol/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "imagelol"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "MCRedstoner2004"; + repo = pname; + rev = "v${version}"; + sha256 = "0978zdrfj41jsqm78afyyd1l64iki9nwjvhd8ynii1b553nn4dmd"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + mkdir -p $out/bin + cp ./ImageLOL $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/MCredstoner2004/ImageLOL"; + description = "Simple program to store a file into a PNG image"; + license = licenses.mit; + maintainers = [ maintainers.ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d35c8a01a325..37bb5ddbc3f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1475,6 +1475,8 @@ in ili2c = callPackage ../tools/misc/ili2c { }; + imagelol = callPackage ../tools/compression/imagelol { }; + imageworsener = callPackage ../tools/graphics/imageworsener { }; imgpatchtools = callPackage ../development/mobile/imgpatchtools { }; From 0080a5869066969e9cd8eebf7fe2f19ded637ff5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 27 Mar 2021 23:09:55 +0000 Subject: [PATCH 0967/1183] vips: 8.10.5 -> 8.10.6 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 333c4848db20..9319fa9b610e 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.5"; + version = "8.10.6"; outputs = [ "bin" "out" "man" "dev" ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-h21Ep6f4/y+m0kdrCA5dcULFeOOyLtMx2etAziG6f9Y="; + sha256 = "sha256-hdpkBC76PnPTN+rnNchLVk1CrhcClTtbaWyUcyUtuAk="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' From 486825e7c8f73f425e76174477eaa90ce2ab92d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 22:55:25 +0000 Subject: [PATCH 0968/1183] flacon: 6.1.0 -> 7.0.1 --- pkgs/applications/audio/flacon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index a9dc7308aca2..83d9c5da8381 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "flacon"; - version = "6.1.0"; + version = "7.0.1"; src = fetchFromGitHub { owner = "flacon"; repo = "flacon"; rev = "v${version}"; - sha256 = "04yp3aym7h70xjni9ancqv5lc4zds5a8dgw3fzgqs8k5nmh074gv"; + sha256 = "sha256-35tARJkyhC8EisIyDCwuT/UUruzLjJRUuZysuqeNssM="; }; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; From fbf8ee0a701b3e28ae25c5263e8af2938621ca61 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 26 Apr 2021 08:58:42 +1000 Subject: [PATCH 0969/1183] Revert "docutils: 0.16 -> 0.17.1" This reverts commit 78459891186af7cc32b0257c7abed69b59340ed9. Causes mass rebuild on master. --- pkgs/development/python-modules/docutils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index 0ccd53a9cbdc..bae0acc1d45d 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -3,16 +3,17 @@ , fetchPypi , buildPythonPackage , isPy3k +, isPy38 , python }: buildPythonPackage rec { pname = "docutils"; - version = "0.17.1"; + version = "0.16"; src = fetchPypi { inherit pname version; - hash = "sha256-aGV30uTDI4C7UMuyL1de10LVgWjO436ZEXqFS82I8SU="; + sha256 = "c2de3a60e9e7d07be26b7f2b00ca0309c207e06c100f9cc2a94931fc75a478fc"; }; # Only Darwin needs LANG, but we could set it in general. @@ -29,8 +30,8 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = "http://docutils.sourceforge.net/"; description = "Python Documentation Utilities"; + homepage = "http://docutils.sourceforge.net/"; license = with licenses; [ publicDomain bsd2 psfl gpl3Plus ]; maintainers = with maintainers; [ AndersonTorres ]; }; From 17f00cd216e5fc949ac0f1df3dba836c7bef431a Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Mon, 26 Apr 2021 01:06:52 +0200 Subject: [PATCH 0970/1183] nxdomain: 1.0.1 -> 1.0.2 --- pkgs/tools/networking/nxdomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix index 073ac48b8d34..4e7a708125aa 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "nxdomain"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn"; + sha256 = "0va7nkbdjgzrf7fnbxkh1140pbc62wyj86rdrrh5wmg3phiziqkb"; }; propagatedBuildInputs = [ dnspython ]; @@ -23,7 +23,7 @@ buildPythonApplication rec { homepage = "https://github.com/zopieux/nxdomain"; description = "A domain (ad) block list creator"; platforms = platforms.all; - license = licenses.gpl3Plus; + license = licenses.gpl3Only; maintainers = with maintainers; [ zopieux ]; }; } From f20ae954d57f7fa4f007a000291dc1644036570f Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Tue, 20 Apr 2021 23:00:05 +0200 Subject: [PATCH 0971/1183] make-disk-image: fix broken EFI image builds Work around missing /dev files inside runInLinuxVM by creating a symlink before calling nixos-enter. This fixes https://github.com/NixOS/nixpkgs/issues/93381. I ran into this issue when trying to create a VMware image that boots from EFI. Thanks @colemickens for reporting this and @danielfullmer for fixing the same thing in in qemu-vm.nix (37676e77cb5adab936606838d6465faafda54f61) and explaining what the issue was. --- nixos/lib/make-disk-image.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 023d0791a5c7..88c87bcd568e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -283,6 +283,9 @@ in pkgs.vmTools.runInLinuxVM ( # Some tools assume these exist ln -s vda /dev/xvda ln -s vda /dev/sda + # make systemd-boot find ESP without udev + mkdir /dev/block + ln -s /dev/vda1 /dev/block/254:1 mountPoint=/mnt mkdir $mountPoint From fff4eecadd71b97c0f1ca2910493f57005fdd835 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 23:33:54 +0000 Subject: [PATCH 0972/1183] fluxctl: 1.22.1 -> 1.22.2 --- pkgs/applications/networking/cluster/fluxctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 1d02e675f9c4..fadaa94995cb 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fluxctl"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "sha256-SaDO3a50CLhgLafCdgKEfHpuHdIweSy5L/TUgEUv5CM="; + sha256 = "sha256-qYdVplNHyD31m4IbIeL3x3nauZLl1XquslS3WrtUXBk="; }; vendorSha256 = "sha256-4uSw/9lI/rdDqy78jNC9eHYW/v/sMFb+sQvwYG6GZks="; From 1a5230e4a9f985e7d71e0197e27af5ff2cedbc66 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 15 Apr 2021 14:52:12 -0700 Subject: [PATCH 0973/1183] python3.pkgs.rpmfile: init at 1.0.8 --- .../python-modules/rpmfile/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/rpmfile/default.nix diff --git a/pkgs/development/python-modules/rpmfile/default.nix b/pkgs/development/python-modules/rpmfile/default.nix new file mode 100644 index 000000000000..e5d656795c2a --- /dev/null +++ b/pkgs/development/python-modules/rpmfile/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools-scm +}: +buildPythonPackage rec { + pname = "rpmfile"; + version = "1.0.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "e56cfc10e1a7d953b1890d81652a89400c614f4cdd9909464aece434d93c3a3e"; + }; + + # Tests access the internet + doCheck = false; + + nativeBuildInputs = [ + setuptools-scm + ]; + + pythonImportsCheck = [ + "rpmfile" + ]; + + meta = with lib; { + description = "Read rpm archive files"; + homepage = "https://github.com/srossross/rpmfile"; + license = licenses.mit; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index edeb7ffb3d00..0c343f8fe097 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7108,6 +7108,8 @@ in { inherit python; }); + rpmfile = callPackage ../development/python-modules/rpmfile { }; + rpmfluff = callPackage ../development/python-modules/rpmfluff { }; rpy2 = callPackage ../development/python-modules/rpy2 { }; From bef6991899476882e7fd3937cbf5322568ee3213 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 15 Apr 2021 16:29:21 -0700 Subject: [PATCH 0974/1183] python3.pkgs.cve-bin-tool: init at unstable-2021-04-15 --- .../python-modules/cve-bin-tool/default.nix | 83 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 85 insertions(+) create mode 100644 pkgs/development/python-modules/cve-bin-tool/default.nix diff --git a/pkgs/development/python-modules/cve-bin-tool/default.nix b/pkgs/development/python-modules/cve-bin-tool/default.nix new file mode 100644 index 000000000000..61ae8976815e --- /dev/null +++ b/pkgs/development/python-modules/cve-bin-tool/default.nix @@ -0,0 +1,83 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, jsonschema +, plotly +, pytest +, pytest-xdist +, pytest-cov +, pytest-asyncio +, beautifulsoup4 +, pyyaml +, isort +, py +, jinja2 +, rpmfile +, reportlab +, zstandard +, rich +, aiohttp +, toml + # aiohttp[speedups] +, aiodns +, brotlipy +, cchardet +, pillow +, pytestCheckHook +}: +buildPythonPackage { + pname = "cve-bin-tool"; + version = "unstable-2021-04-15"; + + src = fetchFromGitHub { + owner = "intel"; + repo = "cve-bin-tool"; + rev = "10cb6fd0baffe35babfde024bc8c70aa58629237"; + sha256 = "STf0tJBpadBqsbC+MghBai8zahDkrXfLoFRJ+84wvvY="; + }; + + # Wants to open a sqlite database, access the internet, etc + doCheck = false; + + propagatedBuildInputs = [ + jsonschema + plotly + pytest + pytest-xdist + pytest-cov + pytest-asyncio + beautifulsoup4 + pyyaml + isort + py + jinja2 + rpmfile + reportlab + zstandard + rich + aiohttp + toml + + # aiohttp[speedups] + aiodns + brotlipy + cchardet + # needed by brotlipy + pillow + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cve_bin_tool" + ]; + + meta = with lib; { + description = "CVE Binary Checker Tool"; + homepage = "https://github.com/intel/cve-bin-tool"; + license = licenses.gpl3Only; + maintainers = teams.determinatesystems.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c343f8fe097..adb4a4aa4038 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1603,6 +1603,8 @@ in { curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + cve-bin-tool = callPackage ../development/python-modules/cve-bin-tool { }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; cvxpy = callPackage ../development/python-modules/cvxpy { }; From 7d112134de0e6a7cefe503c93d0d070b8ea06fa3 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 25 Apr 2021 19:37:19 -0400 Subject: [PATCH 0975/1183] nixosTests.installer: Fix grub1 test being unreliable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The kernel sometimes assigns `/dev/sdb` to the 8GiB disk. This, in turn, means the test will fail because we're targeting the wrong disk. ``` machine # [ 0.000000] sd 2:0:0:0: [sda] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB) machine # [ 0.000000] sd 3:0:0:0: [sdb] 1048576 512-byte logical blocks: (537 MB/512 MiB) ``` ``` machine # [ 0.000000] sd 2:0:0:0: [sdb] 16777216 512-byte logical blocks: (8.59 GB/8.00 GiB) machine # [ 0.000000] sd 3:0:0:0: [sda] 1048576 512-byte logical blocks: (537 MB/512 MiB) ``` Note how the "sd x:0:0:0:` ID is stable. That is because QEMU **is** told to give specific identifiers to the disks. So using the dev/disk/by-id/ identifiers is stable. * * * Tested by forcing the sda/sdb swap this way: diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 24c55081f9a..2eee224351b 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -702,12 +702,19 @@ in { + " mkpart primary linux-swap 1M 1024M" + " mkpart primary ext2 1024M -1s", "udevadm settle", + ) + print(machine.succeed("find /dev/disk/ '!' -type d -printf '%p → %l\n' | sort")) + machine.succeed( "mkswap ${grubDevice}-part1 -L swap", "swapon -L swap", "mkfs.ext3 -L nixos ${grubDevice}-part2", "mount LABEL=nixos /mnt", "mkdir -p /mnt/tmp", ) + machine.succeed("echo success") + machine.succeed( + 'if [[ "$(find ${grubDevice} -printf \'%l\')" != "../../sdb" ]]; then exit 22; else true; fi' + ) ''; grubVersion = 1; # /dev/sda is not stable, even when the SCSI disk number is. And ran this way: $ until (clear; tmux clear ; time env -i nix-build nixos/release-combined.nix -A nixos.tests.installer.grub1.x86_64-linux); do echo derp; done --- nixos/tests/installer.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 904ec17229e1..24c55081f9a4 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -294,7 +294,7 @@ let # the same during and after installation. virtualisation.emptyDiskImages = [ 512 ]; virtualisation.bootDevice = - if grubVersion == 1 then "/dev/sdb" else "/dev/vdb"; + if grubVersion == 1 then "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive2" else "/dev/vdb"; virtualisation.qemu.diskInterface = if grubVersion == 1 then "scsi" else "virtio"; @@ -695,22 +695,23 @@ in { }; # Test a basic install using GRUB 1. - grub1 = makeInstallerTest "grub1" { + grub1 = makeInstallerTest "grub1" rec { createPartitions = '' machine.succeed( - "flock /dev/sda parted --script /dev/sda -- mklabel msdos" + "flock ${grubDevice} parted --script ${grubDevice} -- mklabel msdos" + " mkpart primary linux-swap 1M 1024M" + " mkpart primary ext2 1024M -1s", "udevadm settle", - "mkswap /dev/sda1 -L swap", + "mkswap ${grubDevice}-part1 -L swap", "swapon -L swap", - "mkfs.ext3 -L nixos /dev/sda2", + "mkfs.ext3 -L nixos ${grubDevice}-part2", "mount LABEL=nixos /mnt", "mkdir -p /mnt/tmp", ) ''; grubVersion = 1; - grubDevice = "/dev/sda"; + # /dev/sda is not stable, even when the SCSI disk number is. + grubDevice = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive1"; }; # Test using labels to identify volumes in grub From f2744c6b80e2be6e3c87d9bb35b9716b4f1301ae Mon Sep 17 00:00:00 2001 From: Morgan Jones Date: Sun, 25 Apr 2021 17:41:30 -0600 Subject: [PATCH 0976/1183] wsjtx: 2.2.2 -> 2.3.1 --- pkgs/applications/radio/wsjtx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/radio/wsjtx/default.nix b/pkgs/applications/radio/wsjtx/default.nix index 697a28e4be9b..ae378b571068 100644 --- a/pkgs/applications/radio/wsjtx/default.nix +++ b/pkgs/applications/radio/wsjtx/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchurl, asciidoc, asciidoctor, autoconf, automake, cmake, docbook_xsl, fftw, fftwFloat, gfortran, libtool, libusb1, qtbase, - qtmultimedia, qtserialport, qttools, texinfo, wrapQtAppsHook }: + qtmultimedia, qtserialport, qttools, boost, texinfo, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "wsjtx"; - version = "2.2.2"; + version = "2.3.1"; # This is a "superbuild" tarball containing both wsjtx and a hamlib fork src = fetchurl { url = "http://physics.princeton.edu/pulsar/k1jt/wsjtx-${version}.tgz"; - sha256 = "17agyrhclqyahgdwba8vi9sl7vq03sm00jlyrmjgv34a4czidg0w"; + sha256 = "11wzh4bxp9277kbqkyrc063akkk09czgxnkpk8k07vl4s3dan3hh"; }; # Hamlib builds with autotools, wsjtx builds with cmake @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { asciidoc asciidoctor autoconf automake cmake docbook_xsl gfortran libtool qttools texinfo wrapQtAppsHook ]; - buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport ]; + buildInputs = [ fftw fftwFloat libusb1 qtbase qtmultimedia qtserialport boost ]; # Remove Git dependency from superbuild since sources are included patches = [ ./super.patch ]; @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { # Older licenses are for the statically-linked hamlib license = with licenses; [ gpl3Plus gpl2Plus lgpl21Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ lasandell ]; + maintainers = with maintainers; [ lasandell numinit ]; }; } From 216491747960901ad905cb7cef4b4a85552a5558 Mon Sep 17 00:00:00 2001 From: therealansh Date: Thu, 22 Apr 2021 00:52:17 +0530 Subject: [PATCH 0977/1183] maintiners: add therealansh --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36140b3889bd..4a481b5ecf09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9861,6 +9861,12 @@ githubId = 3105057; name = "Jan Beinke"; }; + therealansh = { + email = "tyagiansh23@gmail.com"; + github = "therealansh"; + githubId = 57180880; + name = "Ansh Tyagi"; + }; thesola10 = { email = "me@thesola.io"; github = "thesola10"; From f1df273a67a2b17f97bc833b76639cda3cdd5d9a Mon Sep 17 00:00:00 2001 From: therealansh Date: Thu, 22 Apr 2021 00:53:17 +0530 Subject: [PATCH 0978/1183] zellij: init at 0.5.1 --- pkgs/tools/misc/zellij/default.nix | 34 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/zellij/default.nix diff --git a/pkgs/tools/misc/zellij/default.nix b/pkgs/tools/misc/zellij/default.nix new file mode 100644 index 000000000000..2f5f22193466 --- /dev/null +++ b/pkgs/tools/misc/zellij/default.nix @@ -0,0 +1,34 @@ +{ lib, fetchFromGitHub, rustPlatform, stdenv, installShellFiles, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "zellij"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "zellij-org"; + repo = pname; + rev = "v${version}"; + sha256 = "102zw4napzx05rpmx6scl6il55syf3lw1gzmy1y66cg1f70sij4d"; + }; + + cargoSha256 = "121fsch0an6d2hqaq0ws9cm7g5ppzfrycmmhajfacfg6wbiax1m5"; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + preCheck = '' + HOME=$TMPDIR + ''; + + postInstall = '' + installShellCompletion assets/completions/zellij.{bash,fish} --zsh assets/completions/_zellij + ''; + + meta = with lib; { + description = "A terminal workspace with batteries included"; + homepage = "https://zellij.dev/"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ therealansh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bdaec4afa2f5..aba778bfa6bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9771,6 +9771,8 @@ in zdelta = callPackage ../tools/compression/zdelta { }; + zellij = callPackage ../tools/misc/zellij { }; + zenith = callPackage ../tools/system/zenith { inherit (darwin.apple_sdk.frameworks) IOKit; }; From 6be41a3545c5fe7452039b0d17cfc597e540085f Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sun, 25 Apr 2021 20:07:35 -0400 Subject: [PATCH 0979/1183] grub2: Add samueldr as maintainer --- pkgs/tools/misc/grub/2.0x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index ad7a74e8137f..29ce5b23faaa 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -154,5 +154,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.gnu ++ platforms.linux; + + maintainers = [ maintainers.samueldr ]; }; }) From 789398cfa3f2933d5b9261f7df9d2dd5d1876926 Mon Sep 17 00:00:00 2001 From: Aiken Cairncross Date: Fri, 23 Apr 2021 19:59:09 +0100 Subject: [PATCH 0980/1183] python3Packages.onnx: 1.8.1 -> 1.9.0 --- pkgs/development/python-modules/onnx/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 90683a84f46a..62e12ebe7163 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -8,25 +8,22 @@ , numpy , six , typing-extensions -, typing +, pytestCheckHook , pytestrunner -, pytest , nbval , tabulate }: buildPythonPackage rec { pname = "onnx"; - version = "1.8.1"; + version = "1.9.0"; - # Due to Protobuf packaging issues this build of Onnx with Python 2 gives - # errors on import. - # Also support for Python 2 will be deprecated from Onnx v1.8. + # Python 2 is not supported as of Onnx v1.8 disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9d65c52009a90499f8c25fdfe5acda3ac88efe0788eb1d5f2575a989277145fb"; + sha256 = "0yjv2axz2vc2ysniwislsp53fsb8f61y1warrr2ppn2d9ijml1d9"; }; nativeBuildInputs = [ cmake ]; @@ -36,11 +33,11 @@ buildPythonPackage rec { numpy six typing-extensions - ] ++ lib.optional (pythonOlder "3.5") [ typing ]; + ]; checkInputs = [ + pytestCheckHook pytestrunner - pytest nbval tabulate ]; From ff6eef6cf131f1c75ea620ccff832672b7537b50 Mon Sep 17 00:00:00 2001 From: Aiken Cairncross Date: Sun, 25 Apr 2021 23:17:07 +0100 Subject: [PATCH 0981/1183] python3Packages.onnx: Patch out pytest-runner --- pkgs/development/python-modules/onnx/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 62e12ebe7163..cf1d595d90cd 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -9,7 +9,6 @@ , six , typing-extensions , pytestCheckHook -, pytestrunner , nbval , tabulate }: @@ -37,7 +36,6 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook - pytestrunner nbval tabulate ]; @@ -45,6 +43,9 @@ buildPythonPackage rec { postPatch = '' chmod +x tools/protoc-gen-mypy.sh.in patchShebangs tools/protoc-gen-mypy.sh.in tools/protoc-gen-mypy.py + + substituteInPlace setup.py \ + --replace "setup_requires.append('pytest-runner')" "" ''; preBuild = '' From 908c317cc37abc00154c330cf375c32bb550bf9e Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sun, 25 Apr 2021 17:36:16 -0700 Subject: [PATCH 0982/1183] python3Packages.cloudscraper: 1.2.56 -> 1.2.58 --- pkgs/development/python-modules/cloudscraper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cloudscraper/default.nix b/pkgs/development/python-modules/cloudscraper/default.nix index 591d1aac2e6a..cd11aa03f863 100644 --- a/pkgs/development/python-modules/cloudscraper/default.nix +++ b/pkgs/development/python-modules/cloudscraper/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "cloudscraper"; - version = "1.2.56"; + version = "1.2.58"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "84c5910023dd393619b2b793fdb154392c5c8887b55e4bcac3ad2646f1cfe212"; + sha256 = "1wnzv2k8cm8q1x18r4zg8pcnpm4gsdp82hywwjimp2v2qll918nx"; }; propagatedBuildInputs = [ From a54bc9b671b0ff938075c026180b2ec04b53c8b2 Mon Sep 17 00:00:00 2001 From: gfrascadorio Date: Sun, 25 Apr 2021 20:43:09 -0400 Subject: [PATCH 0983/1183] docker: fix systemd unit files (#120019) * docker: fix systemd unit files Add missing docker.socket file and patch ExecStart in docker.service so these units are useful on non-nixos systems using systemd. (issue #70407) * moved systemd units under: optionalString (stdenv.isLinux) --- pkgs/applications/virtualization/docker/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index f3d5572750fe..954404e5268f 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -105,6 +105,8 @@ rec { # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service + substituteInPlace $out/etc/systemd/system/docker.service --replace /usr/bin/dockerd $out/bin/dockerd + install -Dm644 ./contrib/init/systemd/docker.socket $out/etc/systemd/system/docker.socket ''; DOCKER_BUILDTAGS = [] @@ -178,6 +180,11 @@ rec { '' + optionalString (stdenv.isLinux) '' # symlink docker daemon to docker cli derivation ln -s ${moby}/bin/dockerd $out/bin/dockerd + + # systemd + mkdir -p $out/etc/systemd/system + ln -s ${moby}/etc/systemd/system/docker.service $out/etc/systemd/system/docker.service + ln -s ${moby}/etc/systemd/system/docker.socket $out/etc/systemd/system/docker.socket '' + '' # completion (cli) installShellCompletion --bash ./contrib/completion/bash/docker From eeeaa150a833bd69fe7dd8afaa16e3df8357c1fd Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 25 Apr 2021 14:32:33 +0000 Subject: [PATCH 0984/1183] ceph: require big-parallel It takes 3h+ for a 2 core build, and 24m for a big-parallel build for x86_64. For aarch64-linux, it times out with 2 cores. --- pkgs/tools/filesystems/ceph/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 413fc9de1859..57d5845c9961 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -198,6 +198,9 @@ in rec { doCheck = false; # uses pip to install things from the internet + # Takes 7+h to build with 2 cores. + requiredSystemFeatures = [ "big-parallel" ]; + meta = getMeta "Distributed storage system"; passthru.version = version; From b1173688a83f7f30f26edf60e9f2ce13ba1187e5 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 25 Apr 2021 14:36:22 +0000 Subject: [PATCH 0985/1183] clickhouse: require big-parallel It takes 7h+ on a "normal" 2-core-allocated Packet builder, and 20m on a big-parallel machine. --- pkgs/servers/clickhouse/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 063964b2f6a6..02c0b4aa5e56 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Builds in 7+h with 2 cores, and ~20m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { homepage = "https://clickhouse.tech/"; description = "Column-oriented database management system"; From 300d303d258e21bd989a4ff566fec3e06959c86f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 26 Apr 2021 00:30:45 +0000 Subject: [PATCH 0986/1183] aws-sdk-cpp: require big-parallel This compiles in ~2h on a 2-core builder, and 10m on a big-parallel machine. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index d6fbb97014d7..7fd7b2fbbdda 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -63,6 +63,9 @@ stdenv.mkDerivation rec { ./cmake-dirs.patch ]; + # Builds in 2+h with 2 cores, and ~10m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "A C++ interface for Amazon Web Services"; homepage = "https://github.com/awslabs/aws-sdk-cpp"; From 0d4abe5d4b63d55f3b93cd744218cf519a9789a0 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 26 Apr 2021 00:44:48 +0000 Subject: [PATCH 0987/1183] python3Packages.pytorch: require big-parallel This compiles in usually about 2h15m with a 2-core build, but about 10m on a big-parallel machine. --- pkgs/development/python-modules/pytorch/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 1436153e1db5..59a8c74f709c 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -297,6 +297,9 @@ in buildPythonPackage rec { install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib ''; + # Builds in 2+h with 2 cores, and ~15m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; From 3429633af36bcedff106c05e3cc1173641ffc32f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 26 Apr 2021 00:49:20 +0000 Subject: [PATCH 0988/1183] qemu: require big-parallel Compiles in about 2h50m on a 2-core builder, and 20m on a big-parallel machine. --- pkgs/applications/virtualization/qemu/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index c04d3b339452..a3f737e4a814 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -177,6 +177,9 @@ stdenv.mkDerivation rec { qemu-system-i386 = "bin/qemu-system-i386"; }; + # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. + requiredSystemFeatures = [ "big-parallel" ]; + meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; From 1f53e83fa0d69879798ff1e35d4b02d9dc11dc02 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:51:58 +0000 Subject: [PATCH 0989/1183] grype: 0.10.2 -> 0.11.0 --- pkgs/tools/security/grype/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 5db1f1d20e76..7323d092472f 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-kKzrV2TTO8NmB3x27ZStMZpSIRGwm5Ev+cPGwT50FEU="; + sha256 = "sha256-E1tJ9hEJ4GaL+S4dz6aGq3nJPpdtx0/Tfb1RzgJSe8M="; }; - vendorSha256 = "sha256-PC2n6+gPDxpG8RTAmCfK4P40yfxqlleYI6Ex4FtPjk4="; + vendorSha256 = "sha256-LUyrX/rm01tCPT6Ua6hphhf+4ycNn4tLONRyH3iTrZ4="; propagatedBuildInputs = [ docker ]; From ede6c0961e096d519b02121569493a7054b3eb6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:59:23 +0000 Subject: [PATCH 0990/1183] gxkb: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/gxkb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gxkb/default.nix b/pkgs/applications/misc/gxkb/default.nix index 8f6284c7d606..ea1f6b9715f4 100644 --- a/pkgs/applications/misc/gxkb/default.nix +++ b/pkgs/applications/misc/gxkb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gxkb"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "zen-tools"; repo = "gxkb"; rev = "v${version}"; - sha256 = "1fmppvpfz8rip71agsc464fdz423qw0xy8i3pcic14cy5gcwh069"; + sha256 = "sha256-pRVzhNoTMtiwqaxCGVImbvdRmLbZ2bst1IdMA2IKpYc="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From cbf777525fb9e2df32f729c7a4446bd46f2f91c4 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 26 Apr 2021 03:00:18 +0200 Subject: [PATCH 0991/1183] scribusUnstable: 1.5.6.1 -> 1.5.7 --- pkgs/applications/office/scribus/unstable.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index f83ce8b39b1c..549865cd8d85 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -2,7 +2,6 @@ , cairo , cmake , cups -, fetchpatch , fetchurl , fontconfig , freetype @@ -36,20 +35,13 @@ in mkDerivation rec { pname = "scribus"; - version = "1.5.6.1"; + version = "1.5.7"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-devel/${pname}-${version}.tar.xz"; - sha256 = "sha256-1CV2lVOc+kDerYq9rwTFHjTU10vK1aLJNNCObp1Dt6s="; + sha256 = "sha256-MYMWss/Hp2GR0+DT+MImUUfa6gVwFiAo4kPCktgm+M4="; }; - patches = [ - (fetchpatch { # fix build with podofo 0.9.7 - url = "https://github.com/scribusproject/scribus/commit/c6182ef92820b422d61c904e40e9fed865458eb5.patch"; - sha256 = "0vp275xfbd4xnj5s55cgzsihgihby5mmjlbmrc7sa6jbrsm8aa2c"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config From 5907b8151fd8c9e171809779beab6e5b0f6f0036 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 01:12:13 +0000 Subject: [PATCH 0992/1183] handlr: 0.6.1 -> 0.6.3 --- pkgs/tools/misc/handlr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/handlr/default.nix b/pkgs/tools/misc/handlr/default.nix index 978168d36764..baa718c1b1fc 100644 --- a/pkgs/tools/misc/handlr/default.nix +++ b/pkgs/tools/misc/handlr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "handlr"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0mxkirsicagvfyihcb06g2bsz5h0zp7xc87vldp4amgddzaxhpbg"; + sha256 = "sha256-OtU6sL2Bbbec0gHxk3bl5Inn+ZmNYiHgpSF0gjDuRSg="; }; - cargoSha256 = "11glh6f0cjrq76212h80na2rgwpzjmk0j78y3i98nv203rkrczid"; + cargoSha256 = "sha256-bX7QWV1R+pLxvghpaV10LeROv4wBVfZhHyrPCIgqETA="; nativeBuildInputs = [ shared-mime-info ]; From c62b3e0d6a91df360b8f72615f99789295039518 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 01:46:24 +0000 Subject: [PATCH 0993/1183] innernet: 1.1.0 -> 1.2.0 --- pkgs/tools/networking/innernet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index a195841ab575..abc7aca61a32 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "innernet"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tonarino"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OomCSA02ypFVzkYMcmkFREWB6x7oxgpt7x2zRANIDMw="; + sha256 = "sha256-Z4F5RYPVgFiiDBg6lxILjAh/a/rL7IJBqHIJ/tQyLnE="; }; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; nativeBuildInputs = with llvmPackages; [ llvm clang ]; buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-GYNk3j8fjKSo3Qk6Qy0l6kNINK3FxlSYoEkJSx7kVpk="; + cargoSha256 = "sha256-WSkN5aXMgfqZJAV1b3elF7kwf2f5OpcntKSf8620YcY="; meta = with lib; { description = "A private network system that uses WireGuard under the hood"; From aefb9470512a4bb00c8ac36c13386304088ac865 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 07:54:41 +0000 Subject: [PATCH 0994/1183] codeql: 2.5.0 -> 2.5.2 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index f62b1a248061..abcd947fa318 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.5.0"; + version = "2.5.2"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "sha256-teZ/9+oAEqGmy2S8Q89YDe8lqvAjzV6RWJ5AnfgQ6Mc="; + sha256 = "sha256-/Pl9qDzFSL67lBEyHPqy3QfNCXzR510SgM0U8f55Dqg="; }; nativeBuildInputs = [ From 298035ada67114196e21eb435c63ff684533799c Mon Sep 17 00:00:00 2001 From: jalr Date: Mon, 26 Apr 2021 01:40:46 +0200 Subject: [PATCH 0995/1183] chatterino2: 2.2.2 -> 2.3.0 --- .../networking/instant-messengers/chatterino2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix index f9789cfda418..075fd5b3a20a 100644 --- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "chatterino2"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Chatterino"; repo = pname; rev = "v${version}"; - sha256 = "026cs48hmqkv7k4akbm205avj2pn3x1g7q46chwa707k9km325dz"; + sha256 = "0x12zcrbkxn2nn0hqkj1amrxv4q032id282cajzsx7by970r1shd"; fetchSubmodules = true; }; nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; From acfddd576e143669837b4cb79558ed047636f1fb Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Sun, 25 Apr 2021 21:19:49 -0700 Subject: [PATCH 0996/1183] stdenv: support mainProgram in meta Support `mainProgram` as an attribute of `meta` for packages. This is an attribute used by [`nix run`](https://nixos.org/manual/nix/unstable/command-ref/new-cli/nix3-run.html#description) to customize the main program of a package. For example, `pkgs.neovim` provides a `/bin/nvim` executable which users would (almost certainly) prefer `nix run` to execute instead of a non-existing `/bin/neovim`. Signed-off-by: Ana Hobden --- pkgs/stdenv/generic/check-meta.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 7fa7f2305e84..ac62ad30829a 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -203,6 +203,7 @@ let metaTypes = with lib.types; rec { # These keys are documented description = str; + mainProgram = str; longDescription = str; branch = str; homepage = either (listOf str) str; From 580e83525b7101b49d0bbd39f0a291ffabb06982 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sun, 25 Apr 2021 09:53:49 +0800 Subject: [PATCH 0997/1183] inav-blackbox-tools: init at 2021-04-22 --- .../misc/inav-blackbox-tools/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/inav-blackbox-tools/default.nix diff --git a/pkgs/tools/misc/inav-blackbox-tools/default.nix b/pkgs/tools/misc/inav-blackbox-tools/default.nix new file mode 100644 index 000000000000..5f2fb65f9f3d --- /dev/null +++ b/pkgs/tools/misc/inav-blackbox-tools/default.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cairo }: + +stdenv.mkDerivation rec { + pname = "inav-blackbox-tools"; + version = "unstable-2021-04-22"; + + src = fetchFromGitHub { + owner = "iNavFlight"; + repo = "blackbox-tools"; + rev = "0109e2fb9b44d593e60bca4cef4098d83c55c373"; + sha256 = "1rdlw74dqq0hahnka2w2pgvs172vway2x6v8byxl2s773l22k4ln"; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ cairo ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/bin" + cp obj/{blackbox_decode,blackbox_render,encoder_testbed} "$out/bin" + + runHook postInstall + ''; + + meta = with lib; { + description = "Tools for working with blackbox flight logs"; + homepage = "https://github.com/inavflight/blackbox-tools"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ expipiplus1 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d561f54f59d6..1464aba61851 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12209,6 +12209,8 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; + inav-blackbox-tools = callPackage ../tools/misc/inav-blackbox-tools { }; + msp430GccSupport = callPackage ../development/misc/msp430/gcc-support.nix { }; msp430Newlib = callPackage ../development/misc/msp430/newlib.nix { }; From f34e2eb95a1b33a5a10885692a9d457b4cc7acf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 23:59:34 +0000 Subject: [PATCH 0998/1183] gdu: 4.10.1 -> 4.11.0 --- pkgs/tools/system/gdu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/gdu/default.nix b/pkgs/tools/system/gdu/default.nix index 3b7ef2c88d94..9e522f232039 100644 --- a/pkgs/tools/system/gdu/default.nix +++ b/pkgs/tools/system/gdu/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.10.1"; + version = "4.11.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zU4aSvfW1ph9PrXsAErCOedPn4oeeSh8tpnUj5LRlUw="; + sha256 = "sha256-E+/Ig6+J7pJ98O+YAntBGERml2ELzkji3gworBdcSVY="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; From 415db954d8c45ee99bfe5fa18c34e57f9b9cb218 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 22:27:10 +0000 Subject: [PATCH 0999/1183] fastmod: 0.4.1 -> 0.4.2 --- pkgs/tools/text/fastmod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/fastmod/default.nix b/pkgs/tools/text/fastmod/default.nix index ba2bedd5eacc..e838e2931c7e 100644 --- a/pkgs/tools/text/fastmod/default.nix +++ b/pkgs/tools/text/fastmod/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "0nrh6h5imbpl7i0sqqm16x9ggazww5739vng1ay1v6sgbbs0a095"; + sha256 = "sha256-Lv8hARD/aVWiWpJQmPWPeACpX15+3NogoUl5yh63E7A="; }; - cargoSha256 = "18bspi59vfnqijxgipmv2h6h5iy7qynpk1ph46yhjsnndjlxxcba"; + cargoSha256 = "sha256-L1MKoVacVKcpEG2IfS+eENxFZNiSaTDTxfFbFlvzYl8="; buildInputs = lib.optional stdenv.isDarwin Security; From 05c001a5e694b26c8f13087e0c6ed82624a513dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:23:21 +0000 Subject: [PATCH 1000/1183] go-task: 3.4.1 -> 3.4.2 --- pkgs/development/tools/go-task/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index 2e8988ec7881..e97819c4343f 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-task"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-r0AHGgv2huMaZfsbK7o4KKJirNeOff1M3jgG8ZUJoiA="; + sha256 = "sha256-632ISkBIZJBJpybuiuRHOV3CAJg1rSe3hK+W7hmW2cM="; }; vendorSha256 = "sha256-qKjCGZnCts4GfBafSRXR7xTvfJdqK8zjpu01eiyITkU="; From 800b729f06c979112be0bbcafe7f7637b199b698 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:29:06 +0000 Subject: [PATCH 1001/1183] goreleaser: 0.163.1 -> 0.164.0 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 6b92ecc5ef29..77cb54ce58d3 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.163.1"; + version = "0.164.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2SDy/Mk4TkXkJKF1gFW7/FH4Y31TE2X38I0r/Ng/BjU="; + sha256 = "sha256-DGiA9Ww/8sHNRgZ7nOx60YVZaxYBH5GJf6KqilwRKrE="; }; - vendorSha256 = "sha256-+Qdxnd+IhBNfZ0R2lCfPGJSjpTw1TA6uPjykCfrYtMk="; + vendorSha256 = "sha256-y7GesJU2kDtC5S6rnduDX9gcXakNIR8MdLuPW2m1QWs="; buildFlagsArray = [ "-ldflags=" From 9c75aaf3ae568b9029a3db2bc139b5a4f15626b5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 19:48:08 +0000 Subject: [PATCH 1002/1183] air: 1.25 -> 1.27.2 --- pkgs/development/tools/air/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index c058a3fec238..28cb6bf7a46c 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "air"; - version = "1.25"; + version = "1.27.2"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "sha256-on9Rb+QGFWx7/k9xD+tcaPu6YNaBBkFBHHMSWJbZpWM="; + sha256 = "sha256-VQymiDge42JBQwAHfHMF8imBC90uPout0fZRuQVOP5w="; }; vendorSha256 = "sha256-B7AgUFjiW3P1dU88u3kswbCQJ7Qq7rgPlX+b+3Pq1L4="; From abc021b6162f065eb8bfd093f0f0e105b5885152 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 00:12:51 +0000 Subject: [PATCH 1003/1183] gitleaks: 7.4.0 -> 7.4.1 --- pkgs/tools/security/gitleaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix index 685280ab4adb..c47afcd8e0f7 100644 --- a/pkgs/tools/security/gitleaks/default.nix +++ b/pkgs/tools/security/gitleaks/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "7.4.0"; + version = "7.4.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AY9pOARFAqIOimhcwEyau2MwJCFsWu8I36P7Z0xyJH0="; + sha256 = "sha256-GoHntsyxrMzLHlyKC3JxCkLoquIjOtidcG7hTNTYGuI="; }; vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; From f699ac480a3f2a39082aec473c593b3932bf123c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 1 Apr 2021 09:36:04 +0000 Subject: [PATCH 1004/1183] heimer: 2.2.0 -> 2.4.0 --- pkgs/applications/misc/heimer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 9d8dc1eaa03d..5d9fb0f30d76 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "heimer"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "juzzlin"; repo = pname; rev = version; - sha256 = "sha256-upsOmf46bCO8sVp5dBHPLUBZYZP3JyXa7H5KXbd76qo="; + sha256 = "sha256-5cepT9Tfr/3nYbxRAMqKSUDB+suEyojnexWxZ0i7GBw="; }; nativeBuildInputs = [ cmake ]; From 224fc21cc3c1d61bb6a0f0fcf948cabcbcc544f9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 10 Mar 2021 00:33:18 +0000 Subject: [PATCH 1005/1183] tetgen: 1.5.1 -> 1.6.0 --- pkgs/applications/science/geometry/tetgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index c921c05c58e4..75eaa089ecfb 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -1,13 +1,13 @@ {lib, stdenv, fetchurl}: -let version = "1.5.1"; in +let version = "1.6.0"; in stdenv.mkDerivation { pname = "tetgen"; inherit version; src = fetchurl { url = "http://wias-berlin.de/software/tetgen/1.5/src/tetgen${version}.tar.gz"; - sha256 = "0l5q066crs4cjj7qr0r2gnz8ajkgighngwglr1201h77lcs48sp4"; + sha256 = "sha256-h7XmHr06Rx/E8s3XEkwrEd1mOfT+sflBpdL1EQ0Fzjk="; }; installPhase = '' From 7c1a61aca44107f8e42dc34d07744d069c4de5d9 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Tue, 20 Apr 2021 08:49:44 +0200 Subject: [PATCH 1006/1183] cue: 0.3.0 -> 0.3.2 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index c974286ab99f..f48b54471b14 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "cue"; - version = "0.3.0"; + version = "0.3.2"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1h3809xgmn7dr57i3cnifr7r555i3zh3kfsv0gxa9nd7068w19xm"; + sha256 = "0rfgpq4dyd3zm07vcjzn5vv0dhvvryrarxc50sd2pxagbq5cqc8l"; }; vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp"; @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/cue" ]; buildFlagsArray = [ - "-ldflags=-X cuelang.org/go/cmd/cue/cmd.version=${version}" + "-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; meta = { From 4d538804081498a807b9a0e22ae11c54a0251eba Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 16:45:11 +0200 Subject: [PATCH 1007/1183] ocamlPackages.hpack: init at 0.8.0 --- .../ocaml-modules/hpack/default.nix | 37 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/hpack/default.nix diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix new file mode 100644 index 000000000000..ec967312b874 --- /dev/null +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -0,0 +1,37 @@ +{ buildDunePackage +, lib +, fetchurl +, angstrom +, faraday +}: + +buildDunePackage rec { + pname = "hpack"; + version = "0.8.0"; + + src = fetchurl { + url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; + sha256 = "0qcn3yvyz0h419fjg9nb20csfmwmh3ihz0zb0jfzdycf5w4mlry6"; + }; + + useDune2 = true; + minimumOCamlVersion = "4.04"; + + propagatedBuildInputs = [ + angstrom + faraday + ]; + + # circular dependency + doCheck = false; + + meta = { + license = lib.licenses.bsd3; + description = "An HPACK (Header Compression for HTTP/2) implementation in OCaml"; + homepage = "https://github.com/anmonteiro/ocaml-h2"; + maintainers = with lib.maintainers; [ + sternenseemann + anmonteiro + ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c7891a1821e8..30ebf6680bb9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -413,6 +413,8 @@ let hmap = callPackage ../development/ocaml-modules/hmap { }; + hpack = callPackage ../development/ocaml-modules/hpack { }; + hxd = callPackage ../development/ocaml-modules/hxd { }; imagelib = callPackage ../development/ocaml-modules/imagelib { }; From f4c229058da13060c3a1f6fdf67d238cbe4882a7 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 16:46:11 +0200 Subject: [PATCH 1008/1183] ocamlPackages.h2: init at 0.8.0 --- pkgs/development/ocaml-modules/h2/default.nix | 59 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/ocaml-modules/h2/default.nix diff --git a/pkgs/development/ocaml-modules/h2/default.nix b/pkgs/development/ocaml-modules/h2/default.nix new file mode 100644 index 000000000000..dd96e0ecc441 --- /dev/null +++ b/pkgs/development/ocaml-modules/h2/default.nix @@ -0,0 +1,59 @@ +{ buildDunePackage +, lib +, fetchFromGitHub +, ocaml +, hpack +, angstrom +, faraday +, base64 +, psq +, httpaf +, alcotest +, yojson +, hex +}: + +let + http2-frame-test-case = fetchFromGitHub { + owner = "http2jp"; + repo = "http2-frame-test-case"; + rev = "5c67db0d4d68e1fb7d3a241d6e01fc04d981f465"; + sha256 = "16yyb37f8mk9saw7ndjs5is67yq7qa6b6y7k0c75ibxi4n9aw1r3"; + }; +in + +buildDunePackage rec { + pname = "h2"; + + inherit (hpack) + version + src + useDune2 + ; + + minimumOCamlVersion = "4.06"; + + propagatedBuildInputs = [ + angstrom + faraday + base64 + psq + hpack + httpaf + ]; + + # Tests fail with 4.06 + doCheck = lib.versionAtLeast ocaml.version "4.07"; + preCheck = '' + ln -s "${http2-frame-test-case}" lib_test/http2-frame-test-case + ''; + checkInputs = [ + alcotest + yojson + hex + ]; + + meta = hpack.meta // { + description = "A high-performance, memory-efficient, and scalable HTTP/2 library for OCaml"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 30ebf6680bb9..56d992a92637 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -401,6 +401,8 @@ let inherit (pkgs) gsl; }; + h2 = callPackage ../development/ocaml-modules/h2 { }; + hacl_x25519 = callPackage ../development/ocaml-modules/hacl_x25519 { }; herelib = callPackage ../development/ocaml-modules/herelib { }; From 35dfa0e927924956cd47c083709a8147afea6d3d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 19 Apr 2021 10:15:12 +0200 Subject: [PATCH 1009/1183] =?UTF-8?q?alt-ergo:=202.3.3=20=E2=86=92=202.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../science/logic/alt-ergo/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index dd72d148e297..963015b11d50 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -1,12 +1,14 @@ -{ fetchurl, lib, which, ocamlPackages }: +{ fetchFromGitHub, lib, which, ocamlPackages }: let pname = "alt-ergo"; - version = "2.3.3"; + version = "2.4.0"; - src = fetchurl { - url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; - sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; + src = fetchFromGitHub { + owner = "OCamlPro"; + repo = pname; + rev = version; + sha256 = "1jm1yrvsg8iyfp9bb728zdx2i7yb6z7minjrfs27k5ncjqkjm65g"; }; useDune2 = true; @@ -19,6 +21,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src useDune2 nativeBuildInputs; configureFlags = pname; + buildInputs = with ocamlPackages; [ dune-configurator ]; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in @@ -36,7 +39,9 @@ ocamlPackages.buildDunePackage { configureFlags = pname; - buildInputs = [ alt-ergo-parsers ocamlPackages.menhir ]; + buildInputs = [ alt-ergo-parsers ] ++ (with ocamlPackages; [ + cmdliner menhir ]) + ; meta = { description = "High-performance theorem prover and SMT solver"; From 1be3d412c055994870de783417c52af4ef443260 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 26 Apr 2021 08:55:02 +0200 Subject: [PATCH 1010/1183] treewide: go: inherit platforms instead of using platforms.all `buildGoModule` and `buildGoPackage` by default inherit the `platforms` from go. That seems better than explicitly configuring `platforms.all`. There are also many packages that specify 'linux + darwin' - this is even suggested in the documentation. We might also want to update those, but let's do the noncontroversial change first. --- pkgs/applications/editors/gophernotes/default.nix | 1 - pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix | 1 - pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix | 1 - .../version-management/git-and-tools/ghorg/default.nix | 1 - pkgs/development/libraries/boringssl/default.nix | 1 - pkgs/development/tools/protoc-gen-go-grpc/default.nix | 1 - pkgs/servers/irc/robustirc-bridge/default.nix | 1 - pkgs/servers/monitoring/mackerel-agent/default.nix | 1 - 8 files changed, 8 deletions(-) diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix index 161acb54bbad..468b3ff03838 100644 --- a/pkgs/applications/editors/gophernotes/default.nix +++ b/pkgs/applications/editors/gophernotes/default.nix @@ -21,6 +21,5 @@ buildGoModule rec { homepage = "https://github.com/gopherdata/gophernotes"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index ce6491bfba47..3f340b0e5228 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -30,6 +30,5 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.apsl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix index 661048a0c72c..81e0d07d0bba 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-s3.nix @@ -33,6 +33,5 @@ buildGoModule rec { inherit (src.meta) homepage; license = licenses.apsl20; maintainers = with maintainers; [ yurrriq ]; - platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index 74e2a34aec1a..74f644e23ad2 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -32,6 +32,5 @@ buildGoModule rec { homepage = "https://github.com/gabrie30/ghorg"; license = licenses.asl20; maintainers = with maintainers; [ vidbina ]; - platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index f8c27f96dcc1..d51cf159598d 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -52,7 +52,6 @@ buildGoModule { meta = with lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; - platforms = platforms.all; maintainers = [ maintainers.thoughtpolice ]; license = with licenses; [ openssl isc mit bsd3 ]; }; diff --git a/pkgs/development/tools/protoc-gen-go-grpc/default.nix b/pkgs/development/tools/protoc-gen-go-grpc/default.nix index 40aa45a30085..6fd939d00237 100644 --- a/pkgs/development/tools/protoc-gen-go-grpc/default.nix +++ b/pkgs/development/tools/protoc-gen-go-grpc/default.nix @@ -24,6 +24,5 @@ buildGoPackage rec { description = "The Go language implementation of gRPC. HTTP/2 based RPC"; license = licenses.asl20; maintainers = [ maintainers.raboof ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix index 2530c72cbb9d..bc42fd12629e 100644 --- a/pkgs/servers/irc/robustirc-bridge/default.nix +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -24,6 +24,5 @@ buildGoModule rec { homepage = "https://robustirc.net/"; license = licenses.bsd3; maintainers = [ maintainers.hax404 ]; - platforms = platforms.all; }; } diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 8051602489c4..38c93248b5b6 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -37,6 +37,5 @@ buildGoModule rec { homepage = "https://github.com/mackerelio/mackerel-agent"; license = licenses.asl20; maintainers = with maintainers; [ midchildan ]; - platforms = platforms.all; }; } From b516dbfbd91676371f03ea81a0c5dc7e343fde02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Apr 2021 10:00:50 +0200 Subject: [PATCH 1011/1183] ffmpegthumbnailer: use ffmpeg instead of ffmpeg_3 (#120611) --- pkgs/development/libraries/ffmpegthumbnailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 2e68dbb1d120..dfdbf8eb2f80 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, ffmpeg_3, cmake, libpng, pkg-config, libjpeg +{ fetchFromGitHub, lib, stdenv, ffmpeg, cmake, libpng, pkg-config, libjpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config ]; - buildInputs = [ ffmpeg_3 libpng libjpeg ]; + buildInputs = [ ffmpeg libpng libjpeg ]; cmakeFlags = [ "-DENABLE_THUMBNAILER=ON" ]; meta = with lib; { From 0e391039ed045f7d3dc7aa48adf4ad20b3fe759c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Apr 2021 10:04:34 +0200 Subject: [PATCH 1012/1183] mousai: init at 0.3.1 (#120552) --- pkgs/applications/audio/mousai/default.nix | 69 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/audio/mousai/default.nix diff --git a/pkgs/applications/audio/mousai/default.nix b/pkgs/applications/audio/mousai/default.nix new file mode 100644 index 000000000000..502842c7aa73 --- /dev/null +++ b/pkgs/applications/audio/mousai/default.nix @@ -0,0 +1,69 @@ +{ lib +, python3 +, fetchFromGitHub +, appstream-glib +, desktop-file-utils +, gettext +, glib +, gobject-introspection +, gst_all_1 +, gtk3 +, libhandy +, librsvg +, meson +, ninja +, pkg-config +, wrapGAppsHook +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mousai"; + version = "0.3.1"; + + format = "other"; + + src = fetchFromGitHub { + owner = "SeaDve"; + repo = "Mousai"; + rev = "v${version}"; + sha256 = "0x57dci0prhlj79h74yh79cazn48rn0bckz5j3z4njk4fwc3fvfx"; + }; + + postPatch = '' + patchShebangs build-aux/meson + ''; + + nativeBuildInputs = [ + appstream-glib + desktop-file-utils + gettext + glib + gtk3 + meson + ninja + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gtk3 + libhandy + librsvg + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + requests + ]; + + meta = with lib; { + description = "Identify any songs in seconds"; + homepage = "https://github.com/SeaDve/Mousai"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aba778bfa6bc..30b49b3f71f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24657,6 +24657,8 @@ in motif = callPackage ../development/libraries/motif { }; + mousai = callPackage ../applications/audio/mousai { }; + mozjpeg = callPackage ../applications/graphics/mozjpeg { }; easytag = callPackage ../applications/audio/easytag { }; From cde5ca089a76b52cf724f6781c06d7f0ea26b377 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 24 Apr 2021 11:53:17 +0300 Subject: [PATCH 1013/1183] openboard: init at 1.6.1 --- .../graphics/openboard/default.nix | 116 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 118 insertions(+) create mode 100644 pkgs/applications/graphics/openboard/default.nix diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix new file mode 100644 index 000000000000..0aff3c997ffc --- /dev/null +++ b/pkgs/applications/graphics/openboard/default.nix @@ -0,0 +1,116 @@ +{ mkDerivation, lib, fetchFromGitHub, copyDesktopItems, makeDesktopItem, qmake +, qtbase, qtxmlpatterns, qttools, qtwebkit, libGL, fontconfig, openssl, poppler +, ffmpeg, libva, alsaLib, SDL, x264, libvpx, libvorbis, libtheora, libogg +, libopus, lame, fdk_aac, libass, quazip, libXext, libXfixes }: + +let + importer = mkDerivation rec { + pname = "openboard-importer"; + version = "unstable-2016-10-08"; + + src = fetchFromGitHub { + owner = "OpenBoard-org"; + repo = "OpenBoard-Importer"; + rev = "47927bda021b4f7f1540b794825fb0d601875e79"; + sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf"; + }; + + nativeBuildInputs = [ qmake ]; + + installPhase = '' + install -Dm755 OpenBoardImporter $out/bin/OpenBoardImporter + ''; + }; +in mkDerivation rec { + pname = "openboard"; + version = "1.6.1"; + + src = fetchFromGitHub { + owner = "OpenBoard-org"; + repo = "OpenBoard"; + rev = "v${version}"; + sha256 = "sha256-OlGXGIMghil/GG6eso20+CWo/hCjarXGs6edXX9pc/M="; + }; + + postPatch = '' + substituteInPlace OpenBoard.pro \ + --replace '/usr/include/quazip' '${quazip}/include/quazip5' \ + --replace '/usr/include/poppler' '${poppler.dev}/include/poppler' + ''; + + nativeBuildInputs = [ qmake copyDesktopItems ]; + + buildInputs = [ + qtbase + qtxmlpatterns + qttools + qtwebkit + libGL + fontconfig + openssl + poppler + ffmpeg + libva + alsaLib + SDL + x264 + libvpx + libvorbis + libtheora + libogg + libopus + lame + fdk_aac + libass + quazip + libXext + libXfixes + ]; + + propagatedBuildInputs = [ importer ]; + + makeFlags = [ "release-install" ]; + + desktopItems = [ + (makeDesktopItem { + name = "OpenBoard"; + exec = "OpenBoard %f"; + icon = "OpenBoard"; + comment = ""; + desktopName = "OpenBoard"; + mimeType = "application/ubz"; + categories = "Education;"; + startupNotify = true; + }) + ]; + + installPhase = '' + runHook preBuild + + lrelease OpenBoard.pro + + # Replicated release_scripts/linux/package.sh + mkdir -p $out/opt/openboard/i18n + cp -R resources/customizations build/linux/release/product/* $out/opt/openboard/ + cp resources/i18n/*.qm $out/opt/openboard/i18n/ + install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ + install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png + + runHook postBuild + ''; + + dontWrapQtApps = true; + + postFixup = '' + makeWrapper $out/opt/openboard/OpenBoard $out/bin/OpenBoard \ + "''${qtWrapperArgs[@]}" + ''; + + meta = with lib; { + description = + "Cross-platform interactive whiteboard application intended for use in a classroom setting"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ fufexan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad15c084ab2..d6b368f35264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7120,6 +7120,8 @@ in openbazaar = callPackage ../applications/networking/openbazaar { }; openbazaar-client = callPackage ../applications/networking/openbazaar/client.nix { }; + openboard = libsForQt5.callPackage ../applications/graphics/openboard { }; + opencc = callPackage ../tools/text/opencc { }; opencl-info = callPackage ../tools/system/opencl-info { }; From d1f0a17d399def947ffdbc2ac8bf040e478d5a78 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:54:53 +0300 Subject: [PATCH 1014/1183] Update pkgs/applications/graphics/openboard/default.nix Co-authored-by: Christoph Neidahl --- pkgs/applications/graphics/openboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 0aff3c997ffc..73166ea4d527 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -85,7 +85,7 @@ in mkDerivation rec { ]; installPhase = '' - runHook preBuild + runHook preInstall lrelease OpenBoard.pro From b15302a4d32b3ebe24872e61d852bb4df527d266 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:54:58 +0300 Subject: [PATCH 1015/1183] Update pkgs/applications/graphics/openboard/default.nix Co-authored-by: Christoph Neidahl --- pkgs/applications/graphics/openboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index 73166ea4d527..e1dda5000fa4 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -96,7 +96,7 @@ in mkDerivation rec { install -m644 resources/linux/openboard-ubz.xml $out/opt/openboard/etc/ install -Dm644 resources/images/OpenBoard.png $out/share/icons/hicolor/64x64/apps/OpenBoard.png - runHook postBuild + runHook postInstall ''; dontWrapQtApps = true; From e2da9e634d2d56fcf76800cc4bf719f52da1936f Mon Sep 17 00:00:00 2001 From: Mihai Fufezan <36706276+fufexan@users.noreply.github.com> Date: Mon, 26 Apr 2021 11:55:12 +0300 Subject: [PATCH 1016/1183] Update pkgs/applications/graphics/openboard/default.nix Co-authored-by: Christoph Neidahl --- pkgs/applications/graphics/openboard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index e1dda5000fa4..fefe34dc097b 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -76,7 +76,7 @@ in mkDerivation rec { name = "OpenBoard"; exec = "OpenBoard %f"; icon = "OpenBoard"; - comment = ""; + comment = "OpenBoard, an interactive white board application"; desktopName = "OpenBoard"; mimeType = "application/ubz"; categories = "Education;"; From 47e5dcf33e872c5ab6c8dac64293a9c7dd8bd092 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 10:56:22 +0200 Subject: [PATCH 1017/1183] kubei: init at 1.0.11 --- pkgs/tools/security/kubei/default.nix | 31 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/kubei/default.nix diff --git a/pkgs/tools/security/kubei/default.nix b/pkgs/tools/security/kubei/default.nix new file mode 100644 index 000000000000..1b1a8003b094 --- /dev/null +++ b/pkgs/tools/security/kubei/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "kubei"; + version = "1.0.11"; + + src = fetchFromGitHub { + owner = "Portshift"; + repo = pname; + rev = version; + sha256 = "0n9kzlw7wlzkc3yhq68jgjhnvig817kz0q81ydkjxp4snwc1kvw8"; + }; + + vendorSha256 = "0q0vkajn5n1aqb8wwdkvg8jv6j98l70g4hb399ickamhnirk69g4"; + + meta = with lib; { + description = "Kubernetes runtime scanner"; + longDescription = '' + Kubei is a vulnerabilities scanning and CIS Docker benchmark tool that + allows users to get an accurate and immediate risk assessment of their + kubernetes clusters. Kubei scans all images that are being used in a + Kubernetes cluster, including images of application pods and system pods. + ''; + homepage = "https://github.com/Portshift/kubei"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca92c4cc47c..cb07d0113aef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13063,6 +13063,8 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; + kubei = callPackage ../tools/security/kubei { }; + kubeprompt = callPackage ../development/tools/kubeprompt { }; kubespy = callPackage ../applications/networking/cluster/kubespy { }; From 84d3d95f564d4fead92b975a3335898cbbf45b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Apr 2021 11:01:19 +0200 Subject: [PATCH 1018/1183] python3Packages.mock-services: init at 0.3.1 --- .../python-modules/mock-services/default.nix | 56 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/development/python-modules/mock-services/default.nix diff --git a/pkgs/development/python-modules/mock-services/default.nix b/pkgs/development/python-modules/mock-services/default.nix new file mode 100644 index 000000000000..2917b21dcfe4 --- /dev/null +++ b/pkgs/development/python-modules/mock-services/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, attrs +, funcsigs +, requests-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "mock-services"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "peopledoc"; + repo = "mock-services"; + rev = version; + sha256 = "1rqyyfwngi1xsd9a81irjxacinkj1zf6nqfvfxhi55ky34x5phf9"; + }; + + patches = [ + # Fix issues due to internal API breaking in latest versions of requests-mock + (fetchpatch { + url = "https://github.com/peopledoc/mock-services/commit/88d3a0c9ef4dd7d5e011068ed2fdbbecc4a1a03a.patch"; + sha256 = "0a4pwxr33kr525sp8q4mb4cr3n2b51mj2a3052lhg6brdbi4gnms"; + }) + ]; + + propagatedBuildInputs = [ + attrs + funcsigs + requests-mock + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # require networking + "test_real_http_1" + "test_restart_http_mock" + "test_start_http_mock" + "test_stop_http_mock" + ]; + + pythonImportsCheck = [ "mock_services" ]; + + meta = with lib; { + description = "Mock an entire service API based on requests-mock"; + homepage = "https://github.com/peopledoc/mock-services"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 439d4d8e4a5c..f5059edc63a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4184,6 +4184,8 @@ in { mock-open = callPackage ../development/python-modules/mock-open { }; + mock-services = callPackage ../development/python-modules/mock-services { }; + modeled = callPackage ../development/python-modules/modeled { }; moderngl = callPackage ../development/python-modules/moderngl { }; From ab3dba9ad241147155cf6f8b74e143dd26537820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 26 Apr 2021 11:05:39 +0200 Subject: [PATCH 1019/1183] python3Packages.pylxd: fix build Also run tests. --- .../python-modules/pylxd/default.nix | 44 ++++++++++++++----- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/pylxd/default.nix b/pkgs/development/python-modules/pylxd/default.nix index 5d373ada09b5..64232f760faf 100644 --- a/pkgs/development/python-modules/pylxd/default.nix +++ b/pkgs/development/python-modules/pylxd/default.nix @@ -1,24 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi, pbr, dateutil, ws4py, requests-unixsocket, requests-toolbelt, mock }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +, python-dateutil +, requests +, requests-toolbelt +, requests-unixsocket +, ws4py +, ddt +, mock-services +, pytestCheckHook +}: buildPythonPackage rec { pname = "pylxd"; version = "2.3.0"; - src = fetchPypi { - inherit pname version; - sha256 = "1db88l55q974fm9z5gllx3i8bkj0jzi25xrr5cs6id3bfy4zp8a7"; + src = fetchFromGitHub { + owner = "lxc"; + repo = "pylxd"; + rev = version; + sha256 = "144frnlsb21mglgyisms790hyrdfx1l91lcd7incch4m4a1cbpp6"; }; propagatedBuildInputs = [ - pbr - dateutil - ws4py - requests-unixsocket + cryptography + python-dateutil + requests requests-toolbelt + requests-unixsocket + ws4py + ]; + + checkInputs = [ + ddt + mock-services + pytestCheckHook + ]; + + disabledTestPaths = [ + "integration" + "migration" ]; - # tests require an old version of requests-mock that we do not have a package for - doCheck = false; pythonImportsCheck = [ "pylxd" ]; meta = with lib; { From 8a41a6077344348a7514fea10f06e373e26ddc73 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Mon, 26 Apr 2021 12:33:53 +0300 Subject: [PATCH 1020/1183] openboard: update meta.description --- pkgs/applications/graphics/openboard/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix index fefe34dc097b..859c22192181 100644 --- a/pkgs/applications/graphics/openboard/default.nix +++ b/pkgs/applications/graphics/openboard/default.nix @@ -107,8 +107,7 @@ in mkDerivation rec { ''; meta = with lib; { - description = - "Cross-platform interactive whiteboard application intended for use in a classroom setting"; + description = "Interactive whiteboard application"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fufexan ]; platforms = platforms.linux; From 111261cab9df712e96f07830ee20966647231314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 11:34:44 +0200 Subject: [PATCH 1021/1183] krita: 4.4.2 -> 4.4.3 --- pkgs/applications/graphics/krita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 4700b1dfbbf5..63123c02180f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.2"; + version = "4.4.3"; src = fetchurl { - url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "121fjdv5phx1aqk21vx9k9vsc5k1w8s86gp6pamy2y31r2ph7r8y"; + url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.gz"; + sha256 = "0rwghzci2wn2jmisvnzs23yxc2z3d4dcx2qbbhcvjyi3q8ij61nl"; }; nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; From 1586cbd915e652a6a204c11ec55dc7678fd3a322 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Mon, 26 Apr 2021 11:43:42 +0200 Subject: [PATCH 1022/1183] castty: init at 2020-11-10 (#120478) Co-authored-by: Fabian Affolter Co-authored-by: Sandro --- pkgs/tools/misc/castty/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/castty/default.nix diff --git a/pkgs/tools/misc/castty/default.nix b/pkgs/tools/misc/castty/default.nix new file mode 100644 index 000000000000..ddda737c8b5b --- /dev/null +++ b/pkgs/tools/misc/castty/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, fetchFromGitHub, libsoundio, lame }: + +stdenv.mkDerivation { + pname = "castty"; + version = "unstable-2020-11-10"; + + src = fetchFromGitHub { + owner = "dhobsd"; + repo = "castty"; + rev = "333a2bafd96d56cd0bb91577ae5ba0f7d81b3d99"; + sha256 = "0p84ivwsp8ds4drn0hx2ax04gp0xyq6blj1iqfsmrs4slrajdmqs"; + }; + + buildInputs = [ libsoundio lame ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "CLI tool to record audio-enabled screencasts of your terminal, for the web"; + homepage = "https://github.com/dhobsd/castty"; + license = licenses.bsd3; + maintainers = with maintainers; [ iblech ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30b49b3f71f6..3d279513292e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1235,6 +1235,8 @@ in inherit (nodePackages) castnow; + castty = callPackage ../tools/misc/castty { }; + certigo = callPackage ../tools/admin/certigo { }; catcli = python3Packages.callPackage ../tools/filesystems/catcli { }; From 4c959e68bf6b52350033d03a6859ab7a91f10424 Mon Sep 17 00:00:00 2001 From: schnusch Date: Mon, 26 Apr 2021 12:10:59 +0200 Subject: [PATCH 1023/1183] esbuild: 0.11.14 -> 0.11.15 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index 47f8b217bc5f..65dce6d2cdf1 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.11.14"; + version = "0.11.15"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "0qxylzc7lzpsp5hm3dl5jvy9aca8azn8dmbjz9z5n5rkdmm8vd9p"; + sha256 = "1j6qli26i2hwkjqcigz7vyx6hg9daq4vlqigv7ddslw3h8hnp0md"; }; vendorSha256 = "1n5538yik72x94vzfq31qaqrkpxds5xys1wlibw2gn2am0z5c06q"; From 38568801d39cb2382b07a49434f2cc6b78624654 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 12:20:51 +0200 Subject: [PATCH 1024/1183] kubesec: init at 2.11.0 --- pkgs/tools/security/kubesec/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/security/kubesec/default.nix diff --git a/pkgs/tools/security/kubesec/default.nix b/pkgs/tools/security/kubesec/default.nix new file mode 100644 index 000000000000..3059ba9af9f5 --- /dev/null +++ b/pkgs/tools/security/kubesec/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "kubesec"; + version = "2.11.0"; + + src = fetchFromGitHub { + owner = "controlplaneio"; + repo = pname; + rev = "v${version}"; + sha256 = "0rv5qywh8107rqdly1x7wkb6dljalyn9abrkm12bxa7cqscp9b4z"; + }; + + vendorSha256 = "0xngnx67giwp0g7c19xhb6kmc9m3bjlwk2wwp9bn9vwkmss3ysyp"; + + # Tests wants to download additional files + doCheck = false; + + meta = with lib; { + description = "Security risk analysis tool for Kubernetes resources"; + homepage = "https://github.com/controlplaneio/kubesec"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca92c4cc47c..a278269032c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13065,6 +13065,8 @@ in kubeprompt = callPackage ../development/tools/kubeprompt { }; + kubesec = callPackage ../tools/security/kubesec { }; + kubespy = callPackage ../applications/networking/cluster/kubespy { }; kubicorn = callPackage ../development/tools/kubicorn { }; From b164642941e7060f5c565e85746239e96f323cd1 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 26 Apr 2021 19:54:29 +0900 Subject: [PATCH 1025/1183] fishplugins.forgit: init "unstable-2021-04-09" --- pkgs/shells/fish/plugins/default.nix | 2 ++ pkgs/shells/fish/plugins/forgit.nix | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/shells/fish/plugins/forgit.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index c886173096e1..42252ccbe38c 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -15,6 +15,8 @@ lib.makeScope newScope (self: with self; { foreign-env = callPackage ./foreign-env { }; + forgit-fish = callPackage ./forgit.nix { }; + fzf-fish = callPackage ./fzf-fish.nix { }; pure = callPackage ./pure.nix { }; diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix new file mode 100644 index 000000000000..b905b7a25895 --- /dev/null +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -0,0 +1,22 @@ +{ lib, buildFishPlugin, fetchFromGitHub, git, fzf }: + +buildFishPlugin rec { + pname = "forgit"; + version = "unstable-2021-04-09"; + + buildInputs = [ git fzf ]; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = "forgit"; + rev = "7806fc3ab37ac479c315eb54b164f67ba9ed17ea"; + sha256 = "sha256-a7wjuqXe3+y5zlgSLk5J31WoORbieFimvtr0FQHRY5M="; + }; + + meta = with lib; { + description = "A utility tool powered by fzf for using git interactively."; + homepage = "https://github.com/wfxr/forgit"; + license = licenses.mit; + maintainers = with maintainers; [ happysalada ]; + }; +} From dea924ccf8cfc507964160b3dfcb6807c9a2d428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 26 Apr 2021 13:36:11 +0200 Subject: [PATCH 1026/1183] clojure: 1.10.3.814 -> 1.10.3.822 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index a96fb03aab20..a18a51aa621b 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.814"; + version = "1.10.3.822"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-+jpnhuKPvxKJA8xDo9GiRKpFJdPYRJTssmZtafadEn4="; + sha256 = "14vl2lycbcihashs8443rgwi4llkjkrfwls9sfr7dq3mi2g7fidb"; }; nativeBuildInputs = [ From 2a954135a64c70feead578a2b7fd098b6535e99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Apr 2021 14:02:22 +0200 Subject: [PATCH 1027/1183] lazygit: 0.27.3 -> 0.28.1 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index cd0fb4a33305..7038b7c1eb03 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "lazygit"; - version = "0.27.3"; + version = "0.28.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-giHAeD7hhda9YV+NQuZ6w0eow79egGhUCIX0dPvhrWk="; + sha256 = "sha256-tan8ksSyMIeDL7oRAWd3Qtz/sKbhAAfY7IknfwjyvgQ="; }; vendorSha256 = null; From 2ad8aa72ae32d1890a94fbb3c26cc51b2661b88b Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 24 Apr 2021 14:01:47 +0200 Subject: [PATCH 1028/1183] jellyfin_10_5: remove unmaintained version This version contains a vulnerability[1], and isn't maintained. The original reason to have two jellyfin versions was to allow end-users to backup the database before the layout was upgraded, but these backups should be done periodically. [1]: --- nixos/modules/services/misc/jellyfin.nix | 6 +-- pkgs/servers/jellyfin/10.5.x.nix | 61 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 pkgs/servers/jellyfin/10.5.x.nix diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index 64b774a220b6..c1b45864041b 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -18,6 +18,7 @@ in package = mkOption { type = types.package; + default = pkgs.jellyfin; example = literalExample "pkgs.jellyfin"; description = '' Jellyfin package to use. @@ -98,11 +99,6 @@ in }; }; - services.jellyfin.package = mkDefault ( - if versionAtLeast config.system.stateVersion "20.09" then pkgs.jellyfin - else pkgs.jellyfin_10_5 - ); - users.users = mkIf (cfg.user == "jellyfin") { jellyfin = { group = cfg.group; diff --git a/pkgs/servers/jellyfin/10.5.x.nix b/pkgs/servers/jellyfin/10.5.x.nix deleted file mode 100644 index 9bece72566f8..000000000000 --- a/pkgs/servers/jellyfin/10.5.x.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, sqlite, makeWrapper, dotnetCorePackages, ffmpeg, - fontconfig, freetype, nixosTests }: - -let - os = if stdenv.isDarwin then "osx" else "linux"; - arch = - with stdenv.hostPlatform; - if isx86_32 then "x86" - else if isx86_64 then "x64" - else if isAarch32 then "arm" - else if isAarch64 then "arm64" - else lib.warn "Unsupported architecture, some image processing features might be unavailable" "unknown"; - musl = lib.optionalString stdenv.hostPlatform.isMusl - (if (arch != "x64") - then lib.warn "Some image processing features might be unavailable for non x86-64 with Musl" "musl-" - else "musl-"); - runtimeDir = "${os}-${musl}${arch}"; - -in stdenv.mkDerivation rec { - pname = "jellyfin"; - version = "10.5.5"; - - # 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 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; - }; - - nativeBuildInputs = [ unzip ]; - buildInputs = [ - makeWrapper - ]; - - propagatedBuildInputs = [ - dotnetCorePackages.aspnetcore_3_1 - sqlite - ]; - - preferLocalBuild = true; - - installPhase = '' - install -dm 755 "$out/opt/jellyfin" - cp -r * "$out/opt/jellyfin" - makeWrapper "${dotnetCorePackages.aspnetcore_3_1}/bin/dotnet" $out/bin/jellyfin \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ - sqlite fontconfig freetype stdenv.cc.cc.lib - ]}:$out/opt/jellyfin/runtimes/${runtimeDir}/native/" \ - --add-flags "$out/opt/jellyfin/jellyfin.dll --ffmpeg ${ffmpeg}/bin/ffmpeg" - ''; - - passthru.tests = { - smoke-test = nixosTests.jellyfin; - }; - - meta = with lib; { - description = "The Free Software Media System"; - homepage = "https://jellyfin.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ nyanloutre minijackson ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 999c26e320bd..06803175e185 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -335,6 +335,7 @@ mapAliases ({ kodiGBM = kodi-gbm; kodiPlain = kodi; kodiPlainWayland = kodi-wayland; + jellyfin_10_5 = throw "Jellyfin 10.5 is no longer supported and contains a security vulnerability. Please upgrade to a newer version."; # added 2021-04-26 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 kdeconnect = plasma5Packages.kdeconnect-kde; # added 2020-10-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76c68e6b3952..c4edc645a724 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2689,8 +2689,6 @@ in jellyfin = callPackage ../servers/jellyfin { }; - jellyfin_10_5 = callPackage ../servers/jellyfin/10.5.x.nix { }; - jellyfin-media-player = libsForQt5.callPackage ../applications/video/jellyfin-media-player { inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; }; From 571a0de4224b9091a9431ef0e0264a52052c7cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 14:13:57 +0200 Subject: [PATCH 1029/1183] krita: fix license Source code's readme says > Krita as a whole is licensed under the GNU Public License, Version 3. Individual files may have a different, but compatible license. --- pkgs/applications/graphics/krita/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 63123c02180f..282db23f4756 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -48,6 +48,6 @@ mkDerivation rec { homepage = "https://krita.org/"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl3Only; }; } From af3d71a1557cfade72f4bfb0b9c1c8f794b3d4d2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 26 Apr 2021 13:53:00 +0200 Subject: [PATCH 1030/1183] intel-media-driver: 21.1.3 -> 21.2.0 --- pkgs/development/libraries/intel-media-driver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-driver/default.nix b/pkgs/development/libraries/intel-media-driver/default.nix index c60b00552b57..b983e01aa0ab 100644 --- a/pkgs/development/libraries/intel-media-driver/default.nix +++ b/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.3"; + version = "21.2.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1y6y6dia2y3b798f668q26pzwb1xai5d5jpmllpcxs9qikhkkx8p"; + sha256 = "101wbg5j00amdbfz4p6mpg90wi549dl78jd34mac5g6zhcpwqbh9"; }; cmakeFlags = [ From b664b77ebaeec7b6be24372e73338189a869a01e Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 26 Apr 2021 14:24:25 +0200 Subject: [PATCH 1031/1183] wlsunset: 0.1.0 -> 0.2.0 --- pkgs/tools/wayland/wlsunset/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix index 931f394d6890..3572f63f57e5 100644 --- a/pkgs/tools/wayland/wlsunset/default.nix +++ b/pkgs/tools/wayland/wlsunset/default.nix @@ -1,19 +1,19 @@ -{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland +{ lib, stdenv, fetchFromSourcehut, meson, pkg-config, ninja, wayland, scdoc , wayland-protocols }: stdenv.mkDerivation rec { pname = "wlsunset"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromSourcehut { owner = "~kennylevinsen"; repo = pname; rev = version; - sha256 = "12snizvf49y40cirhr2brgyldhsykv4k2gnln2sdrajqzhrc98v6"; + sha256 = "0hhsddh3rs066rbsjksr8kcwg8lvglbvs67dq0r5wx5c1xcwb51w"; }; - nativeBuildInputs = [ meson pkg-config ninja wayland ]; + nativeBuildInputs = [ meson pkg-config ninja wayland scdoc ]; buildInputs = [ wayland wayland-protocols ]; meta = with lib; { From c5120548fc236070bb63e9968c06646464abac79 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 13:31:33 +0200 Subject: [PATCH 1032/1183] ocamlPackages.mirage-crypto*: 0.10.0 -> 0.10.1 https://github.com/mirage/mirage-crypto/releases/tag/v0.10.1 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 2eda6d5f55ea..549838db396c 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -7,11 +7,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "20915c53ddb658c53f588c414f13676bc8ad3cd734d9ed909225ea080dd8144d"; + sha256 = "028e2fc1f0a3e9b06603c6a253ecd043100099bc1c12c0567d8bc46d3781499c"; }; useDune2 = true; From 5b7d7c4bd582f109f6a1e4a9447f4c520fff3256 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 15:02:44 +0200 Subject: [PATCH 1033/1183] python3Packages.karton-mwdb-reporter: remove unused inputs --- .../development/python-modules/karton-mwdb-reporter/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix index 9f4c1ee67099..68b28bffe6fa 100644 --- a/pkgs/development/python-modules/karton-mwdb-reporter/default.nix +++ b/pkgs/development/python-modules/karton-mwdb-reporter/default.nix @@ -1,10 +1,8 @@ { lib , buildPythonPackage -, chardet , fetchFromGitHub , karton-core , mwdblib -, python }: buildPythonPackage rec { From ecb3b74a438dbe6398db7403afdc6c38237a83d6 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 26 Apr 2021 12:01:28 +0200 Subject: [PATCH 1034/1183] ocamlPackages.dtoa: disable hardening feature based on more accurate condition The `strictoverflow` hardening feature causes a build failure when using Clang as the compiler, not just on Darwin. --- pkgs/development/ocaml-modules/dtoa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index da075f5c7982..44bc5d7498bf 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { sha256 = "0zkhn0rdq82g6gamsv6nkx6i44s8104nh6jg5xydazl9jl1704xn"; }; - hardeningDisable = lib.optional stdenv.isDarwin "strictoverflow"; + hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; meta = with lib; { homepage = "https://github.com/flowtype/ocaml-dtoa"; From 6c95bce8b660f43bf95899d29defcce3ad90fec9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 16:20:29 +0200 Subject: [PATCH 1035/1183] ocamlPackages.letsencrypt: init at 0.2.4 --- .../ocaml-modules/letsencrypt/default.nix | 84 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/ocaml-modules/letsencrypt/default.nix diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix new file mode 100644 index 000000000000..b3c0d4f89412 --- /dev/null +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -0,0 +1,84 @@ +{ buildDunePackage +, lib +, fetchurl +, astring +, asn1-combinators +, uri +, rresult +, base64 +, cmdliner +, cohttp +, cohttp-lwt +, cohttp-lwt-unix +, zarith +, logs +, fmt +, lwt +, mirage-crypto +, mirage-crypto-pk +, mirage-crypto-rng +, x509 +, yojson +, ounit +, dns +, dns-tsig +, ptime +, bos +, fpath +, randomconv +, domain-name +}: + +buildDunePackage rec { + pname = "letsencrypt"; + version = "0.2.4"; + + src = fetchurl { + url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-v${version}.tbz"; + sha256 = "91c79828a50243804da29c17563c54d2d528a79207e5b874dce6a3e7fedf7567"; + }; + + minimumOCamlVersion = "4.08"; + useDune2 = true; + + buildInputs = [ + cmdliner + cohttp + cohttp-lwt-unix + zarith + fmt + mirage-crypto-rng + ptime + bos + fpath + randomconv + domain-name + ]; + + propagatedBuildInputs = [ + logs + yojson + lwt + base64 + mirage-crypto + mirage-crypto-pk + asn1-combinators + x509 + uri + dns + dns-tsig + rresult + astring + cohttp-lwt + ]; + + doCheck = true; + checkInputs = [ ounit ]; + + meta = { + description = "ACME implementation in OCaml"; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://github.com/mmaker/ocaml-letsencrypt"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 56d992a92637..3dc4130b10d8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -580,6 +580,8 @@ let lens = callPackage ../development/ocaml-modules/lens { }; + letsencrypt = callPackage ../development/ocaml-modules/letsencrypt { }; + linenoise = callPackage ../development/ocaml-modules/linenoise { }; llvm = callPackage ../development/ocaml-modules/llvm { From 595501325310b7507acf42bd52f292066889c1a5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 25 Apr 2021 17:17:54 +0200 Subject: [PATCH 1036/1183] ocamlPackages.paf: init at 0.0.1 --- .../development/ocaml-modules/paf/default.nix | 82 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 + 2 files changed, 84 insertions(+) create mode 100644 pkgs/development/ocaml-modules/paf/default.nix diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix new file mode 100644 index 000000000000..0c91051e2433 --- /dev/null +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -0,0 +1,82 @@ +{ buildDunePackage +, lib +, fetchurl +, fetchpatch +, mirage-stack +, mirage-time +, httpaf +, tls-mirage +, mimic +, cohttp-lwt +, letsencrypt +, emile +, ke +, bigstringaf +, domain-name +, duration +, faraday +, ipaddr +, tls +, x509 +, lwt +, logs +, fmt +, mirage-crypto-rng +, tcpip +, mirage-time-unix +, ptime +, uri +, alcotest-lwt +}: + +buildDunePackage rec { + pname = "paf"; + version = "0.0.1"; + + src = fetchurl { + url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; + sha256 = "7a794c21ce458bda302553b0f5ac128c067579fbb3b7b8fba9b410446c43e790"; + }; + + useDune2 = true; + minimumOCamlVersion = "4.08"; + + propagatedBuildInputs = [ + mirage-stack + mirage-time + httpaf + tls-mirage + mimic + cohttp-lwt + letsencrypt + emile + ke + bigstringaf + domain-name + ipaddr + duration + faraday + tls + x509 + ]; + + doCheck = true; + checkInputs = [ + lwt + logs + fmt + mirage-crypto-rng + tcpip + mirage-time-unix + ptime + uri + alcotest-lwt + ]; + + meta = { + description = "HTTP/AF and MirageOS"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sternenseemann ]; + homepage = "https://github.com/dinosaure/paf-le-chien"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3dc4130b10d8..bb4541535715 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -944,6 +944,8 @@ let ounit2 = callPackage ../development/ocaml-modules/ounit2 { }; + paf = callPackage ../development/ocaml-modules/paf { }; + parse-argv = callPackage ../development/ocaml-modules/parse-argv { }; path_glob = callPackage ../development/ocaml-modules/path_glob { }; From 37b3341048b98dd3d43fa1859e0c0896f3347708 Mon Sep 17 00:00:00 2001 From: SCOTT-HAMILTON Date: Mon, 26 Apr 2021 15:26:26 +0200 Subject: [PATCH 1037/1183] bottles: init at 2.1.1 -> 3.1.6 --- pkgs/applications/misc/bottles/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/bottles/default.nix b/pkgs/applications/misc/bottles/default.nix index 5c6e9a0f9fef..04003f6a9b5c 100644 --- a/pkgs/applications/misc/bottles/default.nix +++ b/pkgs/applications/misc/bottles/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub , meson, ninja, pkg-config, wrapGAppsHook -, desktop-file-utils, gsettings-desktop-schemas, libnotify +, desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy , python3Packages, gettext , appstream-glib, gdk-pixbuf, glib, gobject-introspection, gspell, gtk3 , steam-run-native @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "bottles"; - version = "2.1.1"; + version = "3.1.6"; src = fetchFromGitHub { owner = "bottlesdevs"; repo = pname; rev = version; - sha256 = "1hbjnd06h0h47gcwb1s1b9py5nwmia1m35da6zydbl70vs75imhn"; + sha256 = "1izks01010akjf83xvi70dr4yzgk6yr84kd0slzz22yq204pdh5m"; }; postPatch = '' @@ -39,6 +39,7 @@ python3Packages.buildPythonApplication rec { gsettings-desktop-schemas gspell gtk3 + libhandy libnotify ]; @@ -69,9 +70,9 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "An easy-to-use wineprefix manager"; - homepage = "https://github.com/bottlesdevs/Bottles"; + homepage = "https://usebottles.com/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ bloomvdomino ]; + maintainers = with maintainers; [ bloomvdomino shamilton ]; platforms = platforms.linux; }; } From ec8f6bc932c02389c4834b463716fe333c453f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Luis=20Lafuente?= Date: Mon, 26 Apr 2021 15:55:31 +0200 Subject: [PATCH 1038/1183] zerotierone: 1.6.4 -> 1.6.5 (#120722) --- pkgs/tools/networking/zerotierone/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 60da9b3abcbb..4a44843e947b 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,22 +2,22 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "06b6k1rzqkd7cdl7n0gz5ky48fs2nhn0q2qxx1rww38vbfc7lpmf"; + sha256 = "0dlnrb59vnxa3pjkgfqd5jil9kl6axh23v0bffi4kx8jwzpdwas8"; }; preConfigure = '' - patchShebangs ./doc/build.sh - substituteInPlace ./doc/build.sh \ - --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ + patchShebangs ./doc/build.sh + substituteInPlace ./doc/build.sh \ + --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ - substituteInPlace ./make-linux.mk \ - --replace 'armv5' 'armv6' + substituteInPlace ./make-linux.mk \ + --replace 'armv5' 'armv6' ''; From c9ab377ebcf6fbf729446abb0176d576896177d5 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Sun, 25 Apr 2021 16:10:11 -0700 Subject: [PATCH 1039/1183] neovim: set meta.mainProgram Signed-off-by: Ana Hobden --- pkgs/applications/editors/neovim/wrapper.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/neovim/wrapper.nix b/pkgs/applications/editors/neovim/wrapper.nix index 8b42191bde69..66127980bf67 100644 --- a/pkgs/applications/editors/neovim/wrapper.nix +++ b/pkgs/applications/editors/neovim/wrapper.nix @@ -113,6 +113,7 @@ let hydraPlatforms = []; # prefer wrapper over the package priority = (neovim.meta.priority or 0) - 1; + mainProgram = "nvim"; }; }; in From 32f7980afb5e33f1e078a51e715b9f102f396a69 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Mon, 26 Apr 2021 05:47:14 +0200 Subject: [PATCH 1040/1183] sbt: 1.5.0 -> 1.5.1 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 00e70c46b2a9..7b9c6bca7e2b 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "1dj241cj3v8kzqnz5s499rijpl7wv4rw171swqnc0xza90513pxa"; + sha256 = "0dsbqipr549awv584fyl227s1gknlpsf5krp990w7w3bbxl3avb7"; }; postPatch = '' From 559c5792ef1d0ef413e0abd5ddd07409989ceb1c Mon Sep 17 00:00:00 2001 From: regnat Date: Mon, 26 Apr 2021 16:20:13 +0200 Subject: [PATCH 1041/1183] Remove the NIXPKGS_CA_BY_DEFAULT env variable Not really needed, and not desired either --- pkgs/stdenv/generic/make-derivation.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 2bceb9e4333e..de1b1abd6155 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -91,8 +91,7 @@ in rec { , __contentAddressed ? (! attrs ? outputHash) # Fixed-output drvs can't be content addressed too - && (config.contentAddressedByDefault or false - || builtins.getEnv "NIXPKGS_CA_BY_DEFAULT" == "1") + && (config.contentAddressedByDefault or false) , ... } @ attrs: From 320660ced3cd3b951c60aff21f4013401db3adff Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 14:23:02 +0000 Subject: [PATCH 1042/1183] =?UTF-8?q?oh-my-zsh:=202021-04-11=20=E2=86=92?= =?UTF-8?q?=202021-04-26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 00610232e439..23c783246e91 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2021-04-11"; + version = "2021-04-26"; pname = "oh-my-zsh"; - rev = "12669f29f0843b8b980dd137f150a74511f88842"; + rev = "63a7422d8dd5eb93c849df0ab9e679e6f333818a"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "07vcxw60cvlh745lgy03l6vgsxkalmwh386akvrpvbg9a6p6k8rb"; + sha256 = "1spi6y5jmha0bf1s69mycpmksxjniqmcnvkvmza4rhji8v8b120w"; }; installPhase = '' From 674de725cbcfa58679199ca160d3e28802f19900 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 19 Apr 2021 21:54:40 +0200 Subject: [PATCH 1043/1183] =?UTF-8?q?coqPackages.coqhammer:=201.3=20?= =?UTF-8?q?=E2=86=92=201.3.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/coq-modules/coqhammer/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 89aa8d74e85c..93582745564e 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -5,18 +5,27 @@ with lib; mkCoqDerivation { pname = "coqhammer"; owner = "lukaszcz"; defaultVersion = with versions; switch coq.coq-version [ - { case = "8.12"; out = "1.3-coq8.12"; } - { case = "8.11"; out = "1.3-coq8.11"; } - { case = "8.10"; out = "1.3-coq8.10"; } + { case = "8.13"; out = "1.3.1-coq8.13"; } + { case = "8.12"; out = "1.3.1-coq8.12"; } + { case = "8.11"; out = "1.3.1-coq8.11"; } + { case = "8.10"; out = "1.3.1-coq8.10"; } { case = "8.9"; out = "1.1.1-coq8.9"; } { case = "8.8"; out = "1.1-coq8.8"; } ] null; + release."1.3.1-coq8.13".sha256 = "033j6saw24anb1lqbgsg1zynxi2rnxq7pgqwh11k8r8y3xisz78w"; + release."1.3.1-coq8.12".sha256 = "0xy3vy4rv8w5ydwb9nq8y4dcimd91yr0hak2j4kn02svssg1kv1y"; + release."1.3.1-coq8.11".sha256 = "0i9nlcayq0ac95vc09d1w8sd221gdjs0g215n086qscqjwimnz8j"; + release."1.3.1-coq8.10".sha256 = "0aq9qwqx680lkidhb77fmyq403rvfcdxch849x1pzy6a48rz5yra"; release."1.3-coq8.12".sha256 = "1q1y3cwhd98pkm98g71fsdjz85bfwgcz2xn7s7wwmiraifv5l6z8"; release."1.3-coq8.11".sha256 = "08zf8qfna7b9p2myfaz4g7bas3a1q1156x78n5isqivlnqfrjc1b"; release."1.3-coq8.10".sha256 = "1fj8497ir4m79hyrmmmmrag01001wrby0h24wv6525vz0w5py3cd"; release."1.1.1-coq8.9".sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; release."1.1-coq8.8".sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + release."1.3.1-coq8.13".version = "1.3.1"; + release."1.3.1-coq8.12".version = "1.3.1"; + release."1.3.1-coq8.11".version = "1.3.1"; + release."1.3.1-coq8.10".version = "1.3.1"; release."1.3-coq8.12".version = "1.3"; release."1.3-coq8.11".version = "1.3"; release."1.3-coq8.10".version = "1.3"; From 6d9a54ed33f388ce6d491de7d3e08c23d3380ba7 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Mon, 26 Apr 2021 16:53:05 +0200 Subject: [PATCH 1044/1183] joplin-desktop: 1.7.10 -> 1.7.11 --- pkgs/applications/misc/joplin-desktop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index f737470d53f1..9c559a364ef9 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.7.10"; + version = "1.7.11"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1f8pfssfqigh0fl5r5wpvdpn48dx1q9qq4mfqi2s5z94h7ci2jxg"; - x86_64-darwin = "0s29mhf88nlhaabmd32k21h1qiavgpqqksbdjxkx8bfg591s8jqb"; + x86_64-linux = "11vjipvhfvf6wxldcg743anma005j8dbbngqk6sq9hlf677ahxii"; + x86_64-darwin = "1l7m86jlf1m066n6rwmh5fkpx2pj3wj5h9ncxdd24v0zll6ki8vs"; }.${system} or throwSystem; }; From d0a055fe90fc86583cfddafb409e2807766ce11d Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Mon, 26 Apr 2021 05:53:42 +0200 Subject: [PATCH 1045/1183] vscx/scalameta-metals: 1.10.3 -> 1.10.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 72581f340a3b..15d280c07501 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -839,8 +839,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.10.3"; - sha256 = "0m4qm1z1j6gfqjjnxl8v48ga7zkaspjy3gcnkrch3aj4fyafjl09"; + version = "1.10.4"; + sha256 = "0q6zjpdi98png4vpzz39q85nxmsh3h1nnan58saz5rr83d6jgj89"; }; meta = { license = lib.licenses.asl20; From 281efa2651794322779c5dd40483ea546b947f04 Mon Sep 17 00:00:00 2001 From: Amanjeev Sethi Date: Sun, 25 Apr 2021 16:19:16 -0400 Subject: [PATCH 1046/1183] semiphemeral: init at 0.6 semiphemeral: init at 0.6 semiphemeral: init at 0.6 semiphemeral: init at 0.6 semiphemeral: fix formatting semiphemeral: refactor for flexibility semiphemeral: remove extraneous inherit semiphemeral: no check since upstream has no tests semiphemeral: refactor move to misc instead of social/twitter semiphemeral: fix formatting --- pkgs/tools/misc/semiphemeral/default.nix | 26 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/semiphemeral/default.nix diff --git a/pkgs/tools/misc/semiphemeral/default.nix b/pkgs/tools/misc/semiphemeral/default.nix new file mode 100644 index 000000000000..67f0f62e877f --- /dev/null +++ b/pkgs/tools/misc/semiphemeral/default.nix @@ -0,0 +1,26 @@ +{ lib +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "semiphemeral"; + version = "0.6"; + + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "c90d73b14c826f262b1339d1f5926c5abc6431181090ea87177af821c0866fb7"; + }; + + doCheck = false; # upstream has no tests + + pythonImportsCheck = [ "semiphemeral" ]; + + propagatedBuildInputs = with python3.pkgs; [ click sqlalchemy flask tweepy colorama ]; + + meta = with lib; { + description = "Automatically delete your old tweets, except for the ones you want to keep"; + homepage = "https://github.com/micahflee/semiphemeral"; + license = licenses.mit; + maintainers = with maintainers; [ amanjeev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5b7420896f8e..a3414accf304 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25795,6 +25795,8 @@ in secretscanner = callPackage ../tools/security/secretscanner { }; + semiphemeral = callPackage ../tools/misc/semiphemeral { }; + sent = callPackage ../applications/misc/sent { }; seq24 = callPackage ../applications/audio/seq24 { }; From 1fd6bf6a01c9c23b3f587292bc2562647976cdce Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 26 Apr 2021 17:14:57 +0200 Subject: [PATCH 1047/1183] punes: init at unstable-2021-04-25 --- pkgs/misc/emulators/punes/default.nix | 61 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 63 insertions(+) create mode 100644 pkgs/misc/emulators/punes/default.nix diff --git a/pkgs/misc/emulators/punes/default.nix b/pkgs/misc/emulators/punes/default.nix new file mode 100644 index 000000000000..68f48bc7b403 --- /dev/null +++ b/pkgs/misc/emulators/punes/default.nix @@ -0,0 +1,61 @@ +{ mkDerivation +, stdenv +, lib +, fetchFromGitHub +, unstableGitUpdater +, qtbase +, qtsvg +, qttools +, autoreconfHook +, cmake +, pkg-config +, ffmpeg +, libGLU +, alsaLib +, sndio +}: + +mkDerivation rec { + pname = "punes"; + version = "unstable-2021-04-25"; + + src = fetchFromGitHub { + owner = "punesemu"; + repo = "puNES"; + rev = "4b4c3495a56d3989544cb56079ce641da8aa9b35"; + sha256 = "1wszvdgm38513v26p14k58shbkxn1qhkn8l0hsqi04vviicad59s"; + }; + + postPatch = '' + substituteInPlace configure.ac \ + --replace '`$PKG_CONFIG --variable=host_bins Qt5Core`/lrelease' '${qttools.dev}/bin/lrelease' + ''; + + nativeBuildInputs = [ autoreconfHook cmake pkg-config qttools ]; + + buildInputs = [ ffmpeg qtbase qtsvg libGLU ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ alsaLib ] + ++ lib.optionals stdenv.hostPlatform.isBSD [ sndio ]; + + dontUseCmakeConfigure = true; + + enableParallelBuilding = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--without-opengl-nvidia-cg" + "--with-ffmpeg" + ]; + + passthru.updateScript = unstableGitUpdater { + url = "https://github.com/punesemu/puNES.git"; + }; + + meta = with lib; { + description = "Qt-based Nintendo Entertaiment System emulator and NSF/NSFe Music Player"; + homepage = "https://github.com/punesemu/puNES"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = with platforms; linux ++ freebsd ++ openbsd ++ windows; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccc5d2776efb..817455f1bb2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30209,6 +30209,8 @@ in protocol = python3Packages.callPackage ../applications/networking/protocol { }; + punes = libsForQt5.callPackage ../misc/emulators/punes { }; + pykms = callPackage ../tools/networking/pykms { }; pyupgrade = with python3Packages; toPythonApplication pyupgrade; From d274222c3b3861a6af79c058ff33f92d342ab52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Mon, 26 Apr 2021 17:46:02 +0200 Subject: [PATCH 1048/1183] fcitx5-configtool: 5.0.2 -> 5.0.4 Fixes fcitx/fcitx5-configtool#38 that prevented compiling. --- pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix index b133d576c6cc..cd7679dbbf19 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "fcitx5-configtool"; - version = "5.0.2"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-configtool"; rev = version; - sha256 = "sha256-kw0KIbS5SVMf6kR/9xsYiChHXQBM0enSVXyh0QfiiPY="; + sha256 = "sha256-UO3Ob+bFQ/2Vqb8YpD9tfmfZt5YLUyoqcbtsHLaVOzE="; }; cmakeFlags = [ From 04f82b9ebd89cb47951d9a67bffe35c67bee72fe Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Tue, 13 Apr 2021 14:55:15 +0200 Subject: [PATCH 1049/1183] doc/submitting-changes: remove incorrect remark Tests don't only apply to NixOS modules, see for example tests/vscodium --- doc/contributing/submitting-changes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 8a981284153c..e360dba5abd7 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -161,7 +161,7 @@ Many Nix packages are designed to run on multiple platforms. As such, it’s imp ### Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests) {#submitting-changes-nixos-tests} -Packages with automated tests are much more likely to be merged in a timely fashion because it doesn’t require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests only apply to packages with NixOS modules defined and can only be run on Linux. For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests). +Packages with automated tests are much more likely to be merged in a timely fashion because it doesn’t require as much manual testing by the maintainer to verify the functionality of the package. If there are existing tests for the package, they should be run to verify your changes do not break the tests. Tests can only be run on Linux. For more details on writing and running tests, see the [section in the NixOS manual](https://nixos.org/nixos/manual/index.html#sec-nixos-tests). ### Tested compilation of all pkgs that depend on this change using `nixpkgs-review` {#submitting-changes-tested-compilation} From 358fb61c363d24667bc2ae0f955623ae209260f9 Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Sat, 24 Apr 2021 22:29:03 +0530 Subject: [PATCH 1050/1183] xplr: 0.5.6 -> 0.5.7 --- pkgs/applications/misc/xplr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xplr/default.nix b/pkgs/applications/misc/xplr/default.nix index ddbd837a6dfb..46dfe713de11 100644 --- a/pkgs/applications/misc/xplr/default.nix +++ b/pkgs/applications/misc/xplr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "xplr"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "sayanarijit"; repo = name; rev = "v${version}"; - sha256 = "070jyii2p7qk6gij47n5i9a8bal5iijgn8cv79mrija3pgddniaz"; + sha256 = "1j417g0isy3cpxdb2wrvrvypnx99qffi83s4a98791wyi8yqiw6b"; }; - cargoSha256 = "113f0hbgy8c9gxl70b6frr0klfc8rm5klgwls7fgbb643rdh03b9"; + cargoSha256 = "0kpwhk2f4czhilcnfqkw5hw2vxvldxqg491xkkgxjkph3w4qv3ji"; meta = with lib; { description = "A hackable, minimal, fast TUI file explorer"; From 1f1cc0065c8a5b7f12c45c8c2310a0b9f6ac4a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 11:55:01 +0200 Subject: [PATCH 1051/1183] remmina: 1.4.12 -> 1.4.13 --- pkgs/applications/networking/remote/remmina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 3421050d1ede..098e3ac0016f 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.12"; + version = "1.4.13"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY="; + sha256 = "sha256-R+RfczAnt5R0YmXt5SmH8gOuWOH0LZ/70pOMDAXJgsE="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; From 99de33bb1d8724c5a60369c4605b4f517bb78fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 12:48:10 +0200 Subject: [PATCH 1052/1183] remmina: fix license --- pkgs/applications/networking/remote/remmina/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 098e3ac0016f..5d0195b62f88 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = { - license = licenses.gpl2; + license = licenses.gpl2Plus; homepage = "https://gitlab.com/Remmina/Remmina"; description = "Remote desktop client written in GTK"; maintainers = with maintainers; [ melsigl ryantm ]; From 8d9e2c31f98e99e9cfcdd3aa638c8f4e313c5ca0 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 26 Apr 2021 10:17:10 -0400 Subject: [PATCH 1053/1183] sagemaker: 2.37.0 -> 2.38.0 --- pkgs/development/python-modules/sagemaker/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix index d227b7f8c656..c9bad89d93c4 100644 --- a/pkgs/development/python-modules/sagemaker/default.nix +++ b/pkgs/development/python-modules/sagemaker/default.nix @@ -10,16 +10,17 @@ , protobuf3-to-dict , smdebug-rulesconfig , pandas +, pathos , packaging }: buildPythonPackage rec { pname = "sagemaker"; - version = "2.37.0"; + version = "2.38.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-96RDi32NHfhFvPeVRhG32EDQJTiwOXEwtSmFZGVBVk0="; + sha256 = "sha256-7cIGr49fKI0zQmX4/9v/gW5yB4kfeQJ3H/Vvgl9CKuY="; }; pythonImportsCheck = [ @@ -34,6 +35,7 @@ buildPythonPackage rec { importlib-metadata numpy packaging + pathos protobuf protobuf3-to-dict smdebug-rulesconfig From 55b38314deb4038ec65b178191248a610fdd9a31 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 14 Apr 2021 11:05:44 +0200 Subject: [PATCH 1054/1183] gnome3.file-roller: 3.38.0 -> 3.38.1 Fixes CVE-2020-36314. Changelog: https://gitlab.gnome.org/GNOME/file-roller/-/blob/12d6c77fb736d70bee4c8f6f5ea7c60adde8473c/NEWS --- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 81680fb5df87..02801cd5a78e 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.38.0"; + version = "3.38.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj"; + sha256 = "0mxwdbfqizakxq65fa8zlvjf48v5f44lv8ckjw8sl8fk2871784l"; }; LANG = "en_US.UTF-8"; # postinstall.py From 6e8ee0e2d87be434808eece79fb2bcc8adac78af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Mon, 26 Apr 2021 17:50:01 +0200 Subject: [PATCH 1055/1183] electrum: 4.1.1 -> 4.1.2 --- pkgs/applications/misc/electrum/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 44f35e503ca0..676efb2aa042 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -20,7 +20,7 @@ }: let - version = "4.1.1"; + version = "4.1.2"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "0yg6ld92a4xgn7y8i51hmr3kmgmrbrjwniikkmyq9q141h2drb80"; + sha256 = "05m6vbd4sfjk536kwa5wa3kv21jxxqnglx0ddvnmxfhf98371bhk"; }; postUnpack = '' @@ -59,6 +59,11 @@ python3.pkgs.buildPythonApplication { cp -ar ${tests} $sourceRoot/electrum/tests ''; + prePatch = '' + substituteInPlace contrib/requirements/requirements.txt \ + --replace "dnspython>=2.0,<2.1" "dnspython>=2.0" + ''; + nativeBuildInputs = lib.optionals enableQt [ wrapQtAppsHook ]; propagatedBuildInputs = with python3.pkgs; [ From a19b0aa223d4a0d873f355dfca8026ca89fc1ff8 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Mon, 26 Apr 2021 18:01:34 +0000 Subject: [PATCH 1056/1183] element: 1.7.25 -> 1.7.26 https://github.com/vector-im/element-web/blob/v1.7.26/CHANGELOG.md https://github.com/vector-im/element-desktop/blob/v1.7.26/CHANGELOG.md --- .../instant-messengers/element/element-desktop-package.json | 2 +- .../instant-messengers/element/element-desktop.nix | 5 +++-- .../networking/instant-messengers/element/element-web.nix | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index aa240b48e884..e1f070eaa9a7 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "src/electron-main.js", - "version": "1.7.25", + "version": "1.7.26", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 75252bb74b49..2a7e01e5291c 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -8,12 +8,12 @@ let executableName = "element-desktop"; - version = "1.7.25"; + version = "1.7.26"; src = fetchFromGitHub { owner = "vector-im"; repo = "element-desktop"; rev = "v${version}"; - sha256 = "sha256-q8hVmTLt/GdLc6NSldLggogObQcPFp+lAeS3wmO0qPo="; + sha256 = "1iflsvzn36mywpzags55kjmyq71c3i7f1hgcdcp2ijmnrjk8fy3n"; }; in mkYarnPackage rec { name = "element-desktop-${version}"; @@ -73,6 +73,7 @@ in mkYarnPackage rec { meta = with lib; { description = "A feature-rich client for Matrix.org"; homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-desktop/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = teams.matrix.members; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 624ba46b8e8b..9f077c833772 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "element-web"; - version = "1.7.25"; + version = "1.7.26"; src = fetchurl { url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz"; - sha256 = "sha256-T4lsGVSUHkw4R7tSeTKPifbhwaTf/YF2vVAakFSrt9k="; + sha256 = "17y6wq6w1yk7r1rfply549kpilfraizahf67p00ra7cws66iqkwg"; }; installPhase = '' @@ -32,6 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; maintainers = lib.teams.matrix.members; license = lib.licenses.asl20; platforms = lib.platforms.all; From 1a6899f701a1c1966a6a1835d2b59695e26791e8 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 26 Apr 2021 20:04:25 +0200 Subject: [PATCH 1057/1183] innernet: - add simple packaging test - add manpages - remove unused linuxHeaders input --- pkgs/tools/networking/innernet/default.nix | 34 +++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index abc7aca61a32..4573db5879e1 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, linuxHeaders, sqlite, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, llvmPackages, sqlite, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "innernet"; @@ -10,11 +10,37 @@ rustPlatform.buildRustPackage rec { rev = "v${version}"; sha256 = "sha256-Z4F5RYPVgFiiDBg6lxILjAh/a/rL7IJBqHIJ/tQyLnE="; }; + cargoSha256 = "sha256-WSkN5aXMgfqZJAV1b3elF7kwf2f5OpcntKSf8620YcY="; + + nativeBuildInputs = with llvmPackages; [ + llvm + clang + installShellFiles + ]; + buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ]; + LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - nativeBuildInputs = with llvmPackages; [ llvm clang ]; - buildInputs = [ sqlite ] ++ lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-WSkN5aXMgfqZJAV1b3elF7kwf2f5OpcntKSf8620YcY="; + postInstall = '' + installManPage doc/innernet-server.8.gz + installManPage doc/innernet.8.gz + ''; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}"-server --version)" == "${pname}-server ${version}" ]]; then + echo '${pname}-server smoke check passed' + else + echo '${pname}-server smoke check failed' + return 1 + fi + if [[ "$("$out/bin/${pname}" --version)" == "${pname} ${version}" ]]; then + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; meta = with lib; { description = "A private network system that uses WireGuard under the hood"; From 86f1c0fb77191f36b0f0e36762ae018037fb1ae2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 26 Apr 2021 20:19:54 +0200 Subject: [PATCH 1058/1183] strace: 5.11 -> 5.12 ChangeLog: https://github.com/strace/strace/releases/tag/v5.12 --- 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 f36b1cf4495b..7ce0971c09de 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -6,11 +6,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { pname = "strace"; - version = "5.11"; + version = "5.12"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-/+NAsQwUWg+Fc0Jx6czlZFfSPyGn6lkxqzL4z055OHk="; + sha256 = "sha256-KRce350lL4nJiKTDQN/exmL0WMuMY9hUMdZLq1kR58Q="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From ca889ec2ec32e46c76bbb32766a6852448b8e3ab Mon Sep 17 00:00:00 2001 From: ilmari-lauhakangas Date: Mon, 26 Apr 2021 21:35:21 +0300 Subject: [PATCH 1059/1183] yle-dl: use latest ffmpeg Downloading with yle-dl no longer works with ffmpeg 3 --- pkgs/tools/misc/yle-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 818ad5ec645e..68218592bbb9 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg_3 }: +{ lib, fetchFromGitHub, rtmpdump, php, wget, python3Packages, ffmpeg }: python3Packages.buildPythonApplication rec { pname = "yle-dl"; @@ -12,12 +12,12 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - attrs ConfigArgParse ffmpeg_3 future lxml requests + attrs ConfigArgParse ffmpeg future lxml requests ]; pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ ffmpeg_3 pytest pytestrunner ]; + checkInputs = with python3Packages; [ ffmpeg pytest pytestrunner ]; meta = with lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; From b0c26d2c4038d2768b9b0191ddeed16377419f7b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 19:04:29 +0200 Subject: [PATCH 1060/1183] pkgs/stdenv/make-derivation: move hostSuffix before the version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adding the hostSuffix to the end of the derivation's name is problematic since some stuff, including user facing programs like nix-env rely on the behavior of parseDrvName instead of pname and version. builtins.parseDrvName currently thinks that the cross compilation target added via hostSuffix is part of the version. This has the practical consequence for example that nix-env would think a cross compiled derivation would be an updated version of a native derivation of the same package and version — breaking user's profiles. We can easily prevent this by moving the hostSuffix in between pname and version. In case name is passed to mkDerivation this is of course not possible and we are forced to fall back to the old behavior. This change could serve as a replacement for the migitation we introduced with the -static appendix to pname in order to avoid confusion between nix and nixStatic as outlined in the comment added with this commit. --- pkgs/stdenv/generic/make-derivation.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index de1b1abd6155..730c90c227c5 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -200,9 +200,7 @@ in rec { // (lib.optionalAttrs (attrs ? name || (attrs ? pname && attrs ? version)) { name = let - staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; - name' = attrs.name or - "${attrs.pname}${staticMarker}-${attrs.version}"; + # Indicate the host platform of the derivation if cross compiling. # Fixed-output derivations like source tarballs shouldn't get a host # suffix. But we have some weird ones with run-time deps that are # just used for their side-affects. Those might as well since the @@ -210,7 +208,16 @@ in rec { hostSuffix = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform && !dontAddHostSuffix) "-${stdenv.hostPlatform.config}"; - in name' + hostSuffix; + # Disambiguate statically built packages. This was originally + # introduce as a means to prevent nix-env to get confused between + # nix and nixStatic. This should be also achieved by moving the + # hostSuffix before the version, so we could contemplate removing + # it again. + staticMarker = lib.optionalString stdenv.hostPlatform.isStatic "-static"; + in + if attrs ? name + then attrs.name + hostSuffix + else "${attrs.pname}${staticMarker}${hostSuffix}-${attrs.version}"; }) // { builder = attrs.realBuilder or stdenv.shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; From dc9694c78eb30084be5e7607f68704987c12f6e7 Mon Sep 17 00:00:00 2001 From: brano543 Date: Fri, 1 Jan 2021 21:42:07 +0100 Subject: [PATCH 1061/1183] openssl: correct cross compile for mingw --- .../development/libraries/openssl/default.nix | 8 ++++--- pkgs/top-level/all-packages.nix | 21 +++++++++---------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index f6d45f66b1af..13cac47793ef 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -6,7 +6,7 @@ # Used to avoid cross compiling perl, for example, in darwin bootstrap tools. # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. -, withPerl ? true +, withPerl ? stdenv.hostPlatform == stdenv.buildPlatform }: assert ( @@ -42,8 +42,10 @@ let substituteInPlace "$a" \ --replace /bin/rm rm done - '' + optionalString (versionAtLeast version "1.1.1") '' - substituteInPlace config --replace '/usr/bin/env' '${coreutils}/bin/env' + '' + # config is a configure script which is not installed. + + optionalString (versionAtLeast version "1.1.1") '' + substituteInPlace config --replace '/usr/bin/env' '${buildPackages.coreutils}/bin/env' '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' substituteInPlace crypto/async/arch/async_posix.h \ --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d6636416eeb..e94824531fa3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -465,16 +465,18 @@ in perl = buildPackages.perl.override { fetchurl = stdenv.fetchurlBoot; }; openssl = buildPackages.openssl.override { fetchurl = stdenv.fetchurlBoot; - coreutils = buildPackages.coreutils.override { - fetchurl = stdenv.fetchurlBoot; + buildPackages = { + coreutils = buildPackages.coreutils.override { + fetchurl = stdenv.fetchurlBoot; + inherit perl; + xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; + gmp = null; + aclSupport = false; + attrSupport = false; + }; inherit perl; - xz = buildPackages.xz.override { fetchurl = stdenv.fetchurlBoot; }; - gmp = null; - aclSupport = false; - attrSupport = false; }; inherit perl; - buildPackages = { inherit perl; }; }; libssh2 = buildPackages.libssh2.override { fetchurl = stdenv.fetchurlBoot; @@ -16901,10 +16903,7 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = - if stdenv.hostPlatform.isMinGW # Work around broken cross build - then openssl_1_0_2 - else openssl_1_1; + openssl = openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 From 78f77869b95d94255d4b347f02a7c7dcbad98a52 Mon Sep 17 00:00:00 2001 From: Robin Townsend Date: Mon, 26 Apr 2021 15:23:42 -0400 Subject: [PATCH 1062/1183] Revert "minecraft-launcher: 2.2.1441 -> 2.2.741" This reverts commit dabfce650aa297748a5737d663b5ccf9be41495c, since it downgraded minecraft-launcher to an older version. --- pkgs/games/minecraft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index d98a7dd25e2c..3d0b53035edd 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -88,11 +88,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.2.741"; + version = "2.2.1441"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "0bm78ybn91ihibxgmlpk7dl2zxy4a57k86qmb08cif3ifbflzkvw"; + sha256 = "03q579hvxnsh7d00j6lmfh53rixdpf33xb5zlz7659pvb9j5w0cm"; }; icon = fetchurl { From 0e3b57f6f56afa029cfe08b789e67bc27ac0887d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 26 Apr 2021 18:34:35 +0200 Subject: [PATCH 1063/1183] ansible-lint: disable tests on darwin --- pkgs/development/python-modules/ansible-lint/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index e404edddbcf3..8388cd33e084 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchPypi , buildPythonPackage , isPy27 @@ -63,6 +64,9 @@ buildPythonPackage rec { "test_role_handler_positive" ]; + # fails to run tests due to issues with temporary directory + doCheck = !stdenv.isDarwin; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; meta = with lib; { From 748e20cc7c4793cf13d99607755063c5380628ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 26 Apr 2021 16:51:33 -0300 Subject: [PATCH 1064/1183] python3Packages.ffmpeg-python: replace ffmpeg_3 with ffmpeg See https://github.com/NixOS/nixpkgs/issues/120705 for the rationale. ffmpeg-python doesn't seem to be strongly bound to any ffmpeg version so we can just migrate away. --- .../python-modules/ffmpeg-python/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/ffmpeg-python/default.nix b/pkgs/development/python-modules/ffmpeg-python/default.nix index 51b0060cb2d6..f845ca6a5d36 100644 --- a/pkgs/development/python-modules/ffmpeg-python/default.nix +++ b/pkgs/development/python-modules/ffmpeg-python/default.nix @@ -2,9 +2,9 @@ , buildPythonPackage , fetchFromGitHub , substituteAll -, ffmpeg_3 +, pytestCheckHook +, ffmpeg , future -, pytest , pytestrunner , pytest-mock }: @@ -21,23 +21,20 @@ buildPythonPackage rec { }; patches = [ - ( - substituteAll { - src = ./ffmpeg-location.patch; - ffmpeg = ffmpeg_3; - } - ) + (substituteAll { + src = ./ffmpeg-location.patch; + inherit ffmpeg; + }) ]; buildInputs = [ pytestrunner ]; propagatedBuildInputs = [ future ]; - checkInputs = [ pytest pytest-mock ]; + checkInputs = [ pytestCheckHook pytest-mock ]; meta = with lib; { description = "Python bindings for FFmpeg - with complex filtering support"; homepage = "https://github.com/kkroening/ffmpeg-python"; license = licenses.asl20; maintainers = [ maintainers.AluisioASG ]; - platforms = platforms.all; }; } From 2efafe69ef0f83bb9c68b889db9055228ba46ef7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 26 Apr 2021 16:57:30 -0300 Subject: [PATCH 1065/1183] r128gain: replace ffmpeg_3 with ffmpeg See https://github.com/NixOS/nixpkgs/issues/120705 for the rationale. --- pkgs/applications/audio/r128gain/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/r128gain/default.nix b/pkgs/applications/audio/r128gain/default.nix index 3044acb32649..96053d08d00f 100644 --- a/pkgs/applications/audio/r128gain/default.nix +++ b/pkgs/applications/audio/r128gain/default.nix @@ -3,7 +3,7 @@ , genericUpdater , substituteAll , common-updater-scripts -, ffmpeg_3 +, ffmpeg , python3Packages , sox }: @@ -20,12 +20,10 @@ python3Packages.buildPythonApplication rec { }; patches = [ - ( - substituteAll { - src = ./ffmpeg-location.patch; - ffmpeg = ffmpeg_3; - } - ) + (substituteAll { + src = ./ffmpeg-location.patch; + inherit ffmpeg; + }) ]; propagatedBuildInputs = with python3Packages; [ crcmod ffmpeg-python mutagen tqdm ]; From 00528521094d05b52005f5a9e23d71efcd13f72a Mon Sep 17 00:00:00 2001 From: Evsyukov Denis <114635+juev@users.noreply.github.com> Date: Mon, 26 Apr 2021 23:50:06 +0300 Subject: [PATCH 1066/1183] python2-packages.nix: fix typo (#120784) disablede to disabled --- pkgs/top-level/python2-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 474d3c2f9510..74a15bb7ac7c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -638,7 +638,7 @@ with self; with super; { yt = callPackage ../development/python-modules/yt { }; - zeek = disablede super.zeek; + zeek = disabled super.zeek; zbase32 = callPackage ../development/python-modules/zbase32 { }; From 7cf6cbe49a4f9efa0607437447d256bbd206b0c4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 23:07:45 +0200 Subject: [PATCH 1067/1183] python3Packages.hatasmota: 0.2.9 -> 0.2.10 --- pkgs/development/python-modules/hatasmota/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hatasmota/default.nix b/pkgs/development/python-modules/hatasmota/default.nix index 961137ed9ab2..9506dbb96de4 100644 --- a/pkgs/development/python-modules/hatasmota/default.nix +++ b/pkgs/development/python-modules/hatasmota/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "hatasmota"; - version = "0.2.9"; + version = "0.2.10"; src = fetchFromGitHub { owner = "emontnemery"; repo = pname; rev = version; - sha256 = "sha256-+4jlzemF5f4Qz4QHDaErsmVHq1Pjn/vsvoq/oCbW/hI="; + sha256 = "sha256-f831DKQJII1/MeF1buFihi65y3l7Vp7reVEcyzbAw3o="; }; propagatedBuildInputs = [ From d3490a072439f8c012e1ea9fafb46108702bf921 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 23:20:06 +0200 Subject: [PATCH 1068/1183] python3Packages.hstspreload: 2021.3.29 -> 2021.4.26 --- pkgs/development/python-modules/hstspreload/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index 55aafc620424..90cb27be8433 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2021.3.29"; + version = "2021.4.26"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "sha256-F5EXwCoXYmFkV0VWT5leIWZU2xH1t6T0LuxodAANS8E="; + sha256 = "sha256-bjyOsZIsYE3xF2/imp+4HPOZzh5wIehAru/uqfijleE="; }; # tests require network connection From 8f19637a39b50804103016ac1716c20969bba974 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sat, 18 Jul 2020 15:54:32 +0200 Subject: [PATCH 1069/1183] haskellPackages.pandoc-sidenote: remove 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 3bf834c16daf..ab237362dab2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8782,7 +8782,6 @@ broken-packages: - pandoc-placetable - pandoc-plantuml-diagrams - pandoc-pyplot - - pandoc-sidenote - pandoc-unlit - pandoc-utils - PandocAgda From 1cf7f3cf6b3f36b723835589390cd628cf32dd46 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 20:30:24 +0000 Subject: [PATCH 1070/1183] drumstick: 1.1.3 -> 2.1.1 --- pkgs/development/libraries/drumstick/default.nix | 13 ++++++++----- .../libraries/drumstick/drumstick-fluidsynth.patch | 9 --------- .../libraries/drumstick/drumstick-plugins.patch | 4 +++- 3 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 21572e52e235..e101da352244 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -1,19 +1,18 @@ { lib, stdenv, fetchurl -, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, pkg-config, wrapQtAppsHook +, cmake, docbook_xml_dtd_45, docbook_xsl, doxygen, graphviz-nox, pkg-config, qttools, wrapQtAppsHook , alsaLib, fluidsynth, qtbase, qtsvg, libpulseaudio }: stdenv.mkDerivation rec { pname = "drumstick"; - version = "1.1.3"; + version = "2.1.1"; src = fetchurl { url = "mirror://sourceforge/drumstick/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1n9wvg79yvkygrkc8xd8pgrd3d7hqmr7gh24dccf0px23lla9b3m"; + sha256 = "06lz4kzpgg5lalcjb14pi35jxca5f4j6ckqf6mdxs1k42dfhjpjp"; }; patches = [ - ./drumstick-fluidsynth.patch ./drumstick-plugins.patch ]; @@ -24,13 +23,17 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ - cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen pkg-config wrapQtAppsHook + cmake docbook_xml_dtd_45 docbook_xml_dtd_45 docbook_xsl doxygen graphviz-nox pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib fluidsynth libpulseaudio qtbase qtsvg ]; + cmakeFlags = [ + "-DUSE_DBUS=ON" + ]; + meta = with lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; diff --git a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch b/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch deleted file mode 100644 index b8cdf63fb649..000000000000 --- a/pkgs/development/libraries/drumstick/drumstick-fluidsynth.patch +++ /dev/null @@ -1,9 +0,0 @@ -It works with fluidsynth 2. - -Backported from r400: https://sourceforge.net/p/drumstick/code/400/ - ---- a/library/rt-backends/CMakeLists.txt -+++ b/library/rt-backends/CMakeLists.txt -@@ -54,1 +54,1 @@ if (PKG_CONFIG_FOUND) -- pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1 fluidsynth<=1.1.11) -+ pkg_check_modules(FLUIDSYNTH fluidsynth>=1.1.1) diff --git a/pkgs/development/libraries/drumstick/drumstick-plugins.patch b/pkgs/development/libraries/drumstick/drumstick-plugins.patch index cbb0a0e34896..59711120a8e8 100644 --- a/pkgs/development/libraries/drumstick/drumstick-plugins.patch +++ b/pkgs/development/libraries/drumstick/drumstick-plugins.patch @@ -1,12 +1,14 @@ Make it look for its plugin in its own installation directory. +Without this vmpk fails to start with "Unable to initialize all MIDI drivers". + --- a/library/rt/backendmanager.cpp +++ b/library/rt/backendmanager.cpp @@ -159,6 +159,7 @@ namespace rt { foreach(const QString& path, QCoreApplication::libraryPaths()) { d->appendDir( path + QDir::separator() + QSTR_DRUMSTICK, result ); } -+ d->appendDir( "@out@/lib/drumstick", result ); ++ d->appendDir( "@out@/lib/" + QSTR_DRUMSTICK, result ); return result; } From 90620b1c2b2f7de8a597954dd02e6a9444383308 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 20:30:50 +0000 Subject: [PATCH 1071/1183] kmetronome: 1.0.1 -> 1.2.0 --- pkgs/applications/audio/kmetronome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/kmetronome/default.nix b/pkgs/applications/audio/kmetronome/default.nix index 02353fcf4f51..51c853809fdb 100644 --- a/pkgs/applications/audio/kmetronome/default.nix +++ b/pkgs/applications/audio/kmetronome/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kmetronome"; - version = "1.0.1"; + version = "1.2.0"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0bzm6vzlm32kjrgn1nvp096b2d41ybys2sk145nhy992wg56v32s"; + sha256 = "1ln0nm24w6bj7wc8cay08j5azzznigd39cbbw3h4skg6fxd8p0s7"; }; nativeBuildInputs = [ cmake pkg-config qttools ]; From de1a5679d725d469c4e184ac77cc48697ff0f609 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 26 Apr 2021 21:18:44 +0000 Subject: [PATCH 1072/1183] vmpk: 0.7.2 -> 0.8.2 --- pkgs/applications/audio/vmpk/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/vmpk/default.nix b/pkgs/applications/audio/vmpk/default.nix index dfae5d40e114..45142568f980 100644 --- a/pkgs/applications/audio/vmpk/default.nix +++ b/pkgs/applications/audio/vmpk/default.nix @@ -5,16 +5,21 @@ mkDerivation rec { pname = "vmpk"; - version = "0.7.2"; + version = "0.8.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.bz2"; - sha256 = "5oLrjQADg59Mxpb0CNLQAE574IOSYLDLJNaQ/9q2cMQ="; + sha256 = "1kv256j13adk4ib7r464gsl4vjhih820bq37ddhqfyfd07wh53a2"; }; nativeBuildInputs = [ cmake pkg-config qttools docbook-xsl-nons ]; - buildInputs = [ qtx11extras drumstick ]; + buildInputs = [ drumstick qtx11extras ]; + + postInstall = '' + # vmpk drumstickLocales looks here: + ln -s ${drumstick}/share/drumstick $out/share/ + ''; meta = with lib; { description = "Virtual MIDI Piano Keyboard"; From 322ed1b535f87a8f2f3e1df6822e6ab64121277d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 26 Apr 2021 23:53:39 +0200 Subject: [PATCH 1073/1183] nbtscanner: init at 0.0.1 --- pkgs/tools/security/nbtscanner/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/security/nbtscanner/default.nix diff --git a/pkgs/tools/security/nbtscanner/default.nix b/pkgs/tools/security/nbtscanner/default.nix new file mode 100644 index 000000000000..6ad9fdd47708 --- /dev/null +++ b/pkgs/tools/security/nbtscanner/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "nbtscanner"; + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "jonkgrimes"; + repo = pname; + rev = version; + sha256 = "06507a8y41v42cmvjpzimyrzdp972w15fjpc6c6750n1wa2wdl6c"; + }; + + cargoSha256 = "0cis54zmr2x0f4z664lmhk9dzx00hvds6jh3x417308sz7ak11gd"; + + buildInputs = lib.optional stdenv.isDarwin Security; + + meta = with lib; { + description = "NetBIOS scanner written in Rust"; + homepage = "https://github.com/jonkgrimes/nbtscanner"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dca92c4cc47c..9c77ff4d660b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6166,6 +6166,10 @@ in nbench = callPackage ../tools/misc/nbench { }; + nbtscanner = callPackage ../tools/security/nbtscanner { + inherit (darwin.apple_sdk.frameworks) Security; + }; + ncrack = callPackage ../tools/security/ncrack { }; nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; From 5c5f728b042f5c793d10e85e7e851e1501201aaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 04:13:43 +0200 Subject: [PATCH 1074/1183] python3Packages.pynndescent: 0.5.1 -> 0.5.2 --- .../python-modules/pynndescent/default.nix | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix index aab8f4e743a2..8cddeb8873fa 100644 --- a/pkgs/development/python-modules/pynndescent/default.nix +++ b/pkgs/development/python-modules/pynndescent/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, fetchpatch , nose , scikitlearn , scipy @@ -12,25 +11,13 @@ buildPythonPackage rec { pname = "pynndescent"; - version = "0.5.1"; + version = "0.5.2"; src = fetchPypi { inherit pname version; - sha256 = "74a05a54d13573a38878781d44812ac6df97d8762a56f9bb5dd87a99911820fe"; + sha256 = "0w87c2v0li2rdbx6qfc2lb6y6bxpdy3jwfgzfs1kcr4d1chj5zfr"; }; - patches = [ - # fixes tests, included in 0.5.2 - (fetchpatch { - url = "https://github.com/lmcinnes/pynndescent/commit/ef5d8c3c3bfe976063b6621e3e0734c0c22d813b.patch"; - sha256 = "sha256-49n3kevs3wpzd4FfZVKmNpF2o1V8pJs4KOx8zCAhR3s="; - }) - ]; - - checkInputs = [ - nose - ]; - propagatedBuildInputs = [ scikitlearn scipy @@ -39,6 +26,10 @@ buildPythonPackage rec { joblib ]; + checkInputs = [ + nose + ]; + checkPhase = '' nosetests ''; From 8ee6a9bfc1053645e95258574f30f8cd4abf0b73 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 04:29:42 +0200 Subject: [PATCH 1075/1183] python3Packages.umap-learn: 0.5.0 -> 0.5.1 --- .../python-modules/umap-learn/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index b9abe2bb7682..f888704e6a8c 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -13,21 +13,15 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; rev = version; - sha256 = "sha256-2Z5RDi4bz8hh8zMwkcCQY9NrGaVd1DJEBOmrCl2oSvM="; + sha256 = "0favphngcz5jvyqs06x07hk552lvl9qx3vka8r4x0xmv88gsg349"; }; - checkInputs = [ - nose - tensorflow - pytestCheckHook - ]; - propagatedBuildInputs = [ numpy scikitlearn @@ -36,6 +30,12 @@ buildPythonPackage rec { pynndescent ]; + checkInputs = [ + nose + tensorflow + pytestCheckHook + ]; + preCheck = '' export HOME=$TMPDIR ''; From d97fc73e0665739a8c2364dc8b1dcf009c8338d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 05:06:02 +0200 Subject: [PATCH 1076/1183] python3Packages.persim: fix build --- .../python-modules/persim/default.nix | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index d016d1ccea8b..65f3529e60c6 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -1,12 +1,14 @@ { lib , buildPythonPackage , fetchPypi -, scikitlearn -, numpy -, matplotlib -, scipy +, deprecated , hopcroftkarp -, pytest +, joblib +, matplotlib +, numpy +, scikitlearn +, scipy +, pytestCheckHook }: buildPythonPackage rec { @@ -19,26 +21,24 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - scikitlearn - numpy - matplotlib - scipy + deprecated hopcroftkarp + joblib + matplotlib + numpy + scikitlearn + scipy ]; checkInputs = [ - pytest + pytestCheckHook ]; - checkPhase = '' + preCheck = '' # specifically needed for darwin export HOME=$(mktemp -d) mkdir -p $HOME/.matplotlib echo "backend: ps" > $HOME/.matplotlib/matplotlibrc - - # ignore tests due to python 2.7 fail - pytest --ignore test/test_plots.py \ - --ignore test/test_visuals.py ''; meta = with lib; { From b0e952a0b74733840d3eacf292e428069771dd6c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 04:17:04 +0000 Subject: [PATCH 1077/1183] istioctl: 1.9.2 -> 1.9.3 --- pkgs/applications/networking/cluster/istioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index fdf9e97e7c96..d0ffb22217f0 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "istioctl"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "sha256-co/0ogI48FxrwVGwIuMqeFPFYtQF4/rv9V6b225TZc4="; + sha256 = "sha256-gCI4LRUjsE6V7fomWaQsseX1Xi2f+2ZgtvWBDarpXvw="; }; vendorSha256 = "sha256-yJHYyRPl1V1WNV0nJoR3bRTTGRTQaT/tG4TSQeL5U88="; From dfe332d2b8e828dd97a65d964978249f3dc43fe3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Apr 2021 04:20:00 +0000 Subject: [PATCH 1078/1183] terraform_0_12: 0.12.30 -> 0.12.31 https://github.com/hashicorp/terraform/releases/tag/v0.12.31 --- 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 f1064d350e0e..20212b9d0965 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -137,8 +137,8 @@ let ]; in rec { terraform_0_12 = pluggable (generic { - version = "0.12.30"; - sha256 = "0mv2nsy2ygb1kgkw98xckihcdqxpzhdmks5p2gi2l7wb7lx51yz2"; + version = "0.12.31"; + sha256 = "03p698xdbk5gj0f9v8v1fpd74zng3948dyy4f2hv7zgks9hid7fg"; patches = [ ./provider-path.patch (fetchpatch { From ed630eea3d868bfa0c5f828f0e74800c0edd7e00 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Apr 2021 04:20:00 +0000 Subject: [PATCH 1079/1183] terraform_0_13: 0.13.6 -> 0.13.7 https://github.com/hashicorp/terraform/releases/tag/v0.13.7 --- 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 20212b9d0965..c323e955455c 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -150,8 +150,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.6"; - sha256 = "04vas8i894ssfhncdvljdvmvj2qzfrcs20zcv71l1wmnnv9ibs6l"; + version = "0.13.7"; + sha256 = "1cahnmp66dk21g7ga6454yfhaqrxff7hpwpdgc87cswyq823fgjn"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); From 3dd11611cfb92fb24f9ec65b8c16927893e3a81b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Apr 2021 04:20:00 +0000 Subject: [PATCH 1080/1183] terraform_0_14: 0.14.10 -> 0.14.11 https://github.com/hashicorp/terraform/releases/tag/v0.14.11 --- 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 c323e955455c..f078c87aef22 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,8 +157,8 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.10"; - sha256 = "05vfb8hzma3qxq4w1h25mmgv96g90if214zlar0sm9fq8zsvb1yw"; + version = "0.14.11"; + sha256 = "1yi1jj3n61g1kn8klw6l78shd23q79llb7qqwigqrx3ki2mp279j"; vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; From 67a6549f8eaae0eb6f90a13a0190ff63af9ae097 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 27 Apr 2021 04:20:00 +0000 Subject: [PATCH 1081/1183] terraform: remove peterhoeg as maintainer https://github.com/NixOS/nixpkgs/pull/120786#issuecomment-827406640 --- pkgs/applications/networking/cluster/terraform/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index f078c87aef22..754dac6a9364 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -49,7 +49,6 @@ let babariviere kalbasit marsam - peterhoeg timstott zimbatm ]; From 34f3f95632f027f89024a56c4433b2035a98f7b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 05:12:44 +0000 Subject: [PATCH 1082/1183] kube-score: 1.10.1 -> 1.11.0 --- pkgs/applications/networking/cluster/kube-score/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-score/default.nix b/pkgs/applications/networking/cluster/kube-score/default.nix index 76bd115a9b13..a466598f00df 100644 --- a/pkgs/applications/networking/cluster/kube-score/default.nix +++ b/pkgs/applications/networking/cluster/kube-score/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kube-score"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "zegl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-TYsuSPWTiIlPscul/QO59+lt6sbjJdt7pJuJYO5R9Tc="; + sha256 = "sha256-O0RtlFkyo01kcxWSzrkhh7vvV76B7I5V19dSzaxvv4Y="; }; - vendorSha256 = "sha256-ob7mNheyeTcDWml4gi1SD3Pq+oWtJeySIUg2ZrCj0y0="; + vendorSha256 = "sha256-qFS+N0tOf3zxqs1tN6Z1EnR3qLR1FfZNfJ21NoRXek0="; meta = with lib; { description = "Kubernetes object analysis with recommendations for improved reliability and security"; From 55c9975f46e874306e31b460a026f679c33e96e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 05:21:03 +0000 Subject: [PATCH 1083/1183] kustomize: 4.0.5 -> 4.1.2 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index b5b0c8b81bf8..aa6382bb16da 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "4.0.5"; + version = "4.1.2"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-rv65sDr6V6hEYgIRxS1OSu9txmW75F7/YGAy/zRXGyY="; + sha256 = "sha256-uomtW6PPs/UHvKRbHToot6kU4YJGLJuet8vJENbwEgI="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-lLUi0vD7uyfDR4HjDiosoTU0NbfQTY7ewZGm38ZT9nU="; + vendorSha256 = "sha256-fcsjxtCojahI6ZIcaSG5ubNqlWEC6DnNHtVYwTtbSw4="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 4ccb9422c77c63df0e779b2dedafe5b5788882ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 05:34:13 +0000 Subject: [PATCH 1084/1183] lean: 3.28.0 -> 3.29.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index b57ee0f61f13..3a0b13d7d09c 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.28.0"; + version = "3.29.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "sha256-IzoFE92F559WeSUCiYZ/fx2hrsyRzgOACr3/pzJ4OOY="; + sha256 = "sha256-f2Gp76c+4R+ww52f1AyVZqixpei1WZPwr7pfgxMMb9Q="; }; nativeBuildInputs = [ cmake ]; From 495d62b5f3390902ff17bd1152643400f9ff7066 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 08:12:35 +0200 Subject: [PATCH 1085/1183] python3Packages.adafruit-platformdetect: 3.6.0 -> 3.8.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 2345f8cae469..5d0ee6f7c42e 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.6.0"; + version = "3.8.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-096bMTAh5d2wikrmlDcUspD9GYZlPHbdDcf/e/BLAHI="; + sha256 = "sha256-AjUpxdY/5IoWMBtufP3OVnMpUwpxgpCNWoydH1w+t+Y="; }; nativeBuildInputs = [ setuptools-scm ]; From 731288ed01ab4fe99f54d68f2aa9df0c1196b0b9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:33:20 +0200 Subject: [PATCH 1086/1183] libguestfs: fix build with OCaml 4.12 --- pkgs/development/libraries/libguestfs/default.nix | 2 +- .../development/libraries/libguestfs/ocaml-4.12.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/libguestfs/ocaml-4.12.patch diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 0f56f8c97f38..47f6ffe2c52f 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; - patches = [ ./libguestfs-syms.patch ]; + patches = [ ./libguestfs-syms.patch ./ocaml-4.12.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libguestfs/ocaml-4.12.patch b/pkgs/development/libraries/libguestfs/ocaml-4.12.patch new file mode 100644 index 000000000000..032527d57130 --- /dev/null +++ b/pkgs/development/libraries/libguestfs/ocaml-4.12.patch @@ -0,0 +1,11 @@ +--- a/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100 ++++ b/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100 +@@ -305,7 +305,7 @@ + | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs + | _ -> invalid_arg "combine3" + +- let rec assoc_lbl ?(cmp = compare) ~default x = function ++ let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function + | [] -> default + | (y, y') :: _ when cmp x y = 0 -> y' + | _ :: ys -> assoc_lbl ~cmp ~default x ys From 9ffb287d75181651d96697a6118476b58fb63b61 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:33:27 +0200 Subject: [PATCH 1087/1183] ocamlformat: build versions < 0.17 with OCaml 4.10 --- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 223ac39c6aa2..eb38b60f9b15 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -25,8 +25,10 @@ let src = }."${version}"; }; ocamlPackages = - if lib.versionAtLeast version "0.14.3" + if lib.versionAtLeast version "0.17.0" then ocaml-ng.ocamlPackages + else if lib.versionAtLeast version "0.14.3" + then ocaml-ng.ocamlPackages_4_10 else ocaml-ng.ocamlPackages_4_07 ; in From 44339cc0b0e29577d882a3c44f3fb22fba110d7d Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:33:32 +0200 Subject: [PATCH 1088/1183] ocamlPackages.ocp-build: fix compilation with OCaml 4.12 --- pkgs/development/tools/ocaml/ocp-build/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index 655f7b4d4c2f..a1d0b76eb1ff 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocaml, findlib, ncurses, cmdliner, re }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocaml, findlib, ncurses, cmdliner, re }: let version = "1.99.21"; in @@ -13,6 +13,14 @@ stdenv.mkDerivation { sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9"; }; + patches = [ + # Fix compilation with OCaml 4.12 + (fetchpatch { + url = "https://github.com/OCamlPro/ocp-build/commit/104e4656ca6dba9edb03b62539c9f1e10abcaae8.patch"; + sha256 = "0sbyi4acig9q8x1ky4hckfg5pm2nad6zasi51ravaf1spgl148c2"; + }) + ]; + buildInputs = [ ocaml findlib cmdliner re ]; propagatedBuildInputs = [ ncurses ]; preInstall = "mkdir -p $out/bin"; From ab51ade9a319d14cda36fb2a06f1a76af35e7ac0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:46:16 +0200 Subject: [PATCH 1089/1183] haxe: build versions < 4.2 with OCaml 4.10 --- pkgs/development/compilers/haxe/default.nix | 17 ++++++++++++++--- pkgs/development/ocaml-modules/extlib/1.7.7.nix | 7 +++++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index c9e5a097de1f..d5277899892e 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -2,7 +2,7 @@ let ocamlDependencies = version: - if lib.versionAtLeast version "4.0" + if lib.versionAtLeast version "4.2" then with ocaml-ng.ocamlPackages; [ ocaml findlib @@ -13,8 +13,19 @@ let sha dune_2 luv - (if lib.versionAtLeast version "4.2" - then ocaml_extlib else ocaml_extlib-1-7-7) + ocaml_extlib + ] else if lib.versionAtLeast version "4.0" + then with ocaml-ng.ocamlPackages_4_10; [ + ocaml + findlib + sedlex_2 + xml-light + ptmap + camlp5 + sha + dune_2 + luv + ocaml_extlib-1-7-7 ] else with ocaml-ng.ocamlPackages_4_05; [ ocaml camlp4 diff --git a/pkgs/development/ocaml-modules/extlib/1.7.7.nix b/pkgs/development/ocaml-modules/extlib/1.7.7.nix index 3314ebcb9b5d..d27fe085569f 100644 --- a/pkgs/development/ocaml-modules/extlib/1.7.7.nix +++ b/pkgs/development/ocaml-modules/extlib/1.7.7.nix @@ -1,11 +1,14 @@ # Older version of extlib for Haxe 4.0 and 4.1. # May be replaceable by the next extlib + extlib-base64 release. -{ fetchurl, ocaml_extlib }: +{ lib, fetchurl, ocaml, ocaml_extlib }: -ocaml_extlib.overrideAttrs (_: rec { +ocaml_extlib.overrideAttrs (x: rec { version = "1.7.7"; src = fetchurl { url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz"; sha256 = "1sxmzc1mx3kg62j8kbk0dxkx8mkf1rn70h542cjzrziflznap0s1"; }; + meta = x.meta // { + broken = lib.versionAtLeast ocaml.version "4.12"; + }; }) From 8d4b6207e9ec396d4ec3c89b1cb2d22fe71ec719 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 06:01:42 +0200 Subject: [PATCH 1090/1183] dune_1: build with OCaml 4.10 --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e94824531fa3..8e19b2ca27bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2371,7 +2371,8 @@ in duf = callPackage ../tools/misc/duf { }; - inherit (ocamlPackages) dune_1 dune_2 dune-release; + inherit (ocaml-ng.ocamlPackages_4_10) dune_1; + inherit (ocamlPackages) dune_2 dune-release; duperemove = callPackage ../tools/filesystems/duperemove { }; From 1a7f327cb6e2d2961aeddba62d9fa042de8433aa Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 06:06:58 +0200 Subject: [PATCH 1091/1183] google-drive-ocamlfuse: build with OCaml 4.10 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e19b2ca27bb..0574afa5ae26 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23043,7 +23043,7 @@ in gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; - inherit (ocamlPackages) google-drive-ocamlfuse; + inherit (ocaml-ng.ocamlPackages_4_10) google-drive-ocamlfuse; googler = callPackage ../applications/misc/googler { python = python3; From 8984dee07e2cc5db541a7ab841d258146e3baf8e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:33:36 +0200 Subject: [PATCH 1092/1183] =?UTF-8?q?ocamlPackages.accessor=5Fcore:=20mark?= =?UTF-8?q?=20as=20broken=20with=20OCaml=20=E2=89=A5=204.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/janestreet/0.14.nix | 2 ++ pkgs/top-level/ocaml-packages.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index eb429b2bb6dc..e348c5d9325a 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,4 +1,5 @@ { self +, lib , openssl , zstd }: @@ -40,6 +41,7 @@ with self; version = "0.14.1"; hash = "1cdkv34m6czhacivpbb2sasj83fgcid6gnqk30ig9i84z8nh2gw2"; meta.description = "Accessors for Core types, for use with the Accessor library"; + meta.broken = lib.versionAtLeast ocaml.version "4.12"; propagatedBuildInputs = [ accessor_base core_kernel ]; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index bb4541535715..1d42dbc96d77 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1284,7 +1284,7 @@ let if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { inherit self; - inherit (pkgs) openssl zstd; + inherit (pkgs) lib openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { From 1a47b8fe6ffeaa07949d89549bd1fa1673701876 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 20 Apr 2021 05:33:41 +0200 Subject: [PATCH 1093/1183] OCaml: default to version 4.12 --- pkgs/top-level/ocaml-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 1d42dbc96d77..6ae5f43a63c7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1502,5 +1502,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_12; - ocamlPackages = ocamlPackages_4_10; + ocamlPackages = ocamlPackages_4_12; } From c7ddfc0760ee328a6fba9e4cbddbd69805870c71 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Tue, 9 Mar 2021 16:20:55 +0100 Subject: [PATCH 1094/1183] xwayland: 1.20.10 -> 21.1.1 The new xwayland release uses meson exclusively, switch the derivation over to meson. See [1] for further reasoning. Also turn xwayland into its own derivation instead of using the override infrastructure. [1]: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/582 Signed-off-by: Rouven Czerwinski --- pkgs/servers/x11/xorg/xwayland.nix | 120 +++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 30 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index e3d2698e8303..e1b2597d4f45 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,40 +1,100 @@ -{ lib, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config -, epoxy, libxslt, libunwind, makeWrapper, egl-wayland +{ egl-wayland +, epoxy +, fetchurl +, fontutil +, lib +, libGL +, libGLU +, libX11 +, libXau +, libXaw +, libXdmcp +, libXext +, libXfixes +, libXfont2 +, libXmu +, libXpm +, libXrender +, libXres +, libXt +, libdrm +, libtirpc +, libunwind +, libxcb +, libxkbfile +, libxshmfence +, mesa +, meson +, ninja +, openssl +, pkg-config +, pixman +, stdenv +, wayland +, wayland-protocols +, xkbcomp +, xkeyboard_config +, xorgproto +, xtrans +, zlib , defaultFontPath ? "" }: -with lib; +stdenv.mkDerivation rec { -xorgserver.overrideAttrs (oldAttrs: { - - name = "xwayland-${xorgserver.version}"; - buildInputs = oldAttrs.buildInputs ++ [ egl-wayland ]; - propagatedBuildInputs = oldAttrs.propagatedBuildInputs - ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; - configureFlags = [ - "--disable-docs" - "--disable-devel-docs" - "--enable-xwayland" - "--enable-xwayland-eglstream" - "--disable-xorg" - "--disable-xvfb" - "--disable-xnest" - "--disable-xquartz" - "--disable-xwin" - "--enable-glamor" - "--with-default-font-path=${defaultFontPath}" - "--with-xkb-bin-directory=${xkbcomp}/bin" - "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" - "--with-xkb-output=$(out)/share/X11/xkb/compiled" + pname = "xwayland"; + version = "21.1.1"; + src = fetchurl { + url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz"; + sha256 = "sha256-MfJhzlG77namyj7AKqNn/6K176K5hBLfV8zv16GQA84="; + }; + nativeBuildInputs = [ pkg-config meson ninja ]; + buildInputs = [ + egl-wayland + epoxy + fontutil + libGL + libGLU + libX11 + libXau + libXaw + libXdmcp + libXext + libXfixes + libXfont2 + libXmu + libXpm + libXrender + libXres + libXt + libdrm + libtirpc + libunwind + libxcb + libxkbfile + libxshmfence + mesa + openssl + pixman + wayland + wayland-protocols + xkbcomp + xorgproto + xtrans + zlib + ]; + mesonFlags = [ + "-Dxwayland-eglstream=true" + "-Ddefault-font-path=${defaultFontPath}" + "-Dxkb_bin_dir=${xkbcomp}/bin" + "-Dxkb_dir=${xkeyboard_config}/etc/X11/xkb" + "-Dxkb_output_dir=${placeholder "out"}/share/X11/xkb/compiled" ]; - postInstall = '' - rm -fr $out/share/X11/xkb/compiled - ''; - - meta = { + meta = with lib; { description = "An X server for interfacing X11 apps with the Wayland protocol"; homepage = "https://wayland.freedesktop.org/xserver.html"; license = licenses.mit; + maintainers = with maintainers; [ emantor ]; platforms = platforms.linux; }; -}) +} From ac928e8c2594a09669cb87ae1e03f34c4ee5679b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 25 Apr 2021 23:02:02 +0200 Subject: [PATCH 1095/1183] python3Packages.adb-enhanced: 2.5.10 -> 2.5.11 --- pkgs/development/python-modules/adb-enhanced/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adb-enhanced/default.nix b/pkgs/development/python-modules/adb-enhanced/default.nix index 59eb468868a8..d782de26ab72 100644 --- a/pkgs/development/python-modules/adb-enhanced/default.nix +++ b/pkgs/development/python-modules/adb-enhanced/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "adb-enhanced"; - version = "2.5.10"; + version = "2.5.11"; disabled = pythonOlder "3.4"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "ashishb"; repo = pname; rev = version; - sha256 = "sha256-JMbcOk9Yr4WbfVUMKe5zZZWvvjKwhpPMdBt9d7xE6ek="; + sha256 = "sha256-jb5O7Qxk2xAX5sax6nqywcGBJao5Xfff9s1yvdfvDCs="; }; postPatch = '' From eb4a0b56a33d2e06fb537beb932f00220b844330 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 09:02:07 +0200 Subject: [PATCH 1096/1183] maintainers/teams: remove prusnak from jitsi team --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index cb30b2e01380..1318ac2a5860 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -110,7 +110,6 @@ with lib.maintainers; { members = [ mmilata petabyteboy - prusnak ryantm ]; scope = "Maintain Jitsi."; From 971940c996cef634aab4ef5911e5f6c6b2090a48 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 27 Apr 2021 09:30:46 +0200 Subject: [PATCH 1097/1183] ripgrep-all: use ffmpeg 4 See also #120705. `ffmpeg` is only used to search for metadata and chapters in video files (such as `.mkv`, `.mp4` etc.). Confirmed that with both `ffmpeg` versions the same result is provided. --- pkgs/tools/text/ripgrep-all/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 5d6a74327d42..ec023dd72a32 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg_3 +{ stdenv, lib, fetchFromGitHub, rustPlatform, makeWrapper, ffmpeg , pandoc, poppler_utils, ripgrep, Security, imagemagick, tesseract }: @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg_3 pandoc poppler_utils ripgrep imagemagick tesseract ]}" + --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep imagemagick tesseract ]}" ''; # Use upstream's example data to run a couple of queries to ensure the dependencies From 1384409e8fd726e52af58682d1492a02aa568c54 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Apr 2021 16:07:52 +0800 Subject: [PATCH 1098/1183] terragrunt: remove peterhoeg as maintainer --- pkgs/applications/networking/cluster/terragrunt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 0d726e5cfc58..f643ae1e673c 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { changelog = "https://github.com/gruntwork-io/terragrunt/releases/tag/v${version}"; description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg jk ]; + maintainers = with maintainers; [ jk ]; }; } From 672912f73e990436313fa568dd1876282877ec30 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 27 Apr 2021 10:31:01 +0900 Subject: [PATCH 1099/1183] wrangler: 1.16.0 -> 1.16.1 --- pkgs/development/tools/wrangler/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/wrangler/default.nix b/pkgs/development/tools/wrangler/default.nix index 84c335820ad5..bb1f23164858 100644 --- a/pkgs/development/tools/wrangler/default.nix +++ b/pkgs/development/tools/wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wrangler"; - version = "1.16.0"; + version = "1.16.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZOkoUMkpp89ON60xgz0ZzL9RAZeHstKTTl/UEc/y3Ls="; + sha256 = "sha256-chKmn38yB05NqDvtYWo4EwEIiD6kjy/1OMaMFM4qAA8="; }; - cargoSha256 = "sha256-Cppj3sRJzH8UiyM8lXT2dWqsWr83EApYKqYq3nJQZi8="; + cargoSha256 = "sha256-pG3ZsRPa/7QRkUik6a987SlGrl3B0thnN3h62JyzdJo="; nativeBuildInputs = [ pkg-config ]; From fc98e85759e93d3041026c91150f4303d706f272 Mon Sep 17 00:00:00 2001 From: "Noah D. Brenowitz" Date: Mon, 26 Apr 2021 10:41:03 -0700 Subject: [PATCH 1100/1183] python3Packages.dask: disable network tests There were hydra failures (https://hydra.nixos.org/build/141870744/nixlog/1) for some tests requiring data on github (failing on mac and linux), and tests requiring local network access on mac. Disable the former and enable the latter. --- pkgs/development/python-modules/dask/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index 13c03a1f7968..1c6d37681a68 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -72,7 +72,10 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - pytestFlagsArray = [ "-n $NIX_BUILD_CORES" ]; + pytestFlagsArray = [ + "-n $NIX_BUILD_CORES" + "-m 'not network'" + ]; disabledTests = [ "test_annotation_pack_unpack" @@ -82,6 +85,8 @@ buildPythonPackage rec { "test_auto_blocksize_csv" ]; + __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "dask.dataframe" "dask" "dask.array" ]; meta = with lib; { From 95f885975a7023090608e2916fffdec655079a27 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 12:01:33 +0200 Subject: [PATCH 1101/1183] openbazaar: 0.14.3 -> 0.14.6 --- pkgs/applications/networking/openbazaar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/openbazaar/default.nix b/pkgs/applications/networking/openbazaar/default.nix index beb957786ba5..aa5d14724ac4 100644 --- a/pkgs/applications/networking/openbazaar/default.nix +++ b/pkgs/applications/networking/openbazaar/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "openbazaar"; - version = "0.14.3"; + version = "0.14.6"; suffix = { i686-linux = "linux-386"; @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/OpenBazaar/openbazaar-go/releases/download/v${version}/${pname}-go-${suffix}"; sha256 = { - i686-linux = "098dgxpz9m4rfswc9yg77s3bvaifd4453s20n8kmh55g5ipgs2x1"; - x86_64-darwin = "0q989m4zj7x9d6vimmpfkla78hmx2zr7bxm9yg61ir00w60l14jx"; - x86_64-linux = "093rwn4nfirknbxz58n16v0l0apj2h0yr63f64fqysmy78883al2"; + i686-linux = "1cmv3gyfd6q7y6yn6kigksy2abkq5b8mfgk51d04ky1ckgbriaqq"; + x86_64-darwin = "0n32a0pyj1k2had3imimdyhdhyb285y1dj04f7g3jajmy5zndaxx"; + x86_64-linux = "105i5yl2yvhcvyh1wf35kqq1qyxgbl9j2kxs6yshsk14b2p02j5i"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From da98ae6198dac36d82e9d71503423dc48df4db8e Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Tue, 27 Apr 2021 04:04:55 -0600 Subject: [PATCH 1102/1183] terraform_0_15: 0.15.0 -> 0.15.1 (#120786) --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index be331156eed5..f1064d350e0e 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -165,9 +165,9 @@ in rec { }); terraform_0_15 = pluggable (generic { - version = "0.15.0"; - sha256 = "0d7hai57x6qczacdnzzvs3766180n6grmq0a7rlw5jp3zgzp8bmr"; - vendorSha256 = "1l67kkrk8jw7v1rqpwj6n0l7lvmfgf1ir430j1n96459s1dzf0cn"; + version = "0.15.1"; + sha256 = "02bqg05wsqld9xybvg7swvmympq5bggkw8vcq91z6vkpawm8z3kg"; + vendorSha256 = "1lnz6b2kjilidvs4flx9vj5j6dxliqdxni96fn2537nqaz4hc7l2"; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; }; }); From 2f15ec0160eac3f05ce42884c1ce6b21ee88e030 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Apr 2021 18:14:36 +0800 Subject: [PATCH 1103/1183] qtox: ffmpeg_3 -> ffmpeg --- .../instant-messengers/qtox/default.nix | 55 +++++++++++++++---- 1 file changed, 44 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index b91db31f89a1..656ddade11f8 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -1,9 +1,30 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake, pkg-config, perl -, libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver -, qtbase, qtsvg, qttools, qttranslations -, ffmpeg_3, filter-audio, libexif, libsodium, libopus -, libvpx, openal, pcre, qrencode, sqlcipher -, AVFoundation }: +{ lib +, stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkg-config +, perl +, libtoxcore +, libpthreadstubs +, libXdmcp +, libXScrnSaver +, qtbase +, qtsvg +, qttools +, qttranslations +, ffmpeg +, filter-audio +, libexif +, libsodium +, libopus +, libvpx +, openal +, pcre +, qrencode +, sqlcipher +, AVFoundation +}: mkDerivation rec { pname = "qtox"; @@ -18,11 +39,23 @@ mkDerivation rec { buildInputs = [ libtoxcore - libpthreadstubs libXdmcp libXScrnSaver - qtbase qtsvg qttranslations - ffmpeg_3 filter-audio libexif libopus libsodium - libvpx openal pcre qrencode sqlcipher - ] ++ lib.optionals stdenv.isDarwin [ AVFoundation] ; + libpthreadstubs + libXdmcp + libXScrnSaver + qtbase + qtsvg + qttranslations + ffmpeg + filter-audio + libexif + libopus + libsodium + libvpx + openal + pcre + qrencode + sqlcipher + ] ++ lib.optionals stdenv.isDarwin [ AVFoundation ]; nativeBuildInputs = [ cmake pkg-config qttools ] ++ lib.optionals stdenv.isDarwin [ perl ]; From 334692eb2911e449070d7b0bb4a3f3505147c360 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 12:20:45 +0200 Subject: [PATCH 1104/1183] python3Packages.bip-utils: 1.7.0 -> 1.9.0 --- pkgs/development/python-modules/bip_utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index 1854bd4f71b5..94f6e3df8f2e 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.7.0"; + version = "1.9.0"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ebellocchia"; repo = pname; rev = "v${version}"; - sha256 = "1dj0c9sj0c4dkdf7rbz3s1z5kfzw22hpncm4bnwqigjzi6nrk81z"; + sha256 = "0i1jdpdsrc8cal5x0b1am9mgbca69ymxlaqpkw0y4d0m3m6vs33k"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; From db48278aba434d5da3f831acb5890d7f3f059372 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 11 Apr 2021 16:03:18 +0000 Subject: [PATCH 1105/1183] slither-analyzer: 0.7.0 -> 0.7.1 --- pkgs/development/python-modules/slither-analyzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 43583416bb40..f0579590f1ef 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "slither-analyzer"; - version = "0.7.0"; + version = "0.7.1"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10r479xidgxvas4wb0z6injp59jrn7rfq8d7bxlcalc2dy4mawr0"; + sha256 = "sha256-v/UuxxgMmkGfP962AfOQU05MI8xJocpD8SkENCZi04I="; }; nativeBuildInputs = [ makeWrapper ]; From 8a8069c08a52ae7d6e3cc25863b69a10c6b4150c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 27 Apr 2021 18:20:53 +0800 Subject: [PATCH 1106/1183] kfilemetadata: ffmpeg_3 -> ffmpeg --- .../kde-frameworks/kfilemetadata/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index c4bee741d2a8..7c16dcf46507 100644 --- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix @@ -1,14 +1,33 @@ -{ - mkDerivation, - extra-cmake-modules, - attr, ebook_tools, exiv2, ffmpeg_3, karchive, kcoreaddons, ki18n, poppler, qtbase, qtmultimedia, taglib +{ mkDerivation +, lib +, extra-cmake-modules +, attr +, ebook_tools +, exiv2 +, ffmpeg +, karchive +, kcoreaddons +, ki18n +, poppler +, qtbase +, qtmultimedia +, taglib }: mkDerivation { name = "kfilemetadata"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ - attr ebook_tools exiv2 ffmpeg_3 karchive kcoreaddons ki18n poppler qtbase qtmultimedia + attr + ebook_tools + exiv2 + ffmpeg + karchive + kcoreaddons + ki18n + poppler + qtbase + qtmultimedia taglib ]; patches = [ From 204e1edf27e0875f91d07b624709e5b8fc65c388 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 12:32:51 +0200 Subject: [PATCH 1107/1183] slither-analyzer: update maintainer --- .../slither-analyzer/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index f0579590f1ef..57168b1d9151 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -15,25 +15,31 @@ buildPythonPackage rec { pname = "slither-analyzer"; version = "0.7.1"; - disabled = pythonOlder "3.6"; - # No Python tests - doCheck = false; - src = fetchPypi { inherit pname version; sha256 = "sha256-v/UuxxgMmkGfP962AfOQU05MI8xJocpD8SkENCZi04I="; }; - nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; + nativeBuildInputs = [ + makeWrapper + ]; + + propagatedBuildInputs = [ + crytic-compile + prettytable + setuptools + ]; postFixup = lib.optionalString withSolc '' wrapProgram $out/bin/slither \ --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; + # No Python tests + doCheck = false; + meta = with lib; { description = "Static Analyzer for Solidity"; longDescription = '' @@ -43,6 +49,6 @@ buildPythonPackage rec { ''; homepage = "https://github.com/trailofbits/slither"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ arturcygan ]; + maintainers = with maintainers; [ arturcygan fab ]; }; } From f5f0c3be1afc60a07ea4b4b48de62725c0429c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Apr 2021 12:40:25 +0200 Subject: [PATCH 1108/1183] tor-browser-bundle-bin: use ffmpeg instead of ffmpeg_3 (#120653) --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 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 3f3eec49c94e..c906a0db4fd4 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -29,7 +29,7 @@ # Media support (implies audio support) , mediaSupport ? true -, ffmpeg_3 +, ffmpeg , gmp @@ -81,7 +81,7 @@ let ] ++ optionals pulseaudioSupport [ libpulseaudio ] ++ optionals mediaSupport [ - ffmpeg_3 + ffmpeg ]; # Library search path for the fte transport From aeb90f995639d3b7d274e0cc7832bc2a477bc0bc Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Tue, 27 Apr 2021 15:50:03 +0700 Subject: [PATCH 1109/1183] jetty: 9.4.37.v20210219 -> 9.4.39.v20210325 Closes #120392 --- pkgs/servers/http/jetty/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 1a43f2592823..a8c45c488725 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.37.v20210219"; + version = "9.4.39.v20210325"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; - sha256 = "sha256-Jyg0cQBnwYtcVJnr2uWwE/9yC3wq+CLTTGKtv3BsZs8="; + sha256 = "0mn3ranh599w946cnykj7sbkj4w7ddpdhly7njmalsgabfbk8qv5"; }; dontBuild = true; @@ -15,10 +15,11 @@ stdenv.mkDerivation rec { mv etc lib modules start.ini start.jar $out ''; - meta = { + meta = with lib; { description = "A Web server and javax.servlet container"; homepage = "https://www.eclipse.org/jetty/"; - platforms = lib.platforms.all; - license = [ lib.licenses.asl20 lib.licenses.epl10 ]; + platforms = platforms.all; + license = with licenses; [ asl20 epl10 ]; + maintainers = with maintainers; [ emmanuelrosa ]; }; } From e9b9feac84b4c519dd556dc3ae97ac0c76f417ba Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Tue, 27 Apr 2021 15:42:39 +1000 Subject: [PATCH 1110/1183] sqlitecpp: update metadata --- pkgs/development/libraries/sqlitecpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix index ffe5e4bbb838..60724aaa8046 100644 --- a/pkgs/development/libraries/sqlitecpp/default.nix +++ b/pkgs/development/libraries/sqlitecpp/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, sqlite, cppcheck, gtest }: stdenv.mkDerivation rec { - pname = "SQLiteCpp"; + pname = "sqlitecpp"; version = "3.1.1"; src = fetchFromGitHub { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://srombauts.github.com/SQLiteCpp"; + homepage = "https://srombauts.github.io/SQLiteCpp/"; description = "C++ SQLite3 wrapper"; license = licenses.mit; platforms = platforms.unix; From c017e64014dfd5e84002c11f84275027cbbaf4cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Apr 2021 13:35:04 +0200 Subject: [PATCH 1111/1183] amarok: use ffmpeg instead of ffmpeg_3 (#120657) --- pkgs/applications/audio/amarok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index c75adb11ed49..10d1bb9ca656 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -3,7 +3,7 @@ , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem , fftw, phonon, plasma-framework, threadweaver -, curl, ffmpeg_3, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras +, curl, ffmpeg, gdk-pixbuf, libaio, liblastfm, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras }: mkDerivation rec { @@ -23,7 +23,7 @@ mkDerivation rec { qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem phonon plasma-framework threadweaver - curl fftw ffmpeg_3 gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static + curl fftw ffmpeg gdk-pixbuf libaio liblastfm libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static pcre snappy taglib taglib_extras ]; From 2dc6743ba7d00829353d4bcc07f429f7a7281396 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 27 Apr 2021 13:44:53 +0200 Subject: [PATCH 1112/1183] nushell: sets main program --- pkgs/shells/nushell/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index ee291ccdc03c..98a73e1acd38 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ Br1ght0ne johntitor marsam ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" ]; + mainProgram = "nu"; }; passthru = { From 47a330d01f576f181735791e7c38cfdd5b5680db Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 27 Apr 2021 13:43:56 +0200 Subject: [PATCH 1113/1183] mediaelch: 2.8.6 -> 2.8.8 --- pkgs/applications/misc/mediaelch/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/mediaelch/default.nix b/pkgs/applications/misc/mediaelch/default.nix index 4adfe0f65262..de145efd4440 100644 --- a/pkgs/applications/misc/mediaelch/default.nix +++ b/pkgs/applications/misc/mediaelch/default.nix @@ -9,23 +9,25 @@ , qtbase , qtdeclarative , qtmultimedia +, qtsvg +, qttools }: mkDerivation rec { pname = "mediaelch"; - version = "2.8.6"; + version = "2.8.8"; src = fetchFromGitHub { owner = "Komet"; repo = "MediaElch"; rev = "v${version}"; - sha256 = "1134vw7hr0mpqcsxjq4bqmg5760dngz17bzj97ypfc5cvzcxjh43"; + sha256 = "0yif0ibmlj0bhl7fnhg9yclxg2iyjygmjhffinp5kgqy0vaabkzw"; fetchSubmodules = true; }; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia ]; + buildInputs = [ curl libmediainfo libzen ffmpeg qtbase qtdeclarative qtmultimedia qtsvg ]; prePatch = '' substituteInPlace MediaElch.pro --replace "/usr" "$out" From 58c179406231ee9d24a9b5646e10df145322ca8e Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Tue, 27 Apr 2021 14:11:41 +0200 Subject: [PATCH 1114/1183] ghp-import: 0.5.5 -> 1.1.0 (#120794) --- .../python-modules/ghp-import/default.nix | 29 +++++++++++++++++++ pkgs/development/tools/ghp-import/default.nix | 28 ------------------ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 ++ 4 files changed, 32 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/ghp-import/default.nix delete mode 100644 pkgs/development/tools/ghp-import/default.nix diff --git a/pkgs/development/python-modules/ghp-import/default.nix b/pkgs/development/python-modules/ghp-import/default.nix new file mode 100644 index 000000000000..37a35febdf03 --- /dev/null +++ b/pkgs/development/python-modules/ghp-import/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi +, dateutil +}: + +buildPythonPackage rec { + pname = "ghp-import"; + version = "1.1.0"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-wiqc4Qw3dT4miNFk12WnANrkuNefptsKLDEyuniBiU8="; + }; + + propagatedBuildInputs = [ dateutil ]; + + # Does not include any unit tests + doCheck = false; + + pythonImportsCheck = [ "ghp_import" ]; + + meta = with lib; { + description = "Copy your docs directly to the gh-pages branch"; + homepage = "https://github.com/c-w/ghp-import"; + license = licenses.asl20; + maintainers = with maintainers; [ veehaitch ]; + }; +} diff --git a/pkgs/development/tools/ghp-import/default.nix b/pkgs/development/tools/ghp-import/default.nix deleted file mode 100644 index 4c258d6154ba..000000000000 --- a/pkgs/development/tools/ghp-import/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ python3, glibcLocales, lib }: - -with python3.pkgs; - -buildPythonApplication rec { - version = "0.5.5"; - pname = "ghp-import"; - - src = fetchPypi { - inherit pname version; - sha256 = "1mvmpi7lqflw2lr0g0y5f9s0d1pv9cav4gbmaqnziqg442klx4iy"; - }; - - disabled = isPyPy; - buildInputs = [ glibcLocales ]; - - LC_ALL="en_US.UTF-8"; - - # No tests available - doCheck = false; - - meta = { - description = "Copy your docs directly to the gh-pages branch"; - homepage = "https://github.com/davisp/ghp-import"; - license = "Tumbolia Public License"; - maintainers = with lib.maintainers; [ ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e9a6e1a06a8..01d7ce6d4859 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14517,7 +14517,7 @@ in givaro_3 = callPackage ../development/libraries/givaro/3.nix {}; givaro_3_7 = callPackage ../development/libraries/givaro/3.7.nix {}; - ghp-import = callPackage ../development/tools/ghp-import { }; + ghp-import = with python3Packages; toPythonApplication ghp-import; ghcid = haskellPackages.ghcid.bin; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adb4a4aa4038..52c0e8e4ffc0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2658,6 +2658,8 @@ in { ghdiff = callPackage ../development/python-modules/ghdiff { }; + ghp-import = callPackage ../development/python-modules/ghp-import { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; gin-config = callPackage ../development/python-modules/gin-config { }; From 8b6a8e44d2d941604695bb9eec811a24d3c25d1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Apr 2021 14:16:05 +0200 Subject: [PATCH 1115/1183] qmmp: switch from ffmpeg_3 to ffmpeg (#120771) Co-authored-by: Sandro --- pkgs/applications/audio/qmmp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index 25263f2a2cbd..2ff145d45cf1 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -4,7 +4,7 @@ , curl, libmms # input plugins , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile -, libcdio, cdparanoia, libcddb, faad2, ffmpeg_3, wildmidi +, libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi # output plugins , alsaLib, libpulseaudio # effect plugins @@ -44,7 +44,7 @@ mkDerivation rec { curl libmms # input plugins libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile - libcdio cdparanoia libcddb faad2 ffmpeg_3 wildmidi + libcdio cdparanoia libcddb faad2 ffmpeg wildmidi # output plugins alsaLib libpulseaudio # effect plugins @@ -53,10 +53,10 @@ mkDerivation rec { meta = with lib; { description = "Qt-based audio player that looks like Winamp"; - homepage = "http://qmmp.ylsoftware.com/"; - license = licenses.gpl2; + homepage = "https://qmmp.ylsoftware.com/"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = "http://qmmp.googlecode.com/svn/"; + repositories.svn = "https://svn.code.sf.net/p/qmmp-dev/code"; }; } From c52c7fb467d0c9d8a4d7cdae332d27ce782111be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 26 Apr 2021 18:45:30 -0300 Subject: [PATCH 1116/1183] python3Packages.rfc3339-validator: init at 0.1.3 --- .../rfc3339-validator/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/rfc3339-validator/default.nix diff --git a/pkgs/development/python-modules/rfc3339-validator/default.nix b/pkgs/development/python-modules/rfc3339-validator/default.nix new file mode 100644 index 000000000000..f51a232550ba --- /dev/null +++ b/pkgs/development/python-modules/rfc3339-validator/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, hypothesis +, six +, strict-rfc3339 +}: + +buildPythonPackage rec { + pname = "rfc3339-validator"; + version = "0.1.3"; + + src = fetchPypi { + pname = "rfc3339_validator"; + inherit version; + sha256 = "7a578aa0740e9ee2b48356fe1f347139190c4c72e27f303b3617054efd15df32"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ pytestCheckHook hypothesis strict-rfc3339 ]; + pythonImportsCheck = [ "rfc3339_validator" ]; + + meta = with lib; { + description = "RFC 3339 validator for Python"; + homepage = "https://github.com/naimetti/rfc3339-validator"; + license = licenses.mit; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index adb4a4aa4038..085320b5e912 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7020,6 +7020,8 @@ in { retworkx = callPackage ../development/python-modules/retworkx { }; + rfc3339-validator = callPackage ../development/python-modules/rfc3339-validator { }; + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; rfc3987 = callPackage ../development/python-modules/rfc3987 { }; From ac9adabaf5adc4ecd40aa7b89764f73edd3a9427 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 26 Apr 2021 18:46:08 -0300 Subject: [PATCH 1117/1183] python3Packages.openapi-schema-validator: init at 0.1.5 --- .../openapi-schema-validator/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/openapi-schema-validator/default.nix diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix new file mode 100644 index 000000000000..f09a42ddd69b --- /dev/null +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, isodate +, jsonschema +, pytest-flake8 +, pytestcov +, rfc3339-validator +, six +, strict-rfc3339 +}: + +buildPythonPackage rec { + pname = "openapi-schema-validator"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "a4b2712020284cee880b4c55faa513fbc2f8f07f365deda6098f8ab943c9f0df"; + }; + + propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; + + checkInputs = [ pytestCheckHook pytestcov pytest-flake8 ]; + pythonImportsCheck = [ "openapi_schema_validator" ]; + + meta = with lib; { + description = "Validates OpenAPI schema against the OpenAPI Schema Specification v3.0"; + homepage = "https://github.com/p1c2u/openapi-schema-validator"; + license = licenses.bsd3; + maintainers = with maintainers; [ AluisioASG ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 085320b5e912..12c78a70a30e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4594,6 +4594,8 @@ in { openant = callPackage ../development/python-modules/openant { }; + openapi-schema-validator = callPackage ../development/python-modules/openapi-schema-validator { }; + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; openbabel-bindings = callPackage ../development/python-modules/openbabel-bindings { From a5a5eea48036c6215aa7a6972bb89181f03ef40d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alu=C3=ADsio=20Augusto=20Silva=20Gon=C3=A7alves?= Date: Mon, 26 Apr 2021 18:46:42 -0300 Subject: [PATCH 1118/1183] python3Packages.openapi-spec-validator: add missing dependency on openapi-schema-validator This new dependency was missed on our update to 0.3.0. --- .../python-modules/openapi-spec-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 1cd95bcd6ab3..88455e726107 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, isPy27, fetchPypi -, jsonschema, pyyaml, six, pathlib +, jsonschema, openapi-schema-validator, pyyaml, six, pathlib , mock, pytest, pytestcov, pytest-flake8, tox, setuptools }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "53ba3d884e98ff2062d5ada025aa590541dcd665b8f81067dc82dd61c0923759"; }; - propagatedBuildInputs = [ jsonschema pyyaml six setuptools ] + propagatedBuildInputs = [ jsonschema openapi-schema-validator pyyaml six setuptools ] ++ (lib.optionals (isPy27) [ pathlib ]); checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; From 422441ed8866503f9d3105a61e3d9991f260df03 Mon Sep 17 00:00:00 2001 From: Mauricio Scheffer Date: Tue, 27 Apr 2021 14:22:06 +0100 Subject: [PATCH 1119/1183] jetbrains.rider: fix internal dotnet runtime/SDK (#120589) Co-authored-by: Sandro --- pkgs/applications/editors/jetbrains/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 1da4a24b3eae..16d7bf7dd161 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, callPackage, fetchurl -, jdk, cmake, libxml2, zlib, python3, ncurses5 -, dotnet-sdk_3 +, jdk, cmake, zlib, python3 +, dotnet-sdk_5 , autoPatchelfHook -, glib , libdbusmenu , vmopts ? null }: @@ -197,7 +196,7 @@ let patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + '' rm -rf lib/ReSharperHost/linux-x64/dotnet mkdir -p lib/ReSharperHost/linux-x64/dotnet/ - ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet + ln -s ${dotnet-sdk_5}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet ''); }); From 1975e5a3262e09c7431864406e7b4905ff7be60f Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 27 Apr 2021 09:29:58 -0400 Subject: [PATCH 1120/1183] tela-icon-theme: init at 2021-01-21 --- pkgs/data/icons/tela-icon-theme/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/icons/tela-icon-theme/default.nix diff --git a/pkgs/data/icons/tela-icon-theme/default.nix b/pkgs/data/icons/tela-icon-theme/default.nix new file mode 100644 index 000000000000..7bbad9452061 --- /dev/null +++ b/pkgs/data/icons/tela-icon-theme/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes, lib, stdenv }: + +stdenv.mkDerivation rec { + pname = "tela-icon-theme"; + version = "2021-01-21"; + + src = fetchFromGitHub { + owner = "vinceliuice"; + repo = pname; + rev = version; + sha256 = "0gphy4aq2qjcg79k6rc0q5901mn3q76qhckn5vxvmypn9n3lb9ph"; + }; + + nativeBuildInputs = [ gtk3 jdupes ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; + + dontDropIconThemeCache = true; + + installPhase = '' + runHook preInstall + patchShebangs install.sh + mkdir -p $out/share/icons + ./install.sh -a -d $out/share/icons + jdupes -l -r $out/share/icons + runHook postInstall + ''; + + meta = with lib; { + description = "A flat colorful Design icon theme"; + homepage = "https://github.com/vinceliuice/tela-icon-theme"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad15c084ab2..110f4c43957f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21724,6 +21724,8 @@ in theano = callPackage ../data/fonts/theano { }; + tela-icon-theme = callPackage ../data/icons/tela-icon-theme { }; + template-glib = callPackage ../development/libraries/template-glib { }; tempora_lgc = callPackage ../data/fonts/tempora-lgc { }; From fa248afdd6ffb9de62880ea50756cf2de06c58af Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Apr 2021 13:53:54 +0200 Subject: [PATCH 1121/1183] phpPackages.composer: 2.0.12 -> 2.0.13 --- pkgs/development/php-packages/composer/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix index a7be06f1d049..6a9cffa8ae77 100644 --- a/pkgs/development/php-packages/composer/default.nix +++ b/pkgs/development/php-packages/composer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "2.0.12"; + version = "2.0.13"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "sha256-guqMFTfPrOt+VvYATHzN+Z3a/OcjfAc3TZIOY1cwpjE="; + sha256 = "sha256-EW/fB8ySavZGY1pqvJLYiv97AqXcNlOPgcUKfSc2bb8="; }; dontUnpack = true; @@ -16,11 +16,13 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; meta = with lib; { From a6d0e1c19057e6966d1858131b1d07cdfc4bfcdc Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 27 Apr 2021 13:55:37 +0200 Subject: [PATCH 1122/1183] phpPackages.composer1: 1.10.15 -> 1.10.22 --- pkgs/development/php-packages/composer/1.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/composer/1.x.nix b/pkgs/development/php-packages/composer/1.x.nix index 4660da9532dc..35cee92972e9 100644 --- a/pkgs/development/php-packages/composer/1.x.nix +++ b/pkgs/development/php-packages/composer/1.x.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, makeWrapper, unzip, lib, php }: let pname = "composer"; - version = "1.10.15"; + version = "1.10.22"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "1shsxsrc2kq74s1jbq3njn9wzidcz7ak66n9vyz8z8d0hqpg37d6"; + sha256 = "00073smi1jja00d4bqfs6p4fqs38mki2ziy7b1kwsmiv5lcsw9v1"; }; dontUnpack = true; @@ -16,11 +16,13 @@ mkDerivation { nativeBuildInputs = [ makeWrapper ]; installPhase = '' + runHook preInstall mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${lib.makeBinPath [ unzip ]} + runHook postInstall ''; meta = with lib; { From d6bd81637076f14e19d7851b9b95b58e61c17404 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 27 Apr 2021 15:44:26 +0200 Subject: [PATCH 1123/1183] chromium: 90.0.4430.85 -> 90.0.4430.93 https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_26.html This update includes 9 security fixes. CVEs: CVE-2021-21227 CVE-2021-21232 CVE-2021-21233 CVE-2021-21228 CVE-2021-21229 CVE-2021-21230 CVE-2021-21231 --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 21d54f7733d9..c9ec1931c546 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "90.0.4430.85", - "sha256": "08j9shrc6p0vpa3x7av7fj8wapnkr7h6m8ag1gh6gaky9d6mki81", - "sha256bin64": "0li9w6zfsmx5r90jm5v5gfv3l2a76jndg6z5jvb9yx9xvrp9gpir", + "version": "90.0.4430.93", + "sha256": "0zimr975vp0v12zz1nqjwag3f0q147wrmdhpzgi4yf089rgwfbjk", + "sha256bin64": "1vifcrrfv69i0q7qnnml43xr0c20bi22hfw6lygq3k2x70zdzgl6", "deps": { "gn": { "version": "2021-02-09", From 7a67a2d1a890eb1b3d98a4c98ce9283be2fe4e10 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 10 Feb 2021 18:42:07 +0100 Subject: [PATCH 1124/1183] gitlab: Add patch for db_key_base length bug, fix descriptions The upstream recommended minimum length for db_key_base is 30 bytes, which our option descriptions repeated. Recently, however, upstream has, in many places, moved to using aes-256-gcm, which requires a key of exactly 32 bytes. To allow for shorter keys, the upstream code pads the key in some places. However, in many others, it just truncates the key if it's too long, leaving it too short if it was to begin with. This adds a patch that fixes this and updates the descriptions to recommend a key of at least 32 characters. See https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602 --- nixos/modules/services/misc/gitlab.nix | 6 +++--- .../version-management/gitlab/default.nix | 11 ++++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index f86653f3ead2..38a541485e52 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -588,7 +588,7 @@ in { the DB. If you change or lose this key you will be unable to access variables stored in database. - Make sure the secret is at least 30 characters and all random, + Make sure the secret is at least 32 characters and all random, no regular words or you'll be exposed to dictionary attacks. This should be a string, not a nix path, since nix paths are @@ -604,7 +604,7 @@ in { the DB. If you change or lose this key you will be unable to access variables stored in database. - Make sure the secret is at least 30 characters and all random, + Make sure the secret is at least 32 characters and all random, no regular words or you'll be exposed to dictionary attacks. This should be a string, not a nix path, since nix paths are @@ -620,7 +620,7 @@ in { tokens. If you change or lose this key, users which have 2FA enabled for login won't be able to login anymore. - Make sure the secret is at least 30 characters and all random, + Make sure the secret is at least 32 characters and all random, no regular words or you'll be exposed to dictionary attacks. This should be a string, not a nix path, since nix paths are diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 5d2b923628b2..89a2ac6ec95d 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchFromGitLab, bundlerEnv +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv , ruby, tzdata, git, nettools, nixosTests, nodejs, openssl , gitlabEnterprise ? false, callPackage, yarn , fixup_yarn_lock, replace, file @@ -125,6 +125,15 @@ stdenv.mkDerivation { patches = [ # Change hardcoded paths to the NixOS equivalent ./remove-hardcoded-locations.patch + + # Use the exactly 32 byte long version of db_key_base with + # aes-256-gcm, see + # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/53602 + (fetchpatch { + name = "secrets_db_key_base_length.patch"; + url = "https://gitlab.com/gitlab-org/gitlab/-/commit/dea620633d446ca0f53a75674454ff0dd4bd8f99.patch"; + sha256 = "19m4z4np3sai9kqqqgabl44xv7p8lkcyqr6s5471axfxmf9m2023"; + }) ]; postPatch = '' From 5092d5c7a74f01f923665de9ec9c155e28f351db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 27 Apr 2021 17:55:16 +0200 Subject: [PATCH 1125/1183] pythonPackages.textdistance: init at 4.2.1 Needed by spyder --- .../python-modules/textdistance/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/textdistance/default.nix diff --git a/pkgs/development/python-modules/textdistance/default.nix b/pkgs/development/python-modules/textdistance/default.nix new file mode 100644 index 000000000000..d4a71dd99628 --- /dev/null +++ b/pkgs/development/python-modules/textdistance/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "textdistance"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "114j3ignw4y9yq1cp08p4bfw518vyr3p0h8ba2mikwy74qxxzy26"; + }; + + # There aren't tests + doCheck = false; + + pythonImportsCheck = [ "textdistance" ]; + + meta = with lib; { + description = "Python library for comparing distance between two or more sequences"; + homepage = "https://github.com/life4/textdistance"; + license = licenses.mit; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6e3fe3260e89..032d6972654f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7962,6 +7962,8 @@ in { test-tube = callPackage ../development/python-modules/test-tube { }; + textdistance = callPackage ../development/python-modules/textdistance { }; + textacy = callPackage ../development/python-modules/textacy { }; texttable = callPackage ../development/python-modules/texttable { }; From 1215bd4ea9364dd9cb52d7b454bdbaa4c074b034 Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 27 Apr 2021 18:04:23 +0200 Subject: [PATCH 1126/1183] Revert "nixos/tests/gitlab: add 32 byte secrets" This reverts commit d6e0d38b84a00b2ab05324b69e3253d956bb5be7. We need shorter secrets to continue working, since the earlier recommendation was too short and there's no way to rotate the them. --- nixos/tests/gitlab.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix index 582f5faf9bc0..af2ab12bf4bd 100644 --- a/nixos/tests/gitlab.nix +++ b/nixos/tests/gitlab.nix @@ -57,9 +57,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : with lib; { }; }; secrets = { - secretFile = pkgs.writeText "secret" "r8X9keSKynU7p4aKlh4GO1Bo77g5a7vj"; - otpFile = pkgs.writeText "otpsecret" "Zu5hGx3YvQx40DvI8WoZJQpX2paSDOlG"; - dbFile = pkgs.writeText "dbsecret" "lsGltKWTejOf6JxCVa7nLDenzkO9wPLR"; + secretFile = pkgs.writeText "secret" "Aig5zaic"; + otpFile = pkgs.writeText "otpsecret" "Riew9mue"; + dbFile = pkgs.writeText "dbsecret" "we2quaeZ"; jwsFile = pkgs.runCommand "oidcKeyBase" {} "${pkgs.openssl}/bin/openssl genrsa 2048 > $out"; }; }; From 458914e06dd366088b4b32f3c91e0b5eedc451e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 27 Apr 2021 18:18:26 +0200 Subject: [PATCH 1127/1183] pythonPackages.python-language-server: relax some dependency versions --- .../python-modules/python-language-server/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index 69fbaa78067e..b776a784c8e3 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -30,6 +30,13 @@ buildPythonPackage rec { sha256 = "07x6jr4z20jxn03bxblwc8vk0ywha492cgwfhj7q97nb5cm7kx0q"; }; + postPatch = '' + # Reading the changelog I don't expect an API break in pycodestyle and pyflakes + substituteInPlace setup.py \ + --replace "pycodestyle>=2.6.0,<2.7.0" "pycodestyle>=2.6.0,<2.8.0" \ + --replace "pyflakes>=2.2.0,<2.3.0" "pyflakes>=2.2.0,<2.4.0" + ''; + propagatedBuildInputs = [ setuptools jedi pluggy future python-jsonrpc-server ujson ] ++ lib.optional (withProvider "autopep8") autopep8 ++ lib.optional (withProvider "mccabe") mccabe From f9776d3db7b3f1c05d7999ae953bfaabc3fcf851 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 27 Apr 2021 18:19:17 +0200 Subject: [PATCH 1128/1183] spyder: fix build --- pkgs/development/python-modules/spyder/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 0293699a450c..12dd743751f4 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -3,7 +3,7 @@ keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, spyder-kernels, qtpy, pyzmq, chardet, qdarkstyle, watchdog, python-language-server, pyqtwebengine, atomicwrites, pyxdg, - diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8 + diff-match-patch, three-merge, pyls-black, pyls-spyder, flake8, textdistance }: buildPythonPackage rec { @@ -20,11 +20,11 @@ buildPythonPackage rec { nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; propagatedBuildInputs = [ - intervaltree jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring + intervaltree jedi pycodestyle psutil rope numpy scipy matplotlib pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels pygments qtpy pyzmq chardet pyqtwebengine qdarkstyle watchdog python-language-server atomicwrites pyxdg diff-match-patch three-merge pyls-black pyls-spyder - flake8 + flake8 textdistance ]; # There is no test for spyder @@ -44,9 +44,13 @@ buildPythonPackage rec { # remove dependency on pyqtwebengine # this is still part of the pyqt 5.11 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py + # The major version bump in watchdog is due to changes in supported + # platforms, not API break. + # https://github.com/gorakhargosh/watchdog/issues/761#issuecomment-777001518 substituteInPlace setup.py \ --replace "pyqt5<5.13" "pyqt5" \ - --replace "parso==0.7.0" "parso" + --replace "parso==0.7.0" "parso" \ + --replace "watchdog>=0.10.3,<2.0.0" "watchdog>=0.10.3,<3.0.0" ''; postInstall = '' From 209bc7e980c12b7f0dc92a8a18516b830b20b8b8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:44:24 +0000 Subject: [PATCH 1129/1183] coolreader: 3.2.55 -> 3.2.57 --- pkgs/applications/misc/coolreader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/coolreader/default.nix b/pkgs/applications/misc/coolreader/default.nix index dc32cbf2c2a4..e1cbaf320eae 100644 --- a/pkgs/applications/misc/coolreader/default.nix +++ b/pkgs/applications/misc/coolreader/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "coolreader"; - version = "3.2.55"; + version = "3.2.57"; src = fetchFromGitHub { owner = "buggins"; repo = pname; rev = "cr${version}"; - sha256 = "sha256-gYAaYGEjw7p6y4h5j6j/4Ld+b37Nv+kt04Wp+qb8gzY="; + sha256 = "sha256-ZfgaLCLvBU6xP7nx7YJTsJSpvpdQgLpSMWH+BsG8E1g="; }; nativeBuildInputs = [ cmake pkg-config ]; From bed71fac1098827852ec94e684f1398fd6f03ddc Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 27 Apr 2021 18:46:23 +0200 Subject: [PATCH 1130/1183] ripgrep: add meta.mainProgram --- pkgs/tools/text/ripgrep/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index 8c9eef9cc3dd..6417fb0f93bc 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -51,5 +51,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/BurntSushi/ripgrep"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = with maintainers; [ tailhook globin ma27 zowoq ]; + mainProgram = "rg"; }; } From 56b1f085a138afc904aa2eacc63b79e9daa18484 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Tue, 27 Apr 2021 18:49:10 +0200 Subject: [PATCH 1131/1183] ripgrep-all: add meta.mainProgram --- pkgs/tools/text/ripgrep-all/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index ec023dd72a32..0b324a0a772a 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -58,5 +58,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/phiresky/ripgrep-all"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ zaninime ma27 ]; + mainProgram = "rga"; }; } From 7427bed05a11ee832c8dbf3f143ffdbb88137cf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:57:49 +0000 Subject: [PATCH 1132/1183] catgirl: 1.6 -> 1.7 --- pkgs/applications/networking/irc/catgirl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/catgirl/default.nix b/pkgs/applications/networking/irc/catgirl/default.nix index 871dcc84c1de..afc308039de1 100644 --- a/pkgs/applications/networking/irc/catgirl/default.nix +++ b/pkgs/applications/networking/irc/catgirl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "catgirl"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "https://git.causal.agency/catgirl/snapshot/${pname}-${version}.tar.gz"; - sha256 = "0shg02zidqqmvywqqsaazlgg9rd5lhhrvjx6n0lzmdfaawxywciv"; + sha256 = "sha256-3shSdeq4l6Y5DEJZEVMHAngp6vjnkPjzpLpcp407X/0="; }; nativeBuildInputs = [ ctags pkg-config ]; From d7564b07c83a0817f42d4ba25c0cd7f9f1bdb778 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 27 Apr 2021 19:21:30 +0200 Subject: [PATCH 1133/1183] tpm2-tools: remove nested wrappers symlinks like `tpm2_createprimary -> tpm2` were wrapped, causing argv0 issues due to double wrapping: $ tpm2_ptool init [..] RuntimeError: Could not execute tpm2_createprimary: b'ERROR: /nix/store/[..]/bin/.tpm2_createprimary-wrapped: unknown tool. This patch only wraps the `tpm2` and `tss2` executables, and not the symlinks to them `tpm2_*` and `tss2_*` --- pkgs/tools/security/tpm2-tools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 73368f40476d..52964b620ddf 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -21,10 +21,8 @@ stdenv.mkDerivation rec { tpm2-tss ] ++ (lib.optional abrmdSupport tpm2-abrmd)); in '' - for bin in $out/bin/*; do - wrapProgram $bin \ - --suffix LD_LIBRARY_PATH : "${ldLibraryPath}" - done + wrapProgram $out/bin/tpm2 --suffix LD_LIBRARY_PATH : "${ldLibraryPath}" + wrapProgram $out/bin/tss2 --suffix LD_LIBRARY_PATH : "${ldLibraryPath}" ''; From e47e2a1b9f89885a154851f245a2a7e4e8bccfd6 Mon Sep 17 00:00:00 2001 From: chessai Date: Fri, 16 Apr 2021 17:15:16 -0700 Subject: [PATCH 1134/1183] init duckling service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/duckling.nix | 39 ++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 nixos/modules/services/misc/duckling.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3720b24f3950..daa96e64f593 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -469,6 +469,7 @@ ./services/misc/couchpotato.nix ./services/misc/devmon.nix ./services/misc/dictd.nix + ./services/misc/duckling.nix ./services/misc/dwm-status.nix ./services/misc/dysnomia.nix ./services/misc/disnix.nix diff --git a/nixos/modules/services/misc/duckling.nix b/nixos/modules/services/misc/duckling.nix new file mode 100644 index 000000000000..77d2a92380b0 --- /dev/null +++ b/nixos/modules/services/misc/duckling.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.duckling; +in { + options = { + services.duckling = { + enable = mkEnableOption "duckling"; + + port = mkOption { + type = types.port; + default = 8080; + description = '' + Port on which duckling will run. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.duckling = { + description = "Duckling server service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment = { + PORT = builtins.toString cfg.port; + }; + + serviceConfig = { + ExecStart = "${pkgs.haskellPackages.duckling}/bin/duckling-example-exe --no-access-log --no-error-log"; + Restart = "always"; + DynamicUser = true; + }; + }; + }; +} From c5e8b0486a2e6a052c5676147584fc3a4642b771 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 19:35:10 +0200 Subject: [PATCH 1135/1183] kodelife: 0.9.0.129 -> 0.9.8.143 --- pkgs/applications/graphics/kodelife/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 4eaab036eb95..2ac507dc8707 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -9,22 +9,20 @@ stdenv.mkDerivation rec { pname = "kodelife"; - version = "0.9.0.129"; + version = "0.9.8.143"; suffix = { aarch64-linux = "linux-arm64"; armv7l-linux = "linux-armhf"; - x86_64-darwin = "macos"; x86_64-linux = "linux-x86_64"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); src = fetchzip { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.zip"; sha256 = { - aarch64-linux = "0z2fqlf156348ha3zhv16kvqdx68fbwbzch2gzjm9x1na9n5k1ra"; - armv7l-linux = "1ppwgrmgl1j2ws9mhrscvvkamd69a6xw7x35df6d30cyj97r0mzy"; - x86_64-darwin = "0f8vn6m3xzsiyxm2ka5wkbp63wvzrix6g1xrbpvcm3v2llmychkl"; - x86_64-linux = "035c1nlw0nim057sz3axpkcgkafqbm6gpr8hwr097vlrqll6w3dv"; + aarch64-linux = "0ryjmpzpfqdqrvqpq851vvrjd8ld5g91gcigpv9rxp3z1b7qdand"; + armv7l-linux = "08nlwn8ixndqil4m7j6c8gjxmwx8zi3in86arnwf13shk6cds5nb"; + x86_64-linux = "0kbz7pvh4i4a3pj1vzbzzslha825i888isvsigcqsqvipjr4798q"; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -35,8 +33,10 @@ stdenv.mkDerivation rec { preferLocalBuild = true; installPhase = '' + runHook preInstall mkdir -p $out/bin mv KodeLife $out/bin + runHook postInstall ''; preFixup = let @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { libGLU libGL xorg.libX11 ]; - in lib.optionalString (!stdenv.isDarwin) '' + in '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { description = "Real-time GPU shader editor"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; - platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ "aarch64-linux" "armv7l-linux" "x86_64-linux" ]; }; } From c14bf3fcc19b1fbb41952d563adce517fec2dc33 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 27 Apr 2021 14:34:37 -0400 Subject: [PATCH 1136/1183] libcint: 4.1.1 -> 4.3.0 --- pkgs/development/libraries/libcint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index d0fc8c3c4a27..b864c279d37a 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "4.1.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - sha256 = "sha256-HBZ/VMuTLAYpqcIPzQ4JbsMSXsI/sKc14ZFpbVhQF/g="; + hash = "sha256-vJ4OyU9HYQvF1SWmniNGAuHQ7K/TfiK8C4celK5hjiA="; }; nativeBuildInputs = [ cmake ]; From 878a2ec6d504838efcdcaccacdce83d3f06cb8a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 18:24:29 +0200 Subject: [PATCH 1137/1183] python3Packages.mido: convert to pytestCheckHook, add pythonImportsCheck --- .../python-modules/mido/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 8312ea783cb4..4b35c05655fb 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -1,6 +1,13 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, substituteAll -, portmidi, pygame, python-rtmidi, rtmidi-python -, pytest +{ stdenv +, lib +, buildPythonPackage +, fetchPypi +, substituteAll +, portmidi +, pygame +, python-rtmidi +, rtmidi-python +, pytestCheckHook }: buildPythonPackage rec { @@ -25,10 +32,13 @@ buildPythonPackage rec { rtmidi-python ]; - checkInputs = [ pytest ]; - checkPhase = '' - py.test . -rs -q - ''; + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "mido" + ]; meta = with lib; { description = "MIDI Objects for Python"; From 4d7527e00afb4462ffe005e8377ea140e2d8416d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 18:25:06 +0200 Subject: [PATCH 1138/1183] python3Packages.mido: remove myself from maintainers --- pkgs/development/python-modules/mido/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mido/default.nix b/pkgs/development/python-modules/mido/default.nix index 4b35c05655fb..ae737dc71661 100644 --- a/pkgs/development/python-modules/mido/default.nix +++ b/pkgs/development/python-modules/mido/default.nix @@ -44,6 +44,6 @@ buildPythonPackage rec { description = "MIDI Objects for Python"; homepage = "https://mido.readthedocs.io"; license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } From 57569ea9d073b8955441844e03deb5096ea0b5b1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 18:32:29 +0200 Subject: [PATCH 1139/1183] python3Packages.rtmidi-python: remove myself from maintainers --- pkgs/development/python-modules/rtmidi-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rtmidi-python/default.nix b/pkgs/development/python-modules/rtmidi-python/default.nix index a1d8102fecc1..4e6da0b8d422 100644 --- a/pkgs/development/python-modules/rtmidi-python/default.nix +++ b/pkgs/development/python-modules/rtmidi-python/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { description = "Python wrapper for RtMidi"; homepage = "https://github.com/superquadratic/rtmidi-python"; license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } From 6fbe7f1bbb06381e840e64cf112c9bf6e62f7c07 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 18:43:33 +0200 Subject: [PATCH 1140/1183] tockloader: 1.5.0 -> 1.6.0 Add a small check phase calling the tockloader executable and checking the version. --- .../tools/misc/tockloader/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index 3aff6c6d36cc..2bdcce12c562 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -1,22 +1,32 @@ -{ lib, python3Packages }: +{ lib +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "tockloader"; - version = "1.5.0"; + version = "1.6.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "11k4ppwq845lnj265ydfr0cn1rrym5amx2i19x1h3ccbxc3gsy3x"; + sha256 = "1aqkj1nplcw3gmklrhq6vxy6v9ad5mqiw4y1svasak2zkqdk1wyc"; }; propagatedBuildInputs = with python3Packages; [ argcomplete colorama crcmod - pytoml pyserial + pytoml + tqdm ]; + # has no test suite + checkPhase = '' + runHook preCheck + $out/bin/tockloader --version | grep -q ${version} + runHook postCheck + ''; + meta = with lib; { homepage = "https://github.com/tock/tockloader"; license = licenses.mit; From e0d044471712c6bda46b173ecdbc50815e3e5fa2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 27 Apr 2021 18:44:18 +0200 Subject: [PATCH 1141/1183] tockloader: remove myself from maintainers Sadly the only device I had that was requiring this was an nRF52840 MDK USB dongle and I apparently broke its bootloader, so it won't get recognized anymore. --- pkgs/development/tools/misc/tockloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/tockloader/default.nix b/pkgs/development/tools/misc/tockloader/default.nix index 2bdcce12c562..8924cbf2fae5 100644 --- a/pkgs/development/tools/misc/tockloader/default.nix +++ b/pkgs/development/tools/misc/tockloader/default.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/tock/tockloader"; license = licenses.mit; description = "Tool for programming Tock onto hardware boards"; - maintainers = with maintainers; [ hexa ]; + maintainers = with maintainers; [ ]; }; } From 056eb56f77fe889db9e774dd4a92487660888653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Albin=20Otterh=C3=A4ll?= Date: Tue, 27 Apr 2021 20:39:06 +0200 Subject: [PATCH 1142/1183] pijul: 1.0.0-alpha.46 -> 1.0.0-alpha.48 --- pkgs/applications/version-management/pijul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 776a794d649d..a51e8c199bcd 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "pijul"; - version = "1.0.0-alpha.46"; + version = "1.0.0-alpha.48"; src = fetchCrate { inherit version pname; - sha256 = "0x095g26qdch1m3izkn8ynwk1xg1qyz9ia8di23j61k7z2rqk0j5"; + sha256 = "09sz5665nwj2jppx2695hbwdqr3ws6z6rg7mmc4ldb7hkp4yilig"; }; - cargoSha256 = "0cw1y4vmhn70a94512mppk0kfh9xdfm0v4rp3zm00y06jzq1a1fp"; + cargoSha256 = "1v5w5za7l3hy9anz136x0vgdmgg090f5sawzgrg5ylgxy2l9s2gn"; cargoBuildFlags = lib.optional gitImportSupport "--features=git"; From e340874c85b40f924c8cb285cf5da60b0fc6f8d3 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 27 Apr 2021 20:43:53 +0200 Subject: [PATCH 1143/1183] nvidia_x11.legacy_390: 390.138 -> 390.143 (#120857) --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index aa1b810976d2..7d83d68e73cc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -56,11 +56,11 @@ rec { # Last one supporting x86 legacy_390 = generic { - version = "390.138"; - sha256_32bit = "0y3qjygl0kfz9qs0rp9scn1k3l8ym9dib7wpkyh5gs4klcip7xkv"; - sha256_64bit = "0rnnb5l4i8s76vlg6yvlrxhm2x9wdqw7k5hgf4fyaa3cr3k1kysz"; - settingsSha256 = "0ad6hwl56nvbdv9g85lw7ywadqvc2gaq9x6d2vjcia9kg4vrmfqx"; - persistencedSha256 = "15jciyq6i3pz1g67xzqlwmc62v3xswzhjcqmfcdndvlvhcibsimr"; + version = "390.143"; + sha256_32bit = "AelrdTTeo/3+ZdXK0iniZDB8gJUkeZQtNoRm25z+bQY="; + sha256_64bit = "tyKqcPM71ErK8ZZHLPtxmgrWzv6tfEmxBRveCSwTlO8="; + settingsSha256 = "EJPXZbxZS1CMENAYk9dCAIsHsRTXJpj473+JLuhGkWI="; + persistencedSha256 = "FtlPF3jCNr18NnImTmr8zJsaK9wbj/aWZ9LwoLr5SeE="; }; legacy_340 = generic { From cf9bf19bf32f8866b19fca02705e02be204a601d Mon Sep 17 00:00:00 2001 From: schnusch Date: Tue, 27 Apr 2021 20:49:18 +0200 Subject: [PATCH 1144/1183] oathToolkit: 2.6.2 -> 2.6.6 (#120610) --- pkgs/tools/security/oath-toolkit/default.nix | 41 +++++--------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index ba49da102fb2..b1a493f30913 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -1,48 +1,25 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pam, xmlsec, autoreconfHook, pkg-config, libxml2, gtk-doc, perl, gengetopt, bison, help2man }: +{ lib, stdenv, fetchurl, pam, xmlsec }: let securityDependency = if stdenv.isDarwin then xmlsec else pam; -in stdenv.mkDerivation { - name = "oath-toolkit-2.6.2"; +in stdenv.mkDerivation rec { + pname = "oath-toolkit"; + version = "2.6.6"; - src = fetchFromGitLab { - owner = "oath-toolkit"; - repo = "oath-toolkit"; - rev = "0dffdec9c5af5c89a5af43add29d8275eefe7414"; - sha256 = "0n2sl444723f1k0sjmc0mzdwslx51yxac39c2cx2bl3ykacgfv74"; + src = fetchurl { + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + sha256 = "0v4lrgip08b8xlivsfn3mwql3nv8hmcpzrn6pi3xp88vqwav6s7x"; }; - patches = [ - # fix for glibc>=2.28 - (fetchpatch { - name = "new_glibc_check.patch"; - url = "https://sources.debian.org/data/main/o/oath-toolkit/2.6.1-1.3/debian/patches/new-glibc-check.patch"; - sha256 = "0h75xyy3xsl485v7w27yqkks6z9sgsjmrv6wiswy15fdj5wyciv3"; - }) - ]; - - buildInputs = [ securityDependency libxml2 perl gengetopt bison ]; - - nativeBuildInputs = [ autoreconfHook gtk-doc help2man pkg-config ]; - - # man file generation fails when true - enableParallelBuilding = false; - - configureFlags = [ "--disable-pskc" ]; - - # Replicate the steps from cfg.mk - preAutoreconf = '' - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > liboath/man/Makefile.gdoc - printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc - touch ChangeLog - ''; + buildInputs = [ securityDependency ]; meta = with lib; { description = "Components for building one-time password authentication systems"; homepage = "https://www.nongnu.org/oath-toolkit/"; + maintainers = with maintainers; [ schnusch ]; platforms = with platforms; linux ++ darwin; }; } From 7e47f02dcc8e761f486a748b2788d626e4dd9588 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 27 Apr 2021 21:06:06 +0200 Subject: [PATCH 1145/1183] khal: 0.10.2 -> 0.10.3 --- pkgs/applications/misc/khal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 7bd4a3bbf7f5..97d01a1e1b5f 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -2,11 +2,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "khal"; - version = "0.10.2"; + version = "0.10.3"; src = fetchPypi { inherit pname version; - sha256 = "11qhrga44knlnp88py9p547d4nr5kn041d2nszwa3dqw7mf22ks9"; + sha256 = "sha256-L92PwU/ll+Wn1unGPHho2WC07QIbVjxoSnHwcJDtpDI="; }; patches = [ From 754c14f16b8872ad1571e9921f512a45bc6987f7 Mon Sep 17 00:00:00 2001 From: Tadeo Kondrak Date: Tue, 27 Apr 2021 13:10:25 -0600 Subject: [PATCH 1146/1183] discord: Remove tadeokondrak as maintainer I added myself as a maintainer when I made a significant change to the package, but I no longer use Discord. --- .../applications/networking/instant-messengers/discord/base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix index b649fd20d512..841c979e97f9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/base.nix +++ b/pkgs/applications/networking/instant-messengers/discord/base.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { homepage = "https://discordapp.com/"; downloadPage = "https://discordapp.com/download"; license = licenses.unfree; - maintainers = with maintainers; [ ldesgoui MP2E tadeokondrak ]; + maintainers = with maintainers; [ ldesgoui MP2E ]; platforms = [ "x86_64-linux" ]; }; } From c287776d9ee3909b0d102b02b8d6203ea0d794e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 27 Apr 2021 12:00:17 +0200 Subject: [PATCH 1147/1183] ffms: 2.23 -> 2.40 https://github.com/FFMS/ffms2/releases/tag/2.40 @tadeokondrak agreed to being a maintainer: https://github.com/NixOS/nixpkgs/pull/120846#issuecomment-827849034 --- pkgs/development/libraries/ffms/default.nix | 32 ++++++++++++++++----- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 7fa96cff7f88..283942df63f9 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -1,20 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, zlib, ffmpeg_3, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, ffmpeg +, zlib +}: stdenv.mkDerivation rec { pname = "ffms"; - version = "2.23"; + version = "2.40"; src = fetchFromGitHub { owner = "FFMS"; repo = "ffms2"; rev = version; - sha256 = "0dkz5b3gxq5p4xz0qqg6l2sigszrlsinz3skyf0ln4wf3zrvf8m5"; + sha256 = "sha256-3bPxt911T0bGpAIS2RxBjo+VV84xW06eKcCj3ZAcmvw="; }; NIX_CFLAGS_COMPILE = "-fPIC"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ zlib ffmpeg_3 ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + preAutoreconf = '' + mkdir src/config + ''; + + buildInputs = [ + ffmpeg + zlib + ]; # ffms includes a built-in vapoursynth plugin, see: # https://github.com/FFMS/ffms2#avisynth-and-vapoursynth-plugin @@ -25,9 +43,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/FFMS/ffms2/"; - description = "Libav/ffmpeg based source library for easy frame accurate access"; + description = "FFmpeg based source library for easy frame accurate access"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ tadeokondrak ]; platforms = platforms.unix; }; } From 16c8941c1325a7d61f0ca2258b0b484f854055bb Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 19:37:05 +0200 Subject: [PATCH 1148/1183] python3Packages.pyu2f: 0.1.4 -> 0.1.5a --- .../python-modules/pyu2f/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index 281511192fe5..cf7b3eb2aeb0 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -1,34 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonPackage, - six, mock, pyfakefs, unittest2, pytest +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, mock +, pyfakefs +, pytestCheckHook }: buildPythonPackage rec { pname = "pyu2f"; - version = "0.1.4"; + version = "0.1.5a"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = version; - sha256 = "0waxdydvxn05a8ab9j235mz72x7p4pwa59pnxyk1zzbwxnpxb3p9"; + sha256 = "0mx7bn1p3n0fxyxa82wg3c719hby7vqkxv57fhf7zvhlg2zfnr0v"; }; - # Platform detection for linux fails - postPatch = lib.optionalString stdenv.isLinux '' - rm pyu2f/tests/hid/macos_test.py - ''; - propagatedBuildInputs = [ six ]; - checkInputs = [ pytest mock pyfakefs unittest2 ]; - - checkPhase = '' - pytest pyu2f/tests - ''; + checkInputs = [ mock pyfakefs pytestCheckHook ]; meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; - homepage = "https://github.com/google/pyu2f/"; + homepage = "https://github.com/google/pyu2f"; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; }; From 32cb3382e512367921983950986801ec1bb2b983 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 08:54:42 +0000 Subject: [PATCH 1149/1183] elan: 0.11.0 -> 1.0.0 --- pkgs/applications/science/logic/elan/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index fab930e2c7b8..a7be01ae4e8c 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -7,16 +7,16 @@ in rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.11.0"; + version = "1.0.0"; src = fetchFromGitHub { - owner = "kha"; + owner = "leanprover"; repo = "elan"; rev = "v${version}"; - sha256 = "1sl69ygdwhf80sx6m76x5gp1kwsw0rr1lv814cgzm8hvyr6g0jqa"; + sha256 = "sha256-Ve9nd/IEHo7Gg4WyxqKLUV495U1k9LfDyClkuVkooyA="; }; - cargoSha256 = "1f881maf8jizd5ip7pc1ncbiq7lpggp0byma13pvqk7gisnqyr4r"; + cargoSha256 = "sha256-InGMZdP0c/QKU6ao8qhAUIDcAhOTumLOz6wo/u2+ibA="; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Small tool to manage your installations of the Lean theorem prover"; - homepage = "https://github.com/Kha/elan"; + homepage = "https://github.com/leanprover/elan"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner ]; }; From a48b4f4088726c09978aa04d08a1252a09766167 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 27 Apr 2021 21:01:53 +0200 Subject: [PATCH 1150/1183] openmpi: 4.1.0 -> 4.1.1 --- pkgs/development/libraries/openmpi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 46b2748cad98..2df08426368d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, gfortran, perl, libnl +{ lib, stdenv, fetchurl, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, targetPackages, symlinkJoin , libpsm2, libfabric, pmix, ucx @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.1.0"; + version = "4.1.1"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; + sha256 = "1nkwq123vvmggcay48snm9qqmrh0bdzpln0l1jnp26niidvplkz2"; }; postPatch = '' From a053eae5619bc5613a155e89ed1d155065e35371 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 12:46:56 +0200 Subject: [PATCH 1151/1183] ethminer: provide a CUDA-free version CUDA is only needed for Nvidia GPUs; AMD has a fully open stack --- pkgs/tools/misc/ethminer/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index c43c66fcc07e..52bf592a987f 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -8,6 +8,7 @@ boost, makeWrapper, cudatoolkit, + cudaSupport, mesa, ethash, opencl-info, @@ -41,6 +42,8 @@ in stdenv.mkDerivation rec { "-DAPICORE=ON" "-DETHDBUS=OFF" "-DCMAKE_BUILD_TYPE=Release" + ] ++ lib.optionals (!cudaSupport) [ + "-DETHASHCUDA=OFF" # on by default ]; nativeBuildInputs = [ @@ -54,12 +57,13 @@ in stdenv.mkDerivation rec { boost opencl-headers mesa - cudatoolkit ethash opencl-info ocl-icd openssl jsoncpp + ] ++ lib.optionals cudaSupport [ + cudatoolkit ]; preConfigure = '' @@ -71,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Ethereum miner with OpenCL, CUDA and stratum support"; + description = "Ethereum miner with OpenCL${lib.optionalString cudaSupport ", CUDA"} and stratum support"; homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69c974932196..1b6967c5eebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3470,7 +3470,9 @@ in ethash = callPackage ../development/libraries/ethash { }; - ethminer = callPackage ../tools/misc/ethminer { }; + ethminer = callPackage ../tools/misc/ethminer { cudaSupport = config.cudaSupport or true; }; + ethminer-cuda = ethminer.override { cudaSupport = true; }; + ethminer-free = ethminer.override { cudaSupport = false; }; cuetools = callPackage ../tools/cd-dvd/cuetools { }; From 101e5cdceb0dd702705e85da2db68154905a0a1b Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 13:04:23 +0200 Subject: [PATCH 1152/1183] ethminer: use regular stdenv when CUDA isn't used --- pkgs/tools/misc/ethminer/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 52bf592a987f..f357a4a9c603 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, clangStdenv, fetchFromGitHub, opencl-headers, @@ -16,11 +17,11 @@ openssl, pkg-config, cli11 -}: +}@args: # Note that this requires clang < 9.0 to build, and currently # clangStdenv provides clang 7.1 which satisfies the requirement. -let stdenv = clangStdenv; +let stdenv = if cudaSupport then clangStdenv else args.stdenv; in stdenv.mkDerivation rec { pname = "ethminer"; From 7787089f1de027b91837eb6f5c3b917a0dc12b29 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 13:03:33 +0200 Subject: [PATCH 1153/1183] ethminer: mark cuda version as broken Doesn't build on my machine, needs https://github.com/NixOS/nixpkgs/pull/109838 --- pkgs/tools/misc/ethminer/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index f357a4a9c603..08ec9d8a78d3 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -81,5 +81,6 @@ in stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; license = licenses.gpl2; + broken = cudaSupport; }; } From 3c678b70983fdba53d0e998ed9df527b317721a4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 25 Apr 2021 15:18:23 +0200 Subject: [PATCH 1154/1183] ethminer: correct license --- pkgs/tools/misc/ethminer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 08ec9d8a78d3..22278cb9a4d4 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p atemu ]; - license = licenses.gpl2; + license = licenses.gpl3Only; broken = cudaSupport; }; } From 8723d226b44d59ef5b1ea8172ea46d3bf666cb35 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 27 Apr 2021 20:51:39 +0300 Subject: [PATCH 1155/1183] nixos/mastodon: update SystemCallFilters --- nixos/modules/services/web-apps/mastodon.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index 661320b5d00a..af46f4e1927f 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -31,7 +31,7 @@ let // (if cfg.smtp.authenticate then { SMTP_LOGIN = cfg.smtp.user; } else {}) // cfg.extraConfig; - systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@resources" "@setuid" "@swap" ]; + systemCallsList = [ "@clock" "@cpu-emulation" "@debug" "@keyring" "@module" "@mount" "@obsolete" "@raw-io" "@reboot" "@setuid" "@swap" ]; cfgService = { # User and group @@ -434,7 +434,7 @@ in { Type = "oneshot"; WorkingDirectory = cfg.package; # System Call Filtering - SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList; + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]); } // cfgService; after = [ "network.target" ]; @@ -461,7 +461,7 @@ in { EnvironmentFile = "/var/lib/mastodon/.secrets_env"; WorkingDirectory = cfg.package; # System Call Filtering - SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList; + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]); } // cfgService; after = [ "mastodon-init-dirs.service" "network.target" ] ++ (if databaseActuallyCreateLocally then [ "postgresql.service" ] else []); wantedBy = [ "multi-user.target" ]; @@ -487,7 +487,7 @@ in { RuntimeDirectory = "mastodon-streaming"; RuntimeDirectoryMode = "0750"; # System Call Filtering - SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" "@resources" ]); } // cfgService; }; @@ -511,7 +511,7 @@ in { RuntimeDirectory = "mastodon-web"; RuntimeDirectoryMode = "0750"; # System Call Filtering - SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); + SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@resources" ]); } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; @@ -532,7 +532,7 @@ in { EnvironmentFile = "/var/lib/mastodon/.secrets_env"; WorkingDirectory = cfg.package; # System Call Filtering - SystemCallFilter = "~" + lib.concatStringsSep " " (systemCallsList ++ [ "@privileged" ]); + SystemCallFilter = "~" + lib.concatStringsSep " " systemCallsList; } // cfgService; path = with pkgs; [ file imagemagick ffmpeg ]; }; From 78813c327c0f16984028458457aa1291c780e694 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Thu, 22 Apr 2021 16:37:56 +0200 Subject: [PATCH 1156/1183] sd-switch: 0.2.0 -> 0.2.1 --- pkgs/os-specific/linux/sd-switch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/sd-switch/default.nix b/pkgs/os-specific/linux/sd-switch/default.nix index a58b7efa7b30..faa766ecd979 100644 --- a/pkgs/os-specific/linux/sd-switch/default.nix +++ b/pkgs/os-specific/linux/sd-switch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sd-switch"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitLab { owner = "rycee"; repo = pname; rev = version; - sha256 = "1bhks4ma3sn95bsszs6lj9cwfr8zgmja0hqfp8xr5iq77ww2p6k3"; + sha256 = "0sg1y8lb2pnll3408fbqp65acys31mrlzsqfrwm4nvbkayf0jcv3"; }; - cargoSha256 = "0lskxakzh3yji0rzk8jcfz1sv4j19b5kmdsaj7401m5w84s1cbjw"; + cargoSha256 = "16yb61wihg06i2h9vjqcsjqkjjpmxyv4df22i25034gkcgb20xcn"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ dbus ]; From 38c75ad02dd578591401690adab769db038cd574 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 01:17:56 +0200 Subject: [PATCH 1157/1183] python3Packages.async-upnp-client: 0.16.0 -> 0.16.2 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index a25916bc99c1..2fa186a07d16 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.16.0"; + version = "0.16.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-vgy/zn1Xm7Fm7u/YMe/nJa3tyRNKx/WHz0AHfhFaVKo="; + sha256 = "0raq3jgh2aqllycvvi0x2j5f602vv8ggmyd3879jzqbz2znngsgb"; }; propagatedBuildInputs = [ From 625ef89a224c98e95659166565cfa93faaa62006 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Apr 2021 01:20:00 +0200 Subject: [PATCH 1158/1183] python3Packages.clldutils: 3.7.0 -> 3.8.0 --- pkgs/development/python-modules/clldutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix index 96e6b86c1507..2271337dc986 100644 --- a/pkgs/development/python-modules/clldutils/default.nix +++ b/pkgs/development/python-modules/clldutils/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "clldutils"; - version = "3.7.0"; + version = "3.8.0"; disabled = isPy27; src = fetchFromGitHub { owner = "clld"; repo = pname; rev = "v${version}"; - sha256 = "13shas7krf7j04gqxjn09ipy318hmrp1s3b5d576d5r1xfxakam4"; + sha256 = "18sjcqzprf96s7bkn5zm3lh83hxfxj56nycxyldrwz7ndgkgxxx2"; }; patchPhase = '' From be0863874b956e171086401898560fcacb8b5d55 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 26 Apr 2021 00:53:31 +0200 Subject: [PATCH 1159/1183] python3Packages.deepmerge: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/deepmerge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deepmerge/default.nix b/pkgs/development/python-modules/deepmerge/default.nix index c29737595af8..da4b72d2ff49 100644 --- a/pkgs/development/python-modules/deepmerge/default.nix +++ b/pkgs/development/python-modules/deepmerge/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "deepmerge"; - version = "0.2.1"; + version = "0.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "082bvlk65pkf9qzkzzl8fq7s6zfz1b2v5pcb0ikwg1nx0xspggaz"; + sha256 = "1zfl8rkw98vj7jdpb29ably50x46pq6pazhrkrczndf5jc97zzgn"; }; nativeBuildInputs = [ From 9913c2be57a6350713889c36839ddb70c0d06e05 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 28 Apr 2021 02:45:43 +0200 Subject: [PATCH 1160/1183] python3Packages.sacn: 1.6.2 -> 1.6.4 --- pkgs/development/python-modules/sacn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sacn/default.nix b/pkgs/development/python-modules/sacn/default.nix index 9b1e935d6ed9..46678504cab6 100644 --- a/pkgs/development/python-modules/sacn/default.nix +++ b/pkgs/development/python-modules/sacn/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "sacn"; - version = "1.6.2"; + version = "1.6.4"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "2fea82a1dd83b0a67dc0be68a53b1fef1c44b12f3f018e47ac736bd15b36c068"; + sha256 = "1abkalzpy8bj2hpx563bxii5h0gv9v89f0yp9clc1l76amyf6dj2"; }; # no tests From dacb5ba2941bcd486ae6633402f0c34f6297f358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 23:57:09 +0000 Subject: [PATCH 1161/1183] janet: 1.15.4 -> 1.15.5 --- pkgs/development/interpreters/janet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 163c255c5222..b55c4b613a24 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.15.4"; + version = "1.15.5"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lE2BAwiwvewydIpVYoN+zrfpzQbMbe5Nb1r0mzdxMao="; + sha256 = "sha256-szqH2Qqc+AKTuoZjYHhTmiHcFQ+PMsljh0RSD/q4gD4="; }; nativeBuildInputs = [ meson ninja ]; From 55e8cc00587497e0d1c4a1764c53f1cc8de99b33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 03:25:14 +0000 Subject: [PATCH 1162/1183] calcurse: 4.7.0 -> 4.7.1 --- pkgs/applications/misc/calcurse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 8a83c593986a..837fcc5c27d6 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.7.0"; + version = "4.7.1"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "0dc4bka2l9z03bnlygsnl06l1zi2wbn29rkc02b13x2kdab7arpg"; + sha256 = "sha256-CnxV0HZ0Vp0WbAsOdYeyly09qBYM231gsdvSiVgDr7A="; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; From 51d128cf174cd9d685b08c4fee34b7da5b780b5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 23:29:25 +0000 Subject: [PATCH 1163/1183] humioctl: 0.28.2 -> 0.28.3 --- pkgs/applications/logging/humioctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index f3aef213ad28..c1aae04b2e58 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -1,8 +1,8 @@ { buildGoModule, fetchFromGitHub, installShellFiles, lib }: let - humioCtlVersion = "0.28.2"; - sha256 = "sha256-mCYxgBiuKylL2Qx4RCnD4ZoMFUm2J6VIL/Erc0u3BMA="; + humioCtlVersion = "0.28.3"; + sha256 = "sha256-GUn5hg4gPGjQ6U2dboGE22u8XuZ578+EnkmHLASXd3Q="; vendorSha256 = "sha256-867x33Aq27D2m14NqqsdByC39pjjyJZbfX3jmwVU2yo="; in buildGoModule { name = "humioctl-${humioCtlVersion}"; From d3e48342a38e502dcbf978acde77a4cf89e379f4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 22:34:06 +0000 Subject: [PATCH 1164/1183] gitui: 0.14.0 -> 0.15.0 --- .../version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 551db33b0108..09587daf3944 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1ymvvmryzv5is535bjg8h9p7gsxygyawnpyd0hicdrdiwml5mgsq"; + sha256 = "sha256-KJXYkOHR50Zap0Ou+jVi09opHuZBfHN/ToZbasZ3IE4="; }; - cargoSha256 = "14hf3xkdvk2mgag5pzai5382h3g79fq76s0p9pj8q9v8q21wg6pr"; + cargoSha256 = "sha256-N6Yr+TqxWwl/6SgjizIyZJoVsjn/R9yjxUKCqwt8UJg="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] From 2ba5086bdb7e7975dae0ca6f8f1006b3b580a0f3 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Tue, 27 Apr 2021 19:01:00 +0100 Subject: [PATCH 1165/1183] open-policy-agent: 0.27.1 -> 0.28.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index a73907cd2579..eb9bd6de5dc4 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.27.1"; + version = "0.28.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-IiPUmLgkD50LxOT+ZEf/UZJ0192GYOy9xk8U94Q0BWc="; + sha256 = "sha256-khXcpV4bPfFwoQ4LrHFohhlTHOIDClZuE3qg+MYk36k="; }; vendorSha256 = null; From 3b4d456465fbf26680b3cdbd298f04ce973b580f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 16:39:59 +0000 Subject: [PATCH 1166/1183] buf: 0.40.0 -> 0.41.0 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index fc232d55da6d..8d76b8925dc7 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "buf"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-N6o+1cfer8rgKJ3+CL25axJSjGV/YSG1sLIHXJzsC6o="; + sha256 = "sha256-f1UcvsXWW+fMAgTRtHkEXmUN/DTrJ/Xd+9HbR2FjFog="; }; patches = [ @@ -25,7 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ protobuf ]; - vendorSha256 = "sha256-vl+WqtpegoAvylx/lcyfJk8DAOub8U4Lx3Pe3eW4M/E="; + vendorSha256 = "sha256-XMGXVsSLEzuzujX5Fg3LLkgzyJY+nIBJEO9iI2t9eGc="; meta = with lib; { description = "Create consistent Protobuf APIs that preserve compatibility and comply with design best-practices"; From f1b5b7461750ede726d85cfe005c6a1ec2e8f5e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 06:17:40 +0000 Subject: [PATCH 1167/1183] belr: 4.5.1 -> 4.5.3 --- pkgs/development/libraries/belr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index 252ac3e80edc..90e27a6a9dc1 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "belr"; - version = "4.5.1"; + version = "4.5.3"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "0m0s7g8d25nbnafbl76w9v3x7q4jhsypxmz1gg80pj7j34xc2dsd"; + sha256 = "sha256-TTfBOhnyyAvQe+HXfr2GkuDTx07cHLqcsssW0dA7GlQ="; }; buildInputs = [ bctoolbox ]; From b5b575d2763c3480a35a73ce46a42329cce6c3f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 28 Apr 2021 04:11:32 +0000 Subject: [PATCH 1168/1183] bpytop: 1.0.63 -> 1.0.64 --- pkgs/tools/system/bpytop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index f10c3f628b86..4940c45e3ffe 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.63"; + version = "1.0.64"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5KTqiPqYBDI1KFQ+2WN7QZFL/YSb+MPPWbKzJTUa8Zw="; + sha256 = "sha256-BwpMBPTWSrfmz7SHYa1+SZ79V2YZdIkZcOTLtlVlgr8="; }; nativeBuildInputs = [ makeWrapper ]; From 7566f5ed5ff5d2c7d31fd9ef754aa1010c1dca5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 26 Apr 2021 01:33:47 +0000 Subject: [PATCH 1169/1183] i3wsr: 2.0.0 -> 2.0.1 --- pkgs/applications/window-managers/i3/wsr.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/i3/wsr.nix b/pkgs/applications/window-managers/i3/wsr.nix index 6799473470b2..6af5717916bf 100644 --- a/pkgs/applications/window-managers/i3/wsr.nix +++ b/pkgs/applications/window-managers/i3/wsr.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "i3wsr"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "roosta"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PluczllPRlfzoM2y552YJirrX5RQZQAkBQkner7fWhU="; + sha256 = "sha256-JzQWfC0kmnMArpIAE5fgb3YLmXktSCH5aUdrQH9pCbo="; }; - cargoSha256 = "sha256-GwRiyAHTcRoByxUViXSwslb+IAP6LK8IWZ0xICQ8qag="; + cargoSha256 = "sha256-ZvSdJLaw1nfaqpTBKIiHiXvNFSZhsmLk0PBrV6ykv/w="; nativeBuildInputs = [ python3 ]; buildInputs = [ libxcb ]; From a338775b63a563d4ab1cf385e942cfb80fab22cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 25 Apr 2021 21:04:25 +0000 Subject: [PATCH 1170/1183] checkstyle: 8.41.1 -> 8.42 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 563119f6b3ab..ae95157a8e5e 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.41.1"; + version = "8.42"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-zW6gjRu5YEH04xCbsW20FeFfmBg+i+aW3WpViBQigXI="; + sha256 = "sha256-SYLr6qQp/kHzviwzCaXEnYTHHuH3j5ZzRLi8gs8xAao="; }; nativeBuildInputs = [ makeWrapper ]; From 360bf6eb36074367ebcb2049ee91e76c7b37e884 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 22:01:25 +0000 Subject: [PATCH 1171/1183] flyctl: 0.0.210 -> 0.0.211 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 0cf9fc4d727f..b65c342aaa79 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.210"; + version = "0.0.211"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-9SHH54ryll2Mt22Z82YQIcNYk9raPyOZ/QFri2ebPrQ="; + sha256 = "sha256-iR8vEXLRdhLggFvu4Vhb8WW2Wo6qzAMQWC7qUMlWGd8="; }; preBuild = '' From a4b2de8382b8306b9dccd56094a59101b2209062 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 12:52:19 +0200 Subject: [PATCH 1172/1183] python3Packages.ffmpeg-progress-yield: init at 0.0.4 --- .../ffmpeg-progress-yield/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/ffmpeg-progress-yield/default.nix diff --git a/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix new file mode 100644 index 000000000000..5d2641970721 --- /dev/null +++ b/pkgs/development/python-modules/ffmpeg-progress-yield/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, colorama +, tqdm +, pytestCheckHook +, ffmpeg +}: + +buildPythonPackage rec { + pname = "ffmpeg-progress-yield"; + version = "0.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "e944093e2c1b213da8fa4f0c276c1bad44e0b8ba8be7e4fd001f5132d16baef5"; + }; + + propagatedBuildInputs = [ colorama tqdm ]; + + checkInputs = [ pytestCheckHook ffmpeg ]; + + pytestFlagsArray = [ "test/test.py" ]; + + pythonImportsCheck = [ "ffmpeg_progress_yield" ]; + + meta = with lib; { + description = "Run an ffmpeg command with progress"; + homepage = "https://github.com/slhck/ffmpeg-progress-yield"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ prusnak ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 694bafa127a3..39c7940c6102 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2323,6 +2323,8 @@ in { ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; + ffmpeg-progress-yield = callPackage ../development/python-modules/ffmpeg-progress-yield { }; + fido2 = callPackage ../development/python-modules/fido2 { }; filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; From 5965c9e3680adfd9e5e88e4c29ddeb898642e0ee Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 27 Apr 2021 12:52:37 +0200 Subject: [PATCH 1173/1183] ffmpeg-normalize: 1.19.0 -> 1.22.1 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 411ab9e6bc28..de0b088030f1 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -1,20 +1,20 @@ { lib , buildPythonApplication , fetchPypi -, ffmpeg_3 -, tqdm +, ffmpeg +, ffmpeg-progress-yield }: buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.19.0"; + version = "1.22.1"; src = fetchPypi { inherit pname version; - sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; + sha256 = "df826053212d540ab1bbe9819587fcbf36162f8c2535ae85b88b252e47d6d632"; }; - propagatedBuildInputs = [ ffmpeg_3 tqdm ]; + propagatedBuildInputs = [ ffmpeg ffmpeg-progress-yield ]; checkPhase = '' $out/bin/ffmpeg-normalize --help > /dev/null From 11c2459f170dc37ab05607f08d3947efb299a141 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 27 Apr 2021 13:39:38 +0200 Subject: [PATCH 1174/1183] ssl-cert-check: 3.31 -> 4.14 --- pkgs/tools/admin/ssl-cert-check/default.nix | 44 +++++++++++---------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index aafe91dccd24..c314c304aec8 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -1,38 +1,41 @@ -{ lib, stdenv +{ lib +, stdenv +, coreutils , fetchFromGitHub -, makeWrapper -, openssl -, which +, findutils +, gawk , gnugrep , gnused -, gawk +, makeWrapper , mktemp -, coreutils -, findutils +, openssl +, which }: stdenv.mkDerivation rec { pname = "ssl-cert-check"; - version = "3.31"; + version = "4.14"; src = fetchFromGitHub { owner = "Matty9191"; repo = pname; - rev = "698c1996d05152cfaf2a1a3df4cc70482411fac8"; - sha256 = "0jvi9phs0ngfwrj9zixb03v9byavbwxx8xkp0h5m98qppn1kvl3n"; + rev = "4056ceeab5abc0e39f4e0ea40cd54147253a3369"; + sha256 = "07k2n4l68hykraxvy030djc208z8rqff3kc7wy4ib9g6qj7s4mif"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; buildInputs = [ - openssl - which - gnugrep - mktemp - gawk - gnused coreutils findutils + gawk + gnugrep + gnused + mktemp + openssl + which ]; prePatch = '' @@ -47,11 +50,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "a Bourne shell script that can be used to report on expiring SSL certificates"; + description = "Bourne shell script that can be used to report on expiring SSL certificates"; homepage = "https://github.com/Matty9191/ssl-cert-check"; - license = licenses.gpl2; - maintainers = [ maintainers.ryantm ]; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ryantm ]; platforms = platforms.linux; }; - } From 3516b56859cbd2600e6d16ea5a51e068f6e5251d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 27 Apr 2021 04:35:47 +0000 Subject: [PATCH 1175/1183] joker: 0.16.0 -> 0.17.1 --- pkgs/development/interpreters/joker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index a8e73339ee16..8a2130050bfa 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "joker"; - version = "0.16.0"; + version = "0.17.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "sha256-ckbKxWzcISo9yOXuwgOiSfR2hs+5od0Ru0Ku2I52Gu8="; + sha256 = "sha256-3OimYXcQ3KPav44sClbC60220/YK4Jhq+l5UfRFYoJI="; }; vendorSha256 = "sha256-AYoespfzFLP/jIIxbw5K653wc7sSfLY8K7di8GZ64wA="; From c90bb6bbf173ec55bf35ce764b0d86ed7385e8fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 22 Apr 2021 06:01:44 +0000 Subject: [PATCH 1176/1183] aws-nuke: 2.14.0 -> 2.15.0 --- pkgs/tools/admin/aws-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 070a9b6430ca..901f489fb46d 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "2.14.0"; + version = "2.15.0"; src = fetchFromGitHub { owner = "rebuy-de"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ULHT2ysAVZHSojIdsbPTuwskwOQVrK8f14r9eq+Effs="; + sha256 = "sha256-FntHZi+L0Ti2QFbd8keF1sxcdXc01hs13Np23hF/pVc="; }; - vendorSha256 = "sha256-GUCsl5VyptNvStJZgCsJDlllZasX1OhbVkahcQFuiC8="; + vendorSha256 = "sha256-VtsHUxI5RuKbQOSu55qPCJHsDO5+cNGT92y9dlibXlc="; preBuild = '' if [ "x$outputHashAlgo" != "x" ]; then From e424c9118bbc05a82c13ae252f7808ffb6a65a8b Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Fri, 16 Apr 2021 17:49:23 +0200 Subject: [PATCH 1177/1183] seaweedfs: add version check passthru.tests passthru.tests instead of installCheckPhase as recommended in https://github.com/ryantm/nixpkgs-update/issues/260#issuecomment-821287971 Inspired by https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/science/logic/key/default.nix#L54-L57 This is basically the extent of testing I usually do when an upgrade is proposed, so this takes that manual step away. --- pkgs/applications/networking/seaweedfs/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 23d2d498d6c0..61f318009f72 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -1,4 +1,9 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib +, fetchFromGitHub +, buildGoModule +, runCommand +, seaweedfs +}: buildGoModule rec { pname = "seaweedfs"; @@ -15,6 +20,11 @@ buildGoModule rec { subPackages = [ "weed" ]; + passthru.tests.check-version = runCommand "weed-version" { meta.timeout = 3; } '' + ${seaweedfs}/bin/weed version | grep -Fw ${version} + touch $out + ''; + meta = with lib; { description = "Simple and highly scalable distributed file system"; homepage = "https://github.com/chrislusf/seaweedfs"; From 88dbd594c84e4b45e45736111d384379890e393b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 21:05:41 +0200 Subject: [PATCH 1178/1183] mldonkey: 3.1.6 -> 3.1.7-2 --- .../networking/p2p/mldonkey/default.nix | 25 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 37bc1e372acf..10eafcc7ffab 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,26 +1,31 @@ -{ lib, stdenv, fetchurl, ocamlPackages, zlib, bzip2, ncurses, file, gd, libpng, libjpeg }: +{ lib, stdenv, fetchurl, ocamlPackages, zlib }: -stdenv.mkDerivation ({ - name = "mldonkey-3.1.6"; +stdenv.mkDerivation (rec { + pname = "mldonkey"; + version = "3.1.7-2"; src = fetchurl { - url = "https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2"; - sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; + url = "https://ygrek.org/p/release/mldonkey/mldonkey-${version}.tar.bz2"; + sha256 = "b926e7aa3de4b4525af73c88f1724d576b4add56ef070f025941dd51cb24a794"; }; - preConfigure = lib.optionalString (ocamlPackages.camlp4 != null) '' + preConfigure = '' substituteInPlace Makefile --replace '+camlp4' \ '${ocamlPackages.camlp4}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/camlp4' ''; - buildInputs = [ zlib ncurses bzip2 file gd libpng libjpeg ] ++ - (with ocamlPackages; [ ocaml camlp4 ]); - configureFlags = [ "--disable-gui" ]; + buildInputs = (with ocamlPackages; [ + ocaml + camlp4 + num + ]) ++ [ + zlib + ]; meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = "http://mldonkey.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; } // (if !ocamlPackages.ocaml.nativeCompilers then diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba9eecbd9223..bb8e38fb4895 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24599,7 +24599,7 @@ in mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; mldonkey = callPackage ../applications/networking/p2p/mldonkey { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.ocamlPackages_4_08; }; MMA = callPackage ../applications/audio/MMA { }; From 19916afe1d3f68fe9d35637c84b9363ef2493f1b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 26 Apr 2021 21:07:47 +0200 Subject: [PATCH 1179/1183] mldonkey: remove byte code support nativeCompilers is only false in very rare cases (only on mips), so it's really hard to test and maintain this code path. If someone else is able to do that, they should readd this feature. --- .../networking/p2p/mldonkey/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 10eafcc7ffab..41b8a7d0b6c2 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, ocamlPackages, zlib }: -stdenv.mkDerivation (rec { +stdenv.mkDerivation rec { pname = "mldonkey"; version = "3.1.7-2"; @@ -28,15 +28,4 @@ stdenv.mkDerivation (rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; -} // (if !ocamlPackages.ocaml.nativeCompilers then -{ - # Byte code compilation (the ocaml opt compiler is not supported in some platforms) - buildPhase = "make mlnet.byte"; - installPhase = '' - mkdir -p $out/bin - cp mlnet.byte $out/bin/mlnet - ''; - - # ocaml bytecode selfcontained binaries loose the bytecode if stripped - dontStrip = true; -} else {})) +} From 98b372b860203e15b8f51cf5bfe24754da147e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Wed, 28 Apr 2021 07:40:27 +0200 Subject: [PATCH 1180/1183] nginxQuic: 47a43b011dec -> 12f18e0bca09 --- pkgs/servers/http/nginx/quic.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/quic.nix b/pkgs/servers/http/nginx/quic.nix index 062520a3d13e..38a4bd9cdf44 100644 --- a/pkgs/servers/http/nginx/quic.nix +++ b/pkgs/servers/http/nginx/quic.nix @@ -1,10 +1,13 @@ -{ callPackage, fetchhg, boringssl, ... } @ args: +{ callPackage +, fetchhg +, ... +} @ args: callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "47a43b011dec"; # branch=quic - sha256 = "1d4d1v4zbnf5qlfl79pi7sficn1h7zm6kk7llm24yyhlsvssz10x"; + rev = "12f18e0bca09"; # branch=quic + sha256 = "1lr6zlny26kamczgk8ddscmy5fp5mzxqcppwhjhvq1a029a0r4b7"; }; preConfigure = '' From b3efb61263179f7cbe2abc6a3a33199099b56123 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 28 Apr 2021 08:49:32 +0200 Subject: [PATCH 1181/1183] bpytop: remove unused input --- pkgs/tools/system/bpytop/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 4940c45e3ffe..ca53a1956e0b 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, python3Packages, fetchFromGitHub, makeWrapper, substituteAll }: +{ lib +, stdenv +, python3Packages +, fetchFromGitHub +, makeWrapper +}: stdenv.mkDerivation rec { pname = "bpytop"; @@ -12,6 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; + propagatedBuildInputs = with python3Packages; [ python psutil ]; dontBuild = true; From 1437eee5bb0b8b82ef5ca9b3bea1263546b209c8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 21 Apr 2021 20:18:06 +0200 Subject: [PATCH 1182/1183] coqPackages.paramcoq: enable for Coq 8.13 --- pkgs/development/coq-modules/paramcoq/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index 342e4225a3c2..8f2ef30d37cc 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,9 +3,10 @@ with lib; mkCoqDerivation { pname = "paramcoq"; inherit version; - defaultVersion = if versions.range "8.7" "8.12" coq.coq-version + defaultVersion = if versions.range "8.7" "8.13" coq.coq-version then "1.1.2+coq${coq.coq-version}" else null; displayVersion = { paramcoq = "1.1.2"; }; + release."1.1.2+coq8.13".sha256 = "02vnf8p04ynf3qk8myvjzsbga15395235mpdpj54pvxis3h5qq22"; release."1.1.2+coq8.12".sha256 = "0qd72r45if4h7c256qdfiimv75zyrs0w0xqij3m866jxaq591v4i"; release."1.1.2+coq8.11".sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; release."1.1.2+coq8.10".sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; From 5c5ec0bff67f139944c7d17bfd20a983485e3927 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 25 Apr 2021 12:25:19 +0200 Subject: [PATCH 1183/1183] maiko: init at 2021-04-14 --- pkgs/misc/emulators/maiko/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/misc/emulators/maiko/default.nix diff --git a/pkgs/misc/emulators/maiko/default.nix b/pkgs/misc/emulators/maiko/default.nix new file mode 100644 index 000000000000..e78b680d617a --- /dev/null +++ b/pkgs/misc/emulators/maiko/default.nix @@ -0,0 +1,26 @@ +{ lib, stdenv, fetchFromGitHub, cmake, libX11 }: + +stdenv.mkDerivation rec { + pname = "maiko"; + version = "2021-04-14"; + src = fetchFromGitHub { + owner = "Interlisp"; + repo = "maiko"; + rev = "91fe7d51f9d607bcedde0e78e435ee188a8c84c0"; + hash = "sha256-Y+ngep/xHw6RCU8XVRYSWH6S+9hJ74z50pGpIqS2CjM="; + }; + nativeBuildInputs = [ cmake ]; + buildInputs = [ libX11 ]; + installPhase = '' + runHook preInstall + find . -maxdepth 1 -executable -type f -exec install -Dt $out/bin '{}' \; + runHook postInstall + ''; + meta = with lib; { + description = "Medley Interlisp virtual machine"; + homepage = "https://interlisp.org/"; + license = licenses.mit; + maintainers = with maintainers; [ ehmry ]; + inherit (libX11.meta) platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17440ea84746..4610cce7a00f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29971,6 +29971,8 @@ in loop = callPackage ../tools/misc/loop { }; + maiko = callPackage ../misc/emulators/maiko { inherit (xorg) libX11; }; + mailcore2 = callPackage ../development/libraries/mailcore2 { icu = icu58; };