From 3562533edc568e156870d262490868e9f1bcafd4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 3 Dec 2020 12:39:23 +0100 Subject: [PATCH 001/220] filesystems: add syntax to /etc/fstab header ubuntu displays it and it helps in case you forgot the syntax and dont want to consult the man --- nixos/modules/tasks/filesystems.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index a055072f9c96..7883c5899a67 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -244,6 +244,8 @@ in # # To make changes, edit the fileSystems and swapDevices NixOS options # in your /etc/nixos/configuration.nix file. + # + # # Filesystems. ${concatMapStrings (fs: From 2a51117bdd6cd618703ea9cfc34cf3933ac4d4aa Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 25 Apr 2021 15:48:59 +0530 Subject: [PATCH 002/220] inetutils: 1.9.4 -> 2.0 - Remove the already upstream-ed (or not applicable anymore) patches - Add patches to update .ORG, and .IN WHOIS servers (submitted upstream) - Split name into pname, and version - Switch to .xz distfile (smaller) --- pkgs/tools/networking/inetutils/default.nix | 11 +++--- .../networking/inetutils/service-name.patch | 11 ------ .../whois-Update-Canadian-TLD-server.patch | 27 ------------- .../whois-Update-Indian-TLD-server.patch | 25 ++++++++++++ .../whois-Update-ORG-TLD-server.patch | 38 +++++++++++++++++++ 5 files changed, 69 insertions(+), 43 deletions(-) delete mode 100644 pkgs/tools/networking/inetutils/service-name.patch delete mode 100644 pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch create mode 100644 pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch create mode 100644 pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 1290ec2bdb1d..dca6130f7bd3 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,18 +1,19 @@ { stdenv, lib, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { - name = "inetutils-1.9.4"; + pname = "inetutils"; + version = "2.0"; src = fetchurl { - url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI="; }; patches = [ - ./whois-Update-Canadian-TLD-server.patch - ./service-name.patch # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + ./whois-Update-ORG-TLD-server.patch + ./whois-Update-Indian-TLD-server.patch ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; diff --git a/pkgs/tools/networking/inetutils/service-name.patch b/pkgs/tools/networking/inetutils/service-name.patch deleted file mode 100644 index e34516313c57..000000000000 --- a/pkgs/tools/networking/inetutils/service-name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200 -+++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200 -@@ -576,7 +576,7 @@ - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - -- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0) -+ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0) - err_quit ("getaddrinfo: %s", gai_strerror (i)); - - for (ressave = res; res; res = res->ai_next) diff --git a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch deleted file mode 100644 index d63d4e29daf0..000000000000 --- a/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001 -From: Mats Erik Andersson -Date: Thu, 2 Mar 2017 15:38:38 +0100 -Subject: [PATCH] whois: Update Canadian TLD server. -Content-Type: text/plain; charset=utf-8 - ---- - ChangeLog | 8 ++++++++ (OMITTED) - whois/tld_serv_list | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/whois/tld_serv_list b/whois/tld_serv_list -index 056efcf..91697b8 100644 ---- a/whois/tld_serv_list -+++ b/whois/tld_serv_list -@@ -81,7 +81,7 @@ - #.bw # NIC? www.botsnet.bw - #.by NONE # NIC? http://unibel.by www.open.by - .bz NONE # http://www.psg.com/dns/bz/ --.ca whois.cdnnet.ca -+.ca whois.cira.ca - .cc whois.nic.cc - .cd WEB http://www.nic.cd/database/cd/ - #.cf NONE # NIC? http://www.socatel.intnet.cf --- -2.10.0 - diff --git a/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch new file mode 100644 index 000000000000..969b24436fb6 --- /dev/null +++ b/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch @@ -0,0 +1,25 @@ +From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001 +From: Ashish SHUKLA +Date: Sun, 25 Apr 2021 08:17:52 +0530 +Subject: [PATCH] whois: Update whois server for .IN + +--- + whois/tld_serv_list | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/whois/tld_serv_list b/whois/tld_serv_list +index d9257f36..41083c18 100644 +--- a/whois/tld_serv_list ++++ b/whois/tld_serv_list +@@ -151,7 +151,7 @@ + .ie whois.domainregistry.ie + .il whois.isoc.org.il + .im whois.nic.im +-.in whois.inregistry.net ++.in whois.registry.in + .io whois.nic.io + #.iq # NIC? + .ir whois.nic.ir +-- +2.31.1 + diff --git a/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch b/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch new file mode 100644 index 000000000000..dd45ec6ebf7f --- /dev/null +++ b/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch @@ -0,0 +1,38 @@ +From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001 +From: Ashish SHUKLA +Date: Sun, 25 Apr 2021 08:07:52 +0530 +Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore + +See https://www.iana.org/domains/root/db/org.html +--- + whois/data.h | 1 - + whois/tld_serv_list | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/whois/data.h b/whois/data.h +index d1eb10ad..82e22b6f 100644 +--- a/whois/data.h ++++ b/whois/data.h +@@ -68,7 +68,6 @@ const char *rwhois_servers[] = { + const char *gtlds[] = { + ".com", + ".net", +- ".org", + ".edu", + NULL + }; +diff --git a/whois/tld_serv_list b/whois/tld_serv_list +index ad7b9826..d9257f36 100644 +--- a/whois/tld_serv_list ++++ b/whois/tld_serv_list +@@ -219,6 +219,7 @@ + .nu whois.nic.nu + .nz whois.srs.net.nz + #.om NONE # NIC? http://www.gto.net.om ++.org whois.pir.org + .pa WEB http://www.nic.pa + #.pe whois.rcp.net.pe # kero.yachay.pe valid 2011-03-10 + .pe kero.yachay.pe +-- +2.31.1 + From dd3fac876151333997ad76c656a4e3be81f2e761 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 26 May 2021 22:00:06 +0200 Subject: [PATCH 003/220] fwup: fix darwin build --- pkgs/tools/compression/xdelta/default.nix | 2 +- pkgs/tools/misc/fwup/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index ee52f35c9790..fbaab91d0931 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index de2b809eea52..bfb23695a362 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { xdelta ]; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; From 812a8f455a80363f7189830e6fc04d21dbb0a934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= Date: Thu, 29 Jul 2021 11:25:11 +0200 Subject: [PATCH 004/220] saml2aws: 2.31.0 -> 2.32.0 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 8ee2c9a4c4e4..e5404268567d 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-Qe7+INWS9b6lw7QbaaQwIkRwvfx5dRKsZqun3z/U/QA="; + sha256 = "sha256-VMNK6kmMPe1Qwfb/NmMaBhtdqg59KmtiankVNZmhNdY="; }; runVend = true; - vendorSha256 = "sha256-TieQVPSWtIteU0wTqX7si6GrPdYd4WD2eK4ZlLz0VJ8="; + vendorSha256 = "sha256-2tu3wSp9N+icpKvDeUgzYRLc6jXivn1D0jX/5LSgwNw="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From 5d0bd88cdd7a5a1499f83888001cdee3d2defc94 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Wed, 28 Jul 2021 01:13:37 +1000 Subject: [PATCH 005/220] programs/calls: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/calls.nix | 25 +++++++++++++++++++ .../applications/networking/calls/default.nix | 1 + 3 files changed, 27 insertions(+) create mode 100644 nixos/modules/programs/calls.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4d1700ed99af..d184bec9d84c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -121,6 +121,7 @@ ./programs/bash-my-aws.nix ./programs/bcc.nix ./programs/browserpass.nix + ./programs/calls.nix ./programs/captive-browser.nix ./programs/ccache.nix ./programs/cdemu.nix diff --git a/nixos/modules/programs/calls.nix b/nixos/modules/programs/calls.nix new file mode 100644 index 000000000000..59961625e5d9 --- /dev/null +++ b/nixos/modules/programs/calls.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.calls; +in { + options = { + programs.calls = { + enable = mkEnableOption '' + Whether to enable GNOME calls: a phone dialer and call handler. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.calls + ]; + + services.dbus.packages = [ + pkgs.callaudiod + ]; + }; +} diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 52e1bc50601a..68ab73da01e3 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A phone dialer and call handler"; + longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann ]; From 30422daf94f289507980d0ef0ea47156b6d9b41f Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Tue, 10 Aug 2021 14:37:28 -0400 Subject: [PATCH 006/220] maintainers: add jpetrucciani --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0096d15941d6..20a4c8b0b74a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5280,6 +5280,12 @@ githubId = 20675; name = "Joël Perras"; }; + jpetrucciani = { + email = "j@cobi.dev"; + github = "jpetrucciani"; + githubId = 8117202; + name = "Jacobi Petrucciani"; + }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; From a627022f1a2dea8d5c130f59e5f93e8db6caf0e7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 10:13:37 +0000 Subject: [PATCH 007/220] python38Packages.azure-synapse-artifacts: 0.7.0 -> 0.8.0 --- .../python-modules/azure-synapse-artifacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f9c78b6116fc..2b1f3b17ee5e 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2a538d617dc5d2d167716226d0a24e416324efb35ef22b223e0d9fb6b9889a72"; + sha256 = "3d4fdfd0bd666984f7bdc7bc0c7a6018c35a5d46a81a32dd193b07c03b528b72"; }; propagatedBuildInputs = [ From 2e998080267d4ebc71ad4b56d8d0172a63415c38 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 12:03:19 +0000 Subject: [PATCH 008/220] python38Packages.azure-mgmt-containerregistry: 8.0.0 -> 8.1.0 --- .../python-modules/azure-mgmt-containerregistry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8bc79a7df2ff..92658dc60758 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "8.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; + sha256 = "62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd"; extension = "zip"; }; From 8d6e9c2730d1128810e5058ebdb41ec635a50e3b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 12:08:07 +0000 Subject: [PATCH 009/220] python38Packages.databricks-cli: 0.14.3 -> 0.15.0 --- pkgs/development/python-modules/databricks-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-cli/default.nix b/pkgs/development/python-modules/databricks-cli/default.nix index 547b9a3af7a2..e9313447ec88 100644 --- a/pkgs/development/python-modules/databricks-cli/default.nix +++ b/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.14.3"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "bdf89a3917a3f8f8b99163e38d40e66dc478c7408954747f145cd09816b05e2c"; + sha256 = "4d0fbe3cb9c86d7342d45357f1db2e01011c507659f21b7a8144709cf8fa9f96"; }; checkInputs = [ From 1f426291658104d5aec54cc637a7a11be569524e Mon Sep 17 00:00:00 2001 From: Thomas Sean Dominic Kelly Date: Fri, 13 Aug 2021 12:44:56 +0100 Subject: [PATCH 010/220] perlPackages.ExtUtilsMakeMaker: 7.56 -> 7.62 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index fb2f2db19d81..424f7374ff9c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7620,10 +7620,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.56"; + version = "7.62"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.56.tar.gz"; - sha256 = "05h058iwx81qs384kgyx34qnhqznavzwmhdsin65c434hga8jly9"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.62.tar.gz"; + sha256 = "5022ad857fd76bd3f6b16af099fe2324639d9932e08f21e891fb313d9cae1705"; }; meta = { description = "Create a module Makefile"; From 847842d898b2fc4bc3437f32e18d526c8fb02644 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 17:57:02 +0000 Subject: [PATCH 011/220] python38Packages.cma: 3.0.3 -> 3.1.0 --- pkgs/development/python-modules/cma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 8937f78a7a66..473f06076983 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "00vv7imdkv0bqcs4b8dg9nggxcl2fkcnhdd46n22bcmnwy8rjxv6"; + sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf"; }; propagatedBuildInputs = [ From db81b53767a30c964643a01578d06d119239f24a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 18:07:17 +0000 Subject: [PATCH 012/220] python38Packages.coveralls: 3.1.0 -> 3.2.0 --- 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 109667582188..0c16d2d9aca2 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 = "3.1.0"; + version = "3.2.0"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "9b3236e086627340bf2c95f89f757d093cbed43d17179d3f4fb568c347e7d29a"; + sha256 = "15a987d9df877fff44cd81948c5806ffb6eafb757b3443f737888358e96156ee"; }; checkInputs = [ From 556fa6a9aad6c93cb2fe406e150e3a94edee3de4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 18:53:29 +0000 Subject: [PATCH 013/220] python38Packages.databricks-connect: 8.1.6 -> 8.1.10 --- .../development/python-modules/databricks-connect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix index afb8e13dc5a4..97d67cdbfe26 100644 --- a/pkgs/development/python-modules/databricks-connect/default.nix +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.6"; + version = "8.1.10"; src = fetchPypi { inherit pname version; - sha256 = "2d6989491a2a33853eb10500574eb62dbcb98ac691d7e98022c5f18e23ad18b2"; + sha256 = "831ba3d50552c4b7821670ad01b73406aef5092498b29d3ddb24a5063bbcf0b5"; }; sourceRoot = "."; From 9f5e5e65fbc34dc48c8c8cd234756b6edbba5a2d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 20:15:02 +0000 Subject: [PATCH 014/220] python38Packages.django-webpack-loader: 0.7.0 -> 1.1.0 --- .../python-modules/django-webpack-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index 3e849b487739..c782a5f6746e 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "0.7.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + sha256 = "c7f89a272a177a17a045ceab26bbb7e35d28ca5597c384de96817784b610c977"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) From b1a6eebcb7b79daa5c9eca72394e3787322968d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Aug 2021 20:26:24 +0000 Subject: [PATCH 015/220] python38Packages.dropbox: 11.11.0 -> 11.16.0 --- 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 f5a9274a0d18..88b7a1e09708 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 = "11.11.0"; + version = "11.16.0"; src = fetchPypi { inherit pname version; - sha256 = "14dd51e0e3981cb81384a8e13a308de0df13c7c4b6ba7f080177ede947761cbb"; + sha256 = "99e84367d5b983815a3680eea2c7e67bff14637c4702010c5c58611eb714dfe2"; }; postPatch = '' From 444e3030da5ba981ccd05194281a059005faf786 Mon Sep 17 00:00:00 2001 From: sebbel Date: Sun, 15 Aug 2021 08:31:58 +0200 Subject: [PATCH 016/220] matomo, 4.3.1 -> 4.4.1 --- pkgs/servers/web-apps/matomo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 9a0a1bed0c8c..7ee152955939 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "4.3.1"; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + version = "4.4.1"; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; matomo-beta = { - version = "4.3.1"; + version = "4.4.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; }; common = pname: { version, sha256, beta ? null }: From faf977b292a175b1965793cae4ef388038b63dd4 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 12:17:08 +0300 Subject: [PATCH 017/220] maven: 3.8.1 -> 3.8.2 --- .../development/tools/build-managers/apache-maven/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 9e0103170e9f..64234b824c9d 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,13 +4,13 @@ assert jdk != null; stdenv.mkDerivation rec { pname = "apache-maven"; - version = "3.8.1"; + version = "3.8.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "00pgmc9v2s2970wgl2ksvpqy4lxx17zhjm9fgd10fkamxc2ik2mr"; + sha256 = "sha256-ja4QsJ/re45MB5/DmhHzKWq2MP2bxE7OoPsojOx3cPc="; }; nativeBuildInputs = [ makeWrapper ]; From cd7360f19ff31f1dfc7076e2ef11b1a48d656bfd Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Sun, 15 Aug 2021 15:03:12 +0300 Subject: [PATCH 018/220] python38Packages.networkx: 2.5.1 -> 2.6.2 --- pkgs/development/python-modules/networkx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/networkx/default.nix b/pkgs/development/python-modules/networkx/default.nix index c92db16fc6b7..0ed9f3b9cb3c 100644 --- a/pkgs/development/python-modules/networkx/default.nix +++ b/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.5.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a"; + sha256 = "2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb"; }; propagatedBuildInputs = [ decorator setuptools ]; From ef0b3304913553628006dbf19f324efb3ca0d6ae Mon Sep 17 00:00:00 2001 From: sebbel Date: Sun, 15 Aug 2021 19:16:23 +0200 Subject: [PATCH 019/220] maintainers: add sebbel --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2e1efa65be99..0ef81066f3ca 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9680,6 +9680,12 @@ githubId = 1567527; name = "Sebastian Hyberts"; }; + sebbel = { + email = "hej@sebastian-ball.de"; + github = "sebbel"; + githubId = 1940568; + name = "Sebastian Ball"; + }; sebtm = { email = "mail@sebastian-sellmeier.de"; github = "sebtm"; From 4d3399c8f4e53a403540ebfdff870ba8771a0cfc Mon Sep 17 00:00:00 2001 From: sebbel Date: Mon, 16 Aug 2021 18:29:43 +0200 Subject: [PATCH 020/220] matomo: add sebbel as maintainer --- pkgs/servers/web-apps/matomo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 7ee152955939..673b5bbc3b2d 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -102,7 +102,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel ]; }; }; in From 8e2ec78c13d4bb8c990b080c07914f316f2cf842 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 03:47:09 +0000 Subject: [PATCH 021/220] python38Packages.bids-validator: 1.8.0 -> 1.8.2 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index e3ee7b9ba73b..f39e775fc257 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777"; + sha256 = "7969d55e9ed07f6cf7dfd72ed696a05abe56a2f35e81a1ef677f3694b2adf606"; }; # needs packages which are not available in nixpkgs From 595dc022b1523d8ae0210dea3eb50114c05bee8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 06:16:20 +0000 Subject: [PATCH 022/220] python38Packages.jq: 1.1.3 -> 1.2.1 --- pkgs/development/python-modules/jq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jq/default.nix b/pkgs/development/python-modules/jq/default.nix index f9f71a587ab9..3833bf9850f8 100644 --- a/pkgs/development/python-modules/jq/default.nix +++ b/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.1.3"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r"; + sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; }; patches = [ From 65bb58d8ca05f98b51ea7e8863813da45b653f0d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 06:59:49 +0000 Subject: [PATCH 023/220] python38Packages.mecab-python3: 1.0.3 -> 1.0.4 --- pkgs/development/python-modules/mecab-python3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index bb5ffb7de791..ad717e9d0c8f 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e"; + sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8"; }; nativeBuildInputs = [ From a283b94822f387aa9119fad9f21f3a9d6e857474 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 07:48:16 +0000 Subject: [PATCH 024/220] python38Packages.msal: 1.12.0 -> 1.13.0 --- pkgs/development/python-modules/msal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index b5095cc59102..73a40741f3d6 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327"; + sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d"; }; propagatedBuildInputs = [ From 8dfb114b7bfca80fd710bf7f9b3a8f1e022df5f5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 07:53:42 +0000 Subject: [PATCH 025/220] python38Packages.nbsphinx: 0.8.6 -> 0.8.7 --- 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 8611059eb317..1b0a95f3d76f 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.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "097dee333558f400e9abbb53ce7d4fa64a257cfa89dd20f7554dca7f0cd5e143"; + sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c"; }; propagatedBuildInputs = [ From 6e587130c44659d1d061887846eb832f004afcb7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:06:26 +0000 Subject: [PATCH 026/220] python38Packages.django_redis: 4.12.1 -> 5.0.0 --- pkgs/development/python-modules/django_redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 56e4e845f08c..8b689c19fc4b 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -2,11 +2,11 @@ mock, django, redis, msgpack }: buildPythonPackage rec { pname = "django-redis"; - version = "4.12.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63"; + sha256 = "048f665bbe27f8ff2edebae6aa9c534ab137f1e8fa7234147ef470df3f3aa9b8"; }; doCheck = false; From f8a246accb32e3ee79d08e91ac8376f5caf15ac2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:25:22 +0000 Subject: [PATCH 027/220] python38Packages.django-q: 1.3.8 -> 1.3.9 --- pkgs/development/python-modules/django-q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index c9c5410416ad..f81fc01bdd6f 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.8"; + version = "1.3.9"; src = fetchPypi { inherit pname version; - sha256 = "db30266fadd6ab9336a8824291910ff1d1c28f7bc9d6e52cdaf33cc275ae6146"; + sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b"; }; propagatedBuildInputs = [ From 81171e61ac152167344258192208591ec75dec42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 08:42:54 +0000 Subject: [PATCH 028/220] python38Packages.elasticsearch: 7.13.1 -> 7.14.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 86e7477ab317..c469a7c87f97 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.13.1"; + version = "7.14.0"; src = fetchPypi { inherit pname version; - sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9"; + sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4"; }; # Check is disabled because running them destroy the content of the local cluster! From d47ec177e42d894d9973c42cbcc23bf71cda0cbf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 09:46:02 +0000 Subject: [PATCH 029/220] python38Packages.flask-jwt-extended: 4.2.1 -> 4.2.3 --- .../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 7057bb587503..d9eae8ffa585 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 = "4.2.1"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; + sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; From e5766d96922b67468f8a8a0f92990e630ebb4f18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 12:28:54 +0000 Subject: [PATCH 030/220] python38Packages.jwcrypto: 0.9.1 -> 1.0 --- pkgs/development/python-modules/jwcrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 182cfd0d485c..ca7319eeb1fc 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.9.1"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "63531529218ba9869e14ef8c9e7b516865ede3facf9b0ef3d3ba68014da211f9"; + sha256 = "f88816eb0a41b8f006af978ced5f171f33782525006cdb055b536a40f4d46ac9"; }; propagatedBuildInputs = [ From 78c8ad1f885c3c7ba0d74ef5554c03021673ca48 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 13:06:49 +0000 Subject: [PATCH 031/220] python38Packages.django-auth-ldap: 2.4.0 -> 3.0.0 --- pkgs/development/python-modules/django-auth-ldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index ed6ee01e34e0..f83bef6e931a 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.4.0"; + version = "3.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "60fcbfc3141c99c3c49d3ccd7311a3992a231c319d94b6d2c143968f63676676"; + sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; }; propagatedBuildInputs = [ ldap django ]; From 2c6642ddc406f6cf5dae9549a2a7fa243cb89207 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 13:14:07 +0000 Subject: [PATCH 032/220] python38Packages.django_reversion: 3.0.9 -> 4.0.0 --- pkgs/development/python-modules/django_reversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 6de1ce64328b..c470c863dfd6 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.9"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a5af55f086a3f9c38be2f049c251e06005b9ed48ba7a109473736b1fc95a066f"; + sha256 = "ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188"; }; # tests assume the availability of a mysql/postgresql database From c9be54ba97fc9bab0dd761211bf99d4b83fdb092 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 15:16:15 +0000 Subject: [PATCH 033/220] python38Packages.holoviews: 1.14.4 -> 1.14.5 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 0cf33a8f5804..e83bb4157ff8 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.4"; + version = "1.14.5"; src = fetchPypi { inherit pname version; - sha256 = "08e8be82c2e514e1700a75f02307f414179dc0ecfa2202702dd304a381909eaa"; + sha256 = "268e07c09012d24233d8957f0207b9aec33000b639e661ca50e68458d735e6be"; }; propagatedBuildInputs = [ From 5cca732abf167c95c434e4733793d276b5bdc399 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 16:37:26 +0000 Subject: [PATCH 034/220] jc: 1.16.0 -> 1.16.1 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index b09137d361b7..bf671fcb1bac 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.0"; + version = "1.16.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kh9FzMW5davxN8jNFFUh+PGSNAW7w8aeoJP25mGY10="; + sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; From beddf21f5d3cad13888739919d32d3175d4099e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 18:23:22 +0000 Subject: [PATCH 035/220] python38Packages.pytest-qt: 3.3.0 -> 4.0.2 --- pkgs/development/python-modules/pytest-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-qt/default.nix b/pkgs/development/python-modules/pytest-qt/default.nix index 4add58efbca3..23942b522358 100644 --- a/pkgs/development/python-modules/pytest-qt/default.nix +++ b/pkgs/development/python-modules/pytest-qt/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "3.3.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"; + sha256 = "dfc5240dec7eb43b76bcb5f9a87eecae6ef83592af49f3af5f1d5d093acaa93e"; }; nativeBuildInputs = [ From f2b6a2d112580a1df60ac9132c8a3b41291f7629 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 19:16:08 +0000 Subject: [PATCH 036/220] python38Packages.scikit-build: 0.11.1 -> 0.12.0 --- pkgs/development/python-modules/scikit-build/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 42f10aedf393..749e07ef840e 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.11.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; + sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; }; propagatedBuildInputs = [ From d1b607d38ae9e92c8ffeebc5df0942efe8414e58 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 20:10:59 +0000 Subject: [PATCH 037/220] python38Packages.wurlitzer: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/wurlitzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index f37d6de13595..f3b8d47debe8 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0144228960a992ef46e339e8aa560600bd34cd64e018bfebad88c0dd61bd8ba5"; + sha256 = "5a3ea5a13a8aac2d808864087fec87a0518bf7d9776173ab06a6bb4ade9f4d27"; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; From 2d665331c9c544c24a08d250e36f4bce0c64272c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:10:24 +0000 Subject: [PATCH 038/220] python38Packages.pdftotext: 2.1.6 -> 2.2.0 --- pkgs/development/python-modules/pdftotext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 400dc76c0d39..d64b2719f3d6 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "caf8ddbaeaf0a5897f07655a71747242addab2e695e84c5d47f2ea92dfe2a594"; + sha256 = "efbbfb14cf37ed7ab2c71936bae44707dfed6bb3be7ea5214e9c44c8c258c7af"; }; buildInputs = [ poppler ]; From 86bc67fdb5fd5c86f9c00515f0389604186c4e71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:21:29 +0000 Subject: [PATCH 039/220] python38Packages.perfplot: 0.9.6 -> 0.9.8 --- pkgs/development/python-modules/perfplot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 8e15cc0be8db..af653ed0c8da 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.9.6"; + version = "0.9.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = "v${version}"; - sha256 = "11f31d6xqxp04693symc2dl8890gjaycrb2a35y5xy023abwir5b"; + rev = version; + sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; }; format = "pyproject"; From 0a1f5eb55567fbb4675ea8e12a0069a1a1a7686e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:42:59 +0000 Subject: [PATCH 040/220] python38Packages.progress: 1.5 -> 1.6 --- pkgs/development/python-modules/progress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index fcc1a7a92293..801beaa44710 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5"; + version = "1.6"; pname = "progress"; src = fetchPypi { inherit pname version; - sha256 = "0wj3wvdgfmqj44n32wag3mzpp5fjqkkd321x67v1prxvs78yvv39"; + sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd"; }; checkPhase = '' From 1698c2ad6284f3afb632969fa3e3be720accd8d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 21:52:13 +0000 Subject: [PATCH 041/220] python38Packages.pybtex-docutils: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/pybtex-docutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybtex-docutils/default.nix b/pkgs/development/python-modules/pybtex-docutils/default.nix index 2dbd4e8cff58..a4abd26a043f 100644 --- a/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "pybtex-docutils"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e"; + sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626"; }; meta = with lib; { From 1b40521dd60952d19590301804dd25b063b74376 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 23:00:18 +0000 Subject: [PATCH 042/220] python38Packages.qtawesome: 1.0.2 -> 1.0.3 --- pkgs/development/python-modules/qtawesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index af9e724a9e00..0a024faf919f 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "771dd95ac4f50d647d18b4e892fd310a580b56d258476554c7b3498593dfd887"; + sha256 = "d37bbeb69ddc591e5ff036b741bda8d1d92133811f1f5a7150021506f70b8e6e"; }; propagatedBuildInputs = [ qtpy six ]; From 32729ab10cc097438f94690b930aef720cccfcb3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Aug 2021 23:56:08 +0000 Subject: [PATCH 043/220] python38Packages.qtconsole: 5.1.0 -> 5.1.1 --- 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 a5173a0a257d..5e63001013a5 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.1.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "12c734494901658787339dea9bbd82f3dc0d5e394071377a1c77b4a0954d7d8b"; + sha256 = "bbc34bca14f65535afcb401bc74b752bac955e5313001ba640383f7e5857dc49"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; From 9fd133cc879ca549ae91bdf06a0c8108921435d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 00:44:50 +0000 Subject: [PATCH 044/220] python38Packages.strictyaml: 1.4.2 -> 1.4.4 --- pkgs/development/python-modules/strictyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 30028a9599cf..cbd08934115c 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.4"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI="; + sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; }; postPatch = '' From fffc520d6e723f5e98253cb01e9d6a8ac3fb14a0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 01:45:44 +0000 Subject: [PATCH 045/220] python38Packages.websockify: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/websockify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index d3072e750419..af1cb3260475 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.0"; pname = "websockify"; src = fetchPypi { inherit pname version; - sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3"; + sha256 = "6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e"; }; propagatedBuildInputs = [ numpy ]; From 593e310399603038c433f2ed4388540e683c0eff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 03:00:17 +0000 Subject: [PATCH 046/220] python38Packages.Wand: 0.6.6 -> 0.6.7 --- pkgs/development/python-modules/Wand/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 4faedcada3b3..7b8ab874ebee 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.6"; + version = "0.6.7"; src = fetchPypi { inherit pname version; - sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e"; + sha256 = "ebc01bccc25dba68414ab55b482341f9ad2b197d7f49d5e724f339bbf63fb6db"; }; postPatch = '' From 7796697ca77de36554e7f7100d0b627b5b364988 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Aug 2021 10:38:54 +0200 Subject: [PATCH 047/220] python3Packages.feedgenerator: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/feedgenerator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index d5eb1306b398..652cef1b3c19 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9.1"; + version = "1.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0m6fjnrx3sd0bm6pnbhxxx5ywlwqh8bx0lka386kj28mg3fmm2m2"; + sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; }; buildInputs = [ glibcLocales ]; From dc137c8dab33c78d46ae36927a75ae735589761b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 Aug 2021 10:46:54 +0200 Subject: [PATCH 048/220] python3Packages.feedgenerator: enable tests --- .../python-modules/feedgenerator/default.nix | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index 652cef1b3c19..c1e988ca769a 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,23 +1,44 @@ -{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytestCheckHook +, pythonOlder +, pytz +, six +}: buildPythonPackage rec { pname = "feedgenerator"; version = "1.9.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; }; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ six pytz ]; + propagatedBuildInputs = [ + pytz + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "feedgenerator" ]; meta = with lib; { - description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; - homepage = "https://github.com/dmdm/feedgenerator-py3k.git"; + description = "Standalone version of Django's feedgenerator module"; + homepage = "https://github.com/getpelican/feedgenerator"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; } From 5e3d416dff8fe916cd9babb018c253fe7dee099a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 14:38:12 +0000 Subject: [PATCH 049/220] python38Packages.pymbolic: 2020.1 -> 2021.1 --- pkgs/development/python-modules/pymbolic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 23c88ca28d45..4faf04d289ee 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "ca029399f9480f6d51fbac0349fddbb42d937620deb03befa0ba94ac08895e6b"; + sha256 = "67d08ef95568408901e59f79591ba41fd3f2caaecb42b7497c38fc82fd60358c"; }; postConfigure = '' From 91635dea8fb9315f48e19e83a537706ab3c9051c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 15:09:39 +0000 Subject: [PATCH 050/220] python38Packages.stripe: 2.58.0 -> 2.60.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 7aa955e99e25..144be6c554ee 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.58.0"; + version = "2.60.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 = "34829b528e652ffc919d40eff2ba78021149818bab76e33c07801382921cf6d5"; + sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; }; propagatedBuildInputs = [ requests ]; From b2bf78e11b0d2b311e7bfc3998ae24797081f01d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 17:33:45 +0000 Subject: [PATCH 051/220] python38Packages.rq: 1.8.1 -> 1.9.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 e11a48f6a37d..c634aedce1ae 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.8.1"; + version = "1.9.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "1lfv3sb27v5xw3y67lirp877gg9230d28qmykxipvhcqwzqc2dqb"; + sha256 = "1drw7yqgsk1z9alv4hwj44a3sggmr20msdzdcdaxzdcqgb3qdpk8"; }; # test require a running redis rerver, which is something we can't do yet From 73fc08e168f82b812cf7334bae12f9a0bf3d0e53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 18:44:55 +0000 Subject: [PATCH 052/220] python38Packages.scikit-fmm: 2021.2.2 -> 2021.7.8 --- 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 08101bd2d00d..742c404a8454 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 = "2021.2.2"; + version = "2021.7.8"; src = fetchPypi { inherit pname version; - sha256 = "809e20016e6341e4de29b6be4befc477b7002cfd5e2a11b80deae16005f35670"; + sha256 = "f931a2600e7f0824ac51ebde86ee40295146cc1ad5f88fdc208b0a12fcb2ddb3"; }; propagatedBuildInputs = [ From e95db9d78b8e642c360ee8db69f5a2eee72e2b1d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 18:54:32 +0000 Subject: [PATCH 053/220] python38Packages.sounddevice: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 7787e8b16b85..9ada3c6603a7 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b"; + sha256 = "1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; From bd28b13dbd20b55a0e24e68c5719718e0f59574f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 19 Aug 2021 20:44:16 +0000 Subject: [PATCH 054/220] python38Packages.virtualenv-clone: 0.5.4 -> 0.5.6 --- pkgs/development/python-modules/virtualenv-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index 4dfebc13075f..d5f33d07614b 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.4"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; + sha256 = "997c7d225eabc4d09e77672461f4bdf9f3a8ea9dc9e4a847b0e83dc8bad9573a"; }; buildInputs = [ pytest ]; From ed82670030756d15f8ae12460d45fbfdba3105b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Aug 2021 16:32:50 +0000 Subject: [PATCH 055/220] bibclean: 3.04 -> 3.06 --- pkgs/tools/typesetting/bibclean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/bibclean/default.nix b/pkgs/tools/typesetting/bibclean/default.nix index 8c7e123acf73..400319571784 100644 --- a/pkgs/tools/typesetting/bibclean/default.nix +++ b/pkgs/tools/typesetting/bibclean/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibclean"; - version = "3.04"; + version = "3.06"; src = fetchurl { url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz"; - sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg"; + sha256 = "sha256-ZXT5uAQrqPoF6uVBazc4o1w40Sn0jnM+JYeOz7qq3kM="; }; postPatch = '' From 26deb4e3787cbfbd21e0e5aaaa4c26b21ba02cb6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Aug 2021 17:47:22 +0000 Subject: [PATCH 056/220] buf: 0.51.1 -> 0.52.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 f3271b0563df..8bc4aee935b9 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I="; + sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M="; }; - vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY="; + vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc="; patches = [ # Skip a test that requires networking to be available to work. From ca6a7f378d62558ab9474ab766ab8ca23bcfff5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Aug 2021 18:33:33 +0000 Subject: [PATCH 057/220] clojure: 1.10.3.933 -> 1.10.3.943 --- 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 3fca18f65a6e..659f9b87e619 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.933"; + version = "1.10.3.943"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA="; + sha256 = "sha256-w3DRvZsie22uoJMrNQTxN5hW0pIFjH5zAw5Z41I1M/s="; }; nativeBuildInputs = [ From 91b15b6dcfd2d394e707fdfaa10d563bbf2f8198 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 09:43:22 +0200 Subject: [PATCH 058/220] llvm_13: workaround for llvm bug 50611 https://bugs.llvm.org/show_bug.cgi?id=50611 --- pkgs/development/compilers/llvm/13/llvm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index daf4cfe808b6..a15bcc872a6d 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -52,6 +52,13 @@ in stdenv.mkDerivation (rec { patches = [ ./gnu-install-dirs.patch + + # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; + sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' From 48d1e393c03cfbb9c00979a28f99f9a8bd2dac94 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 9 Aug 2021 18:13:45 +0200 Subject: [PATCH 059/220] llvm_13: fix tests on non-x86 platforms --- pkgs/development/compilers/llvm/13/llvm/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index a15bcc872a6d..451dfa8463ef 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -59,6 +59,13 @@ in stdenv.mkDerivation (rec { sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; stripLen = 1; }) + + # Fix tests on non-x86 platforms: https://reviews.llvm.org/D107020 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5060224d9eed8b8359ed5090bb7c577b8575e9e7.patch"; + sha256 = "1s2n3pqa11pmlifys1jkppmw858p5i64xszpc8ppc98middv19v1"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' From b0f27ee74d36075656b6a9ff238254216d6c2687 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 09:42:33 +0200 Subject: [PATCH 060/220] llvmPackages_*: expose release_version --- pkgs/development/compilers/llvm/10/default.nix | 2 +- pkgs/development/compilers/llvm/11/default.nix | 2 +- pkgs/development/compilers/llvm/12/default.nix | 2 +- pkgs/development/compilers/llvm/13/default.nix | 2 +- pkgs/development/compilers/llvm/5/default.nix | 2 +- pkgs/development/compilers/llvm/6/default.nix | 2 +- pkgs/development/compilers/llvm/7/default.nix | 2 +- pkgs/development/compilers/llvm/8/default.nix | 2 +- pkgs/development/compilers/llvm/9/default.nix | 2 +- pkgs/development/compilers/llvm/git/default.nix | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 11367d453cde..690328b26ae2 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -259,4 +259,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix index 1aad123fba9a..661e60e24b18 100644 --- a/pkgs/development/compilers/llvm/11/default.nix +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -274,4 +274,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix index 212c6e52876f..388c7d95f69c 100644 --- a/pkgs/development/compilers/llvm/12/default.nix +++ b/pkgs/development/compilers/llvm/12/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 4b73e78c13fa..b65a8b2c710d 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -264,4 +264,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/5/default.nix b/pkgs/development/compilers/llvm/5/default.nix index d11c08329d54..8205c67da77a 100644 --- a/pkgs/development/compilers/llvm/5/default.nix +++ b/pkgs/development/compilers/llvm/5/default.nix @@ -121,4 +121,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/6/default.nix b/pkgs/development/compilers/llvm/6/default.nix index a0cc84d8d733..7651b5ab13dc 100644 --- a/pkgs/development/compilers/llvm/6/default.nix +++ b/pkgs/development/compilers/llvm/6/default.nix @@ -122,4 +122,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 4057f206caf1..6864353424f1 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -268,4 +268,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/8/default.nix b/pkgs/development/compilers/llvm/8/default.nix index a7a293cfbbf6..34f204be3315 100644 --- a/pkgs/development/compilers/llvm/8/default.nix +++ b/pkgs/development/compilers/llvm/8/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/9/default.nix b/pkgs/development/compilers/llvm/9/default.nix index 8521354dbb8e..8468fc363818 100644 --- a/pkgs/development/compilers/llvm/9/default.nix +++ b/pkgs/development/compilers/llvm/9/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/git/default.nix b/pkgs/development/compilers/llvm/git/default.nix index 5ef24f8f45b1..43c85622cad0 100644 --- a/pkgs/development/compilers/llvm/git/default.nix +++ b/pkgs/development/compilers/llvm/git/default.nix @@ -264,4 +264,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools From f8230bb0f482e639b09d84c2ffaf2ca95c179427 Mon Sep 17 00:00:00 2001 From: Yureka Date: Tue, 10 Aug 2021 17:25:21 +0200 Subject: [PATCH 061/220] llvmPackages_13.libcxx: mark as broken on darwin --- pkgs/development/compilers/llvm/13/libcxx/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/libcxx/default.nix b/pkgs/development/compilers/llvm/13/libcxx/default.nix index f511eba81dc5..c60039274deb 100644 --- a/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { libc++ is an implementation of the C++ standard library, targeting C++11, C++14 and above. ''; + + # https://github.com/NixOS/nixpkgs/pull/133217#issuecomment-895742807 + broken = stdenv.isDarwin; + # "All of the code in libc++ is dual licensed under the MIT license and the # UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; From d6869f323616cd207a458490722caa269e8b9977 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 23 Jul 2021 01:32:07 +0000 Subject: [PATCH 062/220] binaryen: 99 -> 101 --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index ee47ebd98887..533be220633f 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "99"; + version = "101"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "1a6ixxm1f8mrr9mn6a0pimajdzsdr4w1qhr92skxq67168vvc1ic"; + sha256 = "sha256-rNiZQIQqNbc1P2A6UTn0dRHeT3BS+nv1o81aPaJy+5U="; }; nativeBuildInputs = [ cmake python3 ]; From e58961c122f85899db484181416bd0958acb2725 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 20 Aug 2021 21:26:48 +0000 Subject: [PATCH 063/220] cglm: 0.8.3 -> 0.8.4 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index a1c90f6b463b..dfc9f81edb62 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v"; + sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0="; }; nativeBuildInputs = [ cmake ]; From ae9337179b73290cfe9a057d40a0f1c08c8365ed Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 20 Aug 2021 23:31:26 +0200 Subject: [PATCH 064/220] vm: deprecate phases --- pkgs/build-support/vm/default.nix | 4 +++- pkgs/build-support/vm/test.nix | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cfc19c03cfdd..3a52d756571c 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -494,7 +494,9 @@ rec { tarball must contain an RPM specfile. */ buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ - phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; + prePhases = [ prepareImagePhase sysInfoPhase ]; + dontUnpack = true; + dontConfigure = true; outDir = "rpms/${attrs.diskImage.name}"; diff --git a/pkgs/build-support/vm/test.nix b/pkgs/build-support/vm/test.nix index 698503032671..1a29554ee80c 100644 --- a/pkgs/build-support/vm/test.nix +++ b/pkgs/build-support/vm/test.nix @@ -1,4 +1,4 @@ -with import ../../.. {}; +with import ../../.. { }; with vmTools; { @@ -30,7 +30,7 @@ with vmTools; src = patchelf.src; diskImage = diskImages.ubuntu1204i386; memSize = 512; - phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; + prePhases = [ sysInfoPhase ]; sysInfoPhase = '' dpkg-query --list ''; From 691464d1209fd6cc1ce41b5596064c21955fe008 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 09:45:26 +0200 Subject: [PATCH 065/220] emscripten: 2.0.10 -> 2.0.27 --- ...-emulate-clang-sysroot-include-logic.patch | 42 + .../compilers/emscripten/default.nix | 35 +- .../compilers/emscripten/package.json | 18 +- .../compilers/emscripten/yarn.lock | 792 ++++++++++++++-- .../development/compilers/emscripten/yarn.nix | 872 ++++++++++++++++-- pkgs/top-level/all-packages.nix | 4 +- 6 files changed, 1606 insertions(+), 157 deletions(-) create mode 100644 pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch diff --git a/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch new file mode 100644 index 000000000000..9cb3ca2bf9f6 --- /dev/null +++ b/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -0,0 +1,42 @@ +From 67f54fde2b1683aae3800f7a86a4e507c1125be8 Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Sat, 7 Aug 2021 09:16:46 +0200 +Subject: [PATCH] emulate clang 'sysroot + /include' logic + +Authored-By: Alexander Khovansky +Co-Authored-By: Yureka + +Clang provided by nix patches out logic that appends 'sysroot + /include' +to the include path as well as automatic inclusion of libcxx includes (/include/c++/v1). +The patch below adds that logic back by introducing cflags emulating this behavior to emcc +invocations directly. + +Important note: with non-nix clang, sysroot/include dir ends up being the last +in the include search order, right after the resource root. +Hence usage of -idirafter. Clang also documents an -isystem-after flag +but it doesn't appear to work +--- + emcc.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/emcc.py b/emcc.py +index 999314afc..0e23c066c 100755 +--- a/emcc.py ++++ b/emcc.py +@@ -759,7 +759,12 @@ def emsdk_ldflags(user_args): + + + def emsdk_cflags(user_args): +- cflags = ['--sysroot=' + shared.Cache.get_sysroot(absolute=True)] ++ cflags = [ ++ '--sysroot=' + shared.Cache.get_sysroot(absolute=True), ++ '-resource-dir=@resourceDir@', ++ '-idirafter' + shared.Cache.get_sysroot(absolute=True) + os.path.join('/include'), ++ '-iwithsysroot' + os.path.join('/include','c++','v1') ++ ] + + def array_contains_any_of(hay, needles): + for n in needles: +-- +2.32.0 + diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 84520ca52e08..c514b86a6c42 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen -, llvmPackages_11 -, symlinkJoin, makeWrapper +, llvmPackages +, symlinkJoin, makeWrapper, substituteAll , mkYarnModules }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.10"; + version = "2.0.27"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages_11; [ clang-unwrapped lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; }; nodeModules = mkYarnModules { @@ -26,27 +26,32 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk"; + sha256 = "1dpfib2nmbvskqlaqw3kvaay69qpa7d155hd4w05c2xgmahmrd4n"; rev = version; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nodejs python3 ]; + patches = [ + (substituteAll { + src = ./0001-emulate-clang-sysroot-include-logic.patch; + resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; + }) + ]; + buildPhase = '' + runHook preBuild + patchShebangs . # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py # disables cache in user home, use installation directory instead - sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py + sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py - # super ugly: monkeypatch to add sysroot/include to the include - # path because they are otherwise not part of Nix's clang. - sed -i "490a\\ '/include'," tools/shared.py - # required for wasm2c ln -s ${nodeModules}/node_modules . @@ -66,19 +71,19 @@ stdenv.mkDerivation rec { sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py - # The tests use the C compiler to compile generated C code, - # use the wrapped compiler - sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py + runHook postBuild ''; installPhase = '' + runHook preInstall + appdir=$out/share/emscripten mkdir -p $appdir cp -r . $appdir chmod -R +w $appdir mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ @@ -107,6 +112,8 @@ stdenv.mkDerivation rec { pushd $appdir python tests/runner.py test_hello_world popd + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json index 36cd2efe27a0..1102fd62ef2a 100644 --- a/pkgs/development/compilers/emscripten/package.json +++ b/pkgs/development/compilers/emscripten/package.json @@ -1,15 +1,21 @@ { "name": "emscripten", - "version": "2.0.10", + "version": "2.0.26", + "private": true, "devDependencies": { - "es-check": "^5.1.0", + "es-check": "^5.2.4", + "eslint": "^7.29.0", + "eslint-config-google": "^0.14.0", + "source-map": "0.5.7", "ws": "~0.4.28" }, "dependencies": { - "acorn": "7.3.1", - "google-closure-compiler": "20200920.0.0", - "html-minifier-terser": "5.0.2", - "source-map": "0.5.6", + "acorn": "8.4.1", + "google-closure-compiler": "20210601.0.0", + "html-minifier-terser": "5.1.1", "wasm2c": "1.0.0" + }, + "scripts": { + "lint": "eslint src/parseTools.js" } } diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock index 948fcd4ed7f1..0e8853952950 100644 --- a/pkgs/development/compilers/emscripten/yarn.lock +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -2,16 +2,87 @@ # yarn lockfile v1 -acorn@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" - integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" + integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== + +"@babel/highlight@^7.10.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn@8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -27,6 +98,11 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -39,6 +115,13 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + ansi@^0.3.0, ansi@~0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" @@ -52,6 +135,18 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" @@ -80,13 +175,18 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -camel-case@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camel-case@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: - no-case "^2.2.0" - upper-case "^1.1.1" + pascal-case "^3.1.2" + tslib "^2.0.3" caporal@1.4.0: version "1.4.0" @@ -103,7 +203,7 @@ caporal@1.4.0: tabtab "^2.2.2" winston "^2.3.1" -chalk@2.x: +chalk@2.x, chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -123,7 +223,15 @@ chalk@^1.0.0: strip-ansi "^3.0.0" supports-color "^2.0.0" -clean-css@^4.2.1: +chalk@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +clean-css@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== @@ -188,11 +296,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== + colorette@^1.0.1: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" @@ -213,7 +333,7 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.0: +commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== @@ -243,6 +363,15 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" @@ -255,12 +384,51 @@ debug@^2.2.0: dependencies: ms "2.0.0" +debug@^4.0.1, debug@^4.1.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +deep-is@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -es-check@^5.1.0: +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +es-check@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz#76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7" integrity sha512-FZ3qAJ9hwguqPvGGagaKAVDnusSkezeHbiKNM5rOepOjloeVuX2e6meMxQ+mKcnWbAFucCG7fszNrzUT8bvHcQ== @@ -274,6 +442,129 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-config-google@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a" + integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint@^7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -298,6 +589,16 @@ eyes@0.1.x: resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -311,11 +612,36 @@ figures@^1.3.5: escape-string-regexp "^1.0.5" object-assign "^4.1.0" +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + gauge@~1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" @@ -327,7 +653,14 @@ gauge@~1.2.5: lodash.padend "^4.1.0" lodash.padstart "^4.1.0" -glob@^7.1.2: +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.2, glob@^7.1.3: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -339,40 +672,47 @@ glob@^7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -google-closure-compiler-java@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz#23519b14e004f2a9eda4f5b887842ae46ad7022e" - integrity sha512-q8m/+QLBWrzjg5VZ2b4B628zDvbi0Gyenj9bvZQlPY7mqj68HXhe5aOfKzZO7vXgHDXMvsvI3v/1g5mPAku/5w== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + dependencies: + type-fest "^0.20.2" -google-closure-compiler-linux@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz#622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b" - integrity sha512-F5HcTbeklcaxdWzlZu5b1ZKzCt1kSBUWsBfvlrDCFkA2pdBxIIC2VPokGAUZCqlfno2J2gYARz8FNCrx0tCx5g== +google-closure-compiler-java@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz#88dc11b334bee6a704d9674c5143fd2e0d553517" + integrity sha512-bH6nIwOmp4qDWvlbXx5/DE3XA2aDGQoCpmRYZJGONY1Sy6Xfbq0ioXRHH9eBDP9hxhCJ5Sd/K89A0NZ8Nz9RJA== -google-closure-compiler-osx@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz#6157a06e7d851d25d60de95c4bcd464d768278b1" - integrity sha512-2WY+HaUWVQNg9WZs9d4Op3zvS6yIVN2AIouU4grwYWXfFk+CMXZou0ASlsOURaYc2WZ22LW/G1w3vINDoCkSww== +google-closure-compiler-linux@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz#6e5dd7b00b96dc1fd1ba30e3401af85558768322" + integrity sha512-rnEQt7zz/1P1SfPhJiHQpfCgMPrsVVyEgDs09h67xn6+LXa9L0RP+hrJDEHqSWwjDPz0BkfUUv6zkqZvp1h/lw== -google-closure-compiler-windows@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz#755ddeb8032530c6ed13962e328d9af3269d0748" - integrity sha512-0c4Dem3em3ASNpcR/2USx1Kvb+I7L2MvsV1IZ5Pu98jTuhnkmlccQqPzk2rZR6lllVbVFXTb6tju0JxZ7Zoxjg== +google-closure-compiler-osx@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz#e23356bc9ef6e68c2980f60a207f603767b50b21" + integrity sha512-A5r4s/WthR2iLMM0mxsluw8EW2AcOomC5ri/H6FjzpMq0RVEnLTgaGYdXolUAfEzH/7XtJJT2+JkYk3HSLCtrg== -google-closure-compiler@20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz#e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3" - integrity sha512-IOC77xL3+pYcAM+OVfcILKdrZNEy767JmpdVs2sq3I9+4JoHeKaJrmQXgbcXN2reUmzBw5b5m9Kd036Cr8ouBA== +google-closure-compiler-windows@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz#b5400d06bbf0bbd2602ee3ae0c2bc7ebd5829692" + integrity sha512-6r94bPShnB0XXh9+5/qXGDHJN2PQGhF9yJPcgBZj+FAZlQGzlYkT0pkyp+loZT3lG+YRbjD28Lgo7xMcY4xgkA== + +google-closure-compiler@20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz#34597c33c9285ebd3a5364f5299f6c9ddc9fc88a" + integrity sha512-lzzEoG2VTB7uUjnWnMyeZMU163w69HJpM27yh8Up9Ha5McHZeESjt3NRwU8cWMbCRdY06nFbRCDIVCRcadHCiw== dependencies: chalk "2.x" - google-closure-compiler-java "^20200920.0.0" + google-closure-compiler-java "^20210601.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20200920.0.0" - google-closure-compiler-osx "^20200920.0.0" - google-closure-compiler-windows "^20200920.0.0" + google-closure-compiler-linux "^20210601.0.0" + google-closure-compiler-osx "^20210601.0.0" + google-closure-compiler-windows "^20210601.0.0" has-ansi@^2.0.0: version "2.0.0" @@ -386,6 +726,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -396,18 +741,36 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -html-minifier-terser@5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16" - integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ== +html-minifier-terser@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" + integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^4.0.0" + camel-case "^4.1.1" + clean-css "^4.2.3" + commander "^4.1.1" he "^1.2.0" - param-case "^2.1.1" + param-case "^3.0.3" relateurl "^0.2.7" - terser "^4.3.9" + terser "^4.6.3" + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= inflight@^1.0.4: version "1.0.6" @@ -442,6 +805,11 @@ inquirer@^1.0.2: strip-ansi "^3.0.0" through "^2.3.6" +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -454,26 +822,89 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.0, is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + isstream@0.1.x: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.difference@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.pad@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" @@ -489,6 +920,11 @@ lodash.padstart@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -499,10 +935,19 @@ lodash@^4.17.14, lodash@^4.3.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== + dependencies: + tslib "^2.0.3" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" micromist@1.1.0: version "1.1.0" @@ -535,6 +980,11 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + mute-stream@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" @@ -545,12 +995,18 @@ nan@~1.0.0: resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg= -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: - lower-case "^1.1.1" + lower-case "^2.0.2" + tslib "^2.0.3" npmlog@^2.0.3: version "2.0.4" @@ -583,6 +1039,18 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -598,18 +1066,39 @@ os-tmpdir@~1.0.1: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -param-case@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= +param-case@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: - no-case "^2.2.0" + dot-case "^3.0.4" + tslib "^2.0.3" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -622,6 +1111,11 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prettyjson@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289" @@ -635,6 +1129,16 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -648,6 +1152,11 @@ readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" @@ -663,6 +1172,16 @@ replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -671,6 +1190,13 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + run-async@^2.2.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -686,6 +1212,34 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +semver@^7.2.1: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + source-map-support@~0.5.12: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -694,12 +1248,7 @@ source-map-support@~0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@0.5.6: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - integrity sha1-dc449SvwczxafwwRjYEzSiu19BI= - -source-map@^0.5.1: +source-map@0.5.7, source-map@^0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -717,6 +1266,11 @@ spawn-sync@^1.0.15: concat-stream "^1.4.7" os-shim "^0.1.2" +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -739,6 +1293,15 @@ string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -760,6 +1323,18 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -772,6 +1347,25 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + tabtab@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14" @@ -786,7 +1380,7 @@ tabtab@^2.2.2: npmlog "^2.0.3" object-assign "^4.1.0" -terser@^4.3.9: +terser@^4.6.3: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -795,6 +1389,11 @@ terser@^4.3.9: source-map "~0.6.1" source-map-support "~0.5.12" +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -812,21 +1411,45 @@ tmp@^0.0.29: dependencies: os-tmpdir "~1.0.1" +tslib@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +v8-compile-cache@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + vinyl-sourcemaps-apply@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" @@ -835,9 +1458,9 @@ vinyl-sourcemaps-apply@^0.2.0: source-map "^0.5.1" vinyl@2.x: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" + integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== dependencies: clone "^2.1.1" clone-buffer "^1.0.0" @@ -851,6 +1474,13 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + winston@^2.3.1: version "2.4.5" resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" @@ -863,6 +1493,11 @@ winston@^2.3.1: isstream "0.1.x" stack-trace "0.0.x" +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -877,3 +1512,8 @@ ws@~0.4.28: nan "~1.0.0" options ">=0.0.5" tinycolor "0.x" + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix index f053d5f30c7a..e4281f4856ad 100644 --- a/pkgs/development/compilers/emscripten/yarn.nix +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -2,11 +2,51 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "acorn___acorn_7.3.1.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "acorn___acorn_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; - sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; }; } { @@ -17,6 +57,38 @@ sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; }; } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ajv___ajv_8.6.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz"; + sha1 = "60cc45d9c46a477d80d92c48076d972c342e5720"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } { name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; path = fetchurl { @@ -41,6 +113,14 @@ sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { @@ -57,6 +137,14 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } { name = "ansi___ansi_0.3.1.tgz"; path = fetchurl { @@ -73,6 +161,22 @@ sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; }; } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + }; + } { name = "async___async_1.0.0.tgz"; path = fetchurl { @@ -114,11 +218,19 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camel_case___camel_case_4.1.2.tgz"; + path = fetchurl { + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -145,6 +257,14 @@ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + }; + } { name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { @@ -225,6 +345,14 @@ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; }; } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { @@ -233,6 +361,14 @@ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } { name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { @@ -305,6 +441,14 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } { name = "cycle___cycle_1.0.3.tgz"; path = fetchurl { @@ -321,6 +465,22 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } { name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { @@ -329,6 +489,38 @@ sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dot_case___dot_case_3.0.4.tgz"; + path = fetchurl { + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } { name = "es_check___es_check_5.2.4.tgz"; path = fetchurl { @@ -345,6 +537,118 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz"; + sha1 = "4f5f8759ba6e11b424294a219dbfa18c508bcc1a"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + }; + } + { + name = "eslint___eslint_7.29.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz"; + sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } { name = "exit_hook___exit_hook_1.1.1.tgz"; path = fetchurl { @@ -377,6 +681,22 @@ sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; path = fetchurl { @@ -393,6 +713,30 @@ sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; }; } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } + { + name = "flatted___flatted_3.1.1.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + }; + } { name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { @@ -401,6 +745,14 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } { name = "gauge___gauge_1.2.7.tgz"; path = fetchurl { @@ -409,6 +761,14 @@ sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; }; } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } { name = "glob___glob_7.1.7.tgz"; path = fetchurl { @@ -418,43 +778,51 @@ }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz"; - sha1 = "23519b14e004f2a9eda4f5b887842ae46ad7022e"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + name = "google_closure_compiler_java___google_closure_compiler_java_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz"; - sha1 = "622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b"; + name = "google_closure_compiler_java___google_closure_compiler_java_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz"; + sha1 = "88dc11b334bee6a704d9674c5143fd2e0d553517"; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz"; - sha1 = "6157a06e7d851d25d60de95c4bcd464d768278b1"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz"; + sha1 = "6e5dd7b00b96dc1fd1ba30e3401af85558768322"; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz"; - sha1 = "755ddeb8032530c6ed13962e328d9af3269d0748"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz"; + sha1 = "e23356bc9ef6e68c2980f60a207f603767b50b21"; }; } { - name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz"; - sha1 = "e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz"; + sha1 = "b5400d06bbf0bbd2602ee3ae0c2bc7ebd5829692"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20210601.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz"; + sha1 = "34597c33c9285ebd3a5364f5299f6c9ddc9fc88a"; }; } { @@ -473,6 +841,14 @@ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -490,11 +866,35 @@ }; } { - name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz"; - sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } { @@ -521,6 +921,14 @@ sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; path = fetchurl { @@ -537,6 +945,22 @@ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -545,6 +969,14 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { @@ -553,6 +985,54 @@ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; path = fetchurl { @@ -561,6 +1041,14 @@ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } { name = "lodash.difference___lodash.difference_4.5.0.tgz"; path = fetchurl { @@ -569,6 +1057,14 @@ sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; }; } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } { name = "lodash.pad___lodash.pad_4.5.1.tgz"; path = fetchurl { @@ -593,6 +1089,14 @@ sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { @@ -610,11 +1114,19 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; }; } { @@ -657,6 +1169,14 @@ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } { name = "mute_stream___mute_stream_0.0.6.tgz"; path = fetchurl { @@ -674,11 +1194,19 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "no_case___no_case_3.0.4.tgz"; + path = fetchurl { + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -721,6 +1249,14 @@ sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } { name = "options___options_0.0.6.tgz"; path = fetchurl { @@ -746,11 +1282,27 @@ }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "pascal_case___pascal_case_3.1.2.tgz"; + path = fetchurl { + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -761,6 +1313,14 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } { name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; path = fetchurl { @@ -777,6 +1337,14 @@ sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; }; } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } { name = "prettyjson___prettyjson_1.2.1.tgz"; path = fetchurl { @@ -793,6 +1361,22 @@ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; }; } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } { name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { @@ -801,6 +1385,14 @@ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } + { + name = "regexpp___regexpp_3.2.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; + }; + } { name = "relateurl___relateurl_0.2.7.tgz"; path = fetchurl { @@ -825,6 +1417,22 @@ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a"; }; } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } { name = "restore_cursor___restore_cursor_1.0.1.tgz"; path = fetchurl { @@ -833,6 +1441,14 @@ sha1 = "34661f46886327fed2991479152252df92daa541"; }; } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } { name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { @@ -857,6 +1473,38 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + }; + } { name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { @@ -865,14 +1513,6 @@ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } - { - name = "source_map___source_map_0.5.6.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - } { name = "source_map___source_map_0.5.7.tgz"; path = fetchurl { @@ -897,6 +1537,14 @@ sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { @@ -921,6 +1569,14 @@ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -945,6 +1601,22 @@ sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -961,6 +1633,22 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; + }; + } { name = "tabtab___tabtab_2.2.2.tgz"; path = fetchurl { @@ -977,6 +1665,14 @@ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } { name = "through___through_2.3.8.tgz"; path = fetchurl { @@ -1001,6 +1697,30 @@ sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; }; } + { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha1 = "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { @@ -1010,11 +1730,11 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -1025,6 +1745,14 @@ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } { name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; path = fetchurl { @@ -1034,11 +1762,11 @@ }; } { - name = "vinyl___vinyl_2.2.0.tgz"; + name = "vinyl___vinyl_2.2.1.tgz"; path = fetchurl { - name = "vinyl___vinyl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; - sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; + name = "vinyl___vinyl_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz"; + sha1 = "23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"; }; } { @@ -1049,6 +1777,14 @@ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"; }; } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } { name = "winston___winston_2.4.5.tgz"; path = fetchurl { @@ -1057,6 +1793,14 @@ sha1 = "f2e431d56154c4ea765545fc1003bd340c95b59a"; }; } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -1073,5 +1817,13 @@ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b326575a8a7..36e105e85d3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4580,7 +4580,9 @@ with pkgs; choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { }; + emscripten = callPackage ../development/compilers/emscripten { + llvmPackages = llvmPackages_13; + }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); From 0d8f36923a50eeb318e1c81a22ac6eb80622d3f5 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 13:22:12 +0200 Subject: [PATCH 066/220] emscriptenPackages.zlib: fix checks Co-authored-by: Alexander Khovansky --- pkgs/top-level/emscripten-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 9ae97cdf35a0..0d2197faae09 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -163,7 +163,7 @@ rec { echo "Compiling a custom test" set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js + -L. libz.so.${old.version} -I . -o example.js echo "Using node to execute the test" ${pkgs.nodejs}/bin/node ./example.js From d7ac3b473afff8000338f1038e78a22556a5c4a3 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sat, 7 Aug 2021 13:26:45 +0200 Subject: [PATCH 067/220] emscriptenPackages.json_c: fix build Co-authored-by: Alexander Khovansky --- pkgs/top-level/emscripten-packages.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/emscripten-packages.nix b/pkgs/top-level/emscripten-packages.nix index 0d2197faae09..7cf60df98dbf 100644 --- a/pkgs/top-level/emscripten-packages.nix +++ b/pkgs/top-level/emscripten-packages.nix @@ -10,12 +10,11 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' HOME=$TMPDIR - emconfigure ./configure --prefix=$out + emcmake cmake . $cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_INSTALL_INCLUDEDIR=$dev/include ''; checkPhase = '' echo "================= testing json_c using node =================" @@ -26,7 +25,7 @@ rec { `pkg-config zlib --cflags` \ `pkg-config zlib --libs` \ -I . \ - .libs/libjson-c.so \ + libjson-c.a \ -o ./test1.js echo "Using node to execute the test which basically outputs an error on stderr which we grep for" From 507ed3a6dfb07c86d48d6831906790199d37e95a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 12:41:15 +0000 Subject: [PATCH 068/220] python38Packages.azure-mgmt-web: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index b2643eb336c8..9fc5abe968bd 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "274239993a4705c9e1135842137d77a703f63d14ee5c1a5ee87fe1f8a471a061"; + sha256 = "e57437a933e7dea9b0618fe790e0dadc63f9857735361ac8b5f5e8062b9c2a0d"; }; propagatedBuildInputs = [ From e2386f2aeb5c42159e02a3afaee7fd716f3819f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 21 Aug 2021 21:22:40 +0200 Subject: [PATCH 069/220] python3Packages.testfixtures: 6.18.0 -> 6.18.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 525f23f290ba..c330b5e18b89 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.0"; + version = "6.18.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1L0cT5DqyQpz4b3FnDHQOUPyGNaH88WgnkhHiEGor18="; + sha256 = "sha256-CmQic39tibRc3vHi31V29SrQ9QeVYALOECDaqfRCEdY="; }; checkInputs = [ From 6745446b7145edbf5751a7ba0391e296f2b4826b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 21:30:24 +0000 Subject: [PATCH 070/220] docker-buildx: 0.6.1 -> 0.6.2 --- pkgs/applications/virtualization/docker/buildx.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 4cdb253505b0..89b6ed483840 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE="; + sha256 = "sha256-HaQJAVH8N5wZ7G/LcmGYz3Hph0/pHfEY3KObv18K1qg="; }; vendorSha256 = null; From 7c0b3afddb1ef10a9cefe51a8940399466bf2f80 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 21:44:22 +0000 Subject: [PATCH 071/220] zotero: 5.0.96.2 -> 5.0.96.3 --- pkgs/applications/office/zotero/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 53f021344d89..74f05a0b4025 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96.2"; + version = "5.0.96.3"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III="; + sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; }; nativeBuildInputs = [ wrapGAppsHook ]; From 18cd0e97009e7658b59cf0bdcdc6b352ee4712b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 21:52:32 +0000 Subject: [PATCH 072/220] tinyobjloader: 1.0.6 -> 1.0.7 --- pkgs/development/libraries/tinyobjloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tinyobjloader/default.nix b/pkgs/development/libraries/tinyobjloader/default.nix index ad4a999e45cd..113e5f5ae95a 100644 --- a/pkgs/development/libraries/tinyobjloader/default.nix +++ b/pkgs/development/libraries/tinyobjloader/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tinyobjloader"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tinyobjloader"; repo = "tinyobjloader"; rev = "v${version}"; - sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis"; + sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc="; }; nativeBuildInputs = [ cmake ]; From 763f92278b75bec84f7374db0ed2b1c95da838bc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 03:46:27 +0000 Subject: [PATCH 073/220] python38Packages.pyodbc: 4.0.31 -> 4.0.32 --- pkgs/development/python-modules/pyodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 08ee6db35ec7..37e7137d3b8f 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.31"; + version = "4.0.32"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "89256e79d23415887cacf0a821f9f94baa5d833080521d456687d5e88c40c226"; + sha256 = "9be5f0c3590655e1968488410fe3528bb8023d527e7ccec1f663d64245071a6b"; }; buildInputs = [ unixODBC ]; From 0e7b7bc224d5a1db10006f6b40b801f8b629e659 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 04:28:07 +0000 Subject: [PATCH 074/220] python38Packages.yamllint: 1.26.2 -> 1.26.3 --- pkgs/development/python-modules/yamllint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index cd314b60a8ac..0204b0f92968 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.2"; + version = "1.26.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CwipZ1Akj98h8egZPLd4dVTvde1Xsn9iHNazvwmvEaE="; + sha256 = "3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e"; }; propagatedBuildInputs = [ From 1aa8a9fe452421791f76f0bef61c009c99ac9032 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 04:28:58 +0000 Subject: [PATCH 075/220] keycloak: 15.0.1 -> 15.0.2 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index f8e9ec33cf77..cd8373f0842b 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.0.1"; + version = "15.0.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8="; + sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY="; }; nativeBuildInputs = [ makeWrapper ]; From 37e2d2e7186223844bbe48e724248e00afaeb57c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 05:53:24 +0000 Subject: [PATCH 076/220] supercollider: 3.11.2 -> 3.12.0 --- pkgs/development/interpreters/supercollider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/supercollider/default.nix b/pkgs/development/interpreters/supercollider/default.nix index fc8d8f1652de..09e97a65e664 100644 --- a/pkgs/development/interpreters/supercollider/default.nix +++ b/pkgs/development/interpreters/supercollider/default.nix @@ -9,11 +9,11 @@ let in mkDerivation rec { pname = "supercollider"; - version = "3.11.2"; + version = "3.12.0"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "wiwyxrxIJnHU+49RZy33Etl6amJ3I1xNojEpEDA6BQY="; + sha256 = "sha256-RgCL50pyjNgy+H+Crvfgds86pmTao2FS+IF3gRHu5NM="; }; hardeningDisable = [ "stackprotector" ]; From 8e6b31922e1f05a29a7ff7e7443dcc22ffa65cf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 08:00:58 +0000 Subject: [PATCH 077/220] nwg-drawer: 0.1.4 -> 0.1.7 --- pkgs/applications/misc/nwg-drawer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nwg-drawer/default.nix b/pkgs/applications/misc/nwg-drawer/default.nix index 4e6518c6ffd2..efe4740d7737 100644 --- a/pkgs/applications/misc/nwg-drawer/default.nix +++ b/pkgs/applications/misc/nwg-drawer/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg="; + sha256 = "sha256-WUYWS0pkYJwXadhlZDHIl9BuirLTu5TNITZ+cBMArVw="; }; vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; From a0871ca21c6888a09fff1060a425ea375d623d7e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 08:46:20 +0000 Subject: [PATCH 078/220] python38Packages.pycuda: 2020.1 -> 2021.1 --- pkgs/development/python-modules/pycuda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 5bf9114d6937..cdd07e86110b 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -22,11 +22,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5"; + sha256 = "ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed"; }; preConfigure = with lib.versions; '' From 01a88ed7bdb91e6a50288e667fb2ad5b1bab9419 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:01:19 +0000 Subject: [PATCH 079/220] python38Packages.pyviz-comms: 0.7.6 -> 2.1.0 --- 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 e9e07de4df2d..3b96fbc50ec3 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.6"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zZZJqeqd/LmzTXj5pk4YcKqLa5TeVG4smca7U9ZKtdE="; + sha256 = "f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0"; }; propagatedBuildInputs = [ param ]; From 43a7082da72647c6a18bc3353ffa4bb87a7a5743 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:25:50 +0000 Subject: [PATCH 080/220] python38Packages.sopel: 7.1.2 -> 7.1.3 --- pkgs/development/python-modules/sopel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 54fc243be262..d4052d8b12c8 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.2"; + version = "7.1.3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA="; + sha256 = "0f9e673a7eac9dd3619c2e398e58fa2d8117afca5adb550ba07c66e16a90dbdb"; }; propagatedBuildInputs = [ From c76c9bb0e2e8b4a54ac00e5498161c1964b90af7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:32:26 +0000 Subject: [PATCH 081/220] python38Packages.tensorboardx: 2.2 -> 2.4 --- 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 6d04506cf8cc..603d2a1cc2b2 100644 --- a/pkgs/development/python-modules/tensorboardx/default.nix +++ b/pkgs/development/python-modules/tensorboardx/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; rev = "v${version}"; - sha256 = "0wjlh5fhamrrff3rm8j5ws9ncblwjgwf3nanxgr1bkn7asgynhys"; + sha256 = "1kcw062bcqvqva5kag9j7q72wk3vdqgf5cnn0lxmsvhlmq5sjdfn"; }; # apparently torch API changed a bit at 1.6 From 14d2188027164f3721be4e3b8e09208cdb99683b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 12:29:01 +0000 Subject: [PATCH 082/220] python38Packages.seaborn: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/seaborn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/seaborn/default.nix b/pkgs/development/python-modules/seaborn/default.nix index 8c771ea286cb..a57acebb4ad2 100644 --- a/pkgs/development/python-modules/seaborn/default.nix +++ b/pkgs/development/python-modules/seaborn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.11.1"; + version = "0.11.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "44e78eaed937c5a87fc7a892c329a7cc091060b67ebd1d0d306b446a74ba01ad"; + sha256 = "cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6"; }; checkInputs = [ nose ]; From bf916a8a99e46bb0eff7be1851ee089d5f4fe7d3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 13:45:32 +0000 Subject: [PATCH 083/220] seaweedfs: 2.56 -> 2.63 --- pkgs/applications/networking/seaweedfs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index 36518db09917..40cf26962a17 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.56"; + version = "2.63"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "1y9abk2i0qk5c00dnw8wvasy7dmmy6az8d1cf9bq0dwh8g8kylbn"; + sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU="; }; - vendorSha256 = "015qvd0h786z1iwv81i107z92mqhzldp1hkcsp75wzf4j7nmzxvf"; + vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE="; subPackages = [ "weed" ]; From d031843a1eee244172570c64c9e238641563e68e Mon Sep 17 00:00:00 2001 From: Luis-Hebendanz Date: Sun, 22 Aug 2021 22:17:44 +0200 Subject: [PATCH 084/220] firefox: Added checks for new addon behaviour since v91 --- doc/builders/packages/firefox.section.md | 7 +++++-- nixos/doc/manual/from_md/release-notes/rl-2111.section.xml | 6 ++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 3 +++ pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 +++- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/doc/builders/packages/firefox.section.md b/doc/builders/packages/firefox.section.md index b7c430db232d..d6426981da7d 100644 --- a/doc/builders/packages/firefox.section.md +++ b/doc/builders/packages/firefox.section.md @@ -2,11 +2,12 @@ ## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies} -The `wrapFirefox` function allows to pass policies, preferences and extension that are available to firefox. With the help of `fetchFirefoxAddon` this allows build a firefox version that already comes with addons pre-installed: +The `wrapFirefox` function allows to pass policies, preferences and extension that are available to Firefox. With the help of `fetchFirefoxAddon` this allows build a Firefox version that already comes with addons pre-installed: ```nix { - myFirefox = wrapFirefox firefox-unwrapped { + # Nix firefox addons only work with the firefox-esr package. + myFirefox = wrapFirefox firefox-esr-unwrapped { nixExtensions = [ (fetchFirefoxAddon { name = "ublock"; # Has to be unique! @@ -45,5 +46,7 @@ or type into the Firefox url bar: `about:policies#documentation`. Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings. ## Troubleshooting {#sec-firefox-troubleshooting} +If addons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for addons thus nix addons get disabled by the normal Firefox binary. + If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode. diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..a52c4762ea99 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -286,6 +286,12 @@ Superuser created successfully. from 1.0.4 to 4.1.0 + + + Firefox v91 does not support addons with invalid signature + anymore. Firefox ESR needs to be used for nix addon support. + + The erigon ethereum node has moved to a new diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..e5196a20afdf 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -60,6 +60,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} + - The `paperless` module and package have been removed. All users should migrate to the successor `paperless-ng` instead. The Paperless project [has been archived](https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4) @@ -109,6 +110,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 +- Firefox v91 does not support addons with invalid signature anymore. Firefox ESR needs to be used for nix addon support. + - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0ef5233ff6b8..aa6f7da503fb 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -91,6 +91,8 @@ let # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" + else if ! (lib.hasSuffix "esr" browser.name) then + throw "Nix addons are only supported in Firefox ESR" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 656d20435711..94f7943ea4c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24521,10 +24521,12 @@ with pkgs; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr = firefox-esr-78; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; From c3d7b5cfc053b4f94cd25e8352db353afd50bdeb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 20:21:47 +0000 Subject: [PATCH 085/220] python38Packages.django-ipware: 3.0.7 -> 4.0.0 --- pkgs/development/python-modules/django-ipware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 54c3bf7ceed0..50a4dcd829f9 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "3.0.7"; + version = "4.0.0"; meta = { description = "A Django application to retrieve user's IP address"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "753f8214a16ccaac54ea977349a96e37b582a28a54065e00c1c46d530862c85e"; + sha256 = "1294f916f3b3475e40e1b0ec1bd320aa2397978eae672721c81cbc2ed517e9ee"; }; propagatedBuildInputs = [ django ]; From 145b75fe00612487baaf8cebaf7c36201953a50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 22 Aug 2021 22:49:20 +0200 Subject: [PATCH 086/220] mpv: split dev and man output --- pkgs/applications/video/mpv/default.nix | 8 ++++++-- pkgs/applications/video/mpv/wrapper.nix | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3bde15430579..93c3b2203b75 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -97,6 +97,8 @@ in stdenv.mkDerivation rec { pname = "mpv"; version = "0.33.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; @@ -153,8 +155,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ addOpenGLRunpath docutils perl pkg-config python3 wafHook which - ] - ++ optional swiftSupport swift; + ] ++ optional swiftSupport swift; buildInputs = [ ffmpeg freetype libass libpthreadstubs @@ -206,6 +207,9 @@ in stdenv.mkDerivation rec { cp TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop + + substituteInPlace $out/lib/pkgconfig/mpv.pc \ + --replace "$out/include" "$dev/include" '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 4d61971956e9..5225197772c7 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -61,7 +61,8 @@ let symlinkJoin { name = "mpv-with-scripts-${mpv.version}"; - paths = [ mpv ]; + # TODO: don't link all mpv outputs and convert package to mpv-unwrapped? + paths = [ mpv.all ]; buildInputs = [ makeWrapper ]; From 748031089807e2e88609a1c775c526d76d175915 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 03:46:34 +0000 Subject: [PATCH 087/220] python38Packages.tenacity: 7.0.0 -> 8.0.1 --- 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 4591677cdf9e..8de4c87b6fdc 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 = "7.0.0"; + version = "8.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; + sha256 = "43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f"; }; nativeBuildInputs = [ pbr setuptools-scm ]; From 8ab1b0ed66a993bd3dd4389df2ce5a592239e1ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:07:26 +0000 Subject: [PATCH 088/220] python38Packages.west: 0.11.0 -> 0.11.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 fff9582e0b8f..680e37e7a8f5 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.11.0"; + version = "0.11.1"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "67fdc85f44be308383b331940dced0756c8c81a85f753c6b97eb0d65d973f31a"; + sha256 = "30771f3ec2a4281cd05c277a90f7dc94ded97d6dc1e1decdf4fe452dbbacc283"; }; propagatedBuildInputs = [ From c8f0e5a7cb5f1a8c83c5980d8e0a492c5a273b9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:59:48 +0000 Subject: [PATCH 089/220] python38Packages.pymatgen: 2022.0.8 -> 2022.0.11 --- 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 d75af9158c69..364514b6b5d0 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 = "2022.0.8"; + version = "2022.0.11"; src = fetchPypi { inherit pname version; - sha256 = "4f12ac87657e8efe833087c575ec4430900dfcece890bb0486e07f034a2b34a0"; + sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; }; nativeBuildInputs = [ glibcLocales ]; From 2b76ddd015216e8506aed4dfe5695f8790c4db3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:19:37 +0000 Subject: [PATCH 090/220] python38Packages.python-json-logger: 2.0.1 -> 2.0.2 --- .../development/python-modules/python-json-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index cb36bf50e18b..02768431197d 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "python-json-logger"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f26eea7898db40609563bed0a7ca11af12e2a79858632706d835a0f961b7d398"; + sha256 = "202a4f29901a4b8002a6d1b958407eeb2dd1d83c18b18b816f5b64476dde9096"; }; checkInputs = [ nose ]; From 1bdde2bfb91fa67cc6ff4520a756b494123b68dd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:31:59 +0000 Subject: [PATCH 091/220] python38Packages.pytools: 2021.2.7 -> 2021.2.8 --- 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 79fff8875730..af485ce57942 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 = "2021.2.7"; + version = "2021.2.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb"; + sha256 = "e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b"; }; checkInputs = [ pytest ]; From a52c90f80fc7238d1911cb618b95523b91f7a9ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 06:42:19 +0000 Subject: [PATCH 092/220] python38Packages.ripser: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/ripser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 7bc7df0b8fd5..6c510f577e46 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9"; + sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd"; }; checkInputs = [ From 3c086ddb6d89d53799e0629fbf64ac94da71e860 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 09:02:54 +0000 Subject: [PATCH 093/220] python38Packages.phonopy: 2.10.0 -> 2.11.0 --- 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 af728d414c1b..86bece5254ac 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7"; + sha256 = "2ab47d3eb53a5265f3567974d29760b510b3312217358b76efc27ade9bd1a9f0"; }; propagatedBuildInputs = [ From 4ceab33f9be45f8043ab9aeed32c075f2d5c511a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 09:07:56 +0000 Subject: [PATCH 094/220] python38Packages.premailer: 3.9.0 -> 3.10.0 --- pkgs/development/python-modules/premailer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index 8523a47b71a7..21214b5fe752 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.9.0"; + version = "3.10.0"; disabled = isPy27; # no longer compatible with urllib src = fetchPypi { inherit pname version; - sha256 = "da18b9e8cb908893b67ab9b7451276fef7c0ab179f40189378545f6bb0ab3695"; + sha256 = "d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2"; }; buildInputs = [ mock nose ]; From 919b365d14e704a0b8c0b478b69a56a0c0ad3033 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani Date: Mon, 23 Aug 2021 11:25:49 -0400 Subject: [PATCH 095/220] ossutil: init at 1.7.6 --- pkgs/tools/admin/ossutil/default.nix | 33 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/tools/admin/ossutil/default.nix diff --git a/pkgs/tools/admin/ossutil/default.nix b/pkgs/tools/admin/ossutil/default.nix new file mode 100644 index 000000000000..d9f4b481f1b3 --- /dev/null +++ b/pkgs/tools/admin/ossutil/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: + +buildGoModule rec { + version = "1.7.6"; + pname = "ossutil"; + + src = fetchFromGitHub { + owner = "aliyun"; + repo = "ossutil"; + rev = version; + sha256 = "1hkdk0hidnm7vz320i7s4z7jngx2j70acc93agii2b3r2bb91l3d"; + }; + + # this patch is required to add go mods to fetch dependencies + patches = [ + (fetchpatch { + url = "https://github.com/aliyun/ossutil/commit/64067e979fb24ffb198a0c4eca718e81b63f514e.patch"; + sha256 = "2pn0BcbNNL+iMema54LRpG/ca5kyDugLIZQ/TMhYG/8="; + }) + ]; + + vendorSha256 = "lem9Jg4Ywv3qcIwhiZHNi1VH5HxxNr6mnefOLCzPL70="; + + # don't run tests as they require secret access keys that only travis has + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/aliyun/ossutil"; + description = "A user friendly command line tool to access Alibaba Cloud OSS"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f828f7992b27..806e67a96cd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3186,6 +3186,8 @@ with pkgs; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + ossutil = callPackage ../tools/admin/ossutil {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; From c5848a860eeb5db88cef56b4c64fc242c64b5c64 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 03:54:31 +0000 Subject: [PATCH 096/220] python38Packages.djangoql: 0.15.2 -> 0.15.3 --- pkgs/development/python-modules/djangoql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index bceb8526559b..e0e83e0c0619 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.15.2"; + version = "0.15.3"; src = fetchPypi { inherit pname version; - sha256 = "bd9d3accc5e84c439d22211676cf74ab746e557da9bc57afb27fee0ccd00e563"; + sha256 = "e1a2f32573396335a8935dfc2afb29e34eff34babec1150927ff74fcd4bbdb9d"; }; propagatedBuildInputs = [ ply ]; From 4dee57f2d55fdeef7ed009f401885808ee064582 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 04:38:08 +0000 Subject: [PATCH 097/220] folly: 2021.08.02.00 -> 2021.08.23.00 --- pkgs/development/libraries/folly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index a80a5cd9f8f0..91551d076dcf 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.08.02.00"; + version = "2021.08.23.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k="; + sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk="; }; nativeBuildInputs = [ From b90c0a3e1870a597074c068f3bc8b5f5ac9019b1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 05:11:11 +0000 Subject: [PATCH 098/220] python38Packages.django-versatileimagefield: 2.1 -> 2.2 --- .../python-modules/django-versatileimagefield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index dc7cde76a6b3..f7bbccf93c8d 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "2.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "e98f7b0abfbf2559d55b08be40911dcc44b6f3437a6c40d81bf66b6914837fdf"; + sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; }; propagatedBuildInputs = [ pillow python_magic ]; From 216ade27abb156cc4f298e829f644066f2564afd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 06:59:35 +0000 Subject: [PATCH 099/220] python38Packages.dulwich: 0.20.24 -> 0.20.25 --- pkgs/development/python-modules/dulwich/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index eacaa00f1526..58ac73b47203 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.20.24"; + version = "0.20.25"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb"; + sha256 = "79baea81583eb61eb7bd4a819ab6096686b362c626a4640d84d4fc5539139353"; }; LC_ALL = "en_US.UTF-8"; From a240cd9f4f1043f9f90f991f1c938928f7337c2b Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 24 Aug 2021 09:47:24 +0200 Subject: [PATCH 100/220] stacks: Changed license to gpl3Plus --- pkgs/applications/science/biology/stacks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index 16091514f154..c307522f0895 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Software pipeline for building loci from short-read sequences"; homepage = "http://catchenlab.life.illinois.edu/stacks/"; maintainers = [ lib.maintainers.bzizou ]; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; }; } From 98437fb25cc14cb42b02e53fe1d4496d6bcdeb8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 21 Aug 2021 23:13:44 +0000 Subject: [PATCH 101/220] erigon: 2021.08.02 -> 2021.08.03 --- pkgs/applications/blockchains/erigon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 6cdad6bf5ff3..36b04c8e14bc 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2021.08.02"; + version = "2021.08.03"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pyqvzpsDk24UEtSx4qmDew9zRK45pD5i4Qv1uJ03tmk="; + sha256 = "sha256-qr2IzaZhBEG/nkMqxlhAk6gwWV6lUSsdG1ecPp6N91Y="; }; - vendorSha256 = "sha256-FwKlQH8vEtWNDql1pmHzKneIwmJ7cg5LYkETVswO6pc="; + vendorSha256 = "sha256-CjBIbjE67zUIPI8hX2Xg6vy64BATMpnTllC91vE9n0M="; runVend = true; # Build errors in mdbx when format hardening is enabled: From 853e3c7d1939c8428eea5cfe6506f7bc09c0cdb5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 10:15:32 +0200 Subject: [PATCH 102/220] python3Packages.aiofiles: enable tests --- .../python-modules/aiofiles/default.nix | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index ffa176edc8dc..289da1fb2cc7 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -1,22 +1,36 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiofiles"; version = "0.7.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "0vvk9j8cfdqvq8hw2qc6ajfzsy8x1afabf83mxafffq92rwknd4y"; }; - disabled = pythonOlder "3.3"; + nativeBuildInputs = [ + poetry-core + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ "aiofiles" ]; meta = { description = "File support for asyncio"; From 7a3c7d42fb65add39d584e8cb5be78da91058fc1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Aug 2021 08:34:31 +0000 Subject: [PATCH 103/220] libupnp: 1.14.8 -> 1.14.10 --- pkgs/development/libraries/pupnp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index ffa08a6316f8..2c5c6c263484 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.8"; + version = "1.14.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8="; + sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U="; }; nativeBuildInputs = [ From 24017b0b1cca3b8bf1c977b64655a548a0425d20 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 11:18:30 +0200 Subject: [PATCH 104/220] platformio: update override --- pkgs/development/embedded/platformio/core.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/platformio/core.nix b/pkgs/development/embedded/platformio/core.nix index 344835b831b3..a3dcbdd35fdf 100644 --- a/pkgs/development/embedded/platformio/core.nix +++ b/pkgs/development/embedded/platformio/core.nix @@ -9,11 +9,15 @@ let python = python3.override { packageOverrides = self: super: { aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + pname = "aiofiles"; version = "0.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"; + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "0w23d88q65m06884pfcps661clr11w9wm701ihx6kfxjwga6fkzf"; }; + doCheck = false; }); click = super.click.overridePythonAttrs (oldAttrs: rec { From b40c1582d7b5099d4b5298752413fb62b84a339a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 11:52:16 +0200 Subject: [PATCH 105/220] gns3-server: update override --- pkgs/applications/networking/gns3/server.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 761467088218..9feceffc0346 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,15 +1,27 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, packageOverrides ? self: super: {} + }: let defaultOverrides = commonOverrides ++ [ - (mkOverride "aiofiles" "0.5.0" - "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + pname = "aiofiles"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf"; + }; + doCheck = false; + }); + }) ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; in python.pkgs.buildPythonPackage { pname = "gns3-server"; From f1dea7ed30a62a4be9f86ea7ddf0760ceb6b6e3b Mon Sep 17 00:00:00 2001 From: David Terry Date: Tue, 24 Aug 2021 10:22:39 +0200 Subject: [PATCH 106/220] erigon: 2021.08.03 -> 2021.08.04 --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 9 +++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ pkgs/applications/blockchains/erigon.nix | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a138d4c8780c..5ec936b4dbe4 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -293,6 +293,15 @@ Superuser created successfully. a full resync + + + The erigon ethereum node has moved it’s + database location in 2021-08-03, users + upgrading must manually move their chaindata (see + release + notes). + + services.geoip-updater was broken and has diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 35d65dc43cf3..a9298ec4ec9d 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -111,6 +111,8 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync +- The `erigon` ethereum node has moved it's database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)). + - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 36b04c8e14bc..119789fc960c 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "erigon"; - version = "2021.08.03"; + version = "2021.08.04"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qr2IzaZhBEG/nkMqxlhAk6gwWV6lUSsdG1ecPp6N91Y="; + sha256 = "0sw1qr7mdhhmfwdkkyzcjaqs2s3m19d01n3ipzcnqs1iml62rcqr"; }; - vendorSha256 = "sha256-CjBIbjE67zUIPI8hX2Xg6vy64BATMpnTllC91vE9n0M="; + vendorSha256 = "1hschm8xgq52p4s36pp34amcf2fi1kb0clxgkfxr07bsr6z0dn6b"; runVend = true; # Build errors in mdbx when format hardening is enabled: From 591817328cf9be76afb53cac1d3d027ae92036b4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 24 Aug 2021 23:33:34 +0200 Subject: [PATCH 107/220] python3Packages.pyee: 8.1.0 -> 8.2.2 --- .../python-modules/pyee/default.nix | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/development/python-modules/pyee/default.nix b/pkgs/development/python-modules/pyee/default.nix index f4afd49bbc28..a252cd4505ac 100644 --- a/pkgs/development/python-modules/pyee/default.nix +++ b/pkgs/development/python-modules/pyee/default.nix @@ -1,28 +1,24 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , vcversioner -, pytest-runner , mock -, pytest +, pytestCheckHook , pytest-asyncio , pytest-trio , twisted -, zipp ? null -, pyparsing ? null -, pyhamcrest -, futures ? null -, attrs ? null -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "pyee"; - version = "8.1.0"; + version = "8.2.2"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31"; + sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o="; }; buildInputs = [ @@ -31,23 +27,18 @@ buildPythonPackage rec { checkInputs = [ mock - pyhamcrest - pytest pytest-asyncio pytest-trio - pytest-runner + pytestCheckHook twisted - ] ++ lib.optional isPy27 [ - attrs - futures - pyparsing - zipp ]; - meta = { - description = "A port of Node.js's EventEmitter to python"; + pythonImportsCheck = [ "pyee" ]; + + meta = with lib; { + description = "A port of Node.js's EventEmitter to Python"; homepage = "https://github.com/jfhbrook/pyee"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kmein ]; + license = licenses.mit; + maintainers = with maintainers; [ kmein ]; }; } From d5b9aefa439a9da2dae7f533202173745ad7b9e0 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Tue, 24 Aug 2021 22:46:45 +0000 Subject: [PATCH 108/220] stage-1: fix copytoram option for loopback.cfg boot Uses an alternative method to find the size of the ISO when it is a file and not a block device for creating the tmpfs its contents are copied to. --- nixos/modules/system/boot/stage-1-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index ddaf985878e0..3dfcc010b64e 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -542,7 +542,7 @@ while read -u 3 mountPoint; do # If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs. if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then fsType=$(blkid -o value -s TYPE "$device") - fsSize=$(blockdev --getsize64 "$device") + fsSize=$(blockdev --getsize64 "$device" || stat -Lc '%s' "$device") mkdir -p /tmp-iso mount -t "$fsType" /dev/root /tmp-iso From 1733b349dcc03f567612891d782a518bde36f573 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 02:07:57 +0000 Subject: [PATCH 109/220] cloud-nuke: 0.4.0 -> 0.5.0 --- pkgs/development/tools/cloud-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 8b34f981a6e6..aa6472494733 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg="; + sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA="; }; - vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA="; + vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; From 4a9c5a6754913bca1d6912d4a7057a23295882e8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 04:59:11 +0000 Subject: [PATCH 110/220] go-ethereum: 1.10.7 -> 1.10.8 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 8257aa43dd28..b9f31a3e7fa7 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk="; + sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ="; }; runVend = true; - vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM="; + vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw="; doCheck = false; From 4f1b827007ddd4a0ea6953a850c51650586e6234 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 08:47:12 +0200 Subject: [PATCH 111/220] python3Packages.awesomeversion: 21.8.0 -> 21.8.1 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index 7b7d432f0c6b..b5b59ef65508 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.8.0"; + version = "21.8.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg="; + sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI="; }; postPatch = '' From 8873c62734e44a6e4055be8ecd7049caef86b90c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 09:41:08 +0000 Subject: [PATCH 112/220] nushell: 0.35.0 -> 0.36.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index eb3d61dc6651..eaddb0f56dcd 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337"; + sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU="; }; - cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3"; + cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; From f47e6f3b9973bc963876ec912caa00a4551764a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 15:09:46 +0200 Subject: [PATCH 113/220] python3Packages.aioesphomeapi: 7.0.0 -> 8.0.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index b2641cfcbd0b..4e90ea115c6f 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "7.0.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; + sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY="; }; propagatedBuildInputs = [ From 34f455a86a4d83053869dc1d373f5fc898a17982 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 15:47:45 +0200 Subject: [PATCH 114/220] python3Packages.pysyncthru: 0.7.7 -> 0.7.8 --- pkgs/development/python-modules/pysyncthru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysyncthru/default.nix b/pkgs/development/python-modules/pysyncthru/default.nix index 373cb7c6f2b6..67194d51cb2f 100644 --- a/pkgs/development/python-modules/pysyncthru/default.nix +++ b/pkgs/development/python-modules/pysyncthru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.7"; + version = "0.7.8"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nielstron"; repo = "pysyncthru"; rev = "release-${version}"; - sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7"; + sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp"; }; propagatedBuildInputs = [ From 1d9baf159c1d0bfd1d4850550e29edf9e7785530 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 16:41:13 +0200 Subject: [PATCH 115/220] python3Packages.bimmer-connected: 0.7.19 -> 0.7.20 --- pkgs/development/python-modules/bimmer-connected/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 932c90cb7aad..ac2785fe332c 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.19"; + version = "0.7.20"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-r5x+9W1XadtXb1ClC/0HnjrR+UmrytzUTCpi9IyBbwU="; + sha256 = "sha256-vcJYcxBX8wHH3FiU2Cg7IlK0iEQZ3SLVa0MryeAwPCA="; }; nativeBuildInputs = [ From 399fb3046fb4ffad9ccb92d05f3207415f0d15c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 16:50:22 +0200 Subject: [PATCH 116/220] python3Packages.pyaml: 20.4.0 -> 21.8.3 --- pkgs/development/python-modules/pyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 524d34c68d4a..bcb22322ec21 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyaml"; - version = "20.4.0"; + version = "21.8.3"; src = fetchPypi { inherit pname version; - sha256 = "29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71"; + sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU="; }; propagatedBuildInputs = [ pyyaml ]; From d965e5124b1f27bda554852020a9e1b5467666ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 25 Aug 2021 17:00:17 +0200 Subject: [PATCH 117/220] python3Packages.pyaml: add pythonImportsCheck --- pkgs/development/python-modules/pyaml/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index bcb22322ec21..8642c9affbdc 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -14,13 +14,20 @@ buildPythonPackage rec { sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU="; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - checkInputs = [ unidecode ]; + checkInputs = [ + unidecode + ]; - meta = { + pythonImportsCheck = [ "pyaml" ]; + + meta = with lib; { description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; homepage = "https://github.com/mk-fg/pretty-yaml"; - license = lib.licenses.wtfpl; + license = licenses.wtfpl; + maintainers = with maintainers; [ ]; }; } From 982f46985e37a6488d8e904b46e0cba2060adc71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 25 Aug 2021 09:32:10 +0200 Subject: [PATCH 118/220] writers: drop writeC This function is fundamentally broken. Not even the ncurses example will compile. The interface needs to be rethought for it to work (i.e. don't unconditionally include all pc files, set include path and ld path and rpath). Since it is unlikely that in the current this has any user, just drop it for now. --- pkgs/build-support/writers/default.nix | 45 -------------------------- pkgs/build-support/writers/test.nix | 26 --------------- 2 files changed, 71 deletions(-) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 47919c251af1..111ec68a6021 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -99,51 +99,6 @@ rec { writeBashBin = name: writeBash "/bin/${name}"; - # writeC writes an executable c package called `name` to `destination` using `libraries`. - # - # Examples: - # writeC "hello-world-ncurses" { libraries = [ pkgs.ncurses ]; } '' - # #include - # int main() { - # initscr(); - # printw("Hello World !!!"); - # refresh(); endwin(); - # return 0; - # } - # '' - writeC = name: { - libraries ? [], - strip ? true - }: - makeBinWriter { - compileScript = '' - PATH=${makeBinPath [ - pkgs.binutils-unwrapped - pkgs.coreutils - pkgs.findutils - pkgs.gcc - pkgs.pkg-config - ]} - export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} - gcc \ - ${optionalString (libraries != []) - "$(pkg-config --cflags --libs ${ - concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries - })" - } \ - -O \ - -o "$out" \ - -Wall \ - -x c \ - "$contentPath" - ''; - inherit strip; - } name; - - # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin) - writeCBin = name: - writeC "/bin/${name}"; - # Like writeScript but the first line is a shebang to dash # # Example: diff --git a/pkgs/build-support/writers/test.nix b/pkgs/build-support/writers/test.nix index 00cad9a96b53..69bc7dd2c61a 100644 --- a/pkgs/build-support/writers/test.nix +++ b/pkgs/build-support/writers/test.nix @@ -17,14 +17,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test-writers-c" { libraries = [ ]; } '' - #include - int main() { - printf("success\n"); - return 0; - } - ''; - dash = writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' ''; @@ -88,24 +80,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test-writers-c" { libraries = [ glib.dev ]; } '' - #include - #include - int main() { - GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE); - g_application_register (application, NULL, NULL); - GNotification *notification = g_notification_new ("Hello world!"); - g_notification_set_body (notification, "This is an example notification."); - GIcon *icon = g_themed_icon_new ("dialog-information"); - g_notification_set_icon (notification, icon); - g_object_unref (icon); - g_object_unref (notification); - g_object_unref (application); - printf("success\n"); - return 0; - } - ''; - dash = writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' ''; From 871f0bacdb7797abbfef60c933cf71762b2023e0 Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Thu, 26 Aug 2021 02:20:40 +0300 Subject: [PATCH 119/220] tdesktop: 2.9.0 -> 2.9.3 --- .../telegram/tdesktop/default.nix | 106 ++++++++++++++---- 1 file changed, 87 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8478b590084a..7f97e20a85e3 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,15 +1,50 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +{ mkDerivation +, lib +, fetchFromGitHub +, callPackage +, pkg-config +, cmake +, ninja +, python3 +, wrapGAppsHook +, wrapQtAppsHook , extra-cmake-modules -, qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk, jemalloc +, qtbase +, qtimageformats +, gtk3 +, kwayland +, libdbusmenu +, lz4 +, xxHash +, ffmpeg +, openalSoft +, minizip +, libopus +, alsa-lib +, libpulseaudio +, range-v3 +, tl-expected +, hunspell +, glibmm +, webkitgtk +, jemalloc , rnnoise -# Transitive dependencies: + # Transitive dependencies: , util-linuxMinimal -, pcre, libpthreadstubs, libXdmcp, libselinux, libsepol, epoxy -, at-spi2-core, libXtst, libthai, libdatrie -, xdg-utils, libsysprof-capture, libpsl, brotli +, pcre +, libpthreadstubs +, libXdmcp +, libselinux +, libsepol +, epoxy +, at-spi2-core +, libXtst +, libthai +, libdatrie +, xdg-utils +, libsysprof-capture +, libpsl +, brotli }: # Main reference: @@ -20,10 +55,11 @@ # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template let - tg_owt = callPackage ./tg_owt.nix {}; -in mkDerivation rec { + tg_owt = callPackage ./tg_owt.nix { }; +in +mkDerivation rec { pname = "telegram-desktop"; - version = "2.9.0"; + version = "2.9.3"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,7 +68,7 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0964as7rkjq1px6z15z6kmkiz4zw69wmm3namwn940bsja123qls"; + sha256 = "sha256-ZmhgBL5nbgrNLRmCHocqVNC3KtaLm4LUY1f4Xl8CvB4="; }; postPatch = '' @@ -52,20 +88,52 @@ in mkDerivation rec { dontWrapQtApps = true; nativeBuildInputs = [ - pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook + pkg-config + cmake + ninja + python3 + wrapGAppsHook + wrapQtAppsHook extra-cmake-modules ]; buildInputs = [ - qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk jemalloc + qtbase + qtimageformats + gtk3 + kwayland + libdbusmenu + lz4 + xxHash + ffmpeg + openalSoft + minizip + libopus + alsa-lib + libpulseaudio + range-v3 + tl-expected + hunspell + glibmm + webkitgtk + jemalloc rnnoise tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. - pcre libpthreadstubs libXdmcp libselinux libsepol epoxy - at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli + pcre + libpthreadstubs + libXdmcp + libselinux + libsepol + epoxy + at-spi2-core + libXtst + libthai + libdatrie + libsysprof-capture + libpsl + brotli ]; cmakeFlags = [ From 7eeb8feab5ccaead0c7aee39407985a3ab3bbb44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 01:26:26 +0200 Subject: [PATCH 120/220] python39Packages.google-cloud-access-context-manager: remove unused input --- .../google-cloud-access-context-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 71688ec17130..f2e327670586 100644 --- a/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: +{ lib, buildPythonPackage, fetchPypi, google-api-core }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; @@ -24,7 +24,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Protobufs for Google Access Context Manager."; + description = "Protobufs for Google Access Context Manager"; homepage = "https://github.com/googleapis/python-access-context-manager"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; From 012009ec839b0679125d5d852b3589a67e176efa Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 26 Aug 2021 02:04:15 +0200 Subject: [PATCH 121/220] hydrus: hotfix release got forcepushed to same tag, updated hash --- pkgs/applications/graphics/hydrus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 3a7d38f0d386..db14df2c1ee3 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-CSWrmjJ6lFQ6tG403Uf+VAOfvBd1oAhd2kTU/7XA3f0="; + sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1"; }; nativeBuildInputs = [ From 508bb7f42e7337b1788a4d7bcdb0bffc3519682c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 10 Jun 2021 11:53:03 +0200 Subject: [PATCH 122/220] python3Packages.prometheus-client: rename and enable tests --- .../prometheus-client/default.nix | 29 +++++++++++++++++++ .../prometheus_client/default.nix | 19 ------------ pkgs/top-level/python-aliases.nix | 3 +- pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 pkgs/development/python-modules/prometheus-client/default.nix delete mode 100644 pkgs/development/python-modules/prometheus_client/default.nix diff --git a/pkgs/development/python-modules/prometheus-client/default.nix b/pkgs/development/python-modules/prometheus-client/default.nix new file mode 100644 index 000000000000..9a01769695ac --- /dev/null +++ b/pkgs/development/python-modules/prometheus-client/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-client"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "client_python"; + rev = "v${version}"; + sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "prometheus_client" ]; + + meta = with lib; { + description = "Prometheus instrumentation library for Python applications"; + homepage = "https://github.com/prometheus/client_python"; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix deleted file mode 100644 index 7ce36e588d71..000000000000 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "prometheus_client"; - version = "0.11.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"; - }; - - doCheck = false; - - meta = with lib; { - description = "Prometheus instrumentation library for Python applications"; - homepage = "https://github.com/prometheus/client_python"; - license = licenses.asl20; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 3f60f90e0804..27b467cbb2a4 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -53,7 +53,9 @@ mapAliases ({ HAP-python = hap-python; # added 2021-06-01 lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 + pam = python-pam; # added 2020-09-07. privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 + prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 @@ -63,7 +65,6 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 python-lz4 = lz4; # added 2018-06-01 - pam = python-pam; # added 2020-09-07. pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index af437fa0f3bd..bce658066d28 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5671,7 +5671,7 @@ in { progress = callPackage ../development/python-modules/progress { }; - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-client = callPackage ../development/python-modules/prometheus-client { }; prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; From 22a4cf7d987458b02f3beaf10e0b7735d6f1b216 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 2 Jul 2021 12:17:58 +0200 Subject: [PATCH 123/220] python3Packages.gradient-utils: relax prometheus-client depedency --- pkgs/development/python-modules/gradient-utils/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gradient-utils/default.nix b/pkgs/development/python-modules/gradient-utils/default.nix index ee8d1bde6222..171f87b5ddb2 100644 --- a/pkgs/development/python-modules/gradient-utils/default.nix +++ b/pkgs/development/python-modules/gradient-utils/default.nix @@ -5,7 +5,7 @@ , mock , numpy , poetry-core -, prometheus_client +, prometheus-client , pytestCheckHook , requests }: @@ -26,14 +26,15 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \ - --replace 'wheel = "^0.35.1"' 'wheel = "*"' + --replace 'wheel = "^0.35.1"' 'wheel = "*"' \ + --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"' ''; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ hyperopt - prometheus_client + prometheus-client numpy ]; From 6b77988f96e0d100fdde9825a58fbe0f74a722a9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 02:08:48 +0200 Subject: [PATCH 124/220] treewide: prometheus_client -> prometheus-client --- pkgs/applications/version-management/sourcehut/core.nix | 4 ++-- pkgs/applications/version-management/sourcehut/meta.nix | 4 ++-- pkgs/development/python-modules/flower/default.nix | 4 ++-- pkgs/development/python-modules/jupyter_server/default.nix | 4 ++-- pkgs/development/python-modules/jupyterhub/default.nix | 4 ++-- .../development/python-modules/karton-dashboard/default.nix | 6 +++--- pkgs/development/python-modules/notebook/2.nix | 4 ++-- pkgs/development/python-modules/notebook/default.nix | 4 ++-- .../python-modules/prometheus-flask-exporter/default.nix | 4 ++-- .../python-modules/py-air-control-exporter/default.nix | 4 ++-- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/matrix-synapse/default.nix | 2 +- pkgs/servers/mautrix-signal/default.nix | 2 +- pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/kea-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/tor-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/xmpp-alerts.nix | 2 +- pkgs/servers/xandikos/default.nix | 2 +- pkgs/tools/networking/dd-agent/integrations-core.nix | 2 +- 20 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index d359d524eb29..7c3a516ed9dc 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -16,7 +16,7 @@ , cryptography , beautifulsoup4 , sqlalchemy-utils -, prometheus_client +, prometheus-client , celery , alembic , importlib-metadata @@ -70,7 +70,7 @@ buildPythonPackage rec { cryptography beautifulsoup4 sqlalchemy-utils - prometheus_client + prometheus-client # Unofficial runtime dependencies? celery diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index a285d484ed2a..86d293973d7f 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -14,7 +14,7 @@ , dnspython , sshpubkeys , weasyprint -, prometheus_client +, prometheus-client , python }: let @@ -52,7 +52,7 @@ buildPythonPackage rec { pystache sshpubkeys weasyprint - prometheus_client + prometheus-client dnspython ]; diff --git a/pkgs/development/python-modules/flower/default.nix b/pkgs/development/python-modules/flower/default.nix index 67ecdde0d5f1..0d4f834f1f0c 100644 --- a/pkgs/development/python-modules/flower/default.nix +++ b/pkgs/development/python-modules/flower/default.nix @@ -6,7 +6,7 @@ , mock , pytz , tornado -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz tornado humanize - prometheus_client + prometheus-client ]; checkInputs = [ diff --git a/pkgs/development/python-modules/jupyter_server/default.nix b/pkgs/development/python-modules/jupyter_server/default.nix index a8ae35e2bdd0..72e1540e0781 100644 --- a/pkgs/development/python-modules/jupyter_server/default.nix +++ b/pkgs/development/python-modules/jupyter_server/default.nix @@ -17,7 +17,7 @@ , nbconvert , send2trash , terminado -, prometheus_client +, prometheus-client , anyio , websocket-client , requests @@ -46,7 +46,7 @@ buildPythonPackage rec { nbconvert send2trash terminado - prometheus_client + prometheus-client anyio websocket-client ]; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 904cd7df0c2a..a90fa0eb9a13 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -13,7 +13,7 @@ , jupyter-telemetry , oauthlib , pamela -, prometheus_client +, prometheus-client , requests , sqlalchemy , tornado @@ -121,7 +121,7 @@ buildPythonPackage rec { jupyter-telemetry oauthlib pamela - prometheus_client + prometheus-client requests sqlalchemy tornado diff --git a/pkgs/development/python-modules/karton-dashboard/default.nix b/pkgs/development/python-modules/karton-dashboard/default.nix index c2251a0e2363..d1dd4478cf53 100644 --- a/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/pkgs/development/python-modules/karton-dashboard/default.nix @@ -4,7 +4,7 @@ , flask , karton-core , mistune -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -22,13 +22,13 @@ buildPythonPackage rec { flask karton-core mistune - prometheus_client + prometheus-client ]; postPatch = '' substituteInPlace requirements.txt \ --replace "Flask==1.1.1" "Flask" \ - --replace "prometheus_client==0.9.0" "prometheus-client" + --replace "prometheus-client==0.9.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 0e5cfdf43971..179fd25beff9 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -20,7 +20,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client + prometheus-client ]; # disable warning_filters diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 3276c8ec51c9..bc1296b8a50c 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -21,7 +21,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -43,7 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client argon2_cffi + prometheus-client argon2_cffi ]; # disable warning_filters diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index dc35aea6cd11..7abb9670ac8a 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , flask -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; }; - propagatedBuildInputs = [ flask prometheus_client ]; + propagatedBuildInputs = [ flask prometheus-client ]; checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; diff --git a/pkgs/development/python-modules/py-air-control-exporter/default.nix b/pkgs/development/python-modules/py-air-control-exporter/default.nix index 1a8a52fd246e..d67ddba02b9c 100644 --- a/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -5,7 +5,7 @@ , flask , isPy27 , nixosTests -, prometheus_client +, prometheus-client , py-air-control , pytestCheckHook , setuptools-scm @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click flask - prometheus_client + prometheus-client py-air-control ]; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6d91d5fa72bc..da88c09c5b61 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -658,7 +658,7 @@ "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ]; "prosegur" = ps: with ps; [ pyprosegur ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 63b79aebe09c..f996ebe13909 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { netaddr phonenumbers pillow - prometheus_client + prometheus-client psutil psycopg2 pyasn1 diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 365df2fec6f5..46f9bccceff6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec { mautrix phonenumbers pillow - prometheus_client + prometheus-client pycryptodome python-olm python_magic diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index 333be3732112..f2d50fe85014 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 1f5ff7c02235..98df8861e825 100644 --- a/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ click - prometheus_client + prometheus-client ]; checkPhase = '' diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index bb9aaf587972..f0b6055f2ba0 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm0755 knot_exporter $out/bin/knot_exporter patchShebangs $out/bin - buildPythonPath ${python3.pkgs.prometheus_client} + buildPythonPath ${python3.pkgs.prometheus-client} patchPythonScript $out/bin/knot_exporter runHook postInstall diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index 663b532c8fc6..fcfe87806eb9 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0"; }; - propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ]; installPhase = '' mkdir -p $out/share/ diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index ddffc9c55daf..97593cecca89 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ aiohttp slixmpp - prometheus_client + prometheus-client pyyaml ]); diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix index b29151911a63..acf96d008f7a 100644 --- a/pkgs/servers/xandikos/default.nix +++ b/pkgs/servers/xandikos/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict - prometheus_client + prometheus-client ]; passthru.tests.xandikos = nixosTests.xandikos; diff --git a/pkgs/tools/networking/dd-agent/integrations-core.nix b/pkgs/tools/networking/dd-agent/integrations-core.nix index e466be816e43..16b0b1ea09d6 100644 --- a/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus_client uuid simplejson uptime + requests protobuf prometheus-client uuid simplejson uptime ]; }; From 91106928cfa3f16b8fc1207543b3fbe0e070f9a8 Mon Sep 17 00:00:00 2001 From: Sheena Artrip Date: Sat, 1 May 2021 20:04:05 -0700 Subject: [PATCH 125/220] doc/beam: fix syntax error in nix sample --- doc/languages-frameworks/beam.section.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/languages-frameworks/beam.section.md b/doc/languages-frameworks/beam.section.md index 934e6cdca121..08abd4588c64 100644 --- a/doc/languages-frameworks/beam.section.md +++ b/doc/languages-frameworks/beam.section.md @@ -212,7 +212,7 @@ in Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir: ```nix -{ pkgs ? import " {} }: +{ pkgs ? import {} }: with pkgs; From 3d0aca98b2f7a259106ef747ce606548f33d3a22 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 25 Aug 2021 22:01:40 -0300 Subject: [PATCH 126/220] argocd: 2.0.5 -> 2.1.1 --- .../applications/networking/cluster/argocd/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index a0468f506dfb..d82537beac85 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.0.5"; - commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88"; + version = "2.1.1"; + commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU="; + sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc"; }; - vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08="; + vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; @@ -46,7 +46,7 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' $out/bin/argocd version --client | grep ${tag} > /dev/null - $out/bin/argocd-util version | grep ${tag} > /dev/null + $out/bin/argocd-util version --client | grep ${tag} > /dev/null ''; installPhase = '' From 62f99ef4657ed26413501f1fd83ab07482f7cd9d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 25 Aug 2021 22:12:21 -0300 Subject: [PATCH 127/220] linode-cli: 5.6.0 -> 5.8.1 --- pkgs/tools/virtualization/linode-cli/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index 8f71a22b964f..c815f6fcf6d5 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -12,23 +12,23 @@ let # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.101.0"; + specVersion = "4.102.0"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "1l4xi82b2pvkj7p1bq26ax2ava5vnv324j5sw3hvkkqqf1fmpdl5"; + sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.6.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA="; + sha256 = "19lfnwgm09gxk0mcikwl7v4hw2ai2k9lkdjlalz8fsswf81my7h6"; }; # remove need for git history From c3ecc6c38c10e54b5a1c3fe40ca6b631393c0e4a Mon Sep 17 00:00:00 2001 From: Angus Trau Date: Thu, 26 Aug 2021 11:19:54 +1000 Subject: [PATCH 128/220] python3Packages.pymunk: 6.1.0 -> 6.2.0 --- pkgs/development/python-modules/pymunk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymunk/default.nix b/pkgs/development/python-modules/pymunk/default.nix index 216e2488674a..4d8dbee2c2e7 100644 --- a/pkgs/development/python-modules/pymunk/default.nix +++ b/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1k1ncrssywvfrbmai7d20h2mg4lzhq16rhw3dkg4ad5nhik3k0sl"; + sha256 = "1r3jfjg4cpdilrmlyml514hqmjgabyrrs4cvmdr56rylg1sp4gf3"; }; propagatedBuildInputs = [ cffi ]; @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://www.pymunk.org"; license = with licenses; [ mit ]; maintainers = with maintainers; [ angustrau ]; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + platforms = platforms.unix; }; } From 93cd9a58dc9ce6b6610f5edb8be4e711faee418b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 25 Aug 2021 21:12:16 -0300 Subject: [PATCH 129/220] org-packages 2021-08-25 --- .../editors/emacs/elisp-packages/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 6bfe29fc2e7d..10c63bc0b887 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210726"; + version = "20210823"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210726.tar"; - sha256 = "0bz5dwnknxb5mwb3rk6ckwq8a5imd2cjsx40ql9p9vc0c8rirqd4"; + url = "https://orgmode.org/elpa/org-20210823.tar"; + sha256 = "0yd2ydkkfy9lmlnb0lpsm8ywbk88sq9n4i7dasfzslv7czgccyh7"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210726"; + version = "20210823"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210726.tar"; - sha256 = "0fxjmb1773skyq76qmgx1jqfcglxrxxxqysqiirm48cc6yf13kp7"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210823.tar"; + sha256 = "17lyhsi22wg3l3j4k67glvq9p12r3nlc7fs6ka5jr2xrvfypb5aj"; }; packageRequires = []; meta = { From 5f951eca648e2b6187839997a117a4a35646b4dd Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 25 Aug 2021 22:51:10 -0300 Subject: [PATCH 130/220] melpa-packages 2021-08-25 --- .../elisp-packages/recipes-archive-melpa.json | 3842 ++++++++++------- 1 file changed, 2189 insertions(+), 1653 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 3d5880c039ee..2d2044ded8d4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1044,8 +1044,8 @@ "auto-complete", "yasnippet" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1070,8 +1070,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210617, - 949 + 20210820, + 1000 ], "deps": [ "dash", @@ -1081,8 +1081,8 @@ "s", "xcscope" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1489,15 +1489,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20190917, - 318 + 20210806, + 316 ], "deps": [ "avy", "pinyinlib" ], - "commit": "8b2e9335b02486730ea4ceee790130cc5328f9ea", - "sha256": "1p2h4bva0v8yad075is1zkhn69x78ddwa8ncdfm0zzysddw5w8bq" + "commit": "4dc565807a9b74ba637122f746d1614c60f92af8", + "sha256": "1q1s2xwa4wb0h3r255j9wy37yzim6fa1kl42gnxlg5zwgcb2la9w" }, "stable": { "version": [ @@ -1528,8 +1528,8 @@ "deps": [ "avy-menu" ], - "commit": "594a305704be8ca0ef79a12b787bdb59bc6077c0", - "sha256": "1ykpb4l29iw5bxmip9cn6irgiak2hwb79kg1k5m32wc9p6b4kbjf" + "commit": "bc3524eaa28b21725287b59b903c03624cbd5316", + "sha256": "1d5mkkdd67kkas7vl2dc98lm2dlgx10mb35zfdnz2rzcygi5brs7" }, "stable": { "version": [ @@ -1878,14 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20210603, - 1139 + 20210812, + 1934 ], "deps": [ "consult" ], - "commit": "dee51350e1d7d3cfbfb12069dea9246454a3df31", - "sha256": "1dpzwwbkwxmkh430hk3w9p6z1rwns5znzbar071h95gi7phyhm2x" + "commit": "cc63708913fc5d16073bcb96f483c2e207151032", + "sha256": "10764rcakd5v9x2xz0cbv8wnvd1b5m9cwjb75gvbgnhfaxqnxb8n" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "consult" + ], + "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", + "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" } }, { @@ -1944,15 +1955,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210619, - 545 + 20210809, + 721 ], "deps": [ "annotation", "eri" ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -2182,16 +2193,16 @@ "fetcher": "github", "repo": "alan-platform/AlanForEmacs", "unstable": { - "version": [ - 20210728, - 1427 + "version": [ + 20210802, + 1950 ], "deps": [ "flycheck", "s" ], - "commit": "6e2005441af34fe54872c00ed793f6084f25c3f8", - "sha256": "0fqbjklfglgiy838j37p0v0rcvzj48vps8zsn0bmnabnd5vsrc3b" + "commit": "9e66137860d05e9c8e1d70a087bfd9cb5ca5ec07", + "sha256": "1xnb2n77bj3ynrgrl13pwdjbbka9s6gwdskz99cjdky2m7z1xh0z" }, "stable": { "version": [ @@ -2327,26 +2338,26 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20210722, - 1554 + 20210817, + 49 ], "deps": [ "flycheck" ], - "commit": "8089607dc118827e832d4bd524b3c0f0f56e8cdd", - "sha256": "1im0k28skb9skxxfkh279j91xjfc4c7qnmwc8l6sgazhglj5rqs6" + "commit": "95a31c4232e71047a64956976622969df9226381", + "sha256": "09rhs337cnb24blf9qcxc3hgg8s9h4rsyiwpnkqd2by4kkhdyign" }, "stable": { "version": [ 1, - 2, + 3, 1 ], "deps": [ "flycheck" ], - "commit": "7b7041fd58c2b1893e4b65b18045880ecc7a1c73", - "sha256": "1lvhzi6fxnmpcr7xac6ri3904cqbp016ivziih3nfchdzznmzljj" + "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", + "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" } }, { @@ -2441,11 +2452,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210728, - 2330 + 20210817, + 2252 ], - "commit": "e01eeb40858f971e45c014726a14c75556d8cc8f", - "sha256": "0psyfmajz2rsi5asv07514zd7vlwzk42hff4dcbmycyf7s998ifn" + "commit": "b43d2b32f6de83c0dc7792a957f64e8444e59beb", + "sha256": "066kldj7wz6s1qdvkxifv2zx0wimxncgh11r0pchfrji4b0h6pyh" }, "stable": { "version": [ @@ -2457,6 +2468,24 @@ "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" } }, + { + "ename": "all-the-icons-completion", + "commit": "966b1292537834b4b3582a2c093ff810c44cbcc6", + "sha256": "0wn542h8rymb8g86zn6si5dvars4d9h3kwv1b1w00jl44kxsii8n", + "fetcher": "github", + "repo": "iyefrat/all-the-icons-completion", + "unstable": { + "version": [ + 20210728, + 2119 + ], + "deps": [ + "all-the-icons" + ], + "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", + "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + } + }, { "ename": "all-the-icons-dired", "commit": "26f650e465b22a0afdb77318aebfcfbdb832c9ce", @@ -2519,8 +2548,8 @@ "deps": [ "all-the-icons" ], - "commit": "c1c0606a793b71c8c1efc3c55dfcc22182214f24", - "sha256": "0p0icyj9084q7gm3bjknxgxd6g36sgy3b1kpxlm3fmh93j0v6l32" + "commit": "165f1702f6f49f4fc2fb15534ede141102657aef", + "sha256": "0k985lg08dml5cpw9piqhwrh27bbxwqgsy4zcj4f40niaallk6fy" }, "stable": { "version": [ @@ -2575,28 +2604,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210727, - 757 + 20210823, + 1544 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "2a4baba0343d1e4dcabc29e5ccca596fd032ac90", - "sha256": "1fy86vkn5j0v9brkfzfjrwr1zrp792i7pxywlrflahcbxd8v68pp" + "commit": "09b887c01aeb33d715a1f8269f45c38594614d93", + "sha256": "0l6brqdqqgcijd2jfycy3i2n39bwcq7m12km8hg3kx4bv0zmn00g" }, "stable": { "version": [ 1, 6, - 2 + 3 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", - "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" + "commit": "66824c6468cbe256d7e5012f516f6840b5ab1de9", + "sha256": "19i7gnkwa7v6balx1qhd68rl1bxghl2fy442ymcaxl3yykc2hx9d" } }, { @@ -3175,11 +3204,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210620, - 751 + 20210819, + 1443 ], - "commit": "9aba6305fef54f32b085a56ce2b843b3d8194ac2", - "sha256": "1n2pgvc4fw8r22ck2r3jmkrrh1vlwv1r35ljy5g3b95zjh11w7g4" + "commit": "4ae1d4f2a6b6d7e598285c6a43ae1785d44147e5", + "sha256": "0i1ldw5iz61p3sp8anihf3a16z56jqgznrwphgf0b1kl0sdsq6lq" }, "stable": { "version": [ @@ -3217,8 +3246,8 @@ 20200914, 644 ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -3538,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20210423, - 1115 + 20210819, + 2136 ], - "commit": "5e9de43494cc307a3b43b0eebf774c03670a4582", - "sha256": "00lz9mcxcmlgnnbc05b49arxa2fcckjhsxdcqi66v66zn9h8kr13" + "commit": "9e80feb61a173d776495f8a36545b966acac21f2", + "sha256": "00wihhzn779rqmhb41n1f2wd69cfcqq5z86l5hmcyx7lhn0nykyj" }, "stable": { "version": [ @@ -3668,11 +3697,11 @@ "repo": "emacsorphanage/applescript-mode", "unstable": { "version": [ - 20210223, - 1539 + 20210802, + 1715 ], - "commit": "267a1453f58a6a6577a1d5752c876fdaa2896a6d", - "sha256": "0l5nfj5wz9cjpl9906w8q3p6ciwr6imf4nqh8i2s4dzip4n9w6nl" + "commit": "00c141bbff46c89a96598b605dee05dd1d89f624", + "sha256": "1d3ssyp90k26282p46c91wj1bvqxpvghcsicp14bnh78llwninvc" }, "stable": { "version": [ @@ -3714,11 +3743,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210514, - 1710 + 20210809, + 1934 ], - "commit": "b17a8ce0686848ffd7c6d20aa66bf2e97b7ce3e5", - "sha256": "0lba49k05kvx63yxcc3nqmiy2bbp7cl81zfap346kwgwss9fbgx5" + "commit": "e84255cf485004b6b2cb37ce9e0be62fd6512f8b", + "sha256": "06rcf08f8qm068ck2mxqbg03vkr0hf5nnsbzpwmn7i6qqw23x6jd" }, "stable": { "version": [ @@ -4101,11 +4130,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20210501, - 1527 + 20210823, + 528 ], - "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", - "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" + "commit": "d834cd90fe6f1d87dab86b637d23958241cadac3", + "sha256": "00n9w9qh84fp60swcpccimch4lq0rcwqm7aqjym5hqmkc1ncz2bp" }, "stable": { "version": [ @@ -4212,11 +4241,11 @@ "repo": "jcs-elpa/atl-markup", "unstable": { "version": [ - 20200810, - 845 + 20210731, + 609 ], - "commit": "67b67de68f3d878f98c96ea7e340344aed6e6e46", - "sha256": "0qg04bn50s2chnwk7krdfkhq6y944fbgbwxs507qgmg4n0iyzkln" + "commit": "e586473d49acbb16c092017e3e65bf8798c397dc", + "sha256": "0xpbxzv5rc3260bl3d54n7r3r14r1pkvwz48p2nl15hr2fzxaass" }, "stable": { "version": [ @@ -4604,14 +4633,14 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20210728, - 2054 + 20210820, + 1353 ], "deps": [ "packed" ], - "commit": "504863340fa82cf8aca785ad1f2a541be598c3d6", - "sha256": "0d1z6k4gcx9yxvvsi9m3pz0nfbql1f2vs29ccjcdycaxlq04k7ls" + "commit": "ff21de70f3523afa2976d1e787e2febefeba2653", + "sha256": "1pwj7zc870vxvgbq7vzz924b6a0jhx0fkn0igkgz2piiyic627b6" }, "stable": { "version": [ @@ -5116,11 +5145,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20210629, - 1537 + 20210805, + 1344 ], - "commit": "9511446c4359100d0b6433579e663852bf8f36ef", - "sha256": "0gkkgkqvs7sq5s43srzzi8s5xm4pj53x9lifg79cad15a6i9a8sc" + "commit": "0967cc8e5aeaf7f6a36793e2d36717fd125647a8", + "sha256": "0y1hwwk2rijfpjkagn9c3rfvf350d8nas9g3lqgc7baq9jragizi" }, "stable": { "version": [ @@ -5532,8 +5561,8 @@ "avy", "embark" ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -5582,8 +5611,8 @@ "deps": [ "avy" ], - "commit": "2c5e0c08d6cb27c213a8eda5c7033e3ff2aa9661", - "sha256": "11sa9a5vh546dpnxmrhxps77c225vkrfqsb6qlsnli2kmp5cxj48" + "commit": "18bb320f395b7e412f7e377cf4c46d205d4b4e1a", + "sha256": "0p96kxyq1pk9cnwxis80vr6xnklcg2n8gp7pj8z41kz1i2fn960m" }, "stable": { "version": [ @@ -5720,8 +5749,8 @@ "repo": "cniles/axe", "unstable": { "version": [ - 20201113, - 2237 + 20210816, + 1530 ], "deps": [ "dash", @@ -5731,8 +5760,8 @@ "s", "xmlgen" ], - "commit": "f6fb37f6035605755be41d018ca8b70caa2bc75a", - "sha256": "10sb1a5r3ip1p7rckc2lzxbc5wv1fa3r10jqrsaz5y218rx3c2j6" + "commit": "eb4a5b3b06c3cbed521e2c0e0985941c367f4e74", + "sha256": "125bqkakk0k6cs0bmhc46xba3if6zl0k7f8l4d07dbnzdinijc8x" } }, { @@ -6094,11 +6123,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210710, - 1645 + 20210805, + 1401 ], - "commit": "7f1db3df9bb6f4a3c9f4d3c10b9a6cf231752547", - "sha256": "0ycxj4lmmkbpmb8yizys25rdh0zrmw4sbgj19wb6zp2d30xk32qf" + "commit": "9836cc26c2f8ed9d809feee2bfd8c082cfdbd033", + "sha256": "146fmjkib6d05xyz88yc903w8wla19f0vy3f91yr4qj7ab74frxf" }, "stable": { "version": [ @@ -6117,11 +6146,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20210615, - 1601 + 20210821, + 1941 ], - "commit": "d9c97b741db389ceb127b0f0180b2087cb24d0ef", - "sha256": "15m7gbwq1lmca2rlfb2ik86ibmvjnj58yajbp5d23xn03qqd6x6c" + "commit": "c5eaeed156ab906190c662d491269230967104b1", + "sha256": "0r221iirqsbz13s76r68i496izbirrvcw8ql3wsh205zmxa3jqg1" }, "stable": { "version": [ @@ -6312,11 +6341,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20210715, - 2325 + 20210804, + 1431 ], - "commit": "3b0a3a2200cd93497563812d4026c4d67b13e91a", - "sha256": "0pgn1j6fpj2qjns2zvzaswk5l65mkd6sxs08l6z0q2926gb7dpx9" + "commit": "c4292f69c3bf4faa8393438489a3820c1d52b6ee", + "sha256": "0pk8j1vang644rpy8ch126lnxjpj5hz0qyy511q43q5fnx9fi30d" } }, { @@ -7038,14 +7067,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210727, - 1208 + 20210825, + 1743 ], "deps": [ - "bibtex-completion" + "bibtex-completion", + "parsebib" ], - "commit": "a2569ef74b40ed6b6459ed1b1b19e12282b426d0", - "sha256": "02yvr60ri07igfq8c0v2a0hybqzkvnacqp34jv1y4dhd5igbhfdc" + "commit": "f4d9af720d3854ce0e746312061372ae30e2cc97", + "sha256": "0lynllvkyy9svi9c5gsqs5vyp0fgyq43a83drf67x0x14lfhdr1a" }, "stable": { "version": [ @@ -7965,15 +7995,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210618, - 2112 + 20210812, + 1005 ], "deps": [ "epkg", "magit" ], - "commit": "6ea061f30065493e206132ff3f7a2d8febb859d0", - "sha256": "0m7c512r789pbx2qgzx1zgbr2w4y6ma8l7zhvslji57hzhcvj10y" + "commit": "018d5334b4c9af297799f0644e09946a13d55edd", + "sha256": "03h5cgsk3wxpw6g946ia0dbzazlbpip93zhirjh7vxcqp4wwyvcf" }, "stable": { "version": [ @@ -9699,11 +9729,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20190413, - 1205 + 20210825, + 649 ], - "commit": "38ebde12d3d529e6ef8078967997d32226e69e82", - "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp" + "commit": "3b6913ee6af31139bdee2c236ce2b3a10eabc74b", + "sha256": "0gsbhwymr2c3fy6mzrvk70q874r9yxf46vlkyljwp1srw095xi7x" }, "stable": { "version": [ @@ -9760,17 +9790,17 @@ 20210707, 2310 ], - "commit": "c4c70235ebbfc1733789f07f084c2d071679feee", - "sha256": "063gfjlay5fdgd19q363np9p5s24hxrwvxbxahkjjfn40mnb6nqi" + "commit": "86ae7e69e2d07d5dfe9eac66c2b359d098c682a3", + "sha256": "0kvadcjrrj60p3ijbz6f51f2ziapig06zzmkycaahailhf9v1s0b" }, "stable": { "version": [ 0, - 8, + 9, 0 ], - "commit": "57a4ca5af5a7f55b768a9d9d6655250bffb1257f", - "sha256": "0z7p9687bdvhddgyb6b3j0c3bngynnyvc8z6yp4hhynvrlvsmy5d" + "commit": "7f554a89784d3455970fe1edfb9f0044ac570aeb", + "sha256": "038i40apywn8sg95kwld4mg9p9m08izcw5xj7mwkmshycmqw65na" } }, { @@ -9811,14 +9841,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210615, - 1543 + 20210813, + 721 ], "deps": [ "markdown-mode" ], - "commit": "1dd9771853b4327ed161232b65520c13ffe3c0c6", - "sha256": "12pwlww471s6n4vy367m3z8gscxpapi7q6sz5siyis9vjwz3ql2y" + "commit": "794f902bb84437afcc5d677d4a7a996c1f98359b", + "sha256": "0df3ldjwrk0kdyv417k1aq4nph749cgip48af56pq7rcffccdyk2" }, "stable": { "version": [ @@ -9920,8 +9950,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210621, - 1830 + 20210801, + 1509 ], "deps": [ "ansi", @@ -9932,8 +9962,8 @@ "s", "shut-up" ], - "commit": "9fbc15dfe8b0739082e7bbff65f226dfe74ac9dd", - "sha256": "16pc37b6qaaar8gb4b6rzx7bwdj1lamg34a0nlqw6bkp0wzv1d4v" + "commit": "09c3851c118d2e850314e7f3b9efa786932a145b", + "sha256": "1fdnphlg9ip9cwvl1cxjhvlvgd9hxd5c466r79hrzq81vzn076cg" }, "stable": { "version": [ @@ -10112,11 +10142,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20200705, - 443 + 20210814, + 819 ], - "commit": "6bb9481e48b889503626b4e3cb7cfec8d14cbf4b", - "sha256": "0nxq8p7hafpl1xq9daf5lcyk8ragdgnwsfxxd2d0rnzmyflgw5wi" + "commit": "03fbe7d1589d36f627ef9fe7b86f9fe6f623cbb3", + "sha256": "0lp5n3ar1k0scn8xzjylp7mgzf637ibbzai039n72z68nx2drilk" } }, { @@ -10191,11 +10221,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20210621, - 654 + 20210804, + 452 ], - "commit": "614a8d94f67cdc1eeef8371f7b6b90aef8a78158", - "sha256": "1i9la8rh1sgvnk1kwd180x3daaglh3xzlbbfirnjsiqn3yyl9flk" + "commit": "f215b70c5cb02bbc43f5a7d5c8e5e3460ff82428", + "sha256": "0gf4xjzf3afcg88cvjmxq87pqci8s8y2av4phbh3bgd00myjmhfw" }, "stable": { "version": [ @@ -10449,8 +10479,8 @@ 20171115, 2108 ], - "commit": "d33da533194106a0a30dc4a22f11acbd2846cfba", - "sha256": "0q89wmfa4pi2a3vs9qcy27dharxlqpxm9b4lpxbjzii9f08fad0x" + "commit": "90bf324af47e6c607a4d7312a1c69701c2b180fb", + "sha256": "0s3sdvv3r93bz62sk7bk6bdrj5gx6qb9mqd7fd1gkcrryhwb05np" }, "stable": { "version": [ @@ -10683,8 +10713,8 @@ "deps": [ "avy-menu" ], - "commit": "d77c4d64fc8acc386a0fb9727d346c838e75f011", - "sha256": "11hls33r3lq46griyvpfnwkgwfwa4adfjzd03hcx2dn5ji0x0yxb" + "commit": "16e9ce0380a7661c6dae9ccec1172fe4757df682", + "sha256": "0cbs6lpljldz62vy2qqb3bdp3yarx84qpnmayyyah128snb9ic8v" }, "stable": { "version": [ @@ -11240,8 +11270,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210729, - 521 + 20210825, + 1937 ], "deps": [ "clojure-mode", @@ -11252,8 +11282,8 @@ "sesman", "spinner" ], - "commit": "52ad2bc4ebadf6692d9c2d5cfcae467e149beea6", - "sha256": "15vr53diq6q8sj9cnb3w8smxx6jlxp0ps4vjqk24yv1lgycfq0ng" + "commit": "fd5232d03f62c2304daebbdbdf99f6ad860fa702", + "sha256": "1aj289145kza226xlg2zqi8m9wfrpr05xx6b6dvv1g9508jhxvw6" }, "stable": { "version": [ @@ -11522,36 +11552,37 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210727, - 1320 + 20210822, + 1949 ], "deps": [ "dash", "f", "org", + "parsebib", "queue", "s", "string-inflection" ], - "commit": "ad453630ced1fd1aa1f760b96da1cd702c77aaa9", - "sha256": "1v7k1psvj1n90y5nb8cflapfzn5hf75hxsfdmy4ppliw97b5bq9d" + "commit": "299e52b2dda37960d609efa78c40e255001d163a", + "sha256": "0dqnyff2vfncw3ais2ml7k7lsdsrwjvw3kpynw9mb5si88sxh24b" }, "stable": { "version": [ 0, - 1, - 2 + 9 ], "deps": [ "dash", "f", "org", + "parsebib", "queue", "s", "string-inflection" ], - "commit": "80b395b8a0c7fc92290f0d1bfd1b5520ffd415fd", - "sha256": "1b918gjzds9jzs0ywfr41wd069l234pshpa9rn8srkzlpj5lac4d" + "commit": "15034f1706cc9eb0ef97dfeeb7884da2a43b88a9", + "sha256": "1m5j1abyk68f3d1v781yrx2xkg42vyfgfckbj2yk2lgk6d7rz0p1" } }, { @@ -11572,8 +11603,8 @@ "org", "org-ref" ], - "commit": "22a759c4f0ec80075014dcc594baa4d1b470d995", - "sha256": "1j7jdc2as87zycbfhz2nav97dqnx3xnq321dbjswmidg5fbhsr7q" + "commit": "0fb4c96f48b3055a59a397af24d3f1a82cf77b66", + "sha256": "1n69016gds7kmf3253w36i40rf26g3qvgac7n0z67im9jvjfa6a7" }, "stable": { "version": [ @@ -11600,20 +11631,20 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210728, - 125 + 20210823, + 1603 ], - "commit": "5c5958e467e4da7a8578039643d5036b3395e3d6", - "sha256": "1fal5cbj1wbji4ail1b8k9bc3c8mps7m68j7lk2086x67l1il9di" + "commit": "9a0dcc5dad0b0796c8febba1470db49b3e845f2b", + "sha256": "13zl0bxnxqm6cq71lj02d906mpmmd1xpwji3d23fvy80nkxzrm86" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "dcb5ec12d077c9a8f1c165a0868f98098494f78c", - "sha256": "1mf0d9avyhz83kb5fz2flwwn1knrbgrs0245q0layda9bya5i5yk" + "commit": "b74147e2a166e27c7c6074ffeaa5f273d4f938bf", + "sha256": "04vpcn8x188kl43pra3y57n1kky1fm96q1ym8f8kq93qnbjz0b9x" } }, { @@ -11624,11 +11655,11 @@ "repo": "alvinfrancis/cl-format", "unstable": { "version": [ - 20160413, - 45 + 20210824, + 2016 ], - "commit": "4380cb8009c47cc6d9098b383082b93b1aefa460", - "sha256": "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h" + "commit": "a391d7696bea972ad9a968426e712feddc284ef4", + "sha256": "191jkjka1pv2ssggk138gni38ckbndjlk344px3r1p0mnv3gmfaq" }, "stable": { "version": [ @@ -11855,26 +11886,20 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210426, - 245 + 20210813, + 750 ], - "deps": [ - "ivy" - ], - "commit": "0d02d72fb63453ff5623b26234a63f66090da7ac", - "sha256": "033z367nmfh6mc1k8kv2m3xsxjw44hnvgiai2n7fp4h9jdv5j8h8" + "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", + "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" }, "stable": { "version": [ 0, - 5, - 7 + 6, + 2 ], - "deps": [ - "ivy" - ], - "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", - "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" + "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", + "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" } }, { @@ -12222,11 +12247,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210706, - 1318 + 20210821, + 2010 ], - "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", - "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" + "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", + "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" }, "stable": { "version": [ @@ -12252,8 +12277,8 @@ "deps": [ "clojure-mode" ], - "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", - "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" + "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", + "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" }, "stable": { "version": [ @@ -12555,17 +12580,17 @@ 20210104, 1831 ], - "commit": "9251205512c49bbdda5d82f48126dc5b8e79d70f", - "sha256": "0jkkb213w1zngask7n542rj8idjxvzbxy51pgydhas57m6xng4af" + "commit": "e0a34750f8b7a014d021fbde0e860de5a5073473", + "sha256": "16nmp6arjdgd9s1jj2cnj5dak0sf5ass2w894d6xdqhk9mz8g1gi" }, "stable": { "version": [ 3, 21, - 1 + 2 ], - "commit": "f7cf69e34a1607e8ea2b6d10fef6a6058377c24e", - "sha256": "18gwkb8p9086qg4acfbs74891nzh5wqs3id6iv5zqwc76kvcb4y7" + "commit": "31c5700d4322ecfa169db2fccf385d6eced4e737", + "sha256": "0vjrv831qjc0fkayd096nmb0l0q3aphbd8gp5c6xk1hckpgzgwl0" } }, { @@ -13524,11 +13549,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210721, - 2003 + 20210825, + 1508 ], - "commit": "7b731e7d435d8782c5095f6f269704a5e21eccad", - "sha256": "1av9ln4nhkjqd6x6v43yjnzp07kx1qhzcxjni343x4npix6p41xm" + "commit": "c7234a9df0b1a624ae0633d3a7d08f92109ff85a", + "sha256": "0i5xvi21gmqk2abpll761cz6g0g2i7s2gy63hvi2y3ac611fww2z" }, "stable": { "version": [ @@ -14411,15 +14436,15 @@ "repo": "vspinu/company-math", "unstable": { "version": [ - 20200131, - 2337 + 20210731, + 2019 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", - "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" + "commit": "45778f5731c97a21a83e3b965cbde42018709afd", + "sha256": "0s3jnslsd2licgav26s0nawwhhs4yrmz9chl0ghkngplichnp9mk" }, "stable": { "version": [ @@ -14450,8 +14475,8 @@ "maxima", "seq" ], - "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", + "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" }, "stable": { "version": [ @@ -14600,15 +14625,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20210623, - 731 + 20210825, + 2107 ], "deps": [ "company", "org" ], - "commit": "4fd9a9c673225196e211bb3ced411d0ef9ff2f88", - "sha256": "1nsgkamrq54vm88imdyhl4326fxl9hvkfp0prckgjcg2r37pkxar" + "commit": "115af0a3625f4669358eca568466d468cacc78bd", + "sha256": "13kdwi4d1pvba6wv9yn1s0dl4cnq61zwf3j647d1s5ybqlrw5f4r" } }, { @@ -14627,8 +14652,8 @@ "cl-lib", "company" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -15590,8 +15615,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20210409, - 37 + 20210818, + 103 ], "deps": [ "dash", @@ -15599,8 +15624,8 @@ "pythonic", "s" ], - "commit": "6db0720b6dc8880d7d6e7dc2953b4769ca6bbf71", - "sha256": "1p44pnjy9gyjhnqg986ab5qv4dm1cfz3mr7n6r4kvy0xkilk8ikx" + "commit": "4de6eccda5ffa1a15c6f2695d93234047a127d88", + "sha256": "1mk8511zx429970k5l4mqjazr883mnz63hzk9h9jb17fvhv38d3i" }, "stable": { "version": [ @@ -15754,19 +15779,70 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210729, - 844 + 20210818, + 1128 ], - "commit": "ebed71d554a5eda6914de6519cd30b867e9dbc28", - "sha256": "1bk9h3yh4r7l0jsmas83sa0hvzsbj8zvracf081jdhi7vl27p9zq" + "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", + "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" }, "stable": { "version": [ 0, - 9 + 11 ], - "commit": "ee58941308d83a717728f056ea753e80f68cfbc0", - "sha256": "0iy6lrqbpi4lv7141rdawpn278rxinfxspwb81n04azyxrk28vlw" + "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", + "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + } + }, + { + "ename": "consult-dir", + "commit": "461a4fc1ea3fcfac1a10e8004d7a917b14a0b771", + "sha256": "13fnx3ryrb7p220haa7nj9227aqvxggjdrxznfsacyjb1skpl6r1", + "fetcher": "github", + "repo": "karthink/consult-dir", + "unstable": { + "version": [ + 20210820, + 339 + ], + "deps": [ + "consult", + "project" + ], + "commit": "e87362a89c91b33fa683f58ee05947ae4565fda3", + "sha256": "11zrwchwdzbrq97dvi2kk8ff1mic3nx8pl103w3i4c8h2w6a51nx" + } + }, + { + "ename": "consult-eglot", + "commit": "ac5f82428f771a5642312a970ec31dd196139dc7", + "sha256": "06pfr848irdgqppksxc4xsa5icj6m8naggpmd0mzlc3dlz0f9lkq", + "fetcher": "github", + "repo": "mohkale/consult-eglot", + "unstable": { + "version": [ + 20210822, + 1829 + ], + "deps": [ + "consult", + "eglot" + ], + "commit": "a6aeb6fa078cc7ea6537793868f606b55ac63088", + "sha256": "11cwz2259i6fj4xckcvx8q8h3sgwxddjkddgiv7406d88m6ma72m" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "consult", + "eglot" + ], + "commit": "2d0e08e92bccc5ed247d4e9244c5c9ee69207e2c", + "sha256": "01bjgabrw7kq6xy6m3b4assn7g5paq74m253pxrjzqa86rqh44sx" } }, { @@ -15873,27 +15949,27 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210725, - 2113 + 20210815, + 1919 ], "deps": [ "consult", "notmuch" ], - "commit": "62462df58ecd888ae8a3a8421078227acdfd36d1", - "sha256": "0z4ayx6xh9x9rqj1shm4kw4q1xw99xncisd0c4m9g5qbn4mq6yas" + "commit": "5e5f42faaae3e0d372f103b9de276d1f7f1c18e0", + "sha256": "1q8ynrrii92x0wv6hm8zcy0nydshg6jqibm7a85vhbnanh161qx1" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult", "notmuch" ], - "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", - "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" + "commit": "a5133b9e1f19b6d51e51dd5c5e3a4f236ca29b57", + "sha256": "0x2lz2df1rjq3vdxvqqnxqxh257hq5iyx1w3yc85w7lmnb59gbvy" } }, { @@ -15904,14 +15980,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210620, - 1955 + 20210807, + 1613 ], "deps": [ "consult" ], - "commit": "7b54edb8ac011015ccb43c9d6193e455b4405425", - "sha256": "1qz0r36nv5d52g9i4g9lcrp9gh1kf16q8lgjwgxxqi0qrq2h99z0" + "commit": "fe7a09b99d1497a30e11a2f86b6415adde00788a", + "sha256": "1bqmr686ncn46fbbq000mpbqrhf76sc9npbyg85053rhnwjdkk84" } }, { @@ -16246,15 +16322,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210509, - 830 + 20210819, + 1455 ], "deps": [ "ivy", "swiper" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -16414,16 +16490,16 @@ "repo": "tyler-dodge/counsel-edit-mode", "unstable": { "version": [ - 20210103, - 1508 + 20210824, + 1504 ], "deps": [ "counsel", "ht", "s" ], - "commit": "82234306562f47ec50db212888dbcf21ef0b70f8", - "sha256": "0jfl33npvw6rqk734ml87bfvnjrsgzim0z397j1bg7klva60j7q6" + "commit": "413047aedb20e85555785123dbd54eb8e91f6014", + "sha256": "02ni7lmm1mpxwha39cnbqjwzgdff55af1d9b05dkl0n01q9vglfg" }, "stable": { "version": [ @@ -17312,26 +17388,26 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20210309, - 838 + 20210811, + 436 ], "deps": [ "seq" ], - "commit": "20c07848049716a0e1aa2560e23b5f4149f2a74f", - "sha256": "0v65zy9f5wsq9vpibfccyyv6ww4fwgyx3vc38vz83j0c5b2c9r6n" + "commit": "6bfd212a7f7ae32e455802fde1f9e3f4fba932a0", + "sha256": "01727k1fxiq1v2q6slp23gc98yqhflp6dcy3yr0yn9ibqx3pi93q" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "seq" ], - "commit": "5b3c8155a9e9fe6f189645d175976026a2dc7b8d", - "sha256": "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7" + "commit": "3445e7e027592c50505c5237ed1484715d2a3892", + "sha256": "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj" } }, { @@ -17423,20 +17499,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210727, - 1254 + 20210821, + 1939 ], - "commit": "27cd2e8da1f374fd9db121826bf78484b0e4079e", - "sha256": "1qrcxyn9n2xn4k2is8q8brvicncc9x78gq3sl8xw00smww3i3rdj" + "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", + "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" }, "stable": { "version": [ + 1, 0, - 12, - 0 + 1 ], - "commit": "69fe52b5908e1b29b2765d7e01cd6a8f0fc16332", - "sha256": "1x40xm9d5sbxbnyxl12ppkzlgxzyn0bjg2vmc139jpkazmmw7r7k" + "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", + "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" } }, { @@ -18077,11 +18153,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20210319, - 1423 + 20210816, + 1607 ], - "commit": "cf580995f891e339a9485ba91d6cb81a2abd61e4", - "sha256": "1k0zwgr80figw0xkni2ih87bi566q3j4009dhicq4ldv2lyaybl9" + "commit": "576d237a46be79449a22e3a7912a3464d7b0c233", + "sha256": "1jlyfzqmysbp83nhgldlri86mpsg9ch4amwdjm8li597w9g08fd0" }, "stable": { "version": [ @@ -18119,8 +18195,8 @@ 20190111, 2150 ], - "commit": "0574dbceef7b8ee16a9cc94091c3629dfa23133d", - "sha256": "1gnwy0pdxwwwicp46w9g9mcsnz070wb7hjvrj33nilsv796m3kss" + "commit": "8af0271186cc642436306274564986888d5e64c8", + "sha256": "0mffl15acpqv3n2hi73nav8jidr74lbps5mhl8vg5c6h3qm2y54l" }, "stable": { "version": [ @@ -18327,8 +18403,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210720, - 448 + 20210812, + 619 ], "deps": [ "bui", @@ -18340,8 +18416,8 @@ "posframe", "s" ], - "commit": "d472a6c937cf519434e718e873c195f5d1e80f19", - "sha256": "17az0rvcy84iahlfdn246marjn4kgrif4gnv0h1zf4sdznk2aijh" + "commit": "8ec7e98986ea46e3c36b7ecbdf9a6562c90c7632", + "sha256": "01lh0yy3zi87cjma2m1wch0ks45b0v6d05anxqsrpn4bladp8plg" }, "stable": { "version": [ @@ -18697,11 +18773,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210718, - 940 + 20210815, + 445 ], - "commit": "67573ceb3db5bc7a5192311c6cac044cb29f61a7", - "sha256": "1ljcym1gwibldsp656a4h9x4hn36ywavqan7h8gk2grr5716cpx2" + "commit": "3926b1b756fb0be5f84776f578a05d31a244d5d4", + "sha256": "146bddpj6w70i1579bh3qdx0lphyfq2zhlhal5mmbcalrd6c785h" }, "stable": { "version": [ @@ -19091,8 +19167,8 @@ "s", "spinner" ], - "commit": "83e7812cda2673884b3d4d218757c7489f817fbb", - "sha256": "1fiwr55s4aq38kyai9k77lb7j0kk53bcrrhd8sw0yqb65a1n363i" + "commit": "341331918cc83b6cabf7ae91e8dba5b0de57b285", + "sha256": "15x0v6s67wz7bql5z57xy2wbklc8b6nb166yswdzfdvrv5301ri1" }, "stable": { "version": [ @@ -19462,14 +19538,14 @@ "repo": "liblit/demangle-mode", "unstable": { "version": [ - 20200926, - 2014 + 20210822, + 2210 ], "deps": [ "cl-lib" ], - "commit": "aaef0bd77a3ea9ce9132e9a53ac021b0f5d33e12", - "sha256": "0pz49zn81bwszcaq24x9p3kkybrl47xl3ndj5xalg4ifw7nw0ygb" + "commit": "04f545adab066708d6151f13da65aaf519f8ac4e", + "sha256": "0jkw3n7fp0fd1pmaxszncx2lvb5g3hszsm2n6axbvy8waqxydz2w" }, "stable": { "version": [ @@ -19701,11 +19777,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210625, - 1617 + 20210818, + 1622 ], - "commit": "f7c57d1878d78f076e2a2ef1c97129dc8aa4da15", - "sha256": "0fgyv5g23by8gddaai6q7dwv0f87fam91avpd0fx8klckyz3i5ww" + "commit": "19f897f03296fba882a7697d438f0e13529718ad", + "sha256": "0vygmqb7xwlmsl9in0qxnfrl0gjkjaxxg9xnxg55y55k1sf4wlbc" } }, { @@ -19716,11 +19792,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20210703, - 306 + 20210815, + 1600 ], - "commit": "f8572f208d58b2122df63ffef87fdd5112d83233", - "sha256": "10ywfkkczi6hzcz4hnjqxr77708hi22hgrvrykmwrh4lsfxl0iyq" + "commit": "4d81e4db165671ba3e7326dec72f950b26df4dde", + "sha256": "0jfrsqvlfv1xh8ss0c9pk4b5dffrxq8i3vp08ckigbdbk31fsvmx" } }, { @@ -19933,14 +20009,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210716, - 241 + 20210811, + 28 ], "deps": [ "cl-lib" ], - "commit": "d225def4a473a16ac994124e063695ef9cef3308", - "sha256": "1wizqf5qj0bxx9b5d0j726in1alqv0wy508y5ivaw7hcyggkg9i7" + "commit": "dbd46bf23c2efc466a640a7e398ca39a51c1145e", + "sha256": "003ks20f0n1w5h8vzsqknzbddrfih036is6q1n43zgqdnh3mlzld" }, "stable": { "version": [ @@ -20686,11 +20762,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20210510, - 2137 + 20210818, + 2257 ], - "commit": "757c82e888d80e5746ccb8654ba58389fa7dc0eb", - "sha256": "0la6xgl3lr5pjs3x5y0l1g66cjdilnw6m0h526chgq140265yg3l" + "commit": "d54f661c8b3477f342c6c3b3c6c9a500cde595a9", + "sha256": "1p7pvl8fp043cv9b0gzbrilnk0k54s7jana39xyvb1zrch99zx2s" } }, { @@ -20913,15 +20989,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20201224, - 2214 + 20210806, + 850 ], "deps": [ "dash", "s" ], - "commit": "fb0f161ac3cce1b224f52547f5bc7e1dcd283191", - "sha256": "0c92cqdsllly2dqrgfa9x8nmdyia1p9gkzyaf4427m1wd08dnfra" + "commit": "7940d9154d0a908693999b0e1ea351a6d365c93d", + "sha256": "0fhbpy9y89jm03hjqp317h0aj9iasbdan0h829rhjhga11x8rw2y" }, "stable": { "version": [ @@ -21064,15 +21140,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210724, - 1015 + 20210810, + 1533 ], "deps": [ "ess", "ess-view-data" ], - "commit": "92dc267bcaac1b6258ad595488bf10b88882b5ae", - "sha256": "00zzcrhjkc3f0wfda3a843wk0ajkhyi8qi4jy0lax4myc0i8mpsk" + "commit": "75d5f961926392feb408049d416ed5c4c2213f07", + "sha256": "19ygbq9gibl0pj9663r77w3y00wpw7dpr1zh983w5nj57fa0im3p" }, "stable": { "version": [ @@ -21942,8 +22018,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210624, - 1359 + 20210804, + 1308 ], "deps": [ "dash", @@ -21953,8 +22029,8 @@ "tablist", "transient" ], - "commit": "9bcefbe54dbed4d364286fe65a87872e763ff7dc", - "sha256": "184dsvaa60b4j6w8s6146x81l5d2a6hkxjqp69gwiixpyjyvcj6n" + "commit": "a13ff981746fc69b0b0607e55346ef85207d6ea7", + "sha256": "12b1ha8rk8fs3234qvpbc0sp7qa6lbfpf78fvrv7yb1213kxs133" }, "stable": { "version": [ @@ -22148,14 +22224,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210417, - 1315 + 20210801, + 643 ], "deps": [ "s" ], - "commit": "5b80126a71662a4bcd3dff7cfbcf70954610092e", - "sha256": "0ywm29gfqfb8dhv3mwwb8fx1vl363gkhba9vdkx0w3r2wvh17l80" + "commit": "aa8c20d162d5e0b3a8677f2f4f3519ce6fdbe2e5", + "sha256": "1vlvxjfw7f3dsa69gg952fv68vswsh3wkxcwz4irwkk0pfcbyxbf" }, "stable": { "version": [ @@ -22178,11 +22254,29 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210329, - 2337 + 20210825, + 453 ], - "commit": "67fc46c8a68989b932bce879fbaa62c6a2456a1f", - "sha256": "0ax7lhfk98vmlf5ll7jdm0lb0axckvhji461aa3whccwjgbinif8" + "commit": "c7c8687ae8a7f1230732eaebc89ea668b4f7a37d", + "sha256": "1cylpcjgd8v8kp93x5w1nal5m66bb8j44c7rsm6qwl099br3pa72" + } + }, + { + "ename": "dogears", + "commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e", + "sha256": "04p2ild2kniji0q8gr1c24qwzrvmwbkkrkzpgxs3y8hxa1gb9ync", + "fetcher": "github", + "repo": "alphapapa/dogears.el", + "unstable": { + "version": [ + 20210819, + 59 + ], + "deps": [ + "map" + ], + "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", + "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" } }, { @@ -22297,16 +22391,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210721, - 1833 + 20210823, + 1606 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "8cbb0457f3f35b3a1615eef176785aacdf5afe97", - "sha256": "1hxs2vdp0qvjcn32yrxxbqq3vgjb68fx0fqsqhh5x3cgvabcim0j" + "commit": "16c654c1212e97a1441cac45fee2dc5cda022103", + "sha256": "1r75kbmzrr3m5rx8nwp0v2cs4aim6pr2p42i3774012q3hi333kv" }, "stable": { "version": [ @@ -22350,14 +22444,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210728, - 2333 + 20210731, + 818 ], "deps": [ "cl-lib" ], - "commit": "9e2680b9188ebd58c490598684bb7545ba01950d", - "sha256": "1yricwp9xndkqask5gg4frg5axmjn2g65z8bbazg9gixvsj4gbbq" + "commit": "65fb964f36939cf412d03b3fe410618caf99c494", + "sha256": "0nrgy82l9jffsgd12kx6z2amc8z9d9i9clqc3gvdzx6g0nlnyfli" }, "stable": { "version": [ @@ -22601,11 +22695,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210627, - 1011 + 20210730, + 1158 ], - "commit": "99ef8ef438e8e11a4486a20c353508b5e20d010e", - "sha256": "0hrqbggmfizl7wcwjcnpgs7ykns6iqwai51mqv61k7m2m37slf6k" + "commit": "62c960dbfe9cadc72784878c1cff20389895e193", + "sha256": "0wks8jcdfbahlv98v41h5jv8slc0c9aqyza9s2lmyi9a0xglp6i7" }, "stable": { "version": [ @@ -23014,8 +23108,8 @@ 20210715, 548 ], - "commit": "d1e683b1489ff830d61566876a94b1da35bc2aaa", - "sha256": "0yi88xd0h3mbggjhay66pz7j55hjvqln7cs0av2na9d5mf70asrb" + "commit": "d6e490c24dfb4607080b6a41930bb9d378bc2a43", + "sha256": "1kq8griallh81wkn91j6kr0gi9y417gakhhfrzzby5gi998lijyb" }, "stable": { "version": [ @@ -23533,20 +23627,20 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20201112, - 820 + 20210801, + 843 ], - "commit": "527df13dcfb11f7a059ca9e8e4d31ab79423d896", - "sha256": "0ylmd42z0lczliafwhw0ga80y7j1njdypzmfkmnblhlxyiwjxwxk" + "commit": "e7e4be6d2590a9e433817f6ce7420d44f0095235", + "sha256": "14sy7abn8aq5daw7jzfjf21zrcxqni7arzgsr0ns5vr8yjc4m7y0" }, "stable": { "version": [ 2, - 0, - 4 + 1, + 0 ], - "commit": "85a76fa17ebd304392ec9b1dd87d223fdd8fa09f", - "sha256": "0fxb2lv4cqdjxarqhzjgfc43sncc1c6m96n0aflm8l4gdmm090kq" + "commit": "478abf3c72176b8887035921270e254202ff9a0f", + "sha256": "0n1vlzvq5mv7z1yffjjqm9ixd3r0cljr60kg55l9pj9kp72a4iv8" } }, { @@ -23587,15 +23681,15 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20210726, - 2034 + 20210815, + 2059 ], "deps": [ "popup", "request" ], - "commit": "279d242d66dd48f7a59405167dff332a569f4c1d", - "sha256": "0cvzq29299lsh6rq4sxmz2fdsnapbv4iqrx2bnsvld9dpm01m6j6" + "commit": "be19464f1e4487414a29650b7dc46e984d3f73cf", + "sha256": "1cdg98303b3k5am7lqyjffx4n09qr49v9fsip8w3p6m357ls7wqw" }, "stable": { "version": [ @@ -23765,26 +23859,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210607, - 2206 + 20210809, + 1349 ], "deps": [ "parsebib" ], - "commit": "7e49d7e1eaeca755c0086a81967673eb5b45d175", - "sha256": "0n6p460nmy6h6sc29j1nmhb6zcbbk7qczab6pz96hyxp1cj9g5gy" + "commit": "831ffcca35601e169c0778035688c5d17d138b58", + "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" }, "stable": { "version": [ 2, 32, - 1 + 2 ], "deps": [ "parsebib" ], - "commit": "3142de8d64789c611e553667cac3bb84428d004c", - "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" + "commit": "831ffcca35601e169c0778035688c5d17d138b58", + "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" } }, { @@ -24254,27 +24348,28 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210407, - 407 + 20210813, + 1301 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "e10fa22b1304c5801b026c10cc5d65a97ccc0a48", - "sha256": "15a0269qbymkvbqgdmv5d4pb7bhw1cplbwra4ydhgwnvwv5c5q9v" + "commit": "375418d1d63f6ec780876593181b6d39054919da", + "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "0b65d5316bcab4d76b5823ea6ecf8f5880f460d2", - "sha256": "1djlhkap7zddknzvjsjz0agpfsms1ih05zcpg1bikid2vs4gddyr" + "commit": "375418d1d63f6ec780876593181b6d39054919da", + "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" } }, { @@ -24465,6 +24560,21 @@ "sha256": "0l8w5f4bkqzb8pglvh516q91s6lvc1s1lfilxc9h881vl3934y7l" } }, + { + "ename": "efar", + "commit": "9616dbf81e8cc089d4816f2f652f6913989379be", + "sha256": "1fnibs05dl9q29icblsykacsw48fj3ivxza784z4sj01v49n39xz", + "fetcher": "github", + "repo": "suntsov/efar", + "unstable": { + "version": [ + 20210604, + 503 + ], + "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", + "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + } + }, { "ename": "efire", "commit": "4150455d424326667390f72f6edd22b274d9fa01", @@ -24613,8 +24723,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210721, - 2323 + 20210817, + 912 ], "deps": [ "eldoc", @@ -24623,8 +24733,8 @@ "project", "xref" ], - "commit": "194b178ef41ccd3d937983f3829d44a546bb24d6", - "sha256": "12pmqq3l08p1vggbhccpg9bh0n78qrdmk5q30a1d4jrfkifcfbr0" + "commit": "a697084d8dfe29783985f298d38863ea5d59c632", + "sha256": "10x0jnhdn7565nkp134jmadcdgq36436rvd5zbc8187hc9j90396" }, "stable": { "version": [ @@ -24658,8 +24768,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", - "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" + "commit": "c90d762c0692cc43032291d37b8ca3201c3d49bd", + "sha256": "1zavk5aykd04143jqsyygnlxn4n86qvjcg267h9kiihsr8wh108r" }, "stable": { "version": [ @@ -24774,8 +24884,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210723, - 1958 + 20210809, + 2101 ], "deps": [ "anaphora", @@ -24786,8 +24896,8 @@ "websocket", "with-editor" ], - "commit": "983ee612f81c1f976bc1ebce2bfe574a825ba9ed", - "sha256": "1hfsbw5fgxbxma7smzmdc7qa4f9affrgs19xxk3dk0p659789lip" + "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", + "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" }, "stable": { "version": [ @@ -24935,8 +25045,8 @@ 20210613, 1418 ], - "commit": "463f5e985fc53300f87ab7eb054d1738fc6ac93b", - "sha256": "122xbfag9ykvcwq549r3aglrdip1nk68abgqlzhm5mqfpqi0l8a8" + "commit": "ec47ecf257bf010cf1f3061e2061c26f78e61540", + "sha256": "0l7z9dn5gpscvpizj0pvqcn36jhjcr7s1xr4x6fg72alw2bg71dk" }, "stable": { "version": [ @@ -25586,8 +25696,8 @@ 20210606, 1130 ], - "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", - "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" + "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", + "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" }, "stable": { "version": [ @@ -25740,26 +25850,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210605, - 2212 + 20210805, + 1535 ], "deps": [ "elfeed" ], - "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", - "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" + "commit": "53d4154c7d993ea5424535b3f0c4e9e75388e36e", + "sha256": "0ffv2adqnnyvwc6axxi1j32l36q35iddmcazpczh2js2hzp2gw51" }, "stable": { "version": [ 0, - 7, - 9 + 8, + 4 ], "deps": [ "elfeed" ], - "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", - "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" + "commit": "1842f26d7ab520acbc6f491bc8e064af67be7a6b", + "sha256": "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8" } }, { @@ -25777,8 +25887,8 @@ "elfeed", "simple-httpd" ], - "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", - "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" + "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", + "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" }, "stable": { "version": [ @@ -26492,20 +26602,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20210729, - 1123 + 20210823, + 941 ], - "commit": "2cdf02e99dbd2d7f765c08ad2f8477b4ea07d5f7", - "sha256": "19gsy0q8qddsm7mcf8ijkw2f92cqg7q32x7yhqblmmwbqa7zcsjf" + "commit": "0d65ffa3ab238529a11d5c1a5d2dea5a6c27e9b4", + "sha256": "1s6mh7a9r3s0b2nk019pdzzp646ny43mihjd68yq1m2yad7d6y5x" }, "stable": { "version": [ 3, - 1, - 0 + 2, + 2 ], - "commit": "8c20802c5f2262440dadbdca60b7901d09ca022f", - "sha256": "0a6qfm7x4nbfanjv33h1zgcwnywd77qbc4adya5kx8lndcn0669l" + "commit": "7b52709ddf798fe53db3855eef52ca8862e7700d", + "sha256": "0fzqm5gpadqzsl71r1bq72ki8dw8125v4nmhdd3b4rz9jy1rqm2g" } }, { @@ -26844,11 +26954,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210615, - 1503 + 20210819, + 2127 ], - "commit": "ef6dfa8e598b2761d0a481526e98e254123a20f6", - "sha256": "0p7c2mnwz85klliy1af96knkdja6q9k9j11r0hfka7g4fak0qi6d" + "commit": "5aa6369b58e72ef2348a5d6ca6bdf32299329c58", + "sha256": "056hb1mss84d4m7fb052c10bfmshf00x772rlpck671n83fi14li" }, "stable": { "version": [ @@ -26874,8 +26984,8 @@ "deps": [ "cl-lib" ], - "commit": "64ba2e3f3096f48928f7be06ed690069b96add22", - "sha256": "1cjzrckbxcl1ahhnnk78778yxsrhwb725cwjbx6i8y6jxwbddpqj" + "commit": "da88fa2d04e37397c519e8b1181163f06a350e2f", + "sha256": "02g42xccwbhgq0wf4v2sd3khyvvsvigixxjb2rdqw70h4j1k8mya" } }, { @@ -27165,11 +27275,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210729, - 1843 + 20210823, + 1719 ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -27188,15 +27298,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210729, - 1543 + 20210816, + 1819 ], "deps": [ "consult", "embark" ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -27339,11 +27449,11 @@ "repo": "smihica/emmet-mode", "unstable": { "version": [ - 20180613, - 341 + 20210820, + 1124 ], - "commit": "1acb821e0142136344ccf40c1e5fb664d7db2e70", - "sha256": "1p25h191bm0h5b3w5apg7wks51k7pb7h4dlww4jbl9ri4d33fzcl" + "commit": "6b2e554f7fd27f732810f4b14ea01e3c54b7b3da", + "sha256": "0ymd865b73m402cd4nc64n2wy0qn17aal69rc8vnc7cxyilc9v1c" }, "stable": { "version": [ @@ -27363,29 +27473,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210726, - 1926 + 20210825, + 1456 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "a0e26c1a143778f7378ec8a053725726e1e6aeef", - "sha256": "0j1jjwavdl3q33rn6zx9z3ka87d9fihd9s5bhrgw3x4fvgv8gikg" + "commit": "b582a75d033e5a21090c854f58abeefdd238798f", + "sha256": "1gmgh9llriqgq8kjdffmyjw5gb9k385fbh258bf7n5yvgpd3bbsn" }, "stable": { "version": [ 7, - 5 + 6 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "144c49ac2931b6e57e265cc6139b7c9718f1297e", - "sha256": "0j9qh781zr348qx49zvr59rdpmh4204fqx9sm3mfh3kg6kbc7v8x" + "commit": "8b32529950e5a2e1dd7afed8757ff6bc923c95e2", + "sha256": "0pcs95nmdbxahwsqp1fz0m8pgwsxycvf7xixh40sfjgifvbq0a21" } }, { @@ -27982,13 +28092,14 @@ "stable": { "version": [ 0, - 2 + 4 ], "deps": [ + "inheritenv", "seq" ], - "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", - "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" + "commit": "8a9a142cf9d35e62a70d9d100a946f78fe0b066a", + "sha256": "0nqqx4qlw75lmbn0v927sg3xyjkk86ihw1q3rdbbn59va41grds4" } }, { @@ -28113,14 +28224,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210616, - 2229 + 20210806, + 1315 ], "deps": [ "closql" ], - "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", - "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" + "commit": "23045743150f9a50ccc164a710c4d495820de803", + "sha256": "0v5v7iw9qyp8ckh9ana61r0fbhffbpsmhjr2yx88kc6ia59vn561" }, "stable": { "version": [ @@ -28135,6 +28246,24 @@ "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" } }, + { + "ename": "epkg-marginalia", + "commit": "c29882cf057db2895a8ef680f9aea32f6bab1f64", + "sha256": "11s2giwhl21irg0h39n2p4r8f33ldc5ydmh5g49kzlqlz6cgmrrg", + "fetcher": "github", + "repo": "emacscollective/epkg-marginalia", + "unstable": { + "version": [ + 20210802, + 1740 + ], + "deps": [ + "epkg" + ], + "commit": "0879f5b2cf87fff17dcfb74009d289d6a89c9816", + "sha256": "11sbf363qy3i87hppv4admqd2sy0kwpvjgih51hn3rbimbswkwab" + } + }, { "ename": "epl", "commit": "9c6cf24e86d8865bd2e4b405466118de1894851f", @@ -28253,14 +28382,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200824, - 1549 + 20210731, + 2016 ], "deps": [ "dash" ], - "commit": "b0a5e334a7ccf69b837656c8a91c2e9e254e4c76", - "sha256": "1m6p148pcgcfywqzgc0v5wyf1k4knz7kwidf76qhvcff8z9fd5j5" + "commit": "831fcaced262a9dd650bc80241c8214d57de4cdc", + "sha256": "1rgkczdz4ppi0h87vbx10h574xfqn1ba09j3cswhvkxm6w1hram4" } }, { @@ -28384,11 +28513,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20210720, - 412 + 20210804, + 504 ], - "commit": "caafa1a62a76c2132d8b0872d57684f877608408", - "sha256": "0cba6wawwjmidpv1mccmrn2cr5xkyyj44aildifvyqay7nhldp3d" + "commit": "e3a59267c044474f9ca066d36517e9a3d872759c", + "sha256": "1iqyyhaz8zypgj9ij8ivqym0xry10zzyi8qf16fzg2ppxl47bc5i" } }, { @@ -28750,8 +28879,8 @@ 20200914, 644 ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -28774,17 +28903,17 @@ 20210315, 1640 ], - "commit": "4a12f98146fb5f0484ae04b6bf1e469c3d882e12", - "sha256": "09rpzlvygp83drcwgbq75bxgi7m8xrap51mrgqc4rfgcmmmc3zk3" + "commit": "988e8112a6db6f5e16380df30f1aa52b1b233662", + "sha256": "0j3b9cd2hzf2i8lzi2xy39bj2q2fqgcsrsim4viknqsv6awqw04y" }, "stable": { "version": [ 24, 0, - 4 + 5 ], - "commit": "c07336b844645f80430505194c01ffd59672804f", - "sha256": "0wy4fbflsm5sc1jjs6vf8ad0621q1m3vmfazz6jrg1s9llsxgr9r" + "commit": "a29aeb16660f2a91aaa24c474d57c6ee7754ee0a", + "sha256": "153kg6351yrkilr4gwg1jh7ifxpz9ar664mz7vdax9sy31q9i771" } }, { @@ -29274,15 +29403,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20200109, - 2250 + 20210817, + 553 ], "deps": [ "cl-lib", "dash" ], - "commit": "48ee35774c9b8d0e2d96110e3ae84bac60f43dfd", - "sha256": "1w0drk4sfljshcnlvvn028v4lzqznglfx8ly0mfridsm85xws3pw" + "commit": "f638ba32b661d15895e767305f59f41eb01197ae", + "sha256": "1hn05bgznc1az4fb4grg8d9acwpmwr4bp6ibch901c79hp79qlkv" }, "stable": { "version": [ @@ -29471,14 +29600,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20210513, - 425 + 20210731, + 1649 ], "deps": [ "dash" ], - "commit": "5488db4436fc312386fdb123289d7fc5f099702b", - "sha256": "1pipb0l1l3rp3jf1bcd1h3k02ckh2x8x2h9y4bn4cq8xm6bsygvy" + "commit": "3897d8a679a6e98e3f5054aaefe07f6b55f8f128", + "sha256": "0wx0mca7xykjkbyhix2mhqf2l9zc46l14hdy4krnr3xdyb5ibmkr" }, "stable": { "version": [ @@ -29636,11 +29765,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210707, - 917 + 20210818, + 843 ], - "commit": "4fefd0feaae688e28d6a0c36c9eaa219c448903f", - "sha256": "0m9w0l6x67s5mx76ixgh42abblzi8jbp9xpps4flv08jhz1lkc5i" + "commit": "a7ce81bb768d7cc410885711cf99bad0f8941ac3", + "sha256": "0kz9diqb26ksrgnfqdcdgf48sqjapvfg6z1fjk9ib2q2si6nv0yx" }, "stable": { "version": [ @@ -30231,15 +30360,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210726, - 2220 + 20210810, + 844 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", - "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" + "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", + "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" }, "stable": { "version": [ @@ -30383,15 +30512,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20200630, - 1936 + 20210818, + 1228 ], "deps": [ "evil", "evil-snipe" ], - "commit": "584f8f9496bf5250a439c9c9fee1d94f3b4883f0", - "sha256": "0hv8068yaiqwswzhiikrlyl53w43yqi35m9xypvq6v9dwisrqg00" + "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", + "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" }, "stable": { "version": [ @@ -30433,15 +30562,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210721, - 1454 + 20210823, + 2212 ], "deps": [ "annalist", "evil" ], - "commit": "8d10ad4ea59752595de37a8ddc44e8d3fb14fe89", - "sha256": "18qkc3mbc8sr56823bpdr319dg2k2l29chk7c6zr5ln5jls08q8a" + "commit": "0a836facbc1f917c863699eea3eaecc78ac81686", + "sha256": "0zrg4yj62vfpkffz0219ibwqi1yyadj9aaa6qlyz8z6bjg0d7vjz" }, "stable": { "version": [ @@ -30999,14 +31128,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210727, - 1106 + 20210819, + 5 ], "deps": [ "evil" ], - "commit": "80dc731ab736545541546ca64187e850bf0e39c8", - "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk" + "commit": "24a95751f48fb64246de15278734e0179c9f622f", + "sha256": "0gdfnpzzy6y9626nqia7rs5l37bl31nndn1m71dnm0qns5cqfngk" }, "stable": { "version": [ @@ -31029,15 +31158,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20210206, - 1941 + 20210730, + 1752 ], "deps": [ "cl-lib", "evil" ], - "commit": "f04fb17f35f2722f2ac93c862b4450bb8e5b739a", - "sha256": "1d7mdqw4bx6p8y3c843n40g21099pmvras3bf9il5nhg4i3b12z8" + "commit": "246aecc17481dd23c172a9b845f02a9d9e322c7f", + "sha256": "0d3d72q908rdnd4g03aakraij2himw6q4qqrf9wsr3c846q3bvrn" }, "stable": { "version": [ @@ -31137,8 +31266,8 @@ 20210719, 1305 ], - "commit": "2133167e0699f44fe37830839362e2e6793bce88", - "sha256": "0qrqpwnny7v4l8abf93c7l6dz7wkk1b8i6wv0fdcq6b7jrq1ixh4" + "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", + "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" }, "stable": { "version": [ @@ -31173,14 +31302,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210605, - 431 + 20210808, + 1424 ], "deps": [ "evil" ], - "commit": "cd23a7b458d73dc49434a3cf90d3d0caceb5811d", - "sha256": "1naxciaq1ci1ajs4if45wjy5qf8bgkxazyvl1kywrj299wi2qdv9" + "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", + "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" }, "stable": { "version": [ @@ -31759,8 +31888,8 @@ "deps": [ "evil" ], - "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", - "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" + "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", + "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" }, "stable": { "version": [ @@ -31783,15 +31912,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20210728, - 2155 + 20210731, + 927 ], "deps": [ "auctex", "evil" ], - "commit": "9b3a560cc43cca73d2947747892f7d4f92c2c573", - "sha256": "0hain42prqaa08fc116a0qy12j8pbj4a8i589s6h87h4hhy8dj8d" + "commit": "aa0ddf8e768a24cda6d50d07f04c8e7813a2dccd", + "sha256": "1n4xg1c2ia1k6vf3rybzx6afsdq47i8jf57x94fkwfm9wvnf9g4r" }, "stable": { "version": [ @@ -31943,6 +32072,25 @@ "sha256": "031p5i3274dazp7rz6m5y38shfgszm1clmkcf58qfqlvy978ammc" } }, + { + "ename": "evil-textobj-treesitter", + "commit": "949eb5d82e26e37685c3155b22b329e387f0fd59", + "sha256": "1mxx6fcj7k1k9gnjgcs316x92jdicsrx6l584vkzx09h7fz2p4da", + "fetcher": "github", + "repo": "meain/evil-textobj-treesitter", + "unstable": { + "version": [ + 20210816, + 355 + ], + "deps": [ + "evil", + "tree-sitter" + ], + "commit": "461195b882b2179a0e6f8efcd37835ab2a0ed5e2", + "sha256": "1yndxnxx842mhfjqs39i5wz1khm1sha2dr1nhzhi60mz4ywyqyl3" + } + }, { "ename": "evil-traces", "commit": "29f1f13a99b065f4510f6967d0cfce37eaa59178", @@ -32821,10 +32969,10 @@ }, { "ename": "ez-query-replace", - "commit": "c40808c7687ace84e4c59bf8c25332c94b6fdd76", - "sha256": "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx", + "commit": "170b95e0c183368a5074440c1ac22abf746392f9", + "sha256": "1nlik4qq0slbksmxcpc2xmpzj1mw6yrlpmqagvik97vixmm5lny4", "fetcher": "github", - "repo": "Wilfred/ez-query-replace.el", + "repo": "Wilfred/ez-query-replace", "unstable": { "version": [ 20210724, @@ -33132,14 +33280,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210720, - 1833 + 20210823, + 1838 ], "deps": [ "popup" ], - "commit": "eff6cba7b09611ce9ade56972f0ceccf227cf174", - "sha256": "0nzg2l9wxyqkhr4wj0mmcc4ydm1lx1smdcnsf1hs2yqh7bdgi02k" + "commit": "f3b05ad56688f2ca13db053e090a1273cf2deed0", + "sha256": "1hj15wi9jxwjamz345jssx9gd4m9cbdisvmq7mg5vhk89k4h0mvd" } }, { @@ -33189,6 +33337,24 @@ "sha256": "1q15wx53zq6b9f567anrfmfpj04f3r6wz28w4237f9lg62yqhm9x" } }, + { + "ename": "fanyi", + "commit": "f3cb0a07efb7a279f3e7a5d3ba5e6eed8daf88d2", + "sha256": "1yzqasw5wdnshd6s4w6rg5xk6rbd99ryqqj9vzxsnv71s59y5wyy", + "fetcher": "github", + "repo": "condy0919/fanyi.el", + "unstable": { + "version": [ + 20210820, + 423 + ], + "deps": [ + "s" + ], + "commit": "5f4fd0dbee514bada012ab3ecc9c767b8910828e", + "sha256": "1lzmhn0bn6qjyq441bp39gq4wd1xvrcygzrfm6v6srywb6s34dm1" + } + }, { "ename": "farmhouse-theme", "commit": "3b0d427db8ab66d2fe323366b0837595b3b59afa", @@ -33526,11 +33692,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210724, - 2039 + 20210817, + 1612 ], - "commit": "128702146298dad3f4d5409992e985fe670581d1", - "sha256": "12mvxziyrzgbmcg9kcqbscjld42ybl7km027m0kaln39awc0nb03" + "commit": "47152970a98734723b5086b5c774f50da34c0488", + "sha256": "1p9fi5rrqlcx9gg5gljdndmi318x0z5zzxryi1kbqkkc8119kbsg" }, "stable": { "version": [ @@ -33867,20 +34033,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210729, - 5 + 20210813, + 657 ], - "commit": "136018df39520433840d67acbbf92908ab115532", - "sha256": "0rgvk4r1iy4kncmxvgzlgb39dsjvvmihnqwrjgkmzdqfx9891m02" + "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", + "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" }, "stable": { "version": [ 6, - 0, - 7 + 1, + 1 ], - "commit": "2f44af320b4e62053c5b6b523f69a8f16eaaa1c9", - "sha256": "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0" + "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", + "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" } }, { @@ -34220,8 +34386,8 @@ 20210320, 1244 ], - "commit": "10b3aebc3d4411e6889f3428e8f097c0fbf8585c", - "sha256": "0c850rc9nnbvwf1sbp66xk6p246ylrfpqqhh6bcl7lm8b8v0kfzh" + "commit": "b611a8b269d28d226ed1e78fcc7a3120df20f74c", + "sha256": "0w2h538ljsccnw3a66dz1wpq2jxlq8mdgal2qlzx1dw7kdnxhx9n" }, "stable": { "version": [ @@ -34270,8 +34436,8 @@ "deps": [ "cl-lib" ], - "commit": "80cf4529915c34d2d39b4d3410781a19ef264e9f", - "sha256": "193bwcsj42w07aj8k32zl895yp0kw4rgrphn10dd81jv5411r6ij" + "commit": "e967dd4ac98d777deeede8b497d6337634c06df4", + "sha256": "1hs51fb5m9asrzalkyldwlcnw7w6rhdwsspn846yc8s2yprphjz0" }, "stable": { "version": [ @@ -34863,8 +35029,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210708, - 1337 + 20210825, + 1804 ], "deps": [ "dash", @@ -34872,8 +35038,8 @@ "pkg-info", "seq" ], - "commit": "21d52264aa80bfa4ede94c59e37a20fb6d033b0c", - "sha256": "1k2fqiy0aw30za8d8bhia996ab168j61m8h1s9zi7d5y32q1csnh" + "commit": "784f184cdd9f9cb4e3dbb997c09d93e954142842", + "sha256": "137zsivwh3i4b757hzwf5mhv5sg8j2jg7kg0cjphplwasqk70qm7" }, "stable": { "version": [ @@ -35078,8 +35244,8 @@ "deps": [ "flycheck" ], - "commit": "2e386775f1a0eb5d80e5d70e98474ee32ecafb24", - "sha256": "1ai4p0s6wh4sp972fxkjlc4mn6ai1zc27zh4vm63rfrayri1g31z" + "commit": "53598158fa8b74d2e7efea6210edb274e1f0273c", + "sha256": "1gad7i7mw8yh3cg6d5gn1d5jbsnc73v7rcw2sjvif566x8k7n18z" }, "stable": { "version": [ @@ -35860,15 +36026,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20210405, - 1319 + 20210814, + 1627 ], "deps": [ "flycheck", - "grammarly" + "grammarly", + "s" ], - "commit": "abab9e6fadccd6e239f3f7efd91b155c9d5cd716", - "sha256": "1y6v3d4xnlfqcvl5hc4b0y6san1mnf2mx6hcvlbxdphhf12hp560" + "commit": "c4b3c5b4889ee719b6dd0800305f9be869cfd7ec", + "sha256": "0sb8fvkzhc1f1p28mmplj2ld97v8lkpwz4frf62hn3jg21fzj7pk" }, "stable": { "version": [ @@ -36409,8 +36576,8 @@ "deps": [ "flycheck" ], - "commit": "2f5f7502c1e422c1df5b347b8142d67d5cd5caa7", - "sha256": "11bhblr96s8a19sb7lnzrwgihqjcwdnajxr6kiplgqd0wsh2h07v" + "commit": "67d6216229337c9c020a8aecd6ae2417de29b5e8", + "sha256": "1hmh7pzv55c53n46ajvqc1r3sfkz60pa1iz7nms3fc97m7rnc1j8" }, "stable": { "version": [ @@ -36977,14 +37144,14 @@ "repo": "Raku/flycheck-raku", "unstable": { "version": [ - 20210316, - 820 + 20210814, + 903 ], "deps": [ "flycheck" ], - "commit": "4163c0dcc1447bc98bb20b835eb23cb68a638ba9", - "sha256": "0z19zz5dq0pjkzrjg2fbrh9szlgd0lq2j9wmkf4pzkrcb519kchn" + "commit": "50ac228e658a7f86efc298ee3ebd0b9706f083d0", + "sha256": "18wyd7w26wkdpvr76rhblh368dqly7dldkcd71ddjkdi10zas493" } }, { @@ -37785,14 +37952,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20210403, - 1349 + 20210814, + 1628 ], "deps": [ - "grammarly" + "grammarly", + "s" ], - "commit": "06ba82495614f1dfaffb8894f57789156586448c", - "sha256": "1lc3nv7km5m19l673agh9rxv9afllf7sz4sv0brgp1sbmks1il3b" + "commit": "28888bc8d1c795e1b2d798fb5c6cdcc16571c73e", + "sha256": "0vm10sx3w3y110s0qkdiabqnf5fvfjixgnq456rbh8v30y1wgrkc" }, "stable": { "version": [ @@ -37993,14 +38161,11 @@ "repo": "turbo-cafe/flymake-kondor", "unstable": { "version": [ - 20200925, - 1539 + 20210814, + 1303 ], - "deps": [ - "flymake-quickdef" - ], - "commit": "72052b5ba827faf357608cf720a70221192a8282", - "sha256": "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy" + "commit": "0058ef5167142a521825e824aced6229e4898ae9", + "sha256": "09f2xn309gyn0nrsf9hcpwprjyliiqlli3ll406gibgs5nh88hds" }, "stable": { "version": [ @@ -38271,21 +38436,6 @@ "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" } }, - { - "ename": "flymake-proselint", - "commit": "481c3e415dd731b06747f8b2ee86ccc2536cfca2", - "sha256": "115x8syar7f3crw2pfdcmv60q92i9d270dxw0m251w3906rqhdj2", - "fetcher": "github", - "repo": "manuel-uberti/flymake-proselint", - "unstable": { - "version": [ - 20210621, - 929 - ], - "commit": "adf1ce7daf1380cb50f365a36548165fe4a32423", - "sha256": "1mmwq4b4idhbsygwjmn3fj67idixx4gaap9zfa0v4didahjsjsjh" - } - }, { "ename": "flymake-puppet", "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f", @@ -39184,8 +39334,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210727, - 1934 + 20210822, + 840 ], "deps": [ "closql", @@ -39198,8 +39348,8 @@ "transient", "yaml" ], - "commit": "34cbaa7b6a77ba2e4c6750f4f922d3e887c08c67", - "sha256": "1bpkzzkm3r0ylfk319k0dr03ikllhps65yir5i7ybwafddj8albp" + "commit": "a3e6f8aab16a8213cd389fe79d8c02300d26cab7", + "sha256": "0n6p63kfibpz4161wb2f6516ncv3h9algxlgdgrd5lsnn0ympr26" }, "stable": { "version": [ @@ -39253,28 +39403,28 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210708, - 1728 + 20210824, + 1659 ], "deps": [ "inheritenv", "language-id" ], - "commit": "d60a763eaf716d17bf6b8dbff1cc8f54337bfeab", - "sha256": "12gvyr73ab6x4p5iadxdi61d3hwwfbxd9wm6vkja92glyqs2vvbf" + "commit": "06d4d9ee6dd79941d26798cc9754b9c9be87e932", + "sha256": "1bcqj4v5zrqs1ysvvnvar422c3xh1n5yvl1mg7rfwybd0l5pzc80" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "inheritenv", "language-id" ], - "commit": "caa0269ce89789a702823041ca7b309ddaffb5ce", - "sha256": "1y5a704xbnvb46rp1ra9cjjazzs795hvh3p0di2hr5jsql0a0zwa" + "commit": "b18ed67a81b4d81d77f3bd7cf6e004e4e412b630", + "sha256": "1qy4qdvxsagzp8pav2jx29bz37xiwvm5lbwyfp8jlg59715z4cxq" } }, { @@ -39398,26 +39548,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210717, - 906 + 20210807, + 106 ], "deps": [ "seq" ], - "commit": "d2e0cb8f328a1219a3830f82fd01e789cac398b2", - "sha256": "04a5mwlxq43mk132j7v4gx9jiss2pah38rgk0dsc6pn00xjf4j9q" + "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", + "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" }, "stable": { "version": [ 3, 5, - 0 + 1 ], "deps": [ "seq" ], - "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", - "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" + "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", + "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" } }, { @@ -39559,20 +39709,20 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20210728, - 1258 + 20210819, + 2123 ], - "commit": "63d42d913468cd0d75dcccb99e5517057fa34e25", - "sha256": "0ar5dxyxz7nwmh1b1rdiiy76fm43q0pxcpj5959pc7gqxbf5c1rh" + "commit": "029df561ef6572b1ab034490ac48d909d037ac1d", + "sha256": "1b6frjhv4gkix0yj6ibvjgaf4y2b94xq0x4y021v086sp5ifsh3g" }, "stable": { "version": [ 0, 2, - 4 + 5 ], - "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf", - "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6" + "commit": "029df561ef6572b1ab034490ac48d909d037ac1d", + "sha256": "1b6frjhv4gkix0yj6ibvjgaf4y2b94xq0x4y021v086sp5ifsh3g" } }, { @@ -39881,16 +40031,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20210308, - 2316 + 20210809, + 1702 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "3481626cccea8e77e4eee79b05f99c9171559f7b", - "sha256": "1v7p3ln8jw3qm2ka0jl55wq9smal5k31rzsina9i8c5mcslml1l2" + "commit": "bed6c483445017698a1ec27fc61edeffefc004b2", + "sha256": "0yriw08f9crl2basr1a06m73kln8qk1w0n1ljcr4zr6j7ya1fcdf" } }, { @@ -39949,14 +40099,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20210331, - 1931 + 20210807, + 1417 ], "deps": [ "s" ], - "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", - "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" + "commit": "c90d762c0692cc43032291d37b8ca3201c3d49bd", + "sha256": "1zavk5aykd04143jqsyygnlxn4n86qvjcg267h9kiihsr8wh108r" }, "stable": { "version": [ @@ -40176,14 +40326,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200823, - 1521 + 20210803, + 1401 ], "deps": [ "cl-lib" ], - "commit": "88e7bb1eefbe01f781cc4958bc0431fea90b7d93", - "sha256": "1srb3a7p0zgsjgbrdsyx7ql68ygg9h8y93781v4zjmzq4z9qfl8x" + "commit": "17f048c76bd1dc7f5893b04a14db2b850471f399", + "sha256": "0a8gdr0qh985jai75zqb81yjws6lxlfm811wxk939fsglafbxmxx" } }, { @@ -40622,19 +40772,19 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20210428, - 1942 + 20210808, + 16 ], - "commit": "4099dce8f5f17cce8f292cdf0bc1bf2e5cb6975c", - "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" + "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", + "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" }, "stable": { "version": [ 0, - 16 + 17 ], - "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114", - "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" + "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", + "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" } }, { @@ -41709,27 +41859,27 @@ }, { "ename": "git-commit", - "commit": "cec5af50ae7634cc566adfbfdf0f95c3e2951c0c", - "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2", + "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", + "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 822 + 20210806, + 1607 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ @@ -41737,8 +41887,8 @@ "transient", "with-editor" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -41818,11 +41968,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210703, - 1007 + 20210730, + 429 ], - "commit": "35aa068bc2bd6ad8b0070d9f3948d30b76c2e939", - "sha256": "020hnz41hwwr7kr2d1cs8vhlzn2i8p1hvd8v9z79v7a54f7573b9" + "commit": "1003c8cbe2367482ad02422ace0a85a7d56d01d3", + "sha256": "1w2rlxn731jly7v8ks0w670i6351darkh75dvczic50116hfnwnv" }, "stable": { "version": [ @@ -41935,16 +42085,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20210430, - 1603 + 20210730, + 1037 ], "deps": [ "dash", "f", "hydra" ], - "commit": "5b1191f79f1845d7144bd2a49ad25c49866456aa", - "sha256": "06ybkpaqicx3q5hdjz99v3isj1jhrpmg55wf054dzx6wpjy8na21" + "commit": "07f0846fcc92b6c2fdd61db8aa959effd0e23d9d", + "sha256": "1bk1cvll02348d7dwq6dzdm0ykbxf63p16jq8j07q148qm07yf0h" }, "stable": { "version": [ @@ -42008,11 +42158,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20210504, - 2207 + 20210815, + 55 ], - "commit": "0d2fd02c160cf2a09ca4b5b4ffa544833df5afed", - "sha256": "1ryb5hfdfv5iaakv74h5wnwislbc4b9ihjc32cy9sc4gizjvrrmp" + "commit": "c4cb0edc92013ae4e3660f94c0c0d4d13fca6ee6", + "sha256": "03gh9rgw5j4m1clsv97jj02ibmfwz0s4dhr0567g1jhavqm7ibl3" }, "stable": { "version": [ @@ -42376,11 +42526,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210718, - 824 + 20210825, + 1440 ], - "commit": "98d759473ddfdddba0d82ff710aafc9ee6f0490b", - "sha256": "084scd1prj0i1ljz6l298a4yknqkj4rjl9yjvqmd605ac8ji3xh1" + "commit": "cd1186fb6ca7728c1cf2478ad3878a6401c65246", + "sha256": "0zfnqsw3918rfcfapzgfalrd5w6rhy01ym6ykdswrlv38zd9kjk6" }, "stable": { "version": [ @@ -42587,11 +42737,11 @@ "repo": "xuchunyang/gitignore-templates.el", "unstable": { "version": [ - 20200228, - 1419 + 20210814, + 144 ], - "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26", - "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza" + "commit": "d28cd1cec00242b688861648d36d086818b06099", + "sha256": "0x4pg4jpgmbvfw854ps9w3xgp8bgm7n7vmcvk3kp7h2s56l8s2xb" }, "stable": { "version": [ @@ -42929,11 +43079,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20200501, - 2304 + 20210808, + 1945 ], - "commit": "b07112016436d9634cd4ef747f9af6b01366d136", - "sha256": "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s" + "commit": "9b2e5f28e489a1f73c4aed734105618ac0dc0c43", + "sha256": "101y46bdxxgp58li66pwqn6c3skww72gkfmhxpps2v2ijxcvqkl9" } }, { @@ -43625,14 +43775,14 @@ "repo": "s-kostyaev/go-gen-test", "unstable": { "version": [ - 20171023, - 358 + 20210816, + 1215 ], "deps": [ "s" ], - "commit": "44c202ac97e728e93a35cee028a0ea8dd6e4292c", - "sha256": "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs" + "commit": "35df36dcd555233ee1a618c0f6a58ce6db4154d9", + "sha256": "1r0cdpfrrz3lgkd7xzkw77c48w11l9maydm32rz27zpjgzgpakdp" } }, { @@ -44042,8 +44192,8 @@ 20210102, 515 ], - "commit": "1d7d647bb53a49fce03486eba90e97ccf35cf85a", - "sha256": "14ysgyg1cqn83ly6fkwpq7ysibz9pgwcmn9x6lzk38ynkwdwjyz2" + "commit": "d7e933095041aa32033d29f2c87d201b5b43c3b3", + "sha256": "1sa735x8m6c9a1wsavv1w2a3arkx3z7hyp9rkzqz55p2vn0z82vg" }, "stable": { "version": [ @@ -44224,20 +44374,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210712, - 1206 + 20210820, + 633 ], - "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", - "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" + "commit": "bd369750d3aeb7e210c1c033569a53d0fda898c9", + "sha256": "0dkqipsbl7sl6j6asqv7y0md2kxx91n1k4hms7d4jbj4shka7hnz" }, "stable": { "version": [ 2, 0, - 0 + 1 ], - "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", - "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" + "commit": "8530d6697b1534de0146275c80faccae35fa36fa", + "sha256": "0x7ym7bgyr3qdw3bygbp47q4ybah6769y9zzj7c3dfxyqnihmnpv" } }, { @@ -44626,14 +44776,14 @@ "magit-popup", "s" ], - "commit": "19e1a8188e003bae250ff6c40f61a31b638ce35d", - "sha256": "0iajd0qdcgh4vvl3f81z4r1pki9wkzy3hrywp1mmm5zhfncvhfis" + "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", + "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" }, "stable": { "version": [ 0, 26, - 0 + 1 ], "deps": [ "dash", @@ -44641,8 +44791,8 @@ "magit-popup", "s" ], - "commit": "34586b6650fb19689755570628a558ca9ea7946a", - "sha256": "0a7bnw01j4fbhga5x00v5bbk38j2q7mg7ablz6kswlmarqwr4fm6" + "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", + "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" } }, { @@ -45008,28 +45158,28 @@ "repo": "ifitzpatrick/graphql-doc.el", "unstable": { "version": [ - 20210530, - 221 + 20210808, + 8 ], "deps": [ "promise", "request" ], - "commit": "a60a646413fce528ecf42be3ee111b3f92d9f95b", - "sha256": "168yqaygyvrw05kip10azdcjsczahrsflg43vl6ki7ii6x595b5s" + "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452", + "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "promise", "request" ], - "commit": "1623cdd887846057200579cfddc0fa1815d1af9c", - "sha256": "0nqx88ng72vvz1vl7hj1m77ncf9i0d4l3n1bab0kp90fmrgxa69p" + "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452", + "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky" } }, { @@ -45271,11 +45421,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20210609, - 1305 + 20210818, + 623 ], - "commit": "c0ca78990395245e5f742166047b04eeff63cf6a", - "sha256": "1pyi6l08j19d30dk66ign0gpjh9wv1l42jnbsapb5migghas558z" + "commit": "1c82e27beec629514a8039e22f4f7c649e77ee2b", + "sha256": "1hgwqk991cnvslqgmvpwgxavm6nhvgn2cig3r8jpwvmfyjlcbyql" }, "stable": { "version": [ @@ -45410,8 +45560,8 @@ 20210617, 1028 ], - "commit": "b1d873cb6186e08c6f7ec782df989b01e955fb4d", - "sha256": "1rsixglxvc5a25v1pbyz23bngql84nvjn8673lmkhdcqcvd3s1hg" + "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", + "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" }, "stable": { "version": [ @@ -45764,6 +45914,21 @@ "sha256": "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps" } }, + { + "ename": "gumshoe", + "commit": "8683873034caef2ed9ee2a1f9f7753049929c8a4", + "sha256": "1xxlb0kkvbr7j1ic5c9vsg2qfy1w4bm7fmiby7pg1b6c6chaa8r7", + "fetcher": "github", + "repo": "Overdr0ne/gumshoe", + "unstable": { + "version": [ + 20210812, + 1631 + ], + "commit": "35a4b0f45437309a10e2c72e523012c2e2eded07", + "sha256": "16h691h1078m5gm1xqypiapr671i7phsc3kl196m8n3dqypwjj9m" + } + }, { "ename": "guru-mode", "commit": "e60af6ccb902d8ef00cfecbb13cafebbe3b00d89", @@ -46344,11 +46509,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210622, - 2049 + 20210816, + 716 ], - "commit": "98ba3922360199d5260d47f417f096730ad057c5", - "sha256": "1k7zs7vlbpyhizv4ff1mhagz1mvazmm4bvq215z9f871hhf6l7ff" + "commit": "333205066754348b3dd47c5ce834757dd1bbdf48", + "sha256": "1dd79bhvqcz2jwwki6q99815a99agadqk2dbbn7ib4s135xy4fyb" }, "stable": { "version": [ @@ -46678,16 +46843,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210729, - 1510 + 20210822, + 1700 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", - "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" + "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", + "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" }, "stable": { "version": [ @@ -47586,14 +47751,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210716, - 1933 + 20210822, + 952 ], "deps": [ "async" ], - "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", - "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" + "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", + "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" }, "stable": { "version": [ @@ -47879,6 +48044,25 @@ "sha256": "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb" } }, + { + "ename": "helm-dogears", + "commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e", + "sha256": "184l6s2j2fr2z68d275bwgm9rcfz46y1svbwlghran9m7f114518", + "fetcher": "github", + "repo": "alphapapa/dogears.el", + "unstable": { + "version": [ + 20210822, + 2106 + ], + "deps": [ + "dogears", + "helm" + ], + "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", + "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + } + }, { "ename": "helm-emmet", "commit": "acbc5e9fab159ad2d63b10c0fa6ac18636bb2379", @@ -49467,14 +49651,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20210104, - 1214 + 20210816, + 913 ], "deps": [ "helm" ], - "commit": "392a8c11ab27b625d9f863cdde14e09893401b15", - "sha256": "1l7l75g6sg8fhsd98pfc5qw6w05qq08ilvy6bpaxfz50g81saypg" + "commit": "b85019d01815a4b58d6016c3a30fefa60d8363f2", + "sha256": "0dld66r7z525y1b22liq2j8fz248ghj8pxfid66508jpxhh71np3" } }, { @@ -51326,6 +51510,24 @@ "sha256": "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93" } }, + { + "ename": "help-find", + "commit": "2635dfe9bb83463c2d05bb8b59e714f5df0f61aa", + "sha256": "0zmrs414djazm3kzzqqj56ama2iids4m166d9h09xdj6nxm00zrq", + "fetcher": "github", + "repo": "duncanburke/help-find", + "unstable": { + "version": [ + 20210822, + 1704 + ], + "deps": [ + "dash" + ], + "commit": "b1d15676c5bc348821256ffa5aaea308f6f28ad4", + "sha256": "0pz6wxw0p4d5zfz2mb9f7mg6k25iqhik428yia3n77ra80jx8ncr" + } + }, { "ename": "help-find-org-mode", "commit": "572003398d1bba572fa9f6332b25ade9306bf718", @@ -51934,20 +52136,20 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210420, - 1924 + 20210821, + 1957 ], - "commit": "891538de31524956136e1419e1206af0c8befe02", - "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" + "commit": "98178e79a92515fcacd278fb486702dedde0bed3", + "sha256": "02psp4sfirvab6bv9nylfqqfrmmz87wv8x1sf8bmrrqqk0rwn37p" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "891538de31524956136e1419e1206af0c8befe02", - "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" + "commit": "8d43acc799328023ea1ca687122bbf8f068b4989", + "sha256": "0i3fcrkkwalgcb9whw6gjcl5f4yr7vd4vp450i8lj9nab22p7mqc" } }, { @@ -52614,15 +52816,15 @@ "repo": "dunn/homebrew-mode", "unstable": { "version": [ - 20200205, - 224 + 20210820, + 1735 ], "deps": [ "dash", "inf-ruby" ], - "commit": "8c04b040656dc99719efd7663c10f26f74df4a47", - "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf" + "commit": "78e20613674247a65483f89a7912111e3ce4b9b0", + "sha256": "0snclyby8y2k7ps1qrbb18sx3d8h3dkw0d81sg1kxhlwddpp6n8y" }, "stable": { "version": [ @@ -52718,6 +52920,21 @@ "sha256": "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0" } }, + { + "ename": "hotfuzz", + "commit": "8dfb52c062e2195ba51b5670114980bf108aee8b", + "sha256": "04w3cw5h741dsx5xlqkdisw6kr6l7939x1vf2kns2k143qdcjxqf", + "fetcher": "github", + "repo": "axelf4/hotfuzz", + "unstable": { + "version": [ + 20210731, + 821 + ], + "commit": "c09ee50c337a56114834b66ab3475985e3099d06", + "sha256": "1bl99zr75cbknvx1iilw7zjzzmpcv3h541jsz7cz8si1s4dcyhcq" + } + }, { "ename": "hound", "commit": "90cfc34eb4e8be7bf887533b85feba91131a435b", @@ -52803,16 +53020,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210707, - 1513 + 20210816, + 507 ], "deps": [ "org", "promise", "request" ], - "commit": "4943a4ef8d242952ade64903a05c13094de2fbf0", - "sha256": "1fgg1jcnihx3akp7r0fvwdx71ldl2apbw6xa591f6r5slvh179gn" + "commit": "4f3d70009c1368174355ca7a5eb1259f18ec5f34", + "sha256": "0j8i6c21jzdc88bvdsbshxgv62wvl95kham5w6kfkrlj0ld8i8yg" } }, { @@ -52979,19 +53196,19 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20200816, - 746 + 20210825, + 2150 ], - "commit": "49205105898ba8993b5253beec55d8bddd820a70", - "sha256": "0caw0wwbscfr4a9ynfabrpkvgibf0hlrkwisib82nhcqcaanf962" + "commit": "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9", + "sha256": "0kzkspq9cqdz9z6vibx39kpci07fpwm399nl9bpykc1vbj8cm44f" }, "stable": { "version": [ 1, - 55 + 56 ], - "commit": "682edbf751f5c255bfd4af0eb714a8bce0737cec", - "sha256": "0gi3xshscpa53qrj8yplfsqahcilc2ybcc2p7gnh5nbnf2n1n97x" + "commit": "ed220b1f3be1f898e3cfd628196b16d25a65cb5f", + "sha256": "14m8si49br62lgx7asdyp9jysq0v6midrfk32sxy521ydqmqr3c1" } }, { @@ -53187,8 +53404,16 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210721, - 2022 + 20210819, + 811 + ], + "commit": "3a157bab0493fe0654de0324ec59eef9b3d15202", + "sha256": "0jm81nax0r4h82gd7pbvxpf2nb7ynmxq099103y0s5xhy1cx6v8l" + }, + "stable": { + "version": [ + 0, + 2 ], "commit": "d140638360a3eb1bf8f17877bd888f898df63ec0", "sha256": "1lybjbbcjsry20p6jzmkg2h7am7hcgfhjkdmby9pk4whnhk9l4lh" @@ -53305,11 +53530,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210630, - 1155 + 20210806, + 1955 ], - "commit": "e59c8392938235ca8d95306aa1c3f1591a43fb45", - "sha256": "0vrdd4w9v07g6092sva8br0n3dlf1n9gj8y56k13a1wn9hwi2wp3" + "commit": "cb784a69e60938efe14b48130558f1bb1af92d3c", + "sha256": "06wibm3xc5mbpq2ha3ssiwczq7c2660dqwkmpbnsqarx2s4v2km5" } }, { @@ -54325,8 +54550,8 @@ "cl-lib", "prop-menu" ], - "commit": "be578820a7e14cb4264a63eac272800a3540a7f3", - "sha256": "174xlr36n8iv8gmapmfy55jgppmbck0m51yhni35674f50q8200y" + "commit": "3cc9361b4c0ca88fd3ba218633ea1edeae18d6fe", + "sha256": "04zj69lwjcwz0dmmwz84lfr3w0cdca94pv69ldvik4qh685cd0n9" }, "stable": { "version": [ @@ -54364,11 +54589,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210612, - 546 + 20210812, + 735 ], - "commit": "3247f3029a4e309c71a5b066fa4299d4cbb79fbc", - "sha256": "1w6apgfs4zgcqpcn3qgf0ncx46m6sz7vr4ln00s626ll0c4lhnys" + "commit": "2f504c966e7f640dcd6ecbf40a6a1a05ea286de0", + "sha256": "08lgv18584ksgkz0r39vc6xfjid93v0z3wbds38iynaayimr3p68" }, "stable": { "version": [ @@ -54622,8 +54847,8 @@ 20210423, 731 ], - "commit": "01bf1e1101ac9cd34bfda7016ce0f82f97a3de35", - "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf" + "commit": "a90183954522876ebbf1ce96d88b80e6a31b9d34", + "sha256": "1dwa6gvq17p7cj09rf0zwgg6bydny4g7i8mqymfic20vjw2pbmn1" } }, { @@ -55185,14 +55410,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210723, - 718 + 20210811, + 645 ], "deps": [ "clojure-mode" ], - "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8", - "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy" + "commit": "38e7dc1829646b93473c31d704bda0dee6644a38", + "sha256": "1g2dacwf8dnm289y7cpy3vpdyp6qndwg52nvgdxzsbg9xx7wdz72" }, "stable": { "version": [ @@ -55245,11 +55470,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210722, - 1310 + 20210731, + 2030 ], - "commit": "59b7126540bb848d3a38ccff71e85f3cc0cef39d", - "sha256": "1jdc4daydjzrmk07b8a45adrwjaifnwyn9gfi16yl7bn3wx6zcvq" + "commit": "404f88530975e3540f357f6a4f96c864bd19065b", + "sha256": "14hz77f4sjq0pjr22fp77sk5kh6074qs493aiwc900b1apzh47jk" }, "stable": { "version": [ @@ -56465,11 +56690,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210727, - 1907 + 20210730, + 1743 ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -56496,8 +56721,8 @@ "avy", "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -56632,15 +56857,15 @@ "repo": "franburstall/ivy-emms", "unstable": { "version": [ - 20200629, - 801 + 20210817, + 1300 ], "deps": [ "emms", "ivy" ], - "commit": "6f547f9f3dcbf0d5b88595760b3505c7195dc96b", - "sha256": "0bqn0hqdrw8psc8r6xcx6dxrjy7llkfpm0fd1k6ra4ybncgaznfg" + "commit": "dfde98c3bdad8136709eac8382ba048fafdcc6ac", + "sha256": "0h7f9yj2dx36pjqdf6n803xhv7m96xgj11hi59kh1rvr8d28pgm0" } }, { @@ -56864,8 +57089,8 @@ "hydra", "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -58216,8 +58441,8 @@ 20210512, 2301 ], - "commit": "c3548cac4c4d2caffb750391b2d7d88c3892d139", - "sha256": "06328yfj7g575dyxa7a17hwbas3ly45hikrax6qzy64zsakp9gx2" + "commit": "c5cc024a06684b91da9bb05fecf681426596af5e", + "sha256": "1qkkqqq4r5j10s4q17r2r4ryim0gpknr5h512jj9yk52a77q1g7d" } }, { @@ -59033,11 +59258,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20210323, - 612 + 20210824, + 747 ], - "commit": "fe6f6f7a80f8d60ecffa5b2cb43667bb9dc11705", - "sha256": "0afgdga2p7ipdimvi2xncmqxv87x2khg603iifyylfq26wyxscr7" + "commit": "a1ba9a03a4b18a0d9536753efee623ab7afca596", + "sha256": "0czmvm7nm91n9kg5cv6rc5wcw6vwyqfq2fr8lrm4dfzrwvf99204" }, "stable": { "version": [ @@ -59104,8 +59329,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210728, - 523 + 20210818, + 310 ], "deps": [ "dash", @@ -59114,16 +59339,14 @@ "spinner", "vterm" ], - "commit": "7652679de3118c10659fdc492d67ec097e9ef46e", - "sha256": "1n41bvrrnqgj3qijdn4s7zac4xrfvyh759q99agycbsm1xdpkrvj" + "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", + "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" }, "stable": { "version": [ 1, - 0, - 0, - -1, - 6 + 1, + 4 ], "deps": [ "dash", @@ -59132,8 +59355,8 @@ "spinner", "vterm" ], - "commit": "03b4296ba7151963eb3c850f3314b02644101f51", - "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" + "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", + "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" } }, { @@ -59333,20 +59556,20 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20210311, - 2359 + 20210818, + 1526 ], - "commit": "45c248fe72d4a15c5a9f26bc0b27adb874265f53", - "sha256": "065nnm4r6n83lbsn47idrxn3j1vpwnik683fgc4afhi5mm4ij89b" + "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", + "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "8c0d9bec38f717be1549e74839360e35587739e0", - "sha256": "1568fwh6y9584lyx57iq9ncw0xn4j1ywdbq38sk9hlpgbpsy8ln4" + "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", + "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" } }, { @@ -59678,15 +59901,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210727, - 1225 + 20210814, + 1741 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60", - "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g" + "commit": "716aae7e64637e1a7fdeed8ef5b278512b8076f9", + "sha256": "0h7ipf2n9bbp6k1qda1g634gvjx2p3x2g4nkf8473iihk8960k1p" }, "stable": { "version": [ @@ -60030,10 +60253,10 @@ "version": [ 1, 1, - 0 + 1 ], - "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", - "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" + "commit": "04ba7519f34421c235bac458f0192c130f732f12", + "sha256": "09xr0h2ag3pzlz455gv5h915vn1dz56gqx61jx3n7fc4a794pqxw" } }, { @@ -60375,8 +60598,8 @@ "deps": [ "cl-lib" ], - "commit": "388067e764bf3922234196e2e9dd9e8f664c634d", - "sha256": "0rxzl3rsa45jq8b8bjirsc6yry95zxlyp81v5r4hkvgyxqhcp3c1" + "commit": "534300796d5dc528462e2d5deb4c7a8932936909", + "sha256": "1kf4vbv2n2n5jp1qk1hh4f744h26h5283k0x6arpdpx5z7n9acqm" }, "stable": { "version": [ @@ -60487,8 +60710,8 @@ 20210318, 2106 ], - "commit": "a55ad400a52e038f110df10d8f3c1e822b90f76c", - "sha256": "06kwhj190k7g5hqy9ibgphf1xrhkhzp36d0d3kqbqkdfc4jx7xaj" + "commit": "49ef9ff24bf8f545243a30b1e49192d73c1b41f7", + "sha256": "0hs4d5fw1ic8vvzqiq7skb8ag2rdshmz71m2swl38s1bkhnbjbac" }, "stable": { "version": [ @@ -60508,28 +60731,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210724, - 1237 + 20210811, + 31 ], "deps": [ - "elquery", "request" ], - "commit": "71e770ce1e9994cf3e035cbcc7a2f26b1922323c", - "sha256": "0m6insjzl4hc00ank3i5f7y3mq734cbz085yfkm79vziy5j1i2bc" + "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", + "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" }, "stable": { "version": [ 1, 1, - 0 + 3 ], "deps": [ - "elquery", "request" ], - "commit": "e191c312e5c9343fd9601c45a8ccd017479ee475", - "sha256": "1lsbd2qjmpbk474n19s9mq2n1i5sdg6jrnbpja6vdmn3a28c5wj7" + "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", + "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" } }, { @@ -60840,16 +61061,18 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210714, - 1307 + 20210825, + 1458 ], "deps": [ "dash", "magit-popup", - "magit-section" + "magit-section", + "transient", + "with-editor" ], - "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", - "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" + "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", + "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" }, "stable": { "version": [ @@ -60874,15 +61097,15 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210628, - 2003 + 20210825, + 258 ], "deps": [ "evil", "kubernetes" ], - "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", - "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" + "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", + "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" }, "stable": { "version": [ @@ -61014,14 +61237,14 @@ "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "seq" ], - "commit": "518203abc6cee13c73c2d91282354ed59f00f15e", - "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" + "commit": "02b1afad2c5649221abada2d938ef3736e020a96", + "sha256": "0idzyx6pxn8s78my9b4qjxz6561w6bzjvbp3yv267piyjgvwnzpc" } }, { @@ -61032,16 +61255,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210607, - 1851 + 20210819, + 1935 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "d6cd35d57ed9cd1728913ee75e42f575f090c3b9", - "sha256": "0i571idikvgryyar4sskl9k31jrn88cax7gm18mm6yfjq33ivk18" + "commit": "af78f6a6eec6f2f1096ed9b72fc0570458365423", + "sha256": "1aw534hw7s0iijsyzzf4k496xjrx983whxvy13n7yqdmzqp728fz" }, "stable": { "version": [ @@ -61268,25 +61491,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210708, - 1719 + 20210822, + 412 ], "deps": [ "cl-lib" ], - "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", - "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" + "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", + "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" }, "stable": { "version": [ 0, - 14 + 16 ], "deps": [ "cl-lib" ], - "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", - "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" + "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", + "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" } }, { @@ -61673,16 +61896,16 @@ "repo": "conao3/leaf-convert.el", "unstable": { "version": [ - 20201012, - 41 + 20210816, + 1103 ], "deps": [ "leaf", "leaf-keywords", "ppp" ], - "commit": "c5bce825e4a171076c8f93692111979bcb428cdc", - "sha256": "09g4ibd0afdv54cim45ab69cc7zsmx8n0100wqwakmhvpq8g4kf6" + "commit": "da86654f1021445cc42c1a5a9195f15097352209", + "sha256": "14pvdkknbng44frlf8accpqd1bc9j99x7xjymgrdbyczbq2srv4n" } }, { @@ -61712,14 +61935,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20210711, - 156 + 20210816, + 1107 ], "deps": [ "leaf" ], - "commit": "f46311f8e7e5ce0d5af928fea99111b3c86de7ce", - "sha256": "1qlg6n5yaagq97x3c2r58pcblk0gz4bysg3cgm5iq3sq9lpf3h2n" + "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e", + "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6" }, "stable": { "version": [ @@ -61864,11 +62087,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210527, - 1449 + 20210820, + 2243 ], - "commit": "b8ba2a0bf56b751f077f13137a1904d66061a4d0", - "sha256": "0cc9s00flbih3kkbkan7xfqlv5qq9j4cz52ljj4xyxbf51r2lh0z" + "commit": "bcc48c818e34d518a0513e9d2c26fd92b3989c27", + "sha256": "1bv57ymdfs848347ckcl0c7jxdjzs12hpg7mcdih04yrlbvxrhq1" } }, { @@ -62215,15 +62438,15 @@ "repo": "alhassy/lf", "unstable": { "version": [ - 20210729, - 229 + 20210808, + 1921 ], "deps": [ "dash", "s" ], - "commit": "54994d4db09d879c247db9aecdc0b6f27dcb7e6a", - "sha256": "0slv6ix6z0pnwr4rphpyy0fk0ff0bx0h6vqb8qjf85gnwz8l6dwr" + "commit": "35db92ca765a0544721fdeea036d77b7d192d083", + "sha256": "0c22347dfrjdrn0cn4bqqsw8gd1663hkgycxkfivpyg0d734g5nq" } }, { @@ -62237,8 +62460,8 @@ 20210603, 1241 ], - "commit": "8b73426766029eb541b69f49cc49b9dfa1c616be", - "sha256": "101mpzj38w6cng09aq5rq4ly4a0p9zgr8jmbvlkf12i8k03lsfsv" + "commit": "f39ec6a9b93f09e1a49ee84405d1e03e04adc7cf", + "sha256": "0ri06q30z699amw7a94a14ccf83zx547przviqw0wla3l2xaw26j" }, "stable": { "version": [ @@ -62388,6 +62611,24 @@ "sha256": "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9" } }, + { + "ename": "librera-sync", + "commit": "94c396858f0958e0c211de01aaa8971f2c09d398", + "sha256": "03vqm8rkjcgdzk8ywyvkxrxvpijrg2938zwp955rlgc0blbbra14", + "fetcher": "github", + "repo": "jumper047/librera-sync", + "unstable": { + "version": [ + 20210810, + 529 + ], + "deps": [ + "f" + ], + "commit": "b36ab4f3d8c9df1ed28d78b7d517e90195c97244", + "sha256": "0qmpk52j4fq5rp2kmsm9z8i97x6p458h2xvb53kv03r69ncxc595" + } + }, { "ename": "lice", "commit": "2508699ebfc846742940c5e4356b095b540e2405", @@ -62485,17 +62726,17 @@ 20210303, 1751 ], - "commit": "ec85691c073f0c3cb5a96d3716c70a93ff207faf", - "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" + "commit": "c66377f83a7b178b6e6d8bef5c844420c47ecbdd", + "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" }, "stable": { "version": [ 0, - 21, + 23, 0 ], - "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f", - "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" + "commit": "f3a1d941a08443d034a6c2e090b82ca5c28bdd86", + "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" } }, { @@ -62850,8 +63091,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210702, - 1206 + 20210809, + 1001 ], "deps": [ "ace-window", @@ -62860,8 +63101,8 @@ "iedit", "zoutline" ], - "commit": "e9731aa95581951ab2cbfaed28f0ac7d71124ac0", - "sha256": "12vvh1z72bhvh4yhm0r7c3wl3iplf45qkdqk92xc0mp3zf9w6c5g" + "commit": "5ef2e8967f1015e3936ee7a5bf3d3c4b93d5c3a7", + "sha256": "0a5gj6sa49lbn753r6b3xvxxjy2f2c2jv53y79g7mqgr7w6dcx40" }, "stable": { "version": [ @@ -62908,11 +63149,11 @@ "repo": "dgtized/list-environment.el", "unstable": { "version": [ - 20151227, - 256 + 20210810, + 1612 ], - "commit": "b7ca30b05905047be2e55199a6475f8d98ce318b", - "sha256": "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4" + "commit": "a07dc2d2da83ac13abf59eb3de941e5069e9a1e9", + "sha256": "1wq3mxp3pl3gs2a6n9lh22wv2x4kaflghr03jbh4ahj42n0hnzv4" } }, { @@ -62999,6 +63240,32 @@ "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" } }, + { + "ename": "lister", + "commit": "944fe22bd0f893334afb8f60aa1a8bec1158849d", + "sha256": "0r9lqp32bd487l90jglxlgrxyqbxmlhavhmlnys835p13wdrzpnp", + "fetcher": "github", + "repo": "publicimageltd/lister", + "unstable": { + "version": [ + 20210812, + 1729 + ], + "commit": "a8cc3c5d1f0f4b710e15e76477eae40a99a79ad7", + "sha256": "0n6xiyx9syxxq7867ir1nrm5bzjilrp7vcjch279754v238lgcpf" + }, + "stable": { + "version": [ + 0, + 7 + ], + "deps": [ + "seq" + ], + "commit": "06eac24b6d229eb559eb7f8e6097614e647b4dab", + "sha256": "1mdmpm9iv0zfv64sjnfvx8pqm7vi8v053f2rpj7glkgm8nmms5lb" + } + }, { "ename": "lit-mode", "commit": "7a6a1c79c9bba7b17c150ea0663bc61936f15d83", @@ -63274,8 +63541,8 @@ 20210701, 1955 ], - "commit": "23e674f8572f3189fbe3917af6f22e6ec8708818", - "sha256": "1j25p0hmdfyfhlfrdn02q2ng6sgnaqvcjz1ll7rl0liq5acjvd2w" + "commit": "21fcb1a86167e93bf847d60f4f1b4e99eb2f1641", + "sha256": "0rl1cmlx1g07ncyksj1ydi5mvy58ax67jnzdfq6c3s5jlc93kxwd" }, "stable": { "version": [ @@ -63415,11 +63682,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20210724, - 1250 + 20210820, + 2200 ], - "commit": "b4f56e17933d1d4098eeb04ef665a3f18479def9", - "sha256": "0fcz8hz26pwpwbl5dq4w3z6vmnjjjzwckv19zhwxj7bgv9dnm6wa" + "commit": "05c8fd16ff94590393b6b0a9cb193ec9572a9c97", + "sha256": "1aihvp446aci9pxg44ii4pickm04qf6k80mczn2xv8dddjh731sf" } }, { @@ -63873,6 +64140,30 @@ "sha256": "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x" } }, + { + "ename": "loophole", + "commit": "7e7fc46019643eb495bee45efa91fad01c6afc76", + "sha256": "0ff9cidkx9slz34shxn5hs6j3ql7pfl0yf6dc01lsdc76mmw2kk9", + "fetcher": "github", + "repo": "0x60df/loophole", + "unstable": { + "version": [ + 20210825, + 1323 + ], + "commit": "9127dd0876567c8db306793e9c5e8151b9ab392c", + "sha256": "00mvvxrbz0qd73a5jqdlfd1s1mxkw63lcyy5mklp5amfrznwp6m6" + }, + "stable": { + "version": [ + 0, + 6, + 4 + ], + "commit": "5f280e036cad9617212f68348ab5bed159740970", + "sha256": "1ks5hm67100ri0v9mxsgs057laadmkpv01f7g0bn3f3d8kpkizda" + } + }, { "ename": "loopy", "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", @@ -63881,14 +64172,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210729, - 144 + 20210811, + 244 ], "deps": [ "map" ], - "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", - "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" + "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", + "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" } }, { @@ -63899,15 +64190,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210705, - 2006 + 20210810, + 307 ], "deps": [ "dash", "loopy" ], - "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", - "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" + "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", + "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" } }, { @@ -63974,8 +64265,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210728, - 201 + 20210819, + 106 ], "deps": [ "dap-mode", @@ -63986,14 +64277,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "1237f6762a6c8c8f0618c850a3c9be13655118a3", - "sha256": "0bw940zv6alh4gsryyll4k607c5lpl8fzr8v6qd2v91kydsks848" + "commit": "ac52f45742fa5862611b3af04ac679076f100144", + "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" }, "stable": { "version": [ 1, 19, - 1 + 2 ], "deps": [ "dap-mode", @@ -64004,8 +64295,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea", - "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n" + "commit": "ac52f45742fa5862611b3af04ac679076f100144", + "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" } }, { @@ -64105,15 +64396,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20210621, - 1334 + 20210813, + 1040 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "eb37ac4a6a43277263bbb17aed6a862a0992ae8e", - "sha256": "04pcwcw5bq6hs0zr553sf9isbslp4pbahbch0yb0l472ihlbcxwh" + "commit": "4e62cf897dd9e9fcef25c6e8e483490a07a5d439", + "sha256": "027j70422h4r82hnqkamxl84n0844hlf0fvh3h3ah7f751hynylb" } }, { @@ -64175,8 +64466,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210728, - 1739 + 20210806, + 1842 ], "deps": [ "dap-mode", @@ -64188,8 +64479,8 @@ "request", "treemacs" ], - "commit": "7ba9c459a484a9ef8d6a59e509c03d761fccde45", - "sha256": "1pi17qxqpaig8x2hpcdhwnvn3a8smgkkspc2a2gb9xwq9bcjglp5" + "commit": "2a7d27e899edf7ad221a546ed67711ef5487f3ec", + "sha256": "0w5rq9g3gr5miqkhbj400r7gazsxs4lf9906y7a3p2avr400h930" }, "stable": { "version": [ @@ -64300,14 +64591,14 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210608, - 1330 + 20210815, + 1426 ], "deps": [ "lsp-mode" ], - "commit": "d1da153dbc762c5262f6e2a10264cc9075ebb6fc", - "sha256": "06vb7dxmjdc86zmv1i4qckx1isv0kvp5h0av2b4cnaci76bjh3s3" + "commit": "3f6b2ac9585682828eef81f895757f74cfba7309", + "sha256": "0da1fyw0h95hzjippqng9h68kykd0610a074wp4cwlsa4xffhjji" }, "stable": { "version": [ @@ -64330,15 +64621,15 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210715, - 942 + 20210813, + 916 ], "deps": [ "f", "lsp-mode" ], - "commit": "b9a930757c71f7eb30a0828a502a237bfd882b43", - "sha256": "1hsq4jjz79bb1wl8m65n2zmx10mr8zc7dmg5sp6z6sprgyb3vndh" + "commit": "d9148a65961432b6ea8a4cd20c225f8c188e6dbe", + "sha256": "0v5q51jxkxmm6pipvq9jf2s33mnrf8679ymx5fg51pk1hv0svcih" }, "stable": { "version": [ @@ -64361,8 +64652,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210615, - 1413 + 20210815, + 929 ], "deps": [ "dap-mode", @@ -64374,8 +64665,8 @@ "scala-mode", "treemacs" ], - "commit": "9f82ebee48d32cd7bbc3e64b84d1ef5b0926195b", - "sha256": "1l4sxkmlif6dlh6j11fgy6z7hs4739jdcazm0y35cbhq9bspxsnx" + "commit": "ca927e5a837c4e613727c804a14d9c8d36ecfcdc", + "sha256": "0yz4z53iwrz7kz45fqsy3921badcszn6c8zwxsnzgw2qd191hwy1" }, "stable": { "version": [ @@ -64405,8 +64696,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210729, - 732 + 20210825, + 1531 ], "deps": [ "dash", @@ -64416,8 +64707,8 @@ "markdown-mode", "spinner" ], - "commit": "f996db04e1159299c4fce2cbf3dc0cfa0e3966c4", - "sha256": "1w903yw2w4gwcz8ma1rpr2il8w76yh6gnifp3p2885r305xhsf5a" + "commit": "0b4bfd43474b5e317e617834261a2b528e3f8ed4", + "sha256": "1flzknh7mls1fg4w72iv36k77lrpkaysxdd0z922xqsg6x48znb9" }, "stable": { "version": [ @@ -64573,8 +64864,8 @@ "ht", "lsp-mode" ], - "commit": "9a0637e59d2a08a66c49fe8cda708e995ec156ed", - "sha256": "1jcf4jzsw10z9068xm20r7qdspd9yxhswpm0jjsm9rcypi2vm78r" + "commit": "72fd57643d2e8eccb9a55058ec0c89bdc04dba7d", + "sha256": "1p90d85bm51fjxy4q3fxjc4xj2vzabyi9db1bjl2j0q9pr2yphsz" } }, { @@ -64591,8 +64882,8 @@ "deps": [ "lsp-mode" ], - "commit": "4f2ea975c3199c0e8e35c0b1e9778cf1ed6bd9c2", - "sha256": "1hmdayrmxw979vigx1z6mlpzb5dwblx5c1f2k3ysms5didznlmcf" + "commit": "4061bc25aaddacb2fb848df08dd8bbbc12975814", + "sha256": "1ds19l8gvilc6bkqh7s1b5f1v4p79xkdjrq3kln0zawqsszr2crs" }, "stable": { "version": [ @@ -64634,16 +64925,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20200821, - 1703 + 20210820, + 2044 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "ef32b6f734323698fc8ba28646a07515aaafea44", - "sha256": "0mgz6y4x6wy4afh15ara8iv0irk8hkbf8gq2aj9gdandh86iq048" + "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788", + "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r" }, "stable": { "version": [ @@ -64742,16 +65033,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210718, - 1626 + 20210820, + 1331 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "4283414de69312298d51b03e938d95d37d238391", - "sha256": "08wqbwxwapi91mj94mgqy02bjz512sj3nwv77b067xqchz5yv6q5" + "commit": "5d643fbb0c4ef5fc4ee93d9894bf68388095160a", + "sha256": "0005kcj9kr76d5cgviyyfjm9mm13ncra08p8s903b50sm2hsxpp8" }, "stable": { "version": [ @@ -64777,18 +65068,18 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20210619, - 652 + 20210809, + 1320 ], - "commit": "2bd9077dd0405efc9276f612e24a345698c539c4", - "sha256": "0ldk6v7c3xamyhq6zwp2l79iyxfan0qmlycsvj39z3fljaz953z0" + "commit": "5a9bee8d5fc978dc64fcb677167417010321ba65", + "sha256": "1w67k5wlyz9cyxgxka4ffgzszam45dxy4164xalwr16cgyhpnx05" }, "stable": { "version": [ - 20201010 + 20210802 ], - "commit": "345ebfc1e236d9676e7e9f7364493785e7756348", - "sha256": "0yx0h5kir8r3mi9vqpwsz8nsh1b1w7zk0hahn9003j3dxzi755lv" + "commit": "7ee3febab01aeacfd33357124e7f605e1e110d99", + "sha256": "0qb46p91l0pcrjswr49qvq4z8cjwz56zywz35qdb5x7q90hwczak" } }, { @@ -65229,8 +65520,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210728, - 2026 + 20210822, + 529 ], "deps": [ "dash", @@ -65239,13 +65530,13 @@ "transient", "with-editor" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ @@ -65255,8 +65546,8 @@ "transient", "with-editor" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65267,15 +65558,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210525, - 2331 + 20210817, + 2049 ], "deps": [ "cl-lib", "magit" ], - "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", - "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" + "commit": "4271a086635ef2e1ca54b81afeda896b65b3ac25", + "sha256": "10wfd113js54zykmsm84z1h4hn10hnb5a7wl9x5770g9asg0dnqa" }, "stable": { "version": [ @@ -65419,26 +65710,27 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20210414, - 1334 + 20210817, + 1949 ], "deps": [ "magit", "transient" ], - "commit": "31f5ce30e374716818df7deb0cdbf462ef67e679", - "sha256": "08pwdjknd7407922w7gli76ji87zqj9j87sinhzjc38cnlhvm77n" + "commit": "45ed8559171a6392d305f6626d0a8228341f88b2", + "sha256": "0ghcxhi7zwk44lyckbs8n4g7ip9ab8n5bgv45r3xv49snnv5glpx" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "699c5c39c6dbdc8d730721eaf1491f982dd78142", - "sha256": "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb" + "commit": "4f6212e1b19d65e422da1a3c8f54a1a5ab396a2c", + "sha256": "1q4kcr2ha2kir7pj0cshmgllgq51543syxkkk5jk3ksfiaba4crj" } }, { @@ -65579,28 +65871,28 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 819 + 20210806, + 1607 ], "deps": [ "libgit", "magit" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ "libgit", "magit" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65748,26 +66040,26 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 822 + 20210819, + 1119 ], "deps": [ "dash" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ "dash" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65864,8 +66156,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20201101, - 2240 + 20210811, + 459 ], "deps": [ "async", @@ -65874,10 +66166,11 @@ "hl-todo", "magit", "pcre2el", - "s" + "s", + "transient" ], - "commit": "78d24cf419138b543460f40509c8c1a168b52ca0", - "sha256": "0jwi7hz7gpz4sg7n38apwpnga6haqad8pshyvl0d8imlz2a0hkpi" + "commit": "60152d5c4e4b73e72e15f23ca16e8cc7734906bc", + "sha256": "1ri53hnhamp3b9nh9dld6wxjvsxrk883kw900gglvw962ndimx5x" }, "stable": { "version": [ @@ -66549,19 +66842,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210729, - 1226 + 20210823, + 1004 ], - "commit": "a36af71f8ac530fbb24700494f5b2a75f2cc0111", - "sha256": "18xxglr557svzmh2j2n6lybxd9rkwmafxfw6zxd6qxn2b11ps0fh" + "commit": "207eb405706f5415dd0daf490925648fd058cc42", + "sha256": "0sgb4682kz6qyrj4il551yvcz7kbnblh8yxbysjw4psn3aayyam0" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", - "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" + "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", + "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" } }, { @@ -66669,11 +66962,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210728, - 756 + 20210819, + 57 ], - "commit": "8158bc8239c531756fbf6602f4b4dea8d52eb4cc", - "sha256": "1g58va0a4m8q82nr16l693wngbbdj3xw07a937a2x21y1pzrgiih" + "commit": "0839d0709e116584bd070305e4a0d28bd03bc547", + "sha256": "04xsls7lffvhxif9c5z3ycq80yf0l31z9znmj9m3z132k7rz3bs4" }, "stable": { "version": [ @@ -67069,11 +67362,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210716, - 1247 + 20210726, + 858 ], - "commit": "3fbc97b3f29c72b01812739536ed416e3e07e3c1", - "sha256": "0fhsp1g8mlh4ias1xgx0yjvh0g1khdy91pl474b2g0ffrml5ab73" + "commit": "c25894b91225ccdf0044f04020adf97cb41e73e4", + "sha256": "0kns1f5kg4z5wqi26mql4ja2lm1rm8zji4sjiqqlbrnk800iic55" } }, { @@ -67159,8 +67452,8 @@ "s", "test-simple" ], - "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", + "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" }, "stable": { "version": [ @@ -67590,16 +67883,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210622, - 931 + 20210825, + 1800 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "174cb2fb5f1ae674a405667ed432cd6601f53656", - "sha256": "0ix0ph82j12v1x5bi9w643q0a9cik4yd02bmk5c919wnyfz1syy7" + "commit": "56f0365dca1dbb3e97a32cf3da65f817598731b2", + "sha256": "10qp7s84p0j9byrwsfwbr1vyvad8v5y28v8dv7x7mm05pkcr9vv1" } }, { @@ -67613,8 +67906,8 @@ 20210720, 950 ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67643,8 +67936,8 @@ "auto-complete", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67677,8 +67970,8 @@ "company", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67740,8 +68033,8 @@ "iedit", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67785,11 +68078,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20210513, - 1354 + 20210820, + 905 ], - "commit": "69fdb63b59ec7d1acd427cb7de7219c18af46f40", - "sha256": "1q2p31nv7xr1s8w54yyyz7vlflbnb4p63jx6960vrk2c9ppi43d8" + "commit": "1a2e2abb098c9288c2cdb3affbad76edd98abf59", + "sha256": "1bpy0iw5h7vrd3vwzk12bq6b134812dwbxxwsbsmbsk0ji4xyyq3" }, "stable": { "version": [ @@ -68669,8 +68962,8 @@ 20210601, 2158 ], - "commit": "5ad0fd71634ac9dc6f97f653bc748f9fb58d80e4", - "sha256": "0fxk860dv8xqd5rfp4bw1pspm58c71mhac2xp2cxi1i2jrg272dn" + "commit": "cc19df172e2e20a76861ac75ead3616f2f7eb870", + "sha256": "10ca4q7j83kvk2rv5dghqs56lilkdxsq0zfz0ycvdk41r26cr10z" }, "stable": { "version": [ @@ -68755,8 +69048,8 @@ "deps": [ "cl-lib" ], - "commit": "05cdbb643469676b91a44badecf84deccb50f262", - "sha256": "09zlqx9xrcj80vdd07yz9gzq5p8mayjlqkrcv7c8vm5wn5dl3gnq" + "commit": "e5cd2b4d0967758471fd2753f78120bdeb93a781", + "sha256": "05647fhsn4qlh8fyijrsni3zfvy2flivyij2rwd8q31h5k2gip3w" }, "stable": { "version": [ @@ -68914,8 +69207,8 @@ 20210318, 1748 ], - "commit": "0accefac11451b9c9196a56223b5fe1e26d75e6e", - "sha256": "04i776arnyg2gzzhiifarb73dr4w3sg38kw9cwp1bl1x5w49x47x" + "commit": "3d7f652d06c8e39cfe252ece804868a20730df07", + "sha256": "1ysfr02mc11sfcxngcki74zbyj4sa9mlk4v0liqk2bv1wx2cpdb5" }, "stable": { "version": [ @@ -69132,11 +69425,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210729, - 950 + 20210804, + 1453 ], - "commit": "7447abafd82a1a7f9696ed5c193ae683609b5b82", - "sha256": "14wwfvc0gn3ciigslvbl8didxiif84ragwzwaya4wcchwjg5vzsj" + "commit": "52532a1ac2f3b707e79ba67ada8bf36846e45048", + "sha256": "1y12c9xjs6liwgwbfvy5w8sm9kn6ww8imqgkji8nncpjy3vp81vs" }, "stable": { "version": [ @@ -69407,11 +69700,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20201013, - 1754 + 20210824, + 2348 ], - "commit": "cae86f640df5faf44690bfac591ad464981293a0", - "sha256": "08r36wibg2rsiwjy7wd63w50sq9qfhzrapzrpcfzc9wz7wz26zka" + "commit": "d140512781bda5160b4786f591694a569639b9ad", + "sha256": "1qcdh7b02yyaqdjw815mgjpmrns15alr27ac0cwy3sm0alk5zshk" }, "stable": { "version": [ @@ -69488,11 +69781,11 @@ "stable": { "version": [ 0, - 5, - 5 + 6, + 0 ], - "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", - "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" + "commit": "9b679400ca885b8ff51bcfd75b87f79d66c0ee26", + "sha256": "14x3hd0z0nh0dyfi434vqywi7aawfxhlqj6sp7m17np56zq32yhi" } }, { @@ -69838,8 +70131,8 @@ 20210306, 1053 ], - "commit": "87f9ce226a32225cd3dfedde47a21fa16541ae88", - "sha256": "07364nxahcwn77l1xxr5gl9hqf0jc4q6gkzg0gs3wlwbbm9qdaic" + "commit": "fed70bc909ef2a67d907d1ac89bbcd042d277da5", + "sha256": "05jw43ajq404dq62kykw9ryh5kl0lhl9alxyqq3gixpyds3r2205" }, "stable": { "version": [ @@ -70266,6 +70559,29 @@ "sha256": "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg" } }, + { + "ename": "mu4e-column-faces", + "commit": "0c86d677b53584c2ce611dcbf362b8c46c3ed640", + "sha256": "0rzz9sdkixb4zlppr3qsagk2qg714mwq2y547qm6yyvxm15w0ba8", + "fetcher": "github", + "repo": "Alexander-Miller/mu4e-column-faces", + "unstable": { + "version": [ + 20210812, + 1721 + ], + "commit": "34b9b3cbe50eaf48a636f2e05a3496111429b265", + "sha256": "02hqz71ds2alb95y65iii6b9rj0r7a9ymib7yv5321ys25j5bqzl" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "2f903099073a863fb9b827d3d10c439237925548", + "sha256": "03szkxv565pdkam60wxcfqv0bcxjbidww53diid6w42b9y8ks54r" + } + }, { "ename": "mu4e-conversation", "commit": "7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa", @@ -70446,8 +70762,8 @@ "dash", "s" ], - "commit": "63a0377ac1ad48171621c9f0c719b62ec9395d35", - "sha256": "180i7igzqv5l22vk6n96g196mnd50lgwcmjkmzwlwdxn4jsgvjbv" + "commit": "267e0594790a5f34e474a5b480015f0f216a6865", + "sha256": "079pqjgq1gkd0mwhzdns5gw3l1xs8qxs0w59njxc8yp8p4ngzcq4" }, "stable": { "version": [ @@ -70550,11 +70866,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20210105, - 1229 + 20210814, + 1656 ], - "commit": "f71a56978a57ee5b08e75d01a5d6ec75f20cedba", - "sha256": "10fvwrd0l05lv05shrdl0cw1bg231djkz6gxlgccmdr97d01qwkl" + "commit": "151b4fc935b6f4b286249ce52d6473440fb8d1c5", + "sha256": "0jqfb7kdm5ajdxvy5fmrp240zjlrf8mzhv77hyvipg1yzkka99gb" } }, { @@ -70695,8 +71011,8 @@ "deps": [ "cl-lib" ], - "commit": "616fbdd3696f99d85660ad57ebbb0c44d6c7f426", - "sha256": "10raq8p881zzz7si3wfpcgdnwyl8y7y9rgw28akyigjyq8knl6kf" + "commit": "588daf8c520f4545323e36b8900f02693ddcf5d3", + "sha256": "0yinp3148sa72ckmaycgfy7sw3pccz6h5bl7kiz5j54hfk66hsxk" }, "stable": { "version": [ @@ -71780,6 +72096,35 @@ "sha256": "1cpdarxw9pida7pg7lgq4p4lnq2l3ny2y96j0ckxx7r04p24q611" } }, + { + "ename": "netease-cloud-music", + "commit": "07f4c49aff1e2d476fdca80d39b1be8bc7e34ee7", + "sha256": "19xvy5jbwbgf7lg7lzhjrms5s336cc29cnxamv1a75bwrix04k1b", + "fetcher": "github", + "repo": "SpringHan/netease-cloud-music.el", + "unstable": { + "version": [ + 20210817, + 1148 + ], + "deps": [ + "request" + ], + "commit": "e228a3e8646d4d66f61eb91e306b8bc1cfa9861a", + "sha256": "1wckcxjwj4bx31akxjpbzj3fdbhym0lr29sqq05c8xjbxza8dmkh" + }, + "stable": { + "version": [ + 2, + 0 + ], + "deps": [ + "request" + ], + "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", + "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" + } + }, { "ename": "netease-music", "commit": "ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c", @@ -72161,8 +72506,8 @@ 20181024, 1439 ], - "commit": "d52a43d105040b92442e7c6657b50a2188b80ebd", - "sha256": "1pikcr0m533l03ffkwv9ak5w1zqcln3ar28km2052330mq93gpj4" + "commit": "e90dfd3c7528b9c620eab29121a3591af7bf035e", + "sha256": "052shini6g1a5zjqqrwxvjk92c597qxfkar21pdzs4na0sij7szw" }, "stable": { "version": [ @@ -72260,14 +72605,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210706, - 2217 + 20210809, + 1724 ], "deps": [ "f" ], - "commit": "3cca5b6527a69c4701394f424726282a1462ede3", - "sha256": "1cf88v8hbcn2kcyh4bv74yhpp7jf4r80zf3pzfw6cqvrgx19px2k" + "commit": "56748ac556d0406cc6c574f7347fe37decd8381e", + "sha256": "1lgakfj8dar3517rl6k6vxjijkdywq05wg7fjjmnv3a0h8ppjjz4" }, "stable": { "version": [ @@ -72442,8 +72787,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210219, - 1949 + 20210820, + 1503 ], "deps": [ "anaphora", @@ -72451,8 +72796,8 @@ "json-rpc", "rbenv" ], - "commit": "c6074af3b60ef7af7d9c45b8ad1daa21296a5e04", - "sha256": "0hx8sg6wa688f2bzddbzl81b553vjv8aaafizns9r8icsws7acc0" + "commit": "1b064aa49da9ab24fb36d208ec35a40c29d9e5b3", + "sha256": "0sp807drgl8hmxwhz12r0zr371x8x5f5amp2aap4b4irf665dd22" } }, { @@ -72556,14 +72901,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210619, - 2158 + 20210825, + 356 ], "deps": [ "cl-lib" ], - "commit": "b12a85a5afff7b5d60f889c1c2e8f5deab7fdbae", - "sha256": "193kyvj2f3zgb39shhcf2qk33rzbp8qp9mkc9p0cvnrc517h6y5r" + "commit": "dcc96cbf5f018a91d406926d3b69715847ef665a", + "sha256": "1c6nq2sykbsjy30zakfpny503644bbwgb4pxhfsd4wywj5yyzw66" }, "stable": { "version": [ @@ -72853,6 +73198,21 @@ "sha256": "1gy3zis9swkriynaq4xc8mc3xiihak0hi718pckbkxwjmnrfyvc0" } }, + { + "ename": "notink-theme", + "commit": "b4aa0fed8fcb8b4b671d13d403d10f705426c5e5", + "sha256": "07h6ls2ikvx1aw67sln43qm8rll9w3hqaqc4xq81k0swsfm2y5fm", + "fetcher": "github", + "repo": "MetroWind/notink-theme", + "unstable": { + "version": [ + 20210816, + 2337 + ], + "commit": "ede878ee06d4f94b5819ed3ccffe121823fbcf44", + "sha256": "0iyxdbdgv1d3hflndfrbp3zbafa2zn3kpwj2lp32rm9sh3bcp79c" + } + }, { "ename": "notmuch", "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", @@ -72861,20 +73221,50 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210725, - 1815 + 20210822, + 1412 ], - "commit": "b649b0c871e7fbfcd15a24d51b071bad2680e5d2", - "sha256": "1jvibldc37whindnq64ghnj6iha1k3nvvj8bkv9s2fm90g7y4zy1" + "commit": "84347ffcad24b48390c622e5a96c31c97c094daa", + "sha256": "1zn9j0sc49g7gj1fx2n1lvgcixcvjcc3kg9jlvzwniygqnncwcw2" }, "stable": { "version": [ 0, 32, - 2 + 3 ], - "commit": "af56f3bcdc8a644564a1182f58bd311907193a4a", - "sha256": "1f0xccc51z2fijj4cyx4pcxmam9pygq0z1rb4zrybz1vpsr7zrvk" + "commit": "3f30ee65efec7c35e56af36eaa49af5c2e220d8f", + "sha256": "005nc800cr7f32w7vdpr1bqh65ffflsm8ss6x010i5c79ndfli4n" + } + }, + { + "ename": "notmuch-addr", + "commit": "3cb3070c7bb697c1a4bae1a04ca59873b18e1f33", + "sha256": "0grvncdmy3qp27m1jch995zsjqy90k4hmzl3r6pp3smanrvkdwwp", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/notmuch-addr", + "unstable": { + "version": [ + 20210615, + 1512 + ], + "deps": [ + "notmuch" + ], + "commit": "c447ddb94b3c2a473ec1762fc083794acd6057f0", + "sha256": "0x6vvi3j27xi2gkgd9mf7mfprmymdhc4zvna9gn71padpaqf9v50" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "notmuch" + ], + "commit": "55ef94d7d3a6eb224950975b4ceb885851e2d93a", + "sha256": "1iwr1fya1n5vqj1g91sbxjr4ayaklc50fsap21i5af79jcrz80q6" } }, { @@ -72966,6 +73356,36 @@ "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" } }, + { + "ename": "notmuch-transient", + "commit": "4b80cb36063a910a659fd435f2495a67780dc74b", + "sha256": "0ndgp4avxc9l064a34bk39bw1jp2n5b18n1ha4q9mbkdmm78ahy2", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/notmuch-transient", + "unstable": { + "version": [ + 20210703, + 2133 + ], + "deps": [ + "notmuch" + ], + "commit": "d43ac12e397e1f014deef6c76aaf9b187b17ba5b", + "sha256": "1hv3p124wg8lc9jzb8llp47q9x3c9bwy7k6zvsncb1p513n7z8di" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "notmuch" + ], + "commit": "d43ac12e397e1f014deef6c76aaf9b187b17ba5b", + "sha256": "1hv3p124wg8lc9jzb8llp47q9x3c9bwy7k6zvsncb1p513n7z8di" + } + }, { "ename": "nov", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", @@ -73364,27 +73784,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210616, - 1532 + 20210811, + 1458 ], "deps": [ "dash", "s" ], - "commit": "9209d52ddf43eddc983763b77f6932be61982475", - "sha256": "1sx7jj9w20gxxsqx5wa9m6da0971qp8mgp76hpdc1crqrx1mj55b" + "commit": "2d280dd704a1a54bcb3e8091f06656c3311894bc", + "sha256": "1hqagy3ailigy2r43vhk2aayxxlr3qs4xk18mnx2r6bgmnbrzr5m" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "s" ], - "commit": "b8efad7723a0c1d5738d74c7ce56ea962726a74f", - "sha256": "11y73fwn4ca6pll5vb1p04l08z48kj2ldks3qavqj4pamdcm698d" + "commit": "99e955f9fb2cea3f361004d48436e603bfc966bc", + "sha256": "1v908k5xcxx90gppkv06fmi0l0b46hw2a1p5a80qb2ybf5xdl6dy" } }, { @@ -74681,8 +75101,8 @@ 20210617, 1726 ], - "commit": "269984a50006efe282c693a6315962c92749296a", - "sha256": "19w93zpffybb4zb0h12rvyfh0857f1vf3hyr1r7rmgwyslfgp6gh" + "commit": "25ac57f10acae37f21ab3b0959d8c9b3125c4e3e", + "sha256": "0c4cvny8anx4p1i136vl881g6dsy0mrd02xzbgv860g9ix5nzvsx" }, "stable": { "version": [ @@ -74875,26 +75295,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210623, - 653 + 20210819, + 850 ], "deps": [ "org-re-reveal" ], - "commit": "e828f86ee607de487cb60393b41c6919d0b66356", - "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" + "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", + "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" }, "stable": { "version": [ 3, - 20, + 21, 2 ], "deps": [ "org-re-reveal" ], - "commit": "26d6d8946ddd5f71954564f26e63f6b5f1e9c0aa", - "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" + "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", + "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" } }, { @@ -75031,20 +75451,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210510, - 100 + 20210823, + 1054 ], - "commit": "4a0719021625ece4def8f18d28f86a681bee7d28", - "sha256": "1qggyq7yxg25k9iyyx5bsv8zmh1z14gdybc1d4qkyc905395jn0l" + "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", + "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" }, "stable": { "version": [ - 1, - 11, - 4 + 2, + 0, + 2 ], - "commit": "6902410cd857385a3c1aa20ba391901a78d2740b", - "sha256": "1pw1zc0pdwwi9dv8fypfxgn6xbfvm88qzhss880lspialff1wcxn" + "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", + "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" } }, { @@ -75604,14 +76024,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20210105, - 1749 + 20210809, + 1401 ], "deps": [ "zoutline" ], - "commit": "c50b98da70d08b27ad1751c57bc7edcf27cd1d79", - "sha256": "19kgyxq3dci44hayzli3z528vs3mxfpsa5443wxf5pfgr7lkc9c0" + "commit": "1eaf09e31d440f781ba87d0aaa4defa5568a8f48", + "sha256": "0nh3aivgjzcb8vqbwdvvhkk0lww3x1ry52ac8h9cw2k9hdr37ks1" } }, { @@ -75622,11 +76042,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210721, - 2059 + 20210812, + 2035 ], - "commit": "1e84120a28525ccb47b602fc19b7afbeffbbe502", - "sha256": "13smhq5yh5awfqfn3739yw19dxdkqz5fbbczvv8kxf70skjxb9bk" + "commit": "1a7011ac9c476dbb083c5ead88462a5f520ef8aa", + "sha256": "0gmlxfn14gdb241ari4ix3wf9wxg2vpq2kg55h46fchs22wwqyal" }, "stable": { "version": [ @@ -75785,26 +76205,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210628, - 2141 + 20210816, + 2047 ], "deps": [ "request" ], - "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", - "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" + "commit": "4e70c6869181f020c6989f91f5e916e085ba73df", + "sha256": "12iwllz9mbcv7q652v4bc1wkaml065wr7gvqm08kjds8hmc6f1pl" }, "stable": { "version": [ 0, 0, - 3 + 6 ], "deps": [ "request" ], - "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", - "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" + "commit": "c86394d5fd8933d1b6cafbc1dbc36bf61bcc871e", + "sha256": "0jg00hw5k6n7jf19vz1gf9599ad7skm399ng115hpywhas9ly01i" } }, { @@ -75815,14 +76235,26 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210709, - 949 + 20210822, + 39 ], "deps": [ "org" ], - "commit": "148aa124901ae598f69320e3dcada6325cdc2cf0", - "sha256": "0scj53w5kk62k294s7pfr15wqiiwvlprxhnmkrjmfx2gwyb1yh9i" + "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", + "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "org" + ], + "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", + "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" } }, { @@ -75878,11 +76310,11 @@ "repo": "calvinwyoung/org-autolist", "unstable": { "version": [ - 20170924, - 1901 + 20210810, + 2215 ], - "commit": "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1", - "sha256": "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56" + "commit": "943de3a76a16acd54d924392f86e8ef04f1cb086", + "sha256": "1i6sa7pavgk4gal7fppd68brr8vm4jxma6nbkqwcb1djys1vg21b" }, "stable": { "version": [ @@ -76685,32 +77117,30 @@ "repo": "GuiltyDolphin/org-evil", "unstable": { "version": [ - 20180620, - 1517 + 20210809, + 1724 ], "deps": [ "dash", "evil", - "monitor", "org" ], - "commit": "3b4620edc606412ef75c0b5aa637af22486eb126", - "sha256": "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd" + "commit": "981b0931d043d3b0eb61fcab6258b5a88cc74d15", + "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "dash", "evil", - "monitor", "org" ], - "commit": "3b4620edc606412ef75c0b5aa637af22486eb126", - "sha256": "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd" + "commit": "981b0931d043d3b0eb61fcab6258b5a88cc74d15", + "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk" } }, { @@ -76736,20 +77166,20 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20210713, - 551 + 20210815, + 2349 ], - "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", - "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" + "commit": "15861261a437aca2ec858317de71603d2957b423", + "sha256": "0ra4sfy48p8pm1c7h8wlmbl68r4s0f4qc49xapvs550pm4mf3hiq" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 0 ], - "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", - "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" + "commit": "15861261a437aca2ec858317de71603d2957b423", + "sha256": "0ra4sfy48p8pm1c7h8wlmbl68r4s0f4qc49xapvs550pm4mf3hiq" } }, { @@ -76775,8 +77205,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210421, - 2203 + 20210805, + 2225 ], "deps": [ "alert", @@ -76784,8 +77214,8 @@ "request", "request-deferred" ], - "commit": "4c2616a4f85adc77b91aa054bb10e76b06f706d5", - "sha256": "0isw9inxbdrf5rwqhjasbbz8av9sn56nwz7xxksr69nk5mv7zm17" + "commit": "80e6f9501fc883f29d26b0c7fea25f8b101512bd", + "sha256": "0bx2smlls1mfsk4c9c9h3f3xy6fxm78damh96rcmgqk0y6mnvzph" }, "stable": { "version": [ @@ -76985,30 +77415,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210709, - 1801 + 20210820, + 519 ], "deps": [ "dash", "org", "s" ], - "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", - "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" + "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", + "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" }, "stable": { "version": [ 7, - 3, - 0 + 4, + 2 ], "deps": [ "dash", "org", "s" ], - "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", - "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" + "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", + "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" } }, { @@ -77068,15 +77498,15 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210727, - 519 + 20210813, + 1834 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c8b05805f897b5325e12d94e4f10a287219db44d", + "commit": "9de4310c3e853f76aa47bc5bf2dc404d4cf3226b", "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4" }, "stable": { @@ -77102,14 +77532,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20210714, - 911 + 20210812, + 1749 ], "deps": [ "org" ], - "commit": "6c3a2fdb6c85253a32992a29edb976407bad4d77", - "sha256": "0rxrsqj3a8qchjhm9kb37zd9h1h1lcqfg2gwsgab74rfyfgf9ryd" + "commit": "9757996ca058029800c4801fba315b1d1614dcb2", + "sha256": "1h7b165y4z2p7qqbndqh2jyw4fgq50hqxmj2xv24shbjyqg350dh" }, "stable": { "version": [ @@ -77221,14 +77651,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210724, - 1406 + 20210822, + 322 ], "deps": [ "all-the-icons" ], - "commit": "e34c314b84a0c2aef50772baa7c849f54323f598", - "sha256": "0bq1fl8qn3sf9wmqjj27ii42b95g501c16dbwziapvm3jhw3cz6h" + "commit": "c26ea28e6093d23621b9ec20e811986f604c192e", + "sha256": "05zjjsmavpj7klb814xyd58nszladc9wfkybzr8pqfk304bdv0yx" } }, { @@ -77350,26 +77780,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20210309, - 1028 + 20210821, + 341 ], - "deps": [ - "cl-lib" - ], - "commit": "eb21c02ba8f97fe69c14dc657a7883b982664649", - "sha256": "0bgrp39mi8pqfr8hfd2lgjil3br55bgilhj09hy3v6klzypbdviy" + "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", + "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" }, "stable": { "version": [ 0, 2, - 1 + 2 ], - "deps": [ - "cl-lib" - ], - "commit": "3974bd41902a810d18a787e49f07cddd7849c693", - "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj" + "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", + "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" } }, { @@ -77414,15 +77838,15 @@ "version": [ 5, 7, - 0 + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", - "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" + "commit": "4435cd5fc94c00f6e6054324a3e022ad0e37ae0f", + "sha256": "0vk9zv6zx7s1wryfhjwzmpj5asdlkn7zlwwvk9hvf5cv9injf1wx" } }, { @@ -77475,13 +77899,13 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210728, - 2037 + 20210729, + 2144 ], "deps": [ "htmlize" ], - "commit": "bb51a47513d1c4232aca8ca2c705ec57bd174b4b", + "commit": "eb01f60b1ddc132f616d2c1f4038c23f42fc3847", "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp" } }, @@ -77887,8 +78311,8 @@ "deps": [ "org" ], - "commit": "5010b90fd09f484268f731b855d394deb8b5fc3d", - "sha256": "0k8l7qmxbxbzc4g0xh4ipssls78fky0cq2lg3864qdli820wzy5b" + "commit": "7414e406326622dbfb5aaf2905c4ac9f6696d6ed", + "sha256": "0cq2j0fcjlg7zvqim7hkbdsnlzw247vaba847d5n0d1yxl0527b6" } }, { @@ -78171,28 +78595,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210507, - 1615 + 20210811, + 710 ], "deps": [ "htmlize", "org" ], - "commit": "cf000894f6e5d0627151e2bec5b1a54a311ad53e", - "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" + "commit": "ee712db65782ddc2bffe19c60cdc40b72ce56769", + "sha256": "0bnb8h13wpgw1i91zc701agbcdar1ns81b0kqpl8raczr9mg5dvf" }, "stable": { "version": [ 3, - 9, + 10, 0 ], "deps": [ "htmlize", "org" ], - "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", - "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" + "commit": "95c5ad99bc1180d23b69156abc2fb4a95592048c", + "sha256": "0bnb8h13wpgw1i91zc701agbcdar1ns81b0kqpl8raczr9mg5dvf" } }, { @@ -78303,8 +78727,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210726, - 1533 + 20210823, + 27 ], "deps": [ "bibtex-completion", @@ -78319,28 +78743,30 @@ "pdf-tools", "s" ], - "commit": "839ca73f3ae451efbf82859dcd17b63375cb8d76", - "sha256": "0zhzxmwlgwa0c27rfqpbpz7k477mm5ahhxyvmkvk6nafv5gdryc6" + "commit": "37b64e6cc1068c1b7ffe579851a345aa57772333", + "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], "deps": [ + "bibtex-completion", "dash", "f", "helm", "helm-bibtex", + "htmlize", "hydra", "ivy", "key-chord", "pdf-tools", "s" ], - "commit": "db6c52f41faba686a378a8c57356a563f5cef496", - "sha256": "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6" + "commit": "37b64e6cc1068c1b7ffe579851a345aa57772333", + "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" } }, { @@ -78440,14 +78866,14 @@ }, { "ename": "org-roam", - "commit": "6358b4fe160432cee80e6c15eac26764a92aac8a", - "sha256": "16xab5rz98bavk3vjmb5bxl4r5kpynnw40m0ahy1kl6cax51kx0y", + "commit": "27c8b4c527d17203d6b30a92838c1784a0bcc5fb", + "sha256": "1cb7w656w8z126fz171ikwh0aliyb87k4912kpf54rm22ck8c33s", "fetcher": "github", "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210729, - 1527 + 20210825, + 1600 ], "deps": [ "dash", @@ -78457,13 +78883,13 @@ "magit-section", "org" ], - "commit": "127d6efa485c2d7846e1ec88954f4bf93623281f", - "sha256": "1663brqgysfkn5ja26jm6f4rf8zjdvrbbfkwi0xcfkac2sg2f4bq" + "commit": "74a6fd598a03d8d981c21267e9aa25e73d125bcd", + "sha256": "0mm3d8zbnamscnbqmdkqqsj6qy30j83gqdlgwacw1r8n1ncwx8sa" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ @@ -78474,8 +78900,8 @@ "magit-section", "org" ], - "commit": "3a78422a099261317d369be58947f4d4b3df1da3", - "sha256": "0mslrdgd41czay3w7znz4qsv1h0p3zqfsq6bkyxmxfyd2w5z82zf" + "commit": "f819720c510185af713522c592833ec9f2934251", + "sha256": "092xn0sqc7b7f6pdf7m6c3giqqbh6fq02mfz8qrg0wmx4ds1isqp" } }, { @@ -78486,16 +78912,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210729, - 1238 + 20210810, + 1626 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "919ec8d837a7a3bd25232bdba17a0208efaefb2a", - "sha256": "0ir7516ngagf8mvy3qdir50bfigrqd2pl45c4g2y5cih5lvmfsn6" + "commit": "c13a05b2c855ba1516241d8a1de33bf2c689d6e4", + "sha256": "0m1mr0c6wmiw54qiqz6dm74l1cn0khywndyqfdmss3l52sipzc9x" }, "stable": { "version": [ @@ -78512,46 +78938,6 @@ "sha256": "04vc2w7x2lyamp0qa1y274smsf9x2qxr1igrpz9f4y5ha5332px5" } }, - { - "ename": "org-roam-server", - "commit": "40932819ae514a015f998a687d3cf651b30a79a1", - "sha256": "1bizzzmi1bx996n9g9rmkvpm229ipmpdacmh2jd3pvn8kx6252bm", - "fetcher": "github", - "repo": "org-roam/org-roam-server", - "unstable": { - "version": [ - 20210723, - 1424 - ], - "deps": [ - "dash", - "f", - "org", - "org-roam", - "s", - "simple-httpd" - ], - "commit": "35cd20280428470d37c1bff18d26cd49436ec3a2", - "sha256": "0xf229xkvzwaxwg2aqxgxpsi89aw3dp76ixhpkwyx6l52798nznf" - }, - "stable": { - "version": [ - 1, - 1, - 2 - ], - "deps": [ - "dash", - "f", - "org", - "org-roam", - "s", - "simple-httpd" - ], - "commit": "2093ea5a1a1f2d128dd377778472a481913717b4", - "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8" - } - }, { "ename": "org-rtm", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -78578,8 +78964,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20210502, - 1732 + 20210825, + 1544 ], "deps": [ "dash", @@ -78590,8 +78976,8 @@ "s", "seq" ], - "commit": "3206b4ea40614ba87a1b12f66ad0f84354bcdafb", - "sha256": "0b2gs6hm8k25539m7hxbhh5jza37mdfv3z763r130fxj3b646v01" + "commit": "db59e2e9d4230997cca4cbf3a5bb1a89fd38f87f", + "sha256": "1444qsf3fyygw0bpl805fqfyh2mygc821iy2i6cpfyaibrz0n6hj" }, "stable": { "version": [ @@ -78736,16 +79122,16 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210228, - 212 + 20210806, + 154 ], "deps": [ "dash", "org", "s" ], - "commit": "143146d5bab10e32d4a24f4c3e5e30905b0f3176", - "sha256": "1wbb5isfm1ixv2zbys75cn276zcr2927j3h2crb081acygm78qqv" + "commit": "8b7bbcb239cb08ca96a950cf59bb5e9617bee2cc", + "sha256": "11qni2i00ck0kh2x334gahhr4lhnh03mvn69bzvivnx8rlk6w1f7" }, "stable": { "version": [ @@ -79598,16 +79984,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210320, - 1019 + 20210802, + 1435 ], "deps": [ "dash", "org", "s" ], - "commit": "f5512304dccc152816f9957f5627c814bcb0f683", - "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" + "commit": "bced50755c45047565a3ab395c3b5e59ab15cc8e", + "sha256": "155gxp0ysfwgiykw0zjzrm86pd9f2nz5whlcjm51apqd0439jjv9" }, "stable": { "version": [ @@ -79917,14 +80303,14 @@ "version": [ 1, 7, - 0 + 1 ], "deps": [ "magit", "org" ], - "commit": "26242895ef1642bf30c63683fb224fdba25e0853", - "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" + "commit": "f956d802f19ea495efa95af6c673588afeb3adc5", + "sha256": "0mbcr98xq3zim01dk1fbyc1vajnjwx90k62mygv343rhrd05v44m" } }, { @@ -80045,8 +80431,8 @@ 20210722, 737 ], - "commit": "6f3ab471da576938d8200ce600fbb02dcb947f16", - "sha256": "1f8dspi9xizrxylff2zllwzz9lzrg3wr9cx0d5qzs74bs685vwwy" + "commit": "6bb7deaea9ca01137e7cbd74ff23559e6a4d85e7", + "sha256": "0kq5fa3dkz6a8y8zyf588032hlmpvjl7mn7y6m2mjsamf7fxnh3h" }, "stable": { "version": [ @@ -80066,11 +80452,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210315, - 1415 + 20210819, + 1739 ], - "commit": "639ec296ccca4e2f7405e9ef72506fad609f2167", - "sha256": "0nkm6y851sm1bp8ch9d7dxi1z07qs1254ab8zjv16hvq8arp0s6c" + "commit": "141577373600e7be16a5b67284165f54e8743505", + "sha256": "0nhaigi53nygw0fvmj335sd2kin3rlhh501sx4asdvdlhm28n2hr" } }, { @@ -80927,11 +81313,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20210102, - 1517 + 20210819, + 437 ], - "commit": "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0", - "sha256": "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29" + "commit": "b69e7418fdd12c6228079886d42c12fe1342727c", + "sha256": "0z011ipycqr4rvf305z2fdd7zhgqaak4hx7kgzh0yap20h6xqlww" } }, { @@ -81018,8 +81404,8 @@ "deps": [ "org" ], - "commit": "8345ceb90ff1314d598c6b67ba6ee7616e2b0bc4", - "sha256": "09x5dr4kc9pxz8iw1ibl262164akr1m5gms5cws2q3zy04qjqfzl" + "commit": "6ec3d054ddadbca1f5effb961c1db583e377ca35", + "sha256": "1vhyq9hbvbny9lj0h8fw7xk2i0fxcwn3v8rhwh6fjns86m7zy0lj" }, "stable": { "version": [ @@ -81375,14 +81761,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210705, - 2321 + 20210815, + 907 ], "deps": [ "org" ], - "commit": "014561540bdc5dc6fe68671cadcc3793a65f6b54", - "sha256": "1hha8f9vb6pmszpz0xx4lj2imm2nh81mgrvsblvbm92k4qvmk6z4" + "commit": "8eae719acc18592a916715e74984e9222bb6d5fa", + "sha256": "12r4s8xkmyiyv8pcf0zy2jh2dp582rx41pggnfh44cd27skafd30" } }, { @@ -81640,16 +82026,16 @@ "repo": "LaurenceWarne/ox-yaow.el", "unstable": { "version": [ - 20210706, - 1059 + 20210815, + 1957 ], "deps": [ "dash", "f", "s" ], - "commit": "c7eca0130c35b3a8adcade637a35d1474368f4e9", - "sha256": "1k8vr1z9h6qywl037fh5p7ji0k78zm18r4qg996jghdk9sfxasfx" + "commit": "e20e52ef2968323d26a2e6cd0843c9b36195a1ff", + "sha256": "0q5k38raqq7ms4wdxqwxhc0pga31wn3v35dc0cv8dr687i9ck0s5" }, "stable": { "version": [ @@ -82281,15 +82667,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20210317, - 2340 + 20210819, + 1141 ], "deps": [ "dash", "hydra" ], - "commit": "2ad3cfa3045e0a3bcbdee02819c6fd356a8bc40c", - "sha256": "1m6c5y95asrw7fkn9sah6a38glr66vb35d3g6gc8lcvh2ikmgjn1" + "commit": "39167ff0e9293b4632cf162a32c9d0b6990a371d", + "sha256": "1rbn8vj1aazwzzzs79455qcd5w04l82xw4y00xn199mch95rim5d" }, "stable": { "version": [ @@ -82660,20 +83046,20 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20210108, - 1525 + 20210809, + 2049 ], - "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", - "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" + "commit": "8d7cf64badde2b14baac277cac85e83777da9409", + "sha256": "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z" }, "stable": { "version": [ - 2, - 4, + 3, + 0, 1 ], - "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", - "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" + "commit": "8d7cf64badde2b14baac277cac85e83777da9409", + "sha256": "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z" } }, { @@ -82720,8 +83106,8 @@ "deps": [ "a" ], - "commit": "eff941126859bc9e949eae5cd6c2592e731629f2", - "sha256": "0fr8giy750nr2mzl61sk0z2c7544q2pyglj4xwz1gk3gxm1b4jay" + "commit": "1bb3800f8f2417b0b881f57448ccb4acd1fe5b8d", + "sha256": "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb" }, "stable": { "version": [ @@ -83240,11 +83626,20 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210729, - 331 + 20210805, + 1537 ], - "commit": "7d444d5793c779a863d5834572c1dae4d87a250b", - "sha256": "0mvpbv0y25qvk42yrhkawbimff92mbd8kgpcb8rb3lvdjv4mh0n0" + "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", + "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", + "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" } }, { @@ -83834,25 +84229,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210709, - 2353 + 20210821, + 259 ], "deps": [ "cl-lib" ], - "commit": "b55aec612db791a1720232df0e2df0d3597d850b", - "sha256": "01bh8cs54mnikzrbhxc03588mrx8wsn2vqgb12j47g4lmg93759w" + "commit": "1c257f35ccabaa807d3a79f6daed7b6a5872d27b", + "sha256": "0rgkajcw7fismqmww1r0yy84hnqripx5dwklf2mfm042whn9bqgf" }, "stable": { "version": [ 2, - 15 + 16 ], "deps": [ "cl-lib" ], - "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", - "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" + "commit": "c052ab2ce23f969ad2b7853ba0b3cbd4a5954c47", + "sha256": "0hg4rj3v748f6k4fwa21g683vs3bfya0wg9r9xdg216kdhfdk5j7" } }, { @@ -84293,11 +84688,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210714, - 1700 + 20210808, + 1745 ], - "commit": "4b0e9f84d063c476b211ec89b2a17bddac138911", - "sha256": "0jw2c8fmj0m39xms301diid7l1wkhcpxh6mw2mrdla8as31vgygv" + "commit": "8212f415fc5de2dedfc74d797b3951b2cbfb6f58", + "sha256": "1r9arl0v33rqgvi98xz63pf56kb7d8j1j1p74ky89g5zk8zzivd3" }, "stable": { "version": [ @@ -84317,20 +84712,20 @@ "repo": "vpxyz/php-quickhelp", "unstable": { "version": [ - 20210725, - 1413 + 20210819, + 2025 ], - "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", - "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" + "commit": "d5e11b7a6bad64550521e8822139a33218b8c9bb", + "sha256": "1d9rg699wl67qkb93r4qnjn0ng4xn9c2g6kc98zaiy2v0v2wcv8g" }, "stable": { "version": [ 0, 5, - 4 + 5 ], - "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", - "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" + "commit": "d5e11b7a6bad64550521e8822139a33218b8c9bb", + "sha256": "1d9rg699wl67qkb93r4qnjn0ng4xn9c2g6kc98zaiy2v0v2wcv8g" } }, { @@ -84586,11 +84981,11 @@ "repo": "johanclaesson/picpocket", "unstable": { "version": [ - 20210103, - 2315 + 20210806, + 1135 ], - "commit": "fa3a49f011b5ae139728548fec7375743f61c7c7", - "sha256": "1vb358jyfs3px70ah60dmlz5azdfkva9xrw3mgrr4060vcy7w4q1" + "commit": "7e30e96c26b1ff0d374612534c3e09d309426252", + "sha256": "0sx4493sxgw0fd7b48h8biygnd10k5bl69hhsd69a4yc7yq1zbnm" } }, { @@ -84992,6 +85387,21 @@ "sha256": "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1" } }, + { + "ename": "pkg-overview", + "commit": "5d4cf5e09d33a4fe22ebf36ed2b5d487cefbf5c6", + "sha256": "0m6q602yp9xlj2hikyjhc616017q42a39v6p64f6l7v1gk8ri61n", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-pkg-overview", + "unstable": { + "version": [ + 20210802, + 1509 + ], + "commit": "9b2e416758a6c107bb8cc670ec4d2627f82d5590", + "sha256": "1p15jyjpiikx5y3syvhrdxabhhl898af88dv3fi95gm8v39n35i0" + } + }, { "ename": "pkgbuild-mode", "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", @@ -85562,8 +85972,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20200828, - 9 + 20210824, + 658 ], "deps": [ "dash", @@ -85575,8 +85985,8 @@ "rainbow-identifiers", "s" ], - "commit": "dbb7b043edb42341b7f48ce0d81ba08c3c676076", - "sha256": "1xkhk8zb84c8jdgc5yjizzfyf265gk110fv8adww270sqg71la9v" + "commit": "0a177d4a3b4b2532be7f0775e5cc41e6382a45d4", + "sha256": "00ik1lgz9gzpx6701z26y0m064gf574ir4hjf1b2a052917gi97a" }, "stable": { "version": [ @@ -87055,14 +87465,14 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20201228, - 141 + 20210804, + 417 ], "deps": [ "dash" ], - "commit": "9e38442d95a49199e1a2e69aefbfe139ca9036ab", - "sha256": "1x42lfp3ay31lvdmjsvwqblci1bbwxhddq58fq1ip108lwqazl87" + "commit": "b0cbdaf4916c1cf348a8f0e4f6158e040a627562", + "sha256": "1h5fca47kinwr5qy58nh0bqn259vcj540013wb7kwki6ab33l809" }, "stable": { "version": [ @@ -87484,26 +87894,20 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210701, - 441 + 20210825, + 649 ], - "deps": [ - "pkg-info" - ], - "commit": "da08a9103b5ba3b38ef031a9627a19436eb318b5", - "sha256": "08y36qvr20888jc2b5172qgah0xpp9bc3iwp38w8clfrjfd28g2s" + "commit": "db5748ea4a6428136769e7e50c6d0a12aa7acd8f", + "sha256": "0zfvv7iyb0n61hd3q1jk0bldpfwhw49kd61c5wd44g437vr7jm6x" }, "stable": { "version": [ 2, - 4, + 5, 0 ], - "deps": [ - "pkg-info" - ], - "commit": "bbb7b8d4c498e88046e4e6227990626f2b5dbe1b", - "sha256": "0w2s1mxbi8qqv0k34q0jj368n0p764rz72grdzzrmdlc96bbd03s" + "commit": "a2a1aba8aa12d0ff0e044c4336a5c2598c259720", + "sha256": "0wyq23xsfwpzfzncs2wr5ap4x2jh9r95qnhlzr8igq3325vm0b4f" } }, { @@ -87564,8 +87968,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210625, - 708 + 20210810, + 1303 ], "deps": [ "dash", @@ -87575,8 +87979,8 @@ "projectile", "rake" ], - "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", - "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" + "commit": "30828afbfa7b0e07970e3e668e975e7916b824c4", + "sha256": "1m1n1rvna9qhq3dl4sd90lnkzvk7vaz2832r3zhfyg6l5d7dybh6" }, "stable": { "version": [ @@ -87897,11 +88301,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210607, - 1422 + 20210820, + 2321 ], - "commit": "bc86736abb728ec0d28abc90ef0adae21d29a66a", - "sha256": "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa" + "commit": "f84e634c99d0c6bad17e8840baf7b6173563188f", + "sha256": "07gr1czqh23kz0nw29vdg60vrc5yj9p4rymlplb6xbkq91lncnrd" }, "stable": { "version": [ @@ -88004,17 +88408,19 @@ 20200619, 1742 ], - "commit": "53365065d9b8549a5c7b7ef1e7e0fd22926dbd07", - "sha256": "07r0mvflnhhnqc5igmv6r894nrv70a4j6sf9fzz23ka945ss5dgq" + "commit": "38f6e15e77a4e33a669d5d37efd87edfa15c7c04", + "sha256": "1n6xp8yk7vkvgigy46ybvzd3a9597c6qg0zyc9bbhqk93vhwxqkk" }, "stable": { "version": [ 3, - 17, - 3 + 18, + 0, + -1, + 1 ], - "commit": "909a0f36a10075c4b4bc70fdee2c7e32dd612a72", - "sha256": "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d" + "commit": "1a1710b19de57c6f68ebe599a6a22de2392e6018", + "sha256": "0v006kvgmy1m4fpkg15pa1pdf1c2xwn4vbr952jrk1z24sfyljdy" } }, { @@ -88858,16 +89264,18 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210724, - 2207 + 20210824, + 1323 ], "deps": [ "ivy", "nav-flash", + "tree-sitter", + "tree-sitter-langs", "uci-mode" ], - "commit": "7298c3cd798853309bece115848e9d0400a7a627", - "sha256": "049aw0cs8kh4p2113v7f2cxcv9277zby02hxalg86bx0rdy8yaz5" + "commit": "f3d6b5c6c8f74d7c54808759f71ff26c91c0b7e6", + "sha256": "1v5gisi22d2syb5vd9plydncjlz3hqyx9fhzamxjcmpybdzss80m" }, "stable": { "version": [ @@ -88892,15 +89300,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210720, - 47 + 20210803, + 226 ], "deps": [ "async", "xr" ], - "commit": "ace904840c676297138ed62abb4f1d05c837fd4c", - "sha256": "117h1zanyjlb566kzdx014xjzryvf6qvqa37zbyb821ajxjlpkk0" + "commit": "c2604a549b26b7a2125f986e9d34f0b58353336d", + "sha256": "1ikvg9qk4zzp3ch5glihdzhwhijs3vhrn6y1wc2d68h17j7li1gl" }, "stable": { "version": [ @@ -89062,17 +89470,17 @@ 20210411, 1931 ], - "commit": "ca3bc53fd8d628473fba25c7736d0abfac8e4a4a", - "sha256": "0yhkj2468si884x748v0a3jhzyg890fvxv02y5g5v8alpj19j1jj" + "commit": "23488352bc0dbdfa519abb527af3d676244b7106", + "sha256": "0gfig5fnmsvqbfcxd973v31zhvrdldma9grxliy83p7jzphs5kgp" }, "stable": { "version": [ 2, - 9, - 6 + 10, + 2 ], - "commit": "444f654e23de0772036c0e29c8e5745e48a8970c", - "sha256": "15yw69v1cj6zkndk60c2g0dgl0khh8bfm1lrwhjffpdjfc7nkc9a" + "commit": "591a23adcfdd2fe20b8cfdb9e4e07772c8f454f8", + "sha256": "06xrv79ns4bsk819iqrhjcb36k925yl2zi93l6sv7r228y0y8jl6" } }, { @@ -89343,11 +89751,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210620, - 1854 + 20210809, + 1849 ], - "commit": "3f0be5ace492d2ddd8405f4b5186ef89caee762e", - "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" + "commit": "f43ab088af83ec20c5a70acc3559980c94ed2910", + "sha256": "0bflpbjv5j9q15qhm9q0yaaw0sfncx3dw5najvsj2rhiw5i47xx3" }, "stable": { "version": [ @@ -90085,14 +90493,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20210202, - 846 + 20210803, + 922 ], "deps": [ "flycheck" ], - "commit": "61acc77535720f7ed3b8f680fa9d9a1871832f11", - "sha256": "063a76lvyx83h7smplghcg5zxkncx017kjc25y74diwsda16sn0z" + "commit": "57fe85c0f03917f6867833636a5617cbfa663a29", + "sha256": "1y97a876gsva2pr75b4psfs8hd26vd2drfsbfg79hazcqvr51c5j" } }, { @@ -90391,11 +90799,11 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20200911, - 2209 + 20210814, + 1656 ], - "commit": "32d1df138a9b70530ec7a71dc85aa6e133a6cd95", - "sha256": "0bcd54pfy6sw95nc344ahpd2m7a7w6x2qf7badda2sil3bk6fcd1" + "commit": "1cc5e965a221a5987ce0e075825d8002f0862f33", + "sha256": "03drdmjkmzsz1cd78k2crlzcvvqqx43dj892n9z52z8ia3c36dvk" }, "stable": { "version": [ @@ -91001,11 +91409,11 @@ "repo": "nickdrozd/reazon", "unstable": { "version": [ - 20180921, - 1437 + 20210815, + 1519 ], - "commit": "020be6467a83957adcbdcb192b61f2c76a94079b", - "sha256": "18la2g0srybr10vm1dajgbxi67j1l0cs08mr696hxb6m558yxdv5" + "commit": "1bfce512612eb679d06356b5c070e6f8743fd0dc", + "sha256": "1059dqsj19k7yb2lw2vy1s6pdhbl0l4vmsfd2lscwsa6kw42kjp0" }, "stable": { "version": [ @@ -91027,8 +91435,8 @@ 20180324, 821 ], - "commit": "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc", - "sha256": "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7" + "commit": "4b8b5aae9099185e07c2b4cac4943c7f66a3f003", + "sha256": "0y2kcs6zgi3dijagyz6lxbv6gi2mih8m943fhjrzkj35wfvjmhsz" }, "stable": { "version": [ @@ -91935,11 +92343,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210410, - 2218 + 20210816, + 200 ], - "commit": "f3a5b4352e9f444ace2a332939abff504b573887", - "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" + "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", + "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" }, "stable": { "version": [ @@ -91966,8 +92374,8 @@ "deferred", "request" ], - "commit": "f3a5b4352e9f444ace2a332939abff504b573887", - "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" + "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", + "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" }, "stable": { "version": [ @@ -92110,11 +92518,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20210511, - 1331 + 20210813, + 841 ], - "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", - "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" + "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", + "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" } }, { @@ -92132,8 +92540,8 @@ "helm", "restclient" ], - "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", - "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" + "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", + "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" } }, { @@ -92766,11 +93174,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20210624, - 417 + 20210824, + 110 ], - "commit": "ff496660cc52a6dd33d358ef0acc6d4bb70cc340", - "sha256": "05i0101238yy1da6z543nr9x5gpvgdxrrdn3sw5dibcn6z62ml3p" + "commit": "9b1a5abbdf461e6d4bfee50f71e3c85d00da1c0c", + "sha256": "1lmddhaabxq8kzyb54d944xwmdkcb9a6s4gi5wn3dp7sld7yvn4a" } }, { @@ -92781,14 +93189,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210626, - 137 + 20210818, + 2338 ], "deps": [ "inf-ruby" ], - "commit": "e1304d123d729aa063671d0ca526b01e72f0f5ed", - "sha256": "1ghwjymcmmr99z060l1shm9sqbjxxdgq6b7ayn8s9mldcqm5pa3q" + "commit": "9e3805c5c7fadcba0da31a59985a8daeeb8a7b0d", + "sha256": "1bmp317cacl5hmmr5rm7jimxw4k0ggrz80c0vfygb5fx02s5jy0w" }, "stable": { "version": [ @@ -92919,11 +93327,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20200109, - 1940 + 20210730, + 844 ], - "commit": "0babdd3bbc038ee7436db0cc869df35752456268", - "sha256": "1f0bxbm1rgvf68q6qbsf63mzr44541aapk4237rs7pkxk81nnrrl" + "commit": "63d46cefa8552b59556dcb4af0849253dc501ee9", + "sha256": "0imwdapwfj8qn7zqc4842bvxwip7j8gw9bip7mc05l4c9v2v73r0" } }, { @@ -93591,8 +93999,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210719, - 1514 + 20210805, + 1755 ], "deps": [ "dash", @@ -93605,8 +94013,27 @@ "spinner", "xterm-color" ], - "commit": "26c2e09907135d5be9628c710bb0753c256b7242", - "sha256": "1bilqhln8m6qk5r3q8dvhhsql1c38dnf7m55kysja86bf6yb3s59" + "commit": "1941f52d34e7e4752e1e465e5636b21ef7ad42b9", + "sha256": "16vis13axbk9d4pnr7588wx527hsr6kcbjxnppc23wpd54j7sgh2" + } + }, + { + "ename": "rutils", + "commit": "3bbcad6b15e81543e750c754574504a26e5d1c7e", + "sha256": "16rky6zhpfvcd3pwi5hbw8mmnrcvv7snyxskcfj618f27c97zm50", + "fetcher": "github", + "repo": "ShuguangSun/rutils.el", + "unstable": { + "version": [ + 20210805, + 608 + ], + "deps": [ + "ess", + "transient" + ], + "commit": "e216db63a2ccd50fe5c80679fc5b929dd2c114e8", + "sha256": "0ldbrx7xchy4p26ggs0hmazwfw9cbv97mzl4f02whblq3zkx7h5j" } }, { @@ -94076,8 +94503,8 @@ 20200830, 301 ], - "commit": "bb54b9743aca98017746959e2cf0d9c9e0844110", - "sha256": "0yj3ivxbzgv2x96jsagnvn059hh7r65qpmz7gv76l8b6qnfr1i80" + "commit": "4a02387d997b0b4d20b24e9a17a68270692219ad", + "sha256": "1k2382v1srcx7qc4rqxghqd87lx7c6jrls7wxgqq1warvklxfx87" } }, { @@ -95348,6 +95775,24 @@ "sha256": "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v" } }, + { + "ename": "session-async", + "commit": "37ad0e564b1eda4a4286b2315f71266b36664013", + "sha256": "15v12aq5zj478q3gxqilx5spk4k1shksn1rdb207aq06184dzjvs", + "fetcher": "git", + "url": "https://codeberg.org/FelipeLema/session-async.el.git", + "unstable": { + "version": [ + 20210817, + 2218 + ], + "deps": [ + "jsonrpc" + ], + "commit": "e2ff39bdd60da67214d07900582b1049f74d03fc", + "sha256": "0b05smmgcxn5144wcsxlhi4bpliv9ffk21m02fh3l32mc5h24b30" + } + }, { "ename": "seti-theme", "commit": "088924b78575359996cf30745497b287cfb11f37", @@ -95866,14 +96311,14 @@ "repo": "purcell/emacs-shfmt", "unstable": { "version": [ - 20200421, - 103 + 20210803, + 222 ], "deps": [ "reformatter" ], - "commit": "49c9e11567874bc4c5c4b3578a6b8f6b1948c691", - "sha256": "002y0ci1hh55qhyyp1m6gw5d9ncbcfk9bhk6qg30s3x1g1dhq2bi" + "commit": "8496b0df2209cf6792c5197b924dd55807f0cffd", + "sha256": "1sb9zdig0ypr3c0dmm26cysc6dsij5vxf3zypqpjdh77si5asx24" }, "stable": { "version": [ @@ -95937,11 +96382,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210725, - 2353 + 20210825, + 707 ], - "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", - "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" + "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", + "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" } }, { @@ -96588,14 +97033,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210729, - 611 + 20210806, + 1022 ], "deps": [ "cl-lib" ], - "commit": "9601e6b15f36d2e3a721043820a650413cbee42b", - "sha256": "1mclkg8frsljzcklfbbbnr72i9i990ag41n2iivbf1p27xbcp5cc" + "commit": "2281065d00ff8f78a03c1a66fc168fdb198f3d89", + "sha256": "19x12bw75sizc8b04i930zv5f5jypvmhw45frb0z79m7rw41pbs4" } }, { @@ -97014,15 +97459,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210709, - 2051 + 20210802, + 2231 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "68f5623f13c9a0d3d47ce70cf56928e00483d9d6", - "sha256": "1hybxng81ra3zqj07xp5vpzd5mx15sfvqa4wydg1kxi9ics6m9i6" + "commit": "8aa055b9ad4a8b5f1b24ff29c9c7009e9475ee2c", + "sha256": "126ji049i5s8dikzyccj12vsqy31qy32g4rns7zx0szqqjiwzin6" }, "stable": { "version": [ @@ -97762,15 +98207,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210529, - 1129 + 20210817, + 1912 ], "deps": [ "cl-lib", "dash" ], - "commit": "911cc896a0f2eb8b5fbdd6fc8331523ad9889a3a", - "sha256": "12g7q86ncawikvxr87p7vda21pbfiwi3kr3rgkm7b1lx3zabwcai" + "commit": "22794b5b3773504610127c5f011629402dfec20c", + "sha256": "14b65bfsh4fglm65cvzgp412na8ykqkcwaqg84hvw6j6lqrvpg6v" }, "stable": { "version": [ @@ -98274,15 +98719,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210708, - 1128 + 20210825, + 1510 ], "deps": [ "dash", "s" ], - "commit": "1b3071974b55c7f2046bd20a052b8fc795d2c940", - "sha256": "16k64k4mzjaiyq264crcpnmccj7aza2zlr9jg6l7ggjssly3fw5c" + "commit": "212e7c1492a9d208ece2a85e64bd352e9cd53c89", + "sha256": "13afcxy5vs38xzx2mi5xpszwiabyc5hiwq1r9vy6jx6pgsb7pkhc" } }, { @@ -98347,11 +98792,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20201231, - 1632 + 20210813, + 1902 ], - "commit": "7ca25adc94148f182ac58c9f5d35f576a8a3131c", - "sha256": "1bpq8611yqvi7w58qylbyd2k7va6cbg12xyj6md7ipnq79wpfy4j" + "commit": "4cd41a703b730a6b59827853f06b98d91405df5a", + "sha256": "0c770mgxav92j562knmzxdjlabvyhvhqjrgnk3pa13c5rs08800h" } }, { @@ -98488,14 +98933,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210724, - 703 + 20210823, + 609 ], - "deps": [ - "dash" - ], - "commit": "e281635dbaecb1715805a604f3404e7143a19356", - "sha256": "0a1sv5x49adj5s26khandc86y844vqk7241jc5qsli2dvdbxsqdg" + "commit": "48158887c0a605b7cc1ffdbeb937f182b299f4db", + "sha256": "1l9ylidix4l8979d4wzvd9fpsxvjxb6nii09s1g90rsli4av8ps2" }, "stable": { "version": [ @@ -98674,20 +99116,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20210426, - 1433 + 20210813, + 912 ], - "commit": "12d3472e6823ff1bdc1591984367e2ed769afcb7", - "sha256": "1vyg73svawi8g1mq6v5y5g9hw0vnks2nhbwdkbn6d53b7bcr0hpx" + "commit": "cc225f51ea724d8767f97249d8c6b3fc5182d331", + "sha256": "0k73skf3wmfzbiv6lfb7dlyb6icsk36q0sfz4zwq2fpr4s3qzp73" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "bca7a42db1245543d81373e67d71278a0e3135a2", - "sha256": "1i1hb5xg97frkhpmv608dlqs8wclwf78sq9q3sy9776m5zfdhcxl" + "commit": "0b30ee125571a715d069846b4dafc5de8923cedd", + "sha256": "1vqhnajljx104yw11q6r1ywdxhdwsz5cf314wmq718zc58w68xrg" } }, { @@ -99172,11 +99614,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210629, - 1739 + 20210810, + 1723 ], - "commit": "b915b063f9de2eff4b9a37c04559a3f2fbfdba84", - "sha256": "1skwcsv8cvjfsgncgd4hybkhjdf6clb65pnpqfh9jxc866aw9n39" + "commit": "1a623ea518c4fa7af37181eb15b8afd6197e3d93", + "sha256": "05cln85y978sv5fg9mqir14wz3ksyxxcxly8kp1a32mmkj5j1bvi" } }, { @@ -99303,11 +99745,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210617, - 426 + 20210814, + 748 ], - "commit": "1abcb5594e1bfe35716d29e64523e4cebdce737c", - "sha256": "0hk3cly374sgiwdf3crjj45afr8nv4jq4bda1vkdb9yqjla0xw8s" + "commit": "10823ae58f88874aff2a6a35f2da75c8503e726e", + "sha256": "0s7d1fgjk6cc27y37qlqfcjrrpqa0fxagr92qxzcn0mp2lb7pnhc" } }, { @@ -99891,11 +100333,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210727, - 1800 + 20210825, + 1823 ], - "commit": "70935753de73724f338700725462dec2cfda90f7", - "sha256": "1z1cvkbxpw28pgi6fzmkk1w6ha339pw09qy1hzppis8haijj0zxs" + "commit": "a6bbe36afa229b88aa5b406b9ef6e6393d9b2d5d", + "sha256": "102fhdhr3xa9jvdl5i715p07x0lgd3wxkhkh3li91p7gncxhrvyd" }, "stable": { "version": [ @@ -100172,11 +100614,11 @@ "repo": "lueck/standoff-mode", "unstable": { "version": [ - 20171115, - 1731 + 20210810, + 1814 ], - "commit": "76cc8122a39a3ef5947d706377b007ef53a354fe", - "sha256": "034h6mrz8nh42k3dsw7lcaackg95xqa9khkdwl6pj0i3z4rhgph8" + "commit": "c78a04c5cf00320c0e1e6646295e20425537bf9e", + "sha256": "01ifxzzrn31d1gaq7yr88dciwylhy5q6lz4kvwkq6smqmvp3x80w" } }, { @@ -100319,8 +100761,8 @@ 20200606, 1308 ], - "commit": "1b2058a91b7ed920952ea99b5140c60b8c7cdd1b", - "sha256": "1nk6mbxl416dpgwmpy52v161n2ag3gi6crrzvczx524879a9zvkf" + "commit": "c9761ab0439ed1430b635c97cbf7fae7d3019a15", + "sha256": "07g40r27s7qv68qzrplsvjdkrli7jibmak1a7fnbhsgngq9q9ily" }, "stable": { "version": [ @@ -100428,6 +100870,24 @@ "sha256": "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9" } }, + { + "ename": "streamlink", + "commit": "e6674aefa0082fc5754c888538e447037f3618f8", + "sha256": "17r4dkpap72yz62nk9pr3l48qgpm5hidffmdfnbx7bwl07wzk6cb", + "fetcher": "github", + "repo": "benediktbroich/streamlink", + "unstable": { + "version": [ + 20210811, + 1429 + ], + "deps": [ + "s" + ], + "commit": "c265dc61c02ad29ec01dfd8b5cbe3bac60fbf097", + "sha256": "1v6xr9x82m7f43zd228158pr6cwy90lfg8i68w67n6svj2gx19vp" + } + }, { "ename": "strie", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -100791,14 +101251,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210331, - 1845 + 20210808, + 1328 ], "deps": [ "transient" ], - "commit": "9764405dede46791e411cdcc7963808f76201529", - "sha256": "1d4yda1vv1sfjc36b5aaf811jmlcifc8labglmkx1xvjmc7bggsp" + "commit": "42c2e0b5b81c78741c069c8cfdb9e5d494157dc8", + "sha256": "08q6sccdkad4y3vv9h8bxkdn66dc4b2wxzhf7z87i70v7bw1xnwa" } }, { @@ -101092,8 +101552,8 @@ 20210222, 1037 ], - "commit": "25d0018036f44ff9bd685a1c9a76d8ba57c1024d", - "sha256": "070i3k5djw2m1763ihqngpxfmdxq7gs058fvjaaf62dpkqy9vv3a" + "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", + "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" } }, { @@ -101309,16 +101769,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20210405, - 1727 + 20210801, + 2036 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e", - "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk" + "commit": "75f2fc6bd4530a230946ae7cc9eaf67a36fa3ee4", + "sha256": "0z6prh1xrc8ddq57kas6kvp6n4pia25aps5pg3aq78cwfchzzrk0" }, "stable": { "version": [ @@ -101342,14 +101802,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210613, - 543 + 20210810, + 757 ], "deps": [ "seq" ], - "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", - "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" + "commit": "800efe2910e0a8517ac720c8bd0e0714fef142eb", + "sha256": "10b475axhqdqighfisnq505m2lk66bpcq1qgry0fd6iq4m8jkia6" }, "stable": { "version": [ @@ -101432,8 +101892,8 @@ "deps": [ "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -101527,11 +101987,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20210331, - 911 + 20210808, + 742 ], - "commit": "2801d9b3a9d7bf0b64cd8b2f2e572124ed2ff9ad", - "sha256": "0x9sz14m433fi77slkwir9b0dwaglswckygk8vfkckcraxw14dhh" + "commit": "8d9fe251d8d38b223d643df975876356ddfc1b98", + "sha256": "0qc004gpyzf0hpsjr1xhsnfnn0g2jkpfxzvysa05p9nwglfpsn09" }, "stable": { "version": [ @@ -101763,8 +102223,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210727, - 1646 + 20210820, + 2202 ], "deps": [ "evil", @@ -101776,8 +102236,8 @@ "seq", "undo-tree" ], - "commit": "e775e97d5bca462571078f727796727088833949", - "sha256": "0gmwkn5az4xrz9d85xd16bg1h8p5mph344800pqcpapqs389cpba" + "commit": "4561214b453e551253e9a273ef57c84c12c7cd8b", + "sha256": "1adzvdp54l1d6awcbfrbqx41kh40lqk5009h1gpj315l3zq3vhpx" }, "stable": { "version": [ @@ -102010,27 +102470,28 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210727, - 1827 + 20210825, + 116 ], "deps": [ "hide-lines", + "hsluv", "ov" ], - "commit": "299042e1ce65bea0728bc56b0540a7ab8ab02010", - "sha256": "1y2p74am7v0n9bdzsix0fi6fzhi3pafxr8c2n36cm9hf5xdmb4q1" + "commit": "7773a8488db88424e5e86cf4268c9bbe0b94085a", + "sha256": "0cph14cc3dzv3dp8aq6ifs3m92rq8jr4b2rpdjgc8pbcjrs9hvyb" }, "stable": { "version": [ - 2, - 3 + 3, + 0 ], "deps": [ "hide-lines", "ov" ], - "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", - "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + "commit": "014d78269daa99937fb4fa8f5d34e2b3eb368a5f", + "sha256": "03id3zjiq15nyw0by4fari837c8362fscl7y329gn9ikf7z6hxd9" } }, { @@ -102394,11 +102855,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20210615, - 1229 + 20210804, + 1943 ], - "commit": "6ad64d82c8bd8c559b9023cd70b1c2d0c18e9060", - "sha256": "0ig8ng5ycdf256phigh3fzalvd0ncvs54f7kfpq0gp43ky9sgvz0" + "commit": "0460aff3638b7c9e290f28be8eb2b90887a74eed", + "sha256": "1vdr5wsq1bw30zpgmgy0sm7kls0qkn6zs800hf95mixh21l4gzlz" } }, { @@ -102451,8 +102912,8 @@ 20210415, 1322 ], - "commit": "1c0028d6c406cf4884e6aa35313e82041b7e857f", - "sha256": "0gv1iychm7xzdf99l1kiyvqfdhl9s8g900jjq7bj2kkd3r3c22ki" + "commit": "daf9920a8ecb230045f4b07834b3a6f45676f1ce", + "sha256": "0lh90x5hqxm3pyqiy4qb10nxs5ga7w4hc7k6xkax41yhi41bgd58" }, "stable": { "version": [ @@ -102639,28 +103100,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210728, - 1000 + 20210825, + 2144 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e3ae2dfe048f25f3929b414279f6ceffbed748cf", - "sha256": "1lawl9gn59qkn7bfp6phzsiaw1nkmz3g38skbzrn86nsk9dczkzl" + "commit": "08d652fd85fdb799e5b68caddc64bbbdcb08205b", + "sha256": "1f5vhxw34qbgxc99zz7m3lml18xw59qdrgdfmxa79nxfrqczabcd" }, "stable": { "version": [ 0, 7, - 25 + 30 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "f979ac79070c39a4c483c08df96080763287ce4e", - "sha256": "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc" + "commit": "26fee82fac70d55ade55381b475e865d99dde496", + "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" } }, { @@ -102778,11 +103239,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210425, - 2215 + 20210802, + 249 ], - "commit": "3ee3761d9dd30b1c6af74dc393d43b9a91a75951", - "sha256": "1c58m2x4frwqxbi8n884c4l69pfwzdxsrig8p35y7mbywlwf1s2l" + "commit": "23c9bce8c1e3866e7cdbe9a69777648e13707357", + "sha256": "0rn8d0zn3dlqfvr5m5v687bw96mnv02v6ngq5jvljgykyawh3h58" }, "stable": { "version": [ @@ -103730,18 +104191,18 @@ 20200212, 1903 ], - "commit": "00e9095d6b2eeba01ba1b76b4816891d21ccf7e4", - "sha256": "0k9d7zb6l8v7pihgk5spy73jkdab9c7cwc4zwhbd9v65rd6756zj" + "commit": "876f7c33782aaac147e88d9063fd286f7a8a46e1", + "sha256": "1b2kfqkr9ss9lb5133zpp8sz9w7c77mydv1lvb56fi03lms94a5r" }, "stable": { "version": [ 2021, - 7, - 22, + 8, + 23, 0 ], - "commit": "3a1532f0ee53c6746f50dbad17c248eeced05d21", - "sha256": "1nzx3bw472m3ajmhlwp217jyrxm31j9av4h6fw884icpnn3392s7" + "commit": "a70658fff6a7cc01e323dd7a4a5b7305906796cc", + "sha256": "04r195apvbp4b0nk4j45pxhyl5dl6hr7x35zji548v0q8dgiv5lm" } }, { @@ -103797,8 +104258,8 @@ "deps": [ "haskell-mode" ], - "commit": "531db05f9b15feadbc1a0df194a4f9dcd0d10c0a", - "sha256": "16m17q8kc0fxq1nc47ggxjjna04k27hch93q8pqilp00s7695597" + "commit": "7142775c2039cae4cde9bdd6f68b3e0cbae2de9d", + "sha256": "02913lhc08kwx4m0x6hm40bg1yym449y160bndmpfv4n19d92z44" }, "stable": { "version": [ @@ -103831,8 +104292,8 @@ "s", "typescript-mode" ], - "commit": "c593153373d05b56ae56b0ca3a6752ee86708aaa", - "sha256": "0mrzk9ngmqg0p9hgirlvs08wxcc9vm3hibpy8khgclb8gzxjrs57" + "commit": "1e376e3e9798206ea3e42a5c037a7c00aa64ee00", + "sha256": "1g5q70j55qbvsl5ix9hsbmf5xllph1ch27miln7j3y5mi56k0lq9" }, "stable": { "version": [ @@ -104046,11 +104507,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210710, - 1950 + 20210819, + 2241 ], - "commit": "e0629d59adc92112f51b5f9300e06e714349488d", - "sha256": "104zffdf0jlfqh6rlzl7a7ji5gs11pacy63ab4rjs2kx08p3z0y9" + "commit": "facb4da1a2ee333a3c66f56009c8dec8e9652dab", + "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" + }, + "stable": { + "version": [ + 1, + 5 + ], + "commit": "f3243f0d27988eb4c29215dbe07d35f37031114f", + "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" } }, { @@ -104795,11 +105264,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210723, - 1601 + 20210819, + 2118 ], - "commit": "efdf91980a6f8bcb151debb877302ead8751ab65", - "sha256": "17gyd76ih8b9f8jw0c47x337lfdynz98xq1kykxs8riwrih1dhip" + "commit": "65f4eac82c564204d20df0a606dc2fcaa72cc41e", + "sha256": "1avxr5xdx8awzj63r97a505xd32d49qwjszbjzd0yfs3i5y243li" }, "stable": { "version": [ @@ -105036,20 +105505,20 @@ }, { "ename": "tree-sitter", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "1jdnsmy1gwz2f6kybmh8lcf9lg7qw58694drz0dmw34w3q7jjwys", + "commit": "315cccbfb1a9aadb546a5b62de5c3b681108ba6c", + "sha256": "1y7y8qrzc4nr31rh9gi8y3qpgb33jfl8aj8lmbagw5b7pc3v5f11", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210328, - 434 + 20210811, + 1609 ], "deps": [ "tsc" ], - "commit": "7f5d0938002092ec08830a73f64961021303e1e9", - "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" + "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", + "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" }, "stable": { "version": [ @@ -105097,32 +105566,32 @@ }, { "ename": "tree-sitter-langs", - "commit": "4029e21f74841db0c82f4a343a3b51b09cae2f25", - "sha256": "0jygxdlh94blfn5gxn949ic2v2x49cvl0rfzmvig3igyfwmm33sp", + "commit": "4163e6e43626c5149be06b95ec2e6de55acb85cc", + "sha256": "1bkjd5h817dw5zkbfb1dn4yg6cy29m9g0d650ap5ldi2y605zz5v", "fetcher": "github", - "repo": "ubolonton/tree-sitter-langs", + "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20210724, - 1056 + 20210825, + 1205 ], "deps": [ "tree-sitter" ], - "commit": "a516144aa9b109582e89702e5d76217e8fae907b", - "sha256": "1p2izm6n3r31jjxq8sazkqxnlhvg3kalf10323q246pdq6frk0qz" + "commit": "81adcdc06a9700ecf9659171da275b1c9dcfdfb6", + "sha256": "0k067rkzdnxs5h5yf5l7pppbnwc0x6c41d97kygi1z03124s77s6" }, "stable": { "version": [ 0, 10, - 0 + 4 ], "deps": [ "tree-sitter" ], - "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861", - "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a" + "commit": "95c8d2869926014351ffb932ad6749f5dfaff033", + "sha256": "19rjnqsx7xi4g5dj32nb4x7xlxmbhagrm652khfn1chlwd7z94la" } }, { @@ -105169,8 +105638,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210726, - 1955 + 20210823, + 1524 ], "deps": [ "ace-window", @@ -105182,8 +105651,8 @@ "pfuture", "s" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105219,8 +105688,8 @@ "all-the-icons", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" } }, { @@ -105231,15 +105700,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210419, - 1753 + 20210821, + 1041 ], "deps": [ "evil", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105268,8 +105737,8 @@ "deps": [ "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105300,8 +105769,8 @@ "pfuture", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105333,8 +105802,8 @@ "persp-mode", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105366,8 +105835,8 @@ "perspective", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" } }, { @@ -105385,8 +105854,8 @@ "projectile", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105594,27 +106063,28 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20210705, - 341 + 20210813, + 1617 ], "deps": [ "dash", "s" ], - "commit": "b6814e7e688781a586a775ef3504b9252af65b93", - "sha256": "1bf39qx8k7nn1dj1fp6j47zr1lp28ccrj6ciz7z3dk040rlxnv11" + "commit": "3fee71ceefac71ba55eb34829d7e94bb3df37cee", + "sha256": "1041zwlslj70rfjmpcxbib4h05rclhykr7i7pckvz7smsh4w3p2i" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "dash", "s" ], - "commit": "540f6a5adab5d881cc5f50835c0a3fe70e74b992", - "sha256": "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb" + "commit": "0bf2ac9680ae077d6f110ea0629728fbc654e945", + "sha256": "0l35gz1hpada2kzascbyqgawa5d3sdyg67gzvak84p9zx62jppn8" } }, { @@ -105634,17 +106104,17 @@ }, { "ename": "tsc", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "1ml2cha9xwdsx35n52aymdvp65r09hss3rvy5lqbq9aw57p9infy", + "commit": "c44eceafdfe3dd4a98010a8dcac2e9e3ddaeae4c", + "sha256": "1gwavabszakqvvyw8yrr17dng7k9w27g8dsaf5zwihp8j46wim27", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210320, - 1052 + 20210825, + 1402 ], - "commit": "7f5d0938002092ec08830a73f64961021303e1e9", - "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" + "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", + "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" }, "stable": { "version": [ @@ -105723,14 +106193,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210709, - 321 + 20210825, + 1946 ], "deps": [ "caml" ], - "commit": "b59c422759506402f990b089dbaa91c0578e2c2e", - "sha256": "1maqyhy82ayfiv95ng4bpgxrvjkkz331pw4ld1x99jpwqljpwqzc" + "commit": "d2b38f0249e3db467e9708985571f06ae191edbb", + "sha256": "1gaind3zfj1adl6dhk5yrx2fajqhxb8ch38vk66077s81qqzzw7k" }, "stable": { "version": [ @@ -105745,6 +106215,24 @@ "sha256": "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6" } }, + { + "ename": "tubestatus", + "commit": "ac2ece211c8aa3ff514caf99551d1d4a192d984c", + "sha256": "1v529wg38m58hqyy3wxq5pkqk9a5yaxkj20s735v5i89wnvndsxz", + "fetcher": "github", + "repo": "smallwat3r/tubestatus.el", + "unstable": { + "version": [ + 20210801, + 1522 + ], + "deps": [ + "request" + ], + "commit": "eeda4c2647cfdb910de776398037183f48e3fa72", + "sha256": "1fn405rmwcy8y5sa8lh5grq87n5zxbln2b9agxyilfx4jm6rcnpl" + } + }, { "ename": "tumble", "commit": "579a441d153c4c7d9f8172be94983a632d6fab8f", @@ -106029,8 +106517,8 @@ "f", "mmt" ], - "commit": "fa125bf43757737fbcf91958b76c38b440d54b4c", - "sha256": "1l0qb8gjgsmjjdvxlma7g6fn2z6rj246p2kczrikq8ajg1xh61sr" + "commit": "d08ed004bfc13f8d0bdfc13fc54e8f7402876903", + "sha256": "02fnq52a1i0dgdyhxgqjf89zif23038n8cm9idv9c515835c10m2" }, "stable": { "version": [ @@ -106408,11 +106896,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20210418, - 920 + 20210813, + 249 ], - "commit": "e0ad06b5ef2ac2733dad2ad48e3957b5c36edfa5", - "sha256": "0xix4ghri62xdqlh48pydhih1zsnfsy7ncrk6w2wrnz4fa033pia" + "commit": "34b27c01da4c3eb8aa595f3613b7e2e1ed4e54be", + "sha256": "1inh3c88l2dbhcpwivvn88zyq37fba41ccpmyjbkcbyjay52927n" } }, { @@ -106934,6 +107422,25 @@ "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" } }, + { + "ename": "untappd", + "commit": "0d7b1541a317cc253a55696d752ea57453475b8f", + "sha256": "10lqrsrg9kx6134mmc6r4vk1bvggdnjg5mi1xm2b057g11qs8afm", + "fetcher": "github", + "repo": "smallwat3r/untappd.el", + "unstable": { + "version": [ + 20210815, + 1544 + ], + "deps": [ + "emojify", + "request" + ], + "commit": "493d1776d6456b00bf017e71fac9b0721d8cc912", + "sha256": "13p0vr9fnkilw6192gsmz6hi5rx3jqh3dsmqx9siywghj9hfn056" + } + }, { "ename": "untitled-new-buffer", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", @@ -107843,16 +108350,16 @@ "repo": "DamienCassou/vdirel", "unstable": { "version": [ - 20190430, - 624 + 20210813, + 754 ], "deps": [ "helm", "org-vcard", "seq" ], - "commit": "a9ef32a70a1f14416e3dc5fee478ce138cc011d3", - "sha256": "1r60gp3h7cj34wc5kjvpxzidb01gyqsd04ykmhk7asv91m598vs3" + "commit": "dccc51bf68ad3f0066a462b354ec395229bd6a7f", + "sha256": "0mlfmigqsqmvn3rzyxnpq5zy6k0xf4vd2ww2qrr7kd2dqyv55hhw" }, "stable": { "version": [ @@ -108004,11 +108511,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210525, - 2135 + 20210809, + 2140 ], - "commit": "9e3e8a1edd82f7d056d3744f9e40cf8a5bac4ecc", - "sha256": "1kjzglpyrf1vbsb5gjcwmi5b38fvn5rx95yc8fwbizgisx70abkc" + "commit": "6f5b454782d5c2ce9d86616c3d015935d3d5dd6b", + "sha256": "172520apwczyp6c0apga1bz2vbfzy60jdyiq09sjk34533fymcg4" }, "stable": { "version": [ @@ -108617,17 +109124,17 @@ }, { "ename": "vline", - "commit": "515c6cd2efaa2c330122aabd7b23f29d5e4ec27d", - "sha256": "12kwxblqd8zdqhlcacvpd6z732l3ig92vklzbsv90n31k27yzzyn", + "commit": "25f776e108d31f8f2e4626cf931c1049e7187a0b", + "sha256": "1z14rxi2fgbcdag4fjv9915r210jlskiwivrjq1d4d18zsadaczj", "fetcher": "github", - "repo": "emacsorphanage/vline", + "repo": "buzztaiki/vline", "unstable": { "version": [ - 20120108, - 1245 + 20210805, + 1528 ], - "commit": "8cc7947387f8da2888da25538668afa33a1d8662", - "sha256": "0iqnin1z8fxhh59199zakfd6jw7nj7425y642vrxxn043a3s08vw" + "commit": "f5d7b5743dceca75b81c8c95287cd5b0341debf9", + "sha256": "06qqpjaxsacslxb3f2bm790lwygbq6387n9ccn4v9vz9xlyn9dmi" }, "stable": { "version": [ @@ -108829,11 +109336,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210618, - 1922 + 20210824, + 1453 ], - "commit": "d9dfa624679afdd5db6ad25429ef86d3dd91401e", - "sha256": "07nk6bw70mi9r3kgs5b11pfwfvfa73xwdl3xgclv8l7k87yysd69" + "commit": "9e5a208d8871293a23a2734591fac97a584a41c2", + "sha256": "13r9zxivgml610d0hk9cagpyv982596knad6jwq48cpncckwxrvl" } }, { @@ -108972,16 +109479,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210718, - 944 + 20210821, + 1625 ], "deps": [ "org", "org-roam", "s" ], - "commit": "ebbfc00978603c40222e260f06dbec9d781e3306", - "sha256": "1gx8h50r7mhm4p675an5a6hrm37zdcaw1lw2kpn7apr6kyi3c6q7" + "commit": "bc0abbc81917edf130476db7007184c015768d05", + "sha256": "0wjpvspyg6h0692gy9vfz42wcwsr599y53b8mfkjmnbdkbdwy1i0" }, "stable": { "version": [ @@ -109065,11 +109572,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210728, - 2251 + 20210817, + 327 ], - "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", - "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" + "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", + "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" } }, { @@ -109142,11 +109649,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20200730, - 240 + 20210818, + 1556 ], - "commit": "5e6deddda7a70f4b79832e9e8b6636418812e162", - "sha256": "195h5dnanicxksag72kp19nvsxsbqb34pr3pk6shki6yca2ks7yg" + "commit": "8dfe67c1581a0f3688c572dfdb5f8f71d3f874a0", + "sha256": "1rpl2hj1413kcxvxl27jycjl40js8cybf2qrhvjfwfhxncpwacxv" } }, { @@ -109713,14 +110220,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210526, - 129 + 20210822, + 1937 ], "deps": [ "templatel" ], - "commit": "ffea6a93f5d35fed8532f1187463a27eb46bff0a", - "sha256": "185crf3dgfqjq58s2bvdmvff5vmy73v4m4l2d17iwjyw3ifji5a8" + "commit": "cc095820669c7c2e77b06a86a887ecec70ae4853", + "sha256": "0ma5shksdha84yf18ay7a6ss4aacjh94827a5wmyv9bc5za5yvq1" }, "stable": { "version": [ @@ -109743,15 +110250,15 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20210306, - 1215 + 20210813, + 1901 ], "deps": [ "cl-lib", "request" ], - "commit": "87ea8b15f417037bb1a46ac849b2f60f08c0bfeb", - "sha256": "1ixvkxdf8sz2xxdjb28pc9bdnz321m736b1riffhfh4w755z7vzp" + "commit": "bbdc5e5b689a787c6b4ae7690751fe9c10d6796e", + "sha256": "1pl02jvqnh6710maxxnbwy5cfdrhav61x9b4da76wdxhv9rhzjjr" }, "stable": { "version": [ @@ -109781,8 +110288,8 @@ "deps": [ "cl-lib" ], - "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", - "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" + "commit": "fda4455333309545c0787a79d73c19ddbeb57980", + "sha256": "1ga4m9xgiczb6sv7dhmy4841rd9wxsirrvi8va34srpzlq51iq65" }, "stable": { "version": [ @@ -109899,11 +110406,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210717, - 1858 + 20210802, + 2251 ], - "commit": "246410e1c03f7d8d8e76102f7c5e3cda83acb36b", - "sha256": "184n7k0i2m9syy7mkjxdzjm36iyfx4azchwz0aania4pqm8dz7jv" + "commit": "e89a63a62e071180c9cdd9067679fadc3f7bf796", + "sha256": "0gxlz9b7fvbjkqxsyb4l75g7jsxyms0i1vpnb6y499hl115akcaz" } }, { @@ -110073,11 +110580,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210728, - 150 + 20210824, + 11 ], - "commit": "cc84b2d0da629ecb62a92e3fd23cbee4ea20ce56", - "sha256": "0h4f1pdkvp92mqp6vy8vk1xbyjfhgccm4fw00kim08mzf0z8zjyy" + "commit": "4790a14683a2f3e4f72ade197c78e4c0af1cdd4b", + "sha256": "1svz2048qabhy8z9m4p9q5lmdjr5i7vqnaw86x8gmn7vk052h5md" }, "stable": { "version": [ @@ -111146,8 +111653,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210702, - 1200 + 20210809, + 1409 ], "deps": [ "ace-link", @@ -111155,8 +111662,8 @@ "swiper", "zoutline" ], - "commit": "28d381e2603a79340a94a410acbbb8a6b3e237d8", - "sha256": "15567bns5kag47d58xapr4z0gfj5py3a8lwfpjlhmzccmarjr7x8" + "commit": "e31759db6aae8a951c0843a4c855bccb626348c4", + "sha256": "1aziil5gmiyk0qb89ydc7h72zdyr2n71z3ybrqji9ypx3vrrdwdx" }, "stable": { "version": [ @@ -111575,11 +112082,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210721, - 2312 + 20210824, + 120 ], - "commit": "372f5bab99c06a3dbdec220ff5558046e1766476", - "sha256": "0gxd1sk8k8z9d0rrjpgdnh7by8yvwbh2awj4gm81c11k2ylbjcgl" + "commit": "20737b65529ca185db663e709cca412e8d03cb1e", + "sha256": "0621vah5xm5zz6mhlgjlbqiccpbq4nssckm3wyqmw30mk2zr29mb" } }, { @@ -111590,11 +112097,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210627, - 508 + 20210824, + 730 ], - "commit": "86ddb3ce73bb2a844a126e42386571ca8e884260", - "sha256": "1ks43xdfv287n3sy8n25widkwwx388pm3b8p4r2ld6qz200wqjdq" + "commit": "4bd7858dadff5c5320f169ebabde379e29bb7559", + "sha256": "0ygqzyc398asczryyr4qz5sljzz0a4l87l1vys32vv49g4z1szih" } }, { @@ -111605,11 +112112,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210624, - 327 + 20210815, + 201 ], - "commit": "16b8d62ddb1d5548fcd78a0371481434390ebd54", - "sha256": "10scxxxg84b38rjlmk0r486r7b1nvla57yq6v1h1ymlbp0addvby" + "commit": "88e390e1f7ccee30cd4d5ac112acdf9b4c72780d", + "sha256": "1rhivz291580s0wn0syqhhaqdv7p3df0a7vk8zmx6485nm1hy4mh" } }, { @@ -111620,11 +112127,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210721, - 1622 + 20210823, + 302 ], - "commit": "afacaeebc3225de13acf19378d7af832d6150871", - "sha256": "08q495fhvcm8n78smsvcz2svzjqjihmzrvp2allysvyy25ni4d5b" + "commit": "c5a510db6aa15de78c809490571a5b2e9d765202", + "sha256": "05xzhrbn3y0wkan6cpk290cvb5gn4gdjkh64s0q466hbybm4lnj5" } }, { @@ -111635,11 +112142,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20210724, - 159 + 20210813, + 834 ], - "commit": "4f9041e7231108bc86ce722c623884146973343b", - "sha256": "1my96vqbwnnqfmh3r93ch6yqka6kqfq3qis9s3dqrmb91zvcjdl0" + "commit": "ba818dc7fd90b49b780709be5266733ede86a556", + "sha256": "15bjib9n7qakdc70x4xdjaw1q1rm9yz8k55l24mfm848fz62bq30" } }, { @@ -111650,11 +112157,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210708, - 2203 + 20210801, + 102 ], - "commit": "53044a43db3c803fb3e32003c3106403ecfb8e4b", - "sha256": "09x8lrx4sdnx2sr0nkkn19hi7x6hi3gs0ad31xmjx1qgd7bw7as9" + "commit": "d69eb2b66eff70ef311967bf774195bf3331cfff", + "sha256": "12ssjraw8ymphkiyvzpnmh90k9m2sskvklkjcl2ni7qmjc5774v7" } }, { @@ -111665,11 +112172,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210419, - 1833 + 20210815, + 211 ], - "commit": "6ccd3ca21aa71a2c1f831fabbdfc9e32c02e180d", - "sha256": "1bibdx0sawgsdzdiivy4x7rf4s5hnz2ypllwz9sk2fdmjyv8d08c" + "commit": "1685bb8652c28a32c6d55fe61bbf4b5cb3f3dcca", + "sha256": "11akmsmynrbzadyw502czrvaw0mly06mzlj4zg5adgvy52mpb0ip" } }, { @@ -111695,11 +112202,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20210109, - 1741 + 20210815, + 207 ], - "commit": "a051568c21b0bd7907dffebdbe04d0110c038be0", - "sha256": "0z3cvajj5cf23h8lxlj10wm8rxh7vjpnsk8svryx5djd26ffpc11" + "commit": "b5e4f9ebc9e17916e736af9935bf4e17032edde9", + "sha256": "1dy3y27xyprmxymnm43d7vsmsfhdrr1nbbdpvfflqxs9q6hll2xn" } }, { @@ -111831,6 +112338,24 @@ "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" } }, + { + "ename": "xhair", + "commit": "5a15eb95181ddbb8d37bb23a0c5cbcba8a0a3f03", + "sha256": "07sx1yqygnmi2bj917164m3zkgvhli7bb1cccc6n72mw7dhr9wxn", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-xhair", + "unstable": { + "version": [ + 20210801, + 222 + ], + "deps": [ + "vline" + ], + "commit": "c7bd7c501c3545aa99dadac386c882fe7c5edd9c", + "sha256": "03m15lbspk73x59wvb77wgvnkrmrlq4w6kmnrr2i69jgafqh0421" + } + }, { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -112420,20 +112945,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210625, - 528 + 20210730, + 143 ], - "commit": "69c699a15af342199d0dbbbe7676a85487781ae7", - "sha256": "1j1yqpnpn5k17jnrax56and4yss1bimxck3zigbgy5fpng89l8sb" + "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", + "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" }, "stable": { "version": [ 0, 3, - 3 + 4 ], - "commit": "9382bf5a3b1cad1c404bfd13fab8cf6688fe8442", - "sha256": "0xm6c4lk62ifwpc03wmn6602r1izfbk9kpyv3wg3p8ksxllvd0ns" + "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", + "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" } }, { @@ -112474,11 +112999,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20210508, - 1641 + 20210808, + 1122 ], - "commit": "3a57058468211f3cb18e71aecc630dcacb87636b", - "sha256": "1p09vzl6miafjhl9aw67day304wc27g72b0vcbr3barfgczypzsa" + "commit": "63b637f846411806ae47e63adc06fe9427be1131", + "sha256": "1z759sg45ws08bj1c97xvxxbvs5a0fq8lgxrh5j5n7yv4jz4vr1k" }, "stable": { "version": [ @@ -112555,11 +113080,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210625, - 1951 + 20210811, + 1934 ], - "commit": "6f5c7e5171030663ebda4f1f872c30d0e165b6b7", - "sha256": "08f5qn1dsikv9dkdvdrb8mmjb3himlnh9bcany2w4pj0apgcwn4d" + "commit": "6562d021cfc76b88a7b39b49adc44fcad835bd3f", + "sha256": "1xh36s2vy521hni9993ajnqv3apinqsiq09yfhfkz4skw22p891g" }, "stable": { "version": [ @@ -112750,14 +113275,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210408, - 1234 + 20210808, + 1851 ], "deps": [ "yasnippet" ], - "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", - "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" + "commit": "8bf33e9e54de0dca1728221b0dda6789d99b7930", + "sha256": "1gz4q8knyss9bsz5s5vywi4qvazgwg8ryh7byxkrmbrxibvc9d18" }, "stable": { "version": [ @@ -113265,11 +113790,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20201121, - 1050 + 20210823, + 504 ], - "commit": "ea9b8f3aedc6640cb0d15d77f7bb5d98830abe97", - "sha256": "171kqnjqhj69jl6idnbrnk2gpjv127h4n3y9cplnqpp7wfigzdzi" + "commit": "13266182dc51534394bd427840bc78e2a78d01bd", + "sha256": "1174b12mqwkl5p16m0rrnswc18blj35jr9pi2l0annvarny3shkj" }, "stable": { "version": [ @@ -113449,15 +113974,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210721, - 2026 + 20210819, + 1048 ], "deps": [ "ace-window", "deft" ], - "commit": "f4d2e02e7b9d02799036d2dd864d45115f937fbd", - "sha256": "032wpg75jwh0nq9a36727f037vwaic05yqjmcc0lwz23czrkpsd5" + "commit": "910a6607e172ae20347d74e651d29ebedc58ea06", + "sha256": "1cccj3y7a353b2b8gvbbs2ami1g3a7961j3dwmcar9lc0yrh3hys" }, "stable": { "version": [ @@ -113514,8 +114039,8 @@ 20210605, 513 ], - "commit": "0babe7ec524f59d57c01e2fc66294d1afa01f5eb", - "sha256": "0balv7ggz10izjw7r6z9vx17qq88229jdzpsjas6z37gk61bfngk" + "commit": "acf3ee8bbf6b7e49dbfaa8bc82a4c1b9b1f2b531", + "sha256": "0wc65hr9y1yvyb5ywswiwhk8jjxswzd0qzr92b7pkfwghmf0z1yp" } }, { @@ -113611,14 +114136,25 @@ "repo": "sshirokov/ZNC.el", "unstable": { "version": [ - 20210304, - 2337 + 20210803, + 159 ], "deps": [ "cl-lib" ], - "commit": "57d89fc1e17d94a8e9f3365b0d647a80520cc4a8", - "sha256": "0vbpc5lav8pw7caa4442z15a5s1l9wzjv68dgrbjnjvpn6yz3pay" + "commit": "6f0949c393b7778a96033716787d152ada32f705", + "sha256": "0mfx69xgnwhaaj0gq4nrq7j8c0l3i6y4w7nxkjcqq6jg7zbkppai" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "cl-lib" + ], + "commit": "2605f78e37a8a759067dc14fa25a82824ba1bacc", + "sha256": "1ran86ycnays9s23wk3iczqqgnpbyx0lijiarx65am3jc1yzg5ia" } }, { @@ -114102,8 +114638,8 @@ "avy", "cl-lib" ], - "commit": "18d26571b91a9c56b6a7e0d2a58188e833ab5d0f", - "sha256": "0cl76m06cm0wmb8bx6g6xrxaks2vr6zqpibc9d94gbkr5jzccg9k" + "commit": "fa87da4ac95a1d7fe8aa9198c5568debee8d5627", + "sha256": "03gg15vj2jbd70xjqkxpwgngz340fyhq1jjmd4iasf36fqplxccw" }, "stable": { "version": [ From 00910f768ad6475fff10699a710656529f1738c5 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 25 Aug 2021 23:01:12 -0300 Subject: [PATCH 131/220] elpa-packages 2021-08-25 --- .../emacs/elisp-packages/elpa-generated.nix | 114 +++++++++++------- 1 file changed, 72 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index ce30adce608a..31ef6a3e4f03 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.1.7"; + version = "7.1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.7.tar"; - sha256 = "0bzykgzc3kx1dgngishsf9w4czq3ig6wvrv3832zlxb7q3rmw8j2"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.8.tar"; + sha256 = "0gggzjj58bxp7n4xdvhqwaxk6z79bbiqs59cc36mxk4gqyzf41xh"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.12"; + version = "13.0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.12.tar"; - sha256 = "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm"; + url = "https://elpa.gnu.org/packages/auctex-13.0.13.tar"; + sha256 = "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn"; }; packageRequires = [ emacs ]; meta = { @@ -636,10 +636,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.9"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.9.tar"; - sha256 = "1n3bnvgj92fjd9dai9f95wvyfb20yhaw7b722lkqjg42i10jqzfn"; + url = "https://elpa.gnu.org/packages/consult-0.11.tar"; + sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; }; packageRequires = [ emacs ]; meta = { @@ -666,10 +666,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.10.tar"; - sha256 = "0sqr4cld84vgfnf0fjgvbbix1p23s0n2xsszfap6d8a2xzzpp044"; + url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; + sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; }; packageRequires = [ emacs ]; meta = { @@ -722,6 +722,21 @@ license = lib.licenses.free; }; }) {}; + csharp-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "csharp-mode"; + ename = "csharp-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/csharp-mode-1.0.0.tar"; + sha256 = "0vhm443fkcjsj95r4rs9r0mz9vzfk92883nxhyi35d3jaf112gm1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/csharp-mode.html"; + license = lib.licenses.free; + }; + }) {}; csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "csv-mode"; @@ -1011,10 +1026,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.7.1"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.7.1.tar"; - sha256 = "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.2.tar"; + sha256 = "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir"; }; packageRequires = [ emacs seq ]; meta = { @@ -1071,10 +1086,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210710"; + version = "20210822"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210710.tar"; - sha256 = "19k5yncyjg7afvkx54k9mplm86jyr3svjjyprrj1frdi219i5piw"; + url = "https://elpa.gnu.org/packages/eev-20210822.tar"; + sha256 = "1682hl8s15snz9vq2r0q7jfpf81gbhlyxp55l2alsmxll4qq72wh"; }; packageRequires = [ emacs ]; meta = { @@ -1194,10 +1209,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.5"; + version = "7.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.5.tar"; - sha256 = "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j"; + url = "https://elpa.gnu.org/packages/emms-7.6.tar"; + sha256 = "03cp6mr0kxy41dg4ri5ymbzpkw7bd8zg7hx0a2rb4axiss5qmx7i"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1375,6 +1390,21 @@ license = lib.licenses.free; }; }) {}; + flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-proselint"; + ename = "flymake-proselint"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.1.tar"; + sha256 = "08hbz8k3idr1gb98q3ssmzsdya5afjxl25l9xzqp9q2w5krc8433"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-proselint.html"; + license = lib.licenses.free; + }; + }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -2148,10 +2178,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/map-3.0.tar"; - sha256 = "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls"; + url = "https://elpa.gnu.org/packages/map-3.1.tar"; + sha256 = "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx"; }; packageRequires = [ emacs ]; meta = { @@ -2163,10 +2193,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.7.tar"; - sha256 = "1nz55nx6xp72nahs4g6asl5y5yrlnlnza58bjrlwwzmwsf7daz18"; + url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; + sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; }; packageRequires = [ emacs ]; meta = { @@ -2855,10 +2885,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.6.0.tar"; - sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0"; + url = "https://elpa.gnu.org/packages/project-0.6.1.tar"; + sha256 = "174fli3swbn67qcs9isv70vwrf6r41mak6dbs98gia89rlb71c8v"; }; packageRequires = [ emacs xref ]; meta = { @@ -3270,10 +3300,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.3"; + version = "2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.3.tar"; - sha256 = "0sqq5zfzx9dir6d6zvg7vj5v629b508bbxsp7j0sp21rr4fw9nn0"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar"; + sha256 = "1yqcrgfn9lbv26729x5d9qx4zyp1k05r4f63ikrnk8lhqpjs5i00"; }; packageRequires = []; meta = { @@ -3366,10 +3396,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.2.1.tar"; - sha256 = "15paand086g33w2vb6jkyxd3i2pmpp84f31y3j5v8w9ia68pjzms"; + url = "https://elpa.gnu.org/packages/setup-1.0.0.tar"; + sha256 = "05k65r5mgkpbj6f84qscgq4gjbj4wyn7c60b9xjvadw9b55yvfxk"; }; packageRequires = [ emacs ]; meta = { @@ -3396,10 +3426,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; - sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; + sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; }; packageRequires = [ emacs ]; meta = { @@ -4041,10 +4071,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.12"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.12.tar"; - sha256 = "14qlc438bysg23wfj04zpvpraqzzi4jlz3r11vc56vd0k2hfmvmn"; + url = "https://elpa.gnu.org/packages/vertico-0.14.tar"; + sha256 = "1lvfvrmfi6f1jcf356rj1zl2bcbqxas7wi3yb93mxpn37l22l8mi"; }; packageRequires = [ emacs ]; meta = { From c5b90ed43160db09fa7cf3e004e07d72f5ceb410 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 02:54:11 +0000 Subject: [PATCH 132/220] python38Packages.cfgv: 3.3.0 -> 3.3.1 --- pkgs/development/python-modules/cfgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 306019b54b75..c7b074089a68 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"; + sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"; }; propagatedBuildInputs = [ six ]; From 356ef3579b9ca54628eace6b448cb7d00a0dcce7 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:12:18 +0800 Subject: [PATCH 133/220] perlPackages.XSParseKeyword: 0.06 -> 0.12 --- pkgs/top-level/perl-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..12da4a5fec19 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24155,11 +24155,12 @@ let XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.06"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz"; - sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.12.tar.gz"; + sha256 = "0crwhcw9ciqndvwvhycd93m6jgyhi77yyj4vi9xfyglpv84p3y68"; }; + buildInputs = [ ExtUtilsCChecker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; From 1f1357e20e9b05ccd926c2eaf114a38c92f25a86 Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:15:45 +0800 Subject: [PATCH 134/220] perlPackages.XSParseSublike: 0.10 -> 0.12 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..aeee748d69ea 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -24170,10 +24170,10 @@ let XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.10"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.10.tar.gz"; - sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.12.tar.gz"; + sha256 = "08kpia48f1rqc44rvbns97h3jyy2y5c8qlkh4a95v1m0yr5cb22s"; }; buildInputs = [ TestFatal ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; From 89c84c4dc5dc28297985f4dbe47b9a0fec4fe7af Mon Sep 17 00:00:00 2001 From: "Zak B. Elep" Date: Thu, 26 Aug 2021 11:19:23 +0800 Subject: [PATCH 135/220] perlPackages.FutureAsyncAwait: 0.49 -> 0.52 --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 35836205943f..c79fea90f986 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -8645,13 +8645,13 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.49"; + version = "0.52"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "0cm7cgfjrqs7jazl0f9q6lgkhz6k8qbawin1z36nrwh2ywc94zjb"; + sha256 = "0dwij2r51vij91hx808zc2l5q38h55jahzrh73h4rn816jv597yx"; }; buildInputs = [ TestRefcount ]; - propagatedBuildInputs = [ Future XSParseSublike ]; + propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; From 678aea9cb9596206646e053f08d251e6939160a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 04:06:16 +0000 Subject: [PATCH 136/220] python38Packages.google-cloud-bigquery: 2.24.1 -> 2.25.1 --- .../python-modules/google-cloud-bigquery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 21d356f7f7c9..4895661cb421 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.24.1"; + version = "2.25.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-gRHSPir4epbAZGqCqD9i1pS2yIKeeIHrTkN7dURxZJ8="; + sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d"; }; propagatedBuildInputs = [ From 6a9c41924d911e25b61e1df311790b3ea5213b9c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 04:19:49 +0000 Subject: [PATCH 137/220] dotenv-linter: 3.1.0 -> 3.1.1 --- pkgs/development/tools/analysis/dotenv-linter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index 51e43555d5ea..983dd2c2a999 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; + sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo="; }; - cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; + cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; From e6494966dd6a8dcd6d4cb5663f093a57bcc2593e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 13:31:57 +1000 Subject: [PATCH 138/220] treewide: buildFlagsArray -> ldflags --- pkgs/applications/misc/cointop/default.nix | 2 +- .../networking/cluster/argo/default.nix | 17 ++++++++--------- .../networking/cluster/kops/default.nix | 9 ++++----- .../networking/cluster/kube-router/default.nix | 11 ++++------- .../networking/cluster/kubeless/default.nix | 6 +++--- .../networking/cluster/minishift/default.nix | 11 +++++------ .../version-management/git-lfs/default.nix | 2 +- .../virtualization/docker-slim/default.nix | 9 ++++----- .../nvidia-container-runtime/default.nix | 2 +- .../default.nix | 7 +++---- .../gitlab-runner/default.nix | 11 +++++------ pkgs/development/tools/dep/default.nix | 2 +- pkgs/development/tools/glide/default.nix | 7 +++---- pkgs/development/tools/kube-aws/default.nix | 6 +++--- .../development/tools/misc/linuxkit/default.nix | 2 +- .../tools/misc/terraform-lsp/default.nix | 2 +- pkgs/development/tools/toxiproxy/default.nix | 2 +- pkgs/servers/cayley/default.nix | 7 +++---- pkgs/servers/gotify/default.nix | 4 ++-- pkgs/servers/mail/mailhog/default.nix | 2 +- pkgs/servers/mattermost/default.nix | 7 +++---- .../monitoring/prometheus/alertmanager.nix | 17 ++++++++--------- .../monitoring/prometheus/nginx-exporter.nix | 4 ++-- .../monitoring/prometheus/openldap-exporter.nix | 11 +++++------ .../monitoring/prometheus/pushgateway.nix | 17 ++++++++--------- pkgs/servers/tegola/default.nix | 2 +- pkgs/tools/admin/exoscale-cli/default.nix | 2 +- pkgs/tools/filesystems/gcsfuse/default.nix | 2 +- pkgs/tools/misc/cloud-sql-proxy/default.nix | 2 +- pkgs/tools/misc/dashing/default.nix | 2 +- pkgs/tools/misc/gh-ost/default.nix | 2 +- pkgs/tools/misc/git-town/default.nix | 3 +-- pkgs/tools/misc/systrayhelper/default.nix | 14 +++++++------- pkgs/tools/security/keycard-cli/default.nix | 3 +-- pkgs/tools/security/minica/default.nix | 7 +++---- pkgs/tools/text/gucci/default.nix | 7 +++---- 36 files changed, 102 insertions(+), 121 deletions(-) diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 62bcf6a99d2b..4b2f45c47f4f 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/miguelmota/cointop"; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/cointop.version=${version}" ]; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index a49879e53528..6372f19ee6c7 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -43,15 +43,14 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/argoproj/argo-workflows/v3.buildDate=unknown - -X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTreeState=clean - -X github.com/argoproj/argo-workflows/v3.version=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" + "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" + "-X github.com/argoproj/argo-workflows/v3.version=${version}" + ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 54d13f819ab8..389be11e506c 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -21,11 +21,10 @@ let nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; - buildFlagsArray = '' - -ldflags= - -X k8s.io/kops.Version=${version} - -X k8s.io/kops.GitVersion=${version} - ''; + ldflags = [ + "-X k8s.io/kops.Version=${version}" + "-X k8s.io/kops.GitVersion=${version}" + ]; preBuild = '' (cd go/src/k8s.io/kops diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index 85b83c994df8..b9a282b5cd16 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -13,13 +13,10 @@ buildGoPackage rec { sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU="; }; - buildFlagsArray = '' - -ldflags= - -X - ${goPackagePath}/pkg/cmd.version=${version} - -X - ${goPackagePath}/pkg/cmd.buildDate=Nix - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/cmd.version=${version}" + "-X ${goPackagePath}/pkg/cmd.buildDate=Nix" + ]; meta = with lib; { homepage = "https://www.kube-router.io/"; diff --git a/pkgs/applications/networking/cluster/kubeless/default.nix b/pkgs/applications/networking/cluster/kubeless/default.nix index 38323b98b194..537fb611783e 100644 --- a/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/pkgs/applications/networking/cluster/kubeless/default.nix @@ -17,9 +17,9 @@ buildGoPackage rec { subPackages = [ "cmd/kubeless" ]; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}" + ]; postInstall = '' for shell in bash; do diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 5b3b17b3df20..488d0c4327a2 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -34,12 +34,11 @@ in buildGoPackage rec { --replace '"runtime"' "" ''; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/pkg/version.minishiftVersion=${version} - -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion} - -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion} - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/version.minishiftVersion=${version}" + "-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}" + "-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}" + ]; preBuild = '' (cd go/src/github.com/minishift/minishift diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 5976f1de6a76..77a8d9d897f1 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { nativeBuildInputs = [ ronn installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index 6e6db87a6cf8..a38b0675af2d 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -23,11 +23,10 @@ buildGoPackage rec { makeWrapper ]; - buildFlagsArray = [ - ''-ldflags= - -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version} - -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev} - '' + ldflags = [ + "-s" "-w" + "-X ${goPackagePath}/pkg/version.appVersionTag=${version}" + "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix diff --git a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 92717b988919..43eb1639b43e 100644 --- a/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/${pname}/src"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index b5200e22cad8..5b2a7fddeb45 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -15,9 +15,9 @@ buildGoPackage rec { sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw"; }; - buildFlagsArray = '' - -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} - ''; + ldflags = [ + "-X ${goPackagePath}/internal/version.Raw=v${version}" + ]; postInstall = '' mv $out/bin/{internal,ct} @@ -32,4 +32,3 @@ buildGoPackage rec { platforms = with platforms; unix; }; } - diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ee40f1b8cf87..a507ba8650fa 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -19,12 +19,11 @@ buildGoPackage rec { goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; subPackages = [ "." ]; commonPackagePath = "${goPackagePath}/common"; - buildFlagsArray = '' - -ldflags= - -X ${commonPackagePath}.NAME=gitlab-runner - -X ${commonPackagePath}.VERSION=${version} - -X ${commonPackagePath}.REVISION=v${version} - ''; + ldflags = [ + "-X ${commonPackagePath}.NAME=gitlab-runner" + "-X ${commonPackagePath}.VERSION=${version}" + "-X ${commonPackagePath}.REVISION=v${version}" + ]; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index ff7bad87afd6..2c7345d7cc56 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; }; - buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); + ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/golang/dep"; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 05e4ae810612..e97feca11672 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -6,10 +6,9 @@ buildGoPackage rec { goPackagePath = "github.com/Masterminds/glide"; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; src = fetchFromGitHub { rev = "v${version}"; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 0e96683b06e8..e095755df110 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -22,9 +22,9 @@ buildGoPackage rec { go generate ./core/root/config )''; - buildFlagsArray = '' - -ldflags=-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version} - ''; + ldflags = [ + "-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}" + ]; meta = { description = "Tool for deploying kubernetes on aws using coreos"; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index eeb2102bdf0c..da608ba5a061 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { subPackages = [ "src/cmd/linuxkit" ]; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev} -X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; diff --git a/pkgs/development/tools/misc/terraform-lsp/default.nix b/pkgs/development/tools/misc/terraform-lsp/default.nix index 0cfd63ffa283..d55367e70658 100644 --- a/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/juliosueiras/terraform-lsp"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index 448c14ffaf1a..5ecd6ad2eb6f 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { goPackagePath = "github.com/Shopify/toxiproxy"; subPackages = ["cmd" "cli"]; - buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; + ldflags = [ "-X github.com/Shopify/toxiproxy.Version=v${version}" ]; postInstall = '' mv $out/bin/cli $out/bin/toxiproxy-cli diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index c9d06d497714..13bf9326c22b 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -15,10 +15,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; meta = { homepage = "https://cayley.io/"; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index d0a3d9c10a20..8f3739b4ebfb 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -45,8 +45,8 @@ buildGoModule rec { # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Mode=prod" + ldflags = [ + "-X main.Version=${version}" "-X main.Mode=prod" ]; meta = with lib; { diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 0032c4a630e9..d4c358ec47f5 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Web and API based SMTP testing"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 6a7ba06df885..14996cecc659 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -16,10 +16,9 @@ let goPackagePath = "github.com/mattermost/mattermost-server"; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version} - ''; + ldflags = [ + "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}" + ]; }; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index bc3cf7539ece..251c977bd4df 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -14,15 +14,14 @@ buildGoPackage rec { sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; }; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=${src.rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - ''; + ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${src.rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 65206256194a..8b39915193ef 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -6,8 +6,8 @@ buildGoPackage rec { goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; - buildFlagsArray = [ - "-ldflags=" "-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index a439c84bca9b..84cb7a62f243 100644 --- a/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -11,12 +11,11 @@ buildGoPackage rec { sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/tomcz/openldap_exporter.tag=v${version} - -X github.com/tomcz/openldap_exporter.commit=unknown - ''; + ldflags = [ + "-s" "-w" + "-X github.com/tomcz/openldap_exporter.tag=v${version}" + "-X github.com/tomcz/openldap_exporter.commit=unknown" + ]; goPackagePath = "github.com/tomcz/openldap_exporter"; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0bdb0680ae9d..f14ceec44e21 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -17,15 +17,14 @@ buildGoPackage rec { buildUser = "nix@nixpkgs"; buildDate = "19700101-00:00:00"; - buildFlagsArray = '' - -ldflags= - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}" + "-X main.goVersion=${lib.getVersion go}" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 5e3aa2d0ef67..d94f97baf865 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ="; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; excludedPackages = [ "example" ]; diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 0ffa33a1673a..544ffcaf1ab3 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/exoscale/cli"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; # ensures only the cli binary is built and we don't clutter bin/ with submodules subPackages = [ "." ]; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 759104b9c038..4f739769807b 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; diff --git a/pkgs/tools/misc/cloud-sql-proxy/default.nix b/pkgs/tools/misc/cloud-sql-proxy/default.nix index 552ea140d608..6f5a6ec25fbb 100644 --- a/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ]; + ldflags = [ "-X main.versionString=${version}" ]; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index 496639ec07a5..6dfa3f2b7796 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "A Dash Generator Script for Any HTML"; diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix index 2e2d8ccfc14f..16594f898b97 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/github/gh-ost"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ]; meta = with lib; { description = "Triggerless online schema migration solution for MySQL"; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 88d62b896df7..18f251fb7208 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; }; - buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; + ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with lib; { description = "Generic, high-level git support for git-flow workflows"; @@ -21,4 +21,3 @@ buildGoPackage rec { license = licenses.mit; }; } - diff --git a/pkgs/tools/misc/systrayhelper/default.nix b/pkgs/tools/misc/systrayhelper/default.nix index 03d8e58f8b02..2453191d0cb8 100644 --- a/pkgs/tools/misc/systrayhelper/default.nix +++ b/pkgs/tools/misc/systrayhelper/default.nix @@ -16,13 +16,13 @@ buildGoPackage rec { # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. - buildFlagsArray = [ ''-ldflags= - -X main.version=v${version} - -X main.commit=${rev} - -X main.date="nix-byrev" - -s - -w - '' ]; + ldflags = [ + "-X main.version=v${version}" + "-X main.commit=${rev}" + "-X main.date=nix-byrev" + "-s" + "-w" + ]; nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; diff --git a/pkgs/tools/security/keycard-cli/default.nix b/pkgs/tools/security/keycard-cli/default.nix index 6e67358b675a..93384df9b42e 100644 --- a/pkgs/tools/security/keycard-cli/default.nix +++ b/pkgs/tools/security/keycard-cli/default.nix @@ -17,8 +17,7 @@ buildGoPackage rec { sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU="; }; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X main.version=${version}" ]; diff --git a/pkgs/tools/security/minica/default.nix b/pkgs/tools/security/minica/default.nix index 49f1e2beb4db..29574e39cd92 100644 --- a/pkgs/tools/security/minica/default.nix +++ b/pkgs/tools/security/minica/default.nix @@ -13,10 +13,9 @@ buildGoPackage rec { sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny"; }; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - ''; + ldflags = [ + "-X main.BuildVersion=${version}" + ]; meta = with lib; { description = "A simple tool for generating self signed certificates"; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 943b86d3b051..c937e6c7ab16 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -15,9 +15,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = '' - -ldflags=-X main.AppVersion=${version} - ''; + ldflags = [ + "-X main.AppVersion=${version}" + ]; meta = with lib; { description = "A simple CLI templating tool written in golang"; @@ -27,4 +27,3 @@ buildGoPackage rec { platforms = platforms.unix; }; } - From 3c2d7dbfdfc0c8a69752539cdd6330bf9f922e2c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 23 Aug 2021 14:55:51 +1000 Subject: [PATCH 139/220] buildGoPackage: warn if buildFlagsArray is used --- pkgs/development/go-packages/generic/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 6eaeee2a1230..7c4d173b937b 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -43,8 +43,9 @@ , CGO_ENABLED ? go.CGO_ENABLED -# needed for buildFlags warning +# needed for buildFlags{,Array} warning , buildFlags ? "" +, buildFlagsArray ? "" , meta ? {}, ... } @ args: @@ -260,6 +261,6 @@ let } // meta; }); in -lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" +lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package From 372b7ce697010444e41e4a89428aed05fd4fe7bc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 25 Aug 2021 22:30:44 -0500 Subject: [PATCH 140/220] nodejs-16_x: 16.7.0 -> 16.8.0 https://github.com/nodejs/node/releases/tag/v16.8.0 --- pkgs/development/web/nodejs/v16.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v16.nix b/pkgs/development/web/nodejs/v16.nix index 113f0cf95c05..805e62be8d62 100644 --- a/pkgs/development/web/nodejs/v16.nix +++ b/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.7.0"; - sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs"; + version = "16.8.0"; + sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } From 491f953ce55f99fd0c4f63254e2d35a0b19f77c6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 25 Aug 2021 09:23:09 +0000 Subject: [PATCH 141/220] nextdns: 1.35.0 -> 1.36.0 --- pkgs/applications/networking/nextdns/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index dadd17be16f6..025c58a9383d 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nextdns"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg="; + sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME="; }; - vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0="; + vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; doCheck = false; From 0caa3c6e9488891882d7a9b21b76dd8f70d56de7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 06:23:38 +0000 Subject: [PATCH 142/220] grype: 0.16.0 -> 0.17.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 e27526289aa0..4dc119980a5d 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.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xk+AyCcPQDDKKLT/tkZ2znXbBSBEgmqVqmgGBP/3Oos="; + sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; }; - vendorSha256 = "sha256-OAzuL1pHLLKgkKjPjupPg7LEz8sY7ehq2PONnjhvzHE="; + vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; propagatedBuildInputs = [ docker ]; From ebe32d542fd3ceae9b6d8e3ab8f7d11a5708f815 Mon Sep 17 00:00:00 2001 From: Anubhav Kini Date: Thu, 26 Aug 2021 12:32:50 +0530 Subject: [PATCH 143/220] todoman: 3.9.0 -> 4.0.0 --- .../doc/manual/from_md/release-notes/rl-2111.section.xml | 8 ++++++++ nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ pkgs/applications/office/todoman/default.nix | 5 ++--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 39a7965a7ed4..8663f58bedb2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -872,6 +872,14 @@ Superuser created successfully. exfat. + + + The todoman package was upgraded from 3.9.0 + to 4.0.0. This introduces breaking changes in the + configuration + file format. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 0203215f11e8..62796339a730 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -253,6 +253,8 @@ To be able to access the web UI this port needs to be opened in the firewall. - If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7 or later, the `exfatprogs` user-space utilities are used instead of `exfat`. +- The `todoman` package was upgraded from 3.9.0 to 4.0.0. This introduces breaking changes in the [configuration file](https://todoman.readthedocs.io/en/stable/configure.html#configuration-file) format. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index fc9f70094da1..e01391519e49 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -10,11 +10,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.9.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7e5cab13ecce0562b1f13f46ab8cbc079caed4b462f2371929f8a4abff2bcbe"; + sha256 = "4c4d0c6533da8d553f3dd170c9c4ff3752eb11fd7177ee391414a39adfef60ad"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,6 @@ buildPythonApplication rec { click click-log click-repl - configobj humanize icalendar parsedatetime From 354c960d3597d6f732a7937c89eed298afa15864 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 09:37:13 +0200 Subject: [PATCH 144/220] python3Packages.slack-sdk: 3.9.1 -> 3.10.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 f121ac9aeb73..6183ee7b0cba 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.9.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-IskBFccMDG03BFkERRfL7TH1Ppq8Xr9qTxCEoUEqxtk="; + sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; }; propagatedBuildInputs = [ From d2a08fef699a955e4ca2d99286aba9113f734d3f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Aug 2021 09:00:00 -0500 Subject: [PATCH 145/220] ocamlPackages.ppx_cstubs: 0.6.1.1 -> 0.6.1.2 https://github.com/fdopen/ppx_cstubs/raw/0.6.1.2/CHANGES.md --- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index b4ddb4dd5e45..6ad6c4cd8985 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { pname = "ppx_cstubs"; - version = "0.6.1.1"; + version = "0.6.1.2"; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { owner = "fdopen"; repo = "ppx_cstubs"; rev = version; - sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh"; + sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; buildInputs = [ @@ -37,8 +37,9 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; description = "Preprocessor for easier stub generation with ocaml-ctypes"; - license = licenses.mit; + license = licenses.lgpl21Plus; maintainers = [ maintainers.osener ]; }; } From 4a8fec5e6f4e5328ef53d3d5ab30992ba8e04af7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 22 Aug 2021 09:01:00 -0500 Subject: [PATCH 146/220] ocamlPackages.integers: 0.4.0 -> 0.5.1 https://github.com/ocamllabs/ocaml-integers/raw/0.5.1/CHANGES.md --- pkgs/development/ocaml-modules/integers/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 97443bf5706e..ed5ccbedb64d 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip, buildDunePackage, ocaml }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; - version = "0.4.0"; + version = "0.5.1"; useDune2 = lib.versionAtLeast ocaml.version "4.08"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-integers"; + rev = version; + sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi"; }; meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; homepage = "https://github.com/ocamllabs/ocaml-integers"; + changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl ]; }; } From 6ad7483734f71aa3706e87ed28ec8bfbc36c3e8f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:09:56 +1000 Subject: [PATCH 147/220] cri-o: 1.21.2 -> 1.22.0 https://github.com/cri-o/cri-o/releases/tag/v1.22.0 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 26e56ccc609e..bc7e25d93dd7 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI="; + sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc="; }; vendorSha256 = null; From 9362518892ab9ab8c51c64aef9ee3860e50dae50 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 10:07:56 +1000 Subject: [PATCH 148/220] crun: 0.21 -> 1.0 https://github.com/containers/crun/releases/tag/1.0 --- pkgs/applications/virtualization/crun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index a0d8c16d5572..cc9d02681790 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.21"; + version = "1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw="; + sha256 = "sha256-xpNwhNAbcTKkXl5i4L8aayMAx8O8SWdFlgHguHNiqqw="; fetchSubmodules = true; }; From 3bfda0f02c206ea8ada6d76b5f84367d2329a66b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 09:52:04 +0200 Subject: [PATCH 149/220] python3Packages.sendgrid: 6.8.0 -> 6.8.1 --- 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 f4c913b1639c..5aabcc2d0f10 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.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q="; + sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY="; }; propagatedBuildInputs = [ From 551bcc07346479f8c5a76a0569d698eba6fd3b7f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 08:28:23 +0000 Subject: [PATCH 150/220] lgogdownloader: 3.7 -> 3.8 --- pkgs/games/lgogdownloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index 4cb9d3a6c048..d92484cfef27 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "sha256-3xFlFokqdD1Nstu7TSUCaHUxvSodIb12QNVjmNgn9gs="; + sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; }; nativeBuildInputs = [ cmake pkg-config help2man ]; From a4127fa9430d4e54fc19acc691660a4bc4c1fbe3 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Thu, 26 Aug 2021 11:03:54 +0200 Subject: [PATCH 151/220] hp2p: init at 3.3 --- pkgs/tools/networking/hp2p/default.nix | 38 +++++++ pkgs/tools/networking/hp2p/python3.patch | 120 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 160 insertions(+) create mode 100644 pkgs/tools/networking/hp2p/default.nix create mode 100644 pkgs/tools/networking/hp2p/python3.patch diff --git a/pkgs/tools/networking/hp2p/default.nix b/pkgs/tools/networking/hp2p/default.nix new file mode 100644 index 000000000000..52f3455ed4d5 --- /dev/null +++ b/pkgs/tools/networking/hp2p/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, mpi, python3Packages, autoconf, automake } : + +stdenv.mkDerivation rec { + pname = "hp2p"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "cea-hpc"; + repo = "hp2p"; + rev = version; + sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + }; + + patches = [ ./python3.patch ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; + buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; + pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + export CC=mpicc + export CXX=mpic++ + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = with lib; { + description = "A MPI based benchmark for network diagnostics"; + homepage = "https://github.com/cea-hpc/hp2p"; + platforms = platforms.unix; + license = licenses.cecill-c; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/tools/networking/hp2p/python3.patch b/pkgs/tools/networking/hp2p/python3.patch new file mode 100644 index 000000000000..13043d9f09f1 --- /dev/null +++ b/pkgs/tools/networking/hp2p/python3.patch @@ -0,0 +1,120 @@ +diff -u -r source.orig/src/vizhp2p source/src/vizhp2p +--- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 +@@ -94,25 +94,25 @@ + with open(hostfile) as fd: + for line in fd: + if line.startswith(motif_rank): +- print line ++ print(line) + c,v = line[len(motif_rank)+1:-1].split(separator) + nodes[c] = v + + # display k worst nodes indices +- print "\nTop %d bad mean:" % k ++ print("\nTop %d bad mean:" % k) + mean_order = np.argsort(a_mean) +- print [nodes[str(c)] for c in mean_order[:k]] ++ print([nodes[str(c)] for c in mean_order[:k]]) + mean_st = "Top nodes with bad mean:\n" + for i in range(0, k, hostname_per_line): + mean_st += repr([nodes[str(c)] for c + in mean_order[i:i + hostname_per_line]]) + "\n" + +- print "Top %d bad std:" % k +- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] ++ print("Top %d bad std:" % k) ++ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) + +- print "Top %d bad mean/std:" % k ++ print("Top %d bad mean/std:" % k) + pen_order = np.argsort(a_mean / a_std) +- print [nodes[str(c)] for c in pen_order[:k]] ++ print([nodes[str(c)] for c in pen_order[:k]]) + pen_st = "Top nodes with bad mean/std:\n" + for i in range(0, k, hostname_per_line): + pen_st += repr([nodes[str(c)] for c +@@ -293,9 +293,9 @@ + # and 'p' (snapshot) + def onrefresh(event): + if event.key == 'r': +- print "refreshing...", ++ print("refreshing...", end=' ') + loop() +- print "ok" ++ print("ok") + elif event.key == 'q': + exit() + elif event.key == 'p': +@@ -303,9 +303,9 @@ + fig1.savefig(snapfile) + snapfile = outputname + "_snapshot_time.png" + fig2.savefig(snapfile) +- print 'snapshot saved (%s)' % snapfile ++ print('snapshot saved (%s)' % snapfile) + else: +- print "The answer to %s is 42." % event.key ++ print("The answer to %s is 42." % event.key) + + + if __name__ == "__main__": +@@ -356,11 +356,11 @@ + countfile = outputname + ".count.bin" + + print("visu_hp2p configuration:") +- print(" DATAFILE : %s"%resfile) +- print(" BIN_TIMER_FILE : %s"%resfile_time) +- print(" HOSTFILE : %s"%hostfile) +- print(" Bad nodes to display: %d"%k) +- print(" GUI resolution : %s"%resolution) ++ print((" DATAFILE : %s"%resfile)) ++ print((" BIN_TIMER_FILE : %s"%resfile_time)) ++ print((" HOSTFILE : %s"%hostfile)) ++ print((" Bad nodes to display: %d"%k)) ++ print((" GUI resolution : %s"%resolution)) + + hostname_per_line = 4 # for GUI layout + refresh_in_sec = 60 +@@ -377,7 +377,7 @@ + # wait for resfile + while not os.path.exists(resfile) : + time.sleep(5) +- print "Waiting for input files..." ++ print("Waiting for input files...") + + # add callback on key press event + cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) +Only in source/src: vizhp2p.bak +diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html +--- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 +@@ -118,7 +118,7 @@ + hostfile = args.hostfile + clustername = args.clustername + if len(args.OutputName) == 0: +- print "No DATAFILE given! Please provide Hp2p output files name !" ++ print("No DATAFILE given! Please provide Hp2p output files name !") + exit(0) + else: + outputname = args.OutputName.split('.')[0] +@@ -134,13 +134,13 @@ + else: + outfile = args.outfile + +- print "%s configuration:"%commandname +- print " DATAFILE : %s"%resfile +- print " HOSTFILE : %s"%hostfile +- print " CLUSTER : %s"%clustername +- print " OUTPUTFILE : %s"%outfile ++ print("%s configuration:"%commandname) ++ print(" DATAFILE : %s"%resfile) ++ print(" HOSTFILE : %s"%hostfile) ++ print(" CLUSTER : %s"%clustername) ++ print(" OUTPUTFILE : %s"%outfile) + if not os.path.exists(resfile): +- print "%s doesn't exist...Exiting"%resfile ++ print("%s doesn't exist...Exiting"%resfile) + exit(0) + + # Data management +Only in source/src: vizhp2p_html.bak diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20aecbc2994e..9212b97ec9ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1648,6 +1648,8 @@ with pkgs; hostctl = callPackage ../tools/system/hostctl { }; + hp2p = callPackage ../tools/networking/hp2p { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; From 8431c52e46aa4ddeb5249798e78f7ce2b90c77b7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 09:32:14 +0000 Subject: [PATCH 152/220] python38Packages.pytelegrambotapi: 3.8.2 -> 3.8.3 --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 1e07b2c01f0c..58d1d0c694a7 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.2"; + version = "3.8.3"; src = fetchPypi { inherit pname version; - sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496"; + sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; }; propagatedBuildInputs = [ requests ]; From 0d92d8e613d8ffa7fc455970c4ce761488b2f436 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 09:41:08 +0000 Subject: [PATCH 153/220] minio: 2021-08-20T18-32-01Z -> 2021-08-25T00-41-18Z --- 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 56a2850107a4..9293b4c48f01 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-08-20T18-32-01Z"; + version = "2021-08-25T00-41-18Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Ij0QExsCtEtVOI1Zd0YC46y2ACp/mdE07VNIBRVi4/8="; + sha256 = "sha256-gwP1q+5vjgCnrnvWTxPC66fugVrilC1WbLk3SP4NXqA="; }; - vendorSha256 = "sha256-Nr2zpIgqinUvxV9xW8UuZRnrIvCe3pWTe3qE2UtUyzc="; + vendorSha256 = "sha256-JcgMJ6xz3h3YJ1zoSJLCWdWGmd12MPvxcIPX1ZbhpaM="; doCheck = false; From 034b80b453147efcabc75976700d51807e16759f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 10:02:44 +0000 Subject: [PATCH 154/220] python38Packages.somajo: 2.1.4 -> 2.1.5 --- pkgs/development/python-modules/somajo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index e99363690340..6027df2be521 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.4"; + version = "2.1.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq"; + sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr"; }; propagatedBuildInputs = [ regex ]; From 1b1d1499d54cd27cdf29ee27bbffe62051ef456e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 10:38:27 +0000 Subject: [PATCH 155/220] ombi: 4.0.1430 -> 4.0.1468 --- pkgs/servers/ombi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ombi/default.nix b/pkgs/servers/ombi/default.nix index e5e37321d523..0be7a3f0097c 100644 --- a/pkgs/servers/ombi/default.nix +++ b/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-LRScuJVI3/657RYZjY9I3rcmANaEaw48CWIYc0VWHs4="; - arm64-linux_hash = "sha256-k0wi8FlVnU60Cnsng6CNNfoP+UItFLj15OxsqAfkO+4="; - x64-osx_hash = "sha256-czcPj+PC4cfJMqYYZyVy1ReO8pqYFUqeV8o/moHuCRw="; + x64-linux_hash = "sha256-4kvcBRMMH4AnTKSES5Cpst/omTRXVRq1V1y/z5njKJI="; + arm64-linux_hash = "sha256-NLsf0ldvlKSrHJyAXv5Ar2zIetoga6iZPOGTxFOqoQQ="; + x64-osx_hash = "sha256-tjvGuShz/fv3qUknFVKJ+tE/bVtIyPZ7dr4JfTEcDJY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.0.1430"; + version = "4.0.1468"; sourceRoot = "."; From bd08f2f603c7242cf40baee9e1a21744efedc84d Mon Sep 17 00:00:00 2001 From: David Terry Date: Thu, 26 Aug 2021 12:49:48 +0200 Subject: [PATCH 156/220] erigon: 2021-08-04 -> 2021-08-05 --- pkgs/applications/blockchains/erigon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 119789fc960c..cfd3d5da9323 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "erigon"; - version = "2021.08.04"; + version = "2021.08.05"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "0sw1qr7mdhhmfwdkkyzcjaqs2s3m19d01n3ipzcnqs1iml62rcqr"; + sha256 = "sha256-bCREY3UbMgSTu1nVytrYFsGgdMEaMLy5ZGrLqDNu9YM="; }; - vendorSha256 = "1hschm8xgq52p4s36pp34amcf2fi1kb0clxgkfxr07bsr6z0dn6b"; + vendorSha256 = "0a0d6n2c0anp36z7kvkadd6zvxzvsywfpk5qv6aq4ji4qd0hlq8q"; runVend = true; # Build errors in mdbx when format hardening is enabled: From ddc3acae9d482596df4aba4af6888f917c1bcfcf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 12:52:13 +0200 Subject: [PATCH 157/220] libwebsockets: 4.2.0 -> 4.2.1 --- pkgs/development/libraries/libwebsockets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 151d4c7ee48f..777beb9bc14b 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -61,7 +61,7 @@ in { }; libwebsockets_4_2 = generic { - version = "4.2.0"; - sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; + version = "4.2.1"; + sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; }; } From 2d0d479f2bb45e4c9f86029fad16cb4c48313d43 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 10:56:16 +0000 Subject: [PATCH 158/220] openshot-qt: 2.5.1 -> 2.6.0 --- pkgs/applications/video/openshot-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index c25e53b657b6..11f102085bc2 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -5,13 +5,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq"; + sha256 = "0b11h335krvflpksdlhsrq3rqkb8asipnyaf62di2z32ci3irrpq"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; From a5c3bc274b1f985c945b8955c8693c07daddc618 Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 26 Aug 2021 03:12:37 +0900 Subject: [PATCH 159/220] thunderbird-bin: 91.0.2 -> 91.0.3 --- .../thunderbird-bin/release_sources.nix | 522 +++++++++--------- 1 file changed, 261 insertions(+), 261 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index a3a02455e19f..0652ff8f7c54 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.0.2"; + version = "91.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/af/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/af/thunderbird-91.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e2c209ddd2f6589e3b1ff629b0fde65ce84b79de88ce63b4950c082c69733402"; + sha256 = "e9fa155cb5f1a2c4530cb568fbb2c4074f12232fa9949c2d5cdffb0d29c105d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ar/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ar/thunderbird-91.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "554b79b721b5776d2408c00f0aa37ab0beb244aaa374e2701802417e15beb5c3"; + sha256 = "23264b0c80c0da6bbd4f10403c8a51429a36dd5befac65c6506d0b87ad18168e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ast/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ast/thunderbird-91.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7a0e2092124c00d1844462c18caa23965e806c0e7fae7dd07940bccd96f3d9d3"; + sha256 = "3028d99c36c899ce52306d11b9c26e85266e6793b306627f2c4d4f2eae280024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/be/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/be/thunderbird-91.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b31781509ff194af3eee409e0e22e9cb82a69ffb4d4de418c4d854c14afb0cf7"; + sha256 = "0ca92e3875ea62e50449f576dfb7bb0e892bccd9093d623dc577262a3a386dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/bg/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/bg/thunderbird-91.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ae275b3ad6771fbc67dc7a47046a9d7bd20259703c7d016a1d9934436ef2f4ed"; + sha256 = "7c4289991f83cc2b8f6bd57e1f81ca9f49635a7582aba1935737f7dd81fad795"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/br/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/br/thunderbird-91.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c5bac788ae44cdcc89442d8bd5a07f50a936750427232b8e6bd9ea90d2e6fd80"; + sha256 = "d34baf04a9daa69bcb83d8f312faf0436142c2b5850790764628327677c956ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ca/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ca/thunderbird-91.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0c578a299994e661c4d0d7e55128fef40449837d5da4fe45ed3992e3502bf305"; + sha256 = "ba561ffd34db81a6401754d80f6987da62ff043987a228842b4c4cf2e2008efe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cak/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cak/thunderbird-91.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f5b49ed118b8e1f8b2b78f823455368ec895133f15e677377f0de6305e6e31dc"; + sha256 = "ec086e9a2709d953df3953d69eae2fe72b219b0191a04e9c8837ae16b6729adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cs/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cs/thunderbird-91.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "202b566a366e8c1a3c0a147acc9cd9009256193ae01a586b413459c8c526fa71"; + sha256 = "960eafc572d6d45f549f295ae861fe6d95c98da159147bc8ef180177261c70bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cy/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cy/thunderbird-91.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c1a4887fe96665d56fd8db662e6c78e8764eb75307a941ea73accac190de397c"; + sha256 = "ed664202a59d8f2de0fd8a9e1eb89b55af790316e03b4432a83f0d8356a0d115"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/da/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/da/thunderbird-91.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7de010e7273573ada2732af1c466391d94d645d53c6dd148034cbb62d8c3b217"; + sha256 = "914f30fe4b271ee3f9842636286411c0d2ceaaa7cd93dab139c45db3090fd9df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/de/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/de/thunderbird-91.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ad93a79718d5d5477e5c2d5491cc5e3a8c5669efaa657252dd959e8ffa4dc464"; + sha256 = "1d0cecb39dd7e9361cef22705e2d8590d25afc6f0b23c9058a2f19c4a8dccc48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/dsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/dsb/thunderbird-91.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "66004909207ef8c51d3d41ada64430c9714162e2d6343cf4434b65f5835d0dc7"; + sha256 = "5d857231f6d061b0b7f508801dbbabd872e7048b91b9fb685fa53c211003d0c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/el/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/el/thunderbird-91.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fbc2fce4edae1dc07fe689e7bd69be035b3fe62f64cba0900dfeef8d7dd62c2d"; + sha256 = "4b8353aae1f416acfc39dd8dd62a121bfb4e722da3907e7be433af294e87680a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-CA/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-CA/thunderbird-91.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8c5e0ed9cfea8158523df50bf8b680d6541ece70192dfa0b3e12e89dee0d6353"; + sha256 = "68e404576c3fd4a619a3965298e5198bd507a6f6206c2723eebbb41063163e06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-GB/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-GB/thunderbird-91.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a63975d61c4474123dad2d8cc0f4324f16bb5812c61ba4d7a22c08a2fdb937ad"; + sha256 = "06aa97bc593ae38d9cceed6ad91db90edee7d73a0f36310b9cc67b274fa7120b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-US/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-US/thunderbird-91.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0e972bc7910dc9afe82a89cfd45d60cf0ed6f1b0c6adb86169e474c1699dff18"; + sha256 = "e16e01e5dfc6f9da50809ee063d3873f9039f68e975a70ecec8de2de07893712"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-AR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-AR/thunderbird-91.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "264cdb8e096647552ddcc91ae47f2404a1f280c964595e98426924f4ac201293"; + sha256 = "313f2ac3b4dad0fb6952d9717cfd957efcd676771f4fca0c89848185bd1b4f9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-ES/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-ES/thunderbird-91.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b258c31278b5c75a6fb29aa4be29a60ec1ac3344a7b1eef449a8c52d936aaf75"; + sha256 = "e6b2b53c901051602f4d1f8827b3daad1783dce24bee856cea8aa7ae4a536ca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/et/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/et/thunderbird-91.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "dcd630338623c5b24733800e231c5a75514577a20329e9660011c7b2b13600cb"; + sha256 = "4f5801287495d738b7757c85a150e6ac8cb5ef22b056e899b74a26425a2ba165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/eu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/eu/thunderbird-91.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "cd548c58e9c51e91812266a57e2260a8076d4be5130e6507563b17af51c35d85"; + sha256 = "b90304636198df5b90965073aee3f333e6f69686ba6ebb2b87f4f8ea57bae123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fi/thunderbird-91.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6b7bc8ea396f46be383d7667a97ea62512fc1869a53f023b764990c9c26e186c"; + sha256 = "0548dd85e75c60e4d6aa46054d548ff2d826ec669607c3f35a4c2010ca2c661b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fr/thunderbird-91.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "76fcc5ac921ec8a4eddcf7f37d5f97f38e72e7d0760b1df7c6375dac2fe0faae"; + sha256 = "1fca39902328c4808e7851f3596ca894d8f9c43c12a4f8795802f325f58b62d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fy-NL/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fy-NL/thunderbird-91.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "76afc70747bfae0ab55d76b440161fba946417d9a9f959006746e48c02922cf1"; + sha256 = "1120b79a6ce2a926c8b539aad09e6d574d103880ed0623f6e13ba0013c606310"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ga-IE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ga-IE/thunderbird-91.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "793d6941c844dfa6c53e5d9bbde70101efb4f303b7f4b07b5f8cbb7f44c41033"; + sha256 = "67d912e2b4d70b553ff9ad2106beab3cf9495fd24a5e947659dd900f576c515f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gd/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gd/thunderbird-91.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "311bcde1dcf00b3e21593300e7e05afe1b66531864340046c39b34ceabbc0c04"; + sha256 = "5ce277a93edb95dcb9e645f353d9b48181db8b491303ba24241e9833f9d52a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gl/thunderbird-91.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2c7beb30c95b5afeb51ffd5d952dd96990fb997aa00f98811a7e656ec0d15293"; + sha256 = "b57d5a4fb9c14fbdbb6de402d0469d681b2f5fc5a7f8ed51b1defc0da672cb8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/he/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/he/thunderbird-91.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "864c0160562fc593109ef4afc0f7871eb881e32277131ea39c2e86358de2b287"; + sha256 = "cf4fdcce74dcb24ad180f45b31e8165e23ebcedaf28c867fc74e4ac8b79da5dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hr/thunderbird-91.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "053af50f6251daadf2cb8a77157d15bde93f12b913dca64537a533e0937c9f69"; + sha256 = "8d26131d28ee06df1ce63eb21db285f752dac4d3ae71d5c2349c76630e6ebd13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hsb/thunderbird-91.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e4cfe2c9136702a928a761c0d5da9429ab3002076c0248ddc12c13de7bda90d3"; + sha256 = "7d38fee7c4a897d01f0e2254c5094962a7ae1908f071b32510bae408d3647bbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hu/thunderbird-91.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cd620884dbc0b88454860fbd46a3ab11577396ba758c1e04d2e9f379ed131bd4"; + sha256 = "7271548b70d0d378fb191ca2932b7382d9f5dcc4072eae9c4db0e3260558a97d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hy-AM/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hy-AM/thunderbird-91.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4ffaa441ea2dcd474d6ae4ec10258ecee85fd986901860d91e96b415bd232120"; + sha256 = "06d9de4a86cb0791f2c3ea683a637ec5965f9014c656b142601e9c3753231067"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/id/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/id/thunderbird-91.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2e64539c1591c88bfe482befcca6aa609b0352a9de45df24d5912a15058bbd01"; + sha256 = "51ae3415517df352525750a4926e4587f5edce09f88294670a7cc5c5fa830ef4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/is/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/is/thunderbird-91.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "84452b732eb0c2b05346e21444e798a868ad90a9c574876cc6234cea69609ad0"; + sha256 = "d7e9406a3a782bf0e4b80caeb42c1607fa3d45e9982550dd17ed1b7cb7279950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/it/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/it/thunderbird-91.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "420cee754b96b8acddbbd29fe880fb364b0456cd64099d829a8e2aa87faafbf6"; + sha256 = "7d6005c6017f87e0374833106de045f9115cbc3ec1825429315a928f3ad19db1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ja/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ja/thunderbird-91.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "60508f7520e2457a71c4017afb7426f5800e8932ab5fc8b7b84cb20a8d057668"; + sha256 = "7930323cecd2002b37baabf771f1f9a4be304d7b84ce9dac4bab6856d7f9f1d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ka/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ka/thunderbird-91.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1145f89f523f9f7fa4b4030fa0b113150b7188d475a55463bca9600ca0ee2e19"; + sha256 = "10a9e2a23bcde3c94f72701849e3ca0833cc9dbcb821eea65bf412a5feab5ddb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kab/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kab/thunderbird-91.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "25422658dae8b53a4d72840da7aff4bc70cdf94d08444913c4ac06d49c6e3356"; + sha256 = "12e1ccc30b98bb9a363ab824187c5504fd2c14cf0891455681730968cb7e8126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kk/thunderbird-91.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0cefe7e7d93d8d3603fc13a34ffff40d0535713f4ae362d34ddeb3fa4ce8b2e0"; + sha256 = "3de1bbb675ceeff35e1a8e581e8c6a200dd68e97bb9e363e5d6b42fd6a9420c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ko/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ko/thunderbird-91.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3644cdc76d557ee2994c4ba4f16d9d2ec66a06a163fdee30a91aa7b8b75f8ab8"; + sha256 = "a7b011c57df5ee00dd80a6ff9df50f957190c14156e8e3557480177a73ac2379"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lt/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lt/thunderbird-91.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "33371b11574309d011968b0ec7cab94b5a61f7629b60ecb888897fa9d1ba0445"; + sha256 = "fc59f081a579f837afed05b394a8f503f8c24a10c282aaacc522f3fc873281e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lv/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lv/thunderbird-91.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9460f51bc9a27c7fc69d425cfa013a6b45603764055b0f31cac38e8c5092ee5c"; + sha256 = "c2e43c9f3bcd1889f40917238b6da71919c4ed248ab507bb71d74882d7ea2e27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ms/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ms/thunderbird-91.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a2b2d1bbba8f5469465ff5b301d95f37453e22b7cc259d33b81382debf056889"; + sha256 = "6bf1c022f9384894e4047d7d96e3236cf92427ba6de99a0d650e3da985ff7698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nb-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nb-NO/thunderbird-91.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "dbce148234a027c3118d94aefbf77a5ed6b5f0dcb636704408c326c08c76e474"; + sha256 = "82797bc5227b429a51801f60edf485b62c774be19c9befc055d695f9e4ba4e47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nl/thunderbird-91.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "bd99d05225bdaacd4ae1cfde09da0b8667427f7723f48b5ad41c13d09b4e8656"; + sha256 = "0e07d3cea432f914d17016998d5a6cebfe43549e1fb4599f0a92cc73c265fde4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nn-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nn-NO/thunderbird-91.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1d48d681562120c52ac5042937406422d0264343f43720bc04870331a3b888ec"; + sha256 = "70dc2d1d427bc93105fc6cba79c27e9f5062a6a9572c5adbe55bad737e359bbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pa-IN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pa-IN/thunderbird-91.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "271008a2f327abda4c140183e966c9acd6116577ac4bc13db7ab674d40b90206"; + sha256 = "2e07c0661e29e35bc42360894dbc5d4ca0313a3da9f2b96ddcc82936665339e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pl/thunderbird-91.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "da0960c222b4625f717991f2e3f7fb5155c35ef470f87f2d9387469401bac62b"; + sha256 = "5f16cafaa287f67dd33eebd2f0cd3d128b0d0c7119c0721de8e5434be4dbecd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-BR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-BR/thunderbird-91.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "160cca291d27bfcc6d2196090814378110a210c8ab6d62f5296eb217be4c9e3d"; + sha256 = "6e1eb47c6c794f27d7cbb442954450fafc5d22a17c6c4e53dad80d38e8e4a885"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-PT/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-PT/thunderbird-91.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1b4fc4a92388fa1cfac33f9f77e7f5e2f9c7088ab81b1eb3f8346bd77dd3f08a"; + sha256 = "606df5acad3221f4f9eaf9da7c0b6ad30bd8b87ea71dae30b93796342315ea51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/rm/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/rm/thunderbird-91.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cd78d4e737fc6c1b3121472e453ac3a20e7f1451b648e6b56e811bb8b05a5bb8"; + sha256 = "efe31e78f7e6a6351366186e608c680533c89c7947575792b05ecf706727af89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ro/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ro/thunderbird-91.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e83ed778d455ac6c892caa75ee14d8bee7f232f8fce9a72555f3fa7f2a9cd7dc"; + sha256 = "a9c829b1e367ea7ce0176901fd07e6c5f67c8d5d178a7e998f01859c53f59ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ru/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ru/thunderbird-91.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "110a6bf1fd3bfb7b24799b3d12c6660730ccd43b687c82159201849f1a17b2c1"; + sha256 = "94c4dc9fbacb07942978decabd0f9e26fe5183c671f865c6a93e906aebbc0254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sk/thunderbird-91.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "26fa89742dabf2929f81a0882ce527330aa63bb67af9066e2a041cc4a330857c"; + sha256 = "3a52978887a7c52d37704f264f8ec640f6110ea64b568995794ce62b6ae86228"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sl/thunderbird-91.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "93f4a4c327a3ed6270d9765bc466bfc03bd4c6fc457f933f7131a77768209ea4"; + sha256 = "c2b3b28c3bdfa969af465a9aa5dc75334f7372a6317df6075ba7d594f52c0294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sq/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sq/thunderbird-91.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bdfe099edfd92ca449f9db5b4207ab1bfc5660964a99c69301f309bd7f4405e2"; + sha256 = "5524ce37c39018b9b60034ca06b3cd5f862149b7885733af8f840e1b39f13865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sr/thunderbird-91.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "be61663f615151c423d1551419bc36c43b74ecb406ee70a66781a4c931d5db1b"; + sha256 = "8cbfac96a6ce6d35dd68d6d4cf9fcafc146e69a81bc8144f6407621fe992fc1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sv-SE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sv-SE/thunderbird-91.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "cea5ade716541897197bdabd7a2de2cc78d478b6bcc2be19bbbe3cc327544f1a"; + sha256 = "6887854f7efa083f25a21874becd7e34c4b57a35b3898a790ad9988415f143e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/th/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/th/thunderbird-91.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "42ae7ae92f60d466f1759170b7516191df49cdbffd8f792c69635839a91c82e8"; + sha256 = "0e220caaf692550e8424c64bafbc3b9f5efb608fa8dc54f007c9e378e1bc9ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/tr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/tr/thunderbird-91.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d087650517976df85e38ee95bafa00f50e878870d5c8b4d3227436c1d238aab1"; + sha256 = "7c0d780968a1dab36372320ca47ea812e2b522074ba124f29472026d5ee88f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uk/thunderbird-91.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0963c779f56aa7e102e939cad8c3cb2c91013d8a6a1c81e1b95f9bd59b0707fe"; + sha256 = "34c1e098b7746bfeb531886463114479278d98de450136d49c594f30f537a07e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uz/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uz/thunderbird-91.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "18c5ef666ccd0e4ea82d705ce96a654546b5eeae66bbec27b74987174bce5c28"; + sha256 = "edeee2d40fe634bc34733511895f1345d8b4e0eed49fa5ef8f5598245884c20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/vi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/vi/thunderbird-91.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ae59396c600ac3c13e5c4a7bb45439b7ac8ec31305398c0f943a542686410c35"; + sha256 = "2d51311b5e8811254a1a8b68236f60029e3ac8f3528c5d46bef0040917b520f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-CN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-CN/thunderbird-91.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cb6d6648c683677b7513196b883e51666a175b3739dd45fa2c6e2e84869d9257"; + sha256 = "23a97b03c84ba34164a2ea3a80444040da404bcbf702c171e45a12bf1220623f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-TW/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-TW/thunderbird-91.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8bde8041417693842644ae183a7830720be03c02e699d7d5c1d472724a0b8687"; + sha256 = "66e3a359752d1a1dabb881189e9a898729f273b420c57c94c5bfa459967cb364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/af/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/af/thunderbird-91.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b68bfdc320c42caa0b53e84c8ec6d5894079738f2fed7a9eb961b7d809ab2eaf"; + sha256 = "369393b32dd642c757c86f793be6acbf5d9b2cb4e8b893e76cbc422964ef5df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ar/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ar/thunderbird-91.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6ba45770a09dbebc1ca5c496374e9cc4c0bdefd19b3c3f384d6829e801ca7224"; + sha256 = "c1cf67bf674031da9c0d6d9aa76c86acb89a6227b029f9b0b80f555d6bb46a4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ast/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ast/thunderbird-91.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "76ed8764f119a56c1398dccaf6385c92936f84f959cbc38372c866cff653f93c"; + sha256 = "7eb25e0238fcbcd779bd1c0ccb6193750f88aae4eec8544b0ca98734c9253259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/be/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/be/thunderbird-91.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5509d1e4f98fba58d7b5c7dde1ec531eaf3439a22bc8e9eb0843dcbed4d094bf"; + sha256 = "8ae8e53c28005eefd99ea21109fd100359a7a157a72558882781b4fa28420adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/bg/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/bg/thunderbird-91.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "28e6184008449d72dcd0d03c9ffd25eef0746100b67c7cf0684b40d9a7a52870"; + sha256 = "ea01a55258e25c897bf5792f0001bfc332aabefbc09ef24d5cc145831ab3a48a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/br/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/br/thunderbird-91.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "35915f0edd5b0a63b531a8eec680a6403866e0b8f25765cf8ed26344fe82c0a6"; + sha256 = "cdef12d70df4a407adbb8c9f370daed965d20b243433942cabffecdb3a225737"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ca/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ca/thunderbird-91.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7f869a4728c1ecff758486707836b565897f68f6cf4b13218f0555f9a758630b"; + sha256 = "01864d608a98d179cdd2d67480c650c4764d883b4b6a6d9d73256112d5eccffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cak/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cak/thunderbird-91.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5d512196774e8ba63439a2545c30ba7ec11f6c6a0967642b0e7e58629a036f31"; + sha256 = "968fdc7d1feb0247f159489e6600a8e18ef1715c355418e7341de193da418d26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cs/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cs/thunderbird-91.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "31ee6eff33541ceb69df9ce1b5fe7ef43e2937bfd0c306611e3e35a698cb6308"; + sha256 = "fbd819e3f5a3be0d0624472b902af1f29c18cf3c9e524826882efacedc6965fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cy/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cy/thunderbird-91.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "07dd83614f7920e2f49b9455b9b2734a2f8a8a555f46691b9a4a34a713c6a035"; + sha256 = "f2ed1bc1544046b30ecffaeb62ec09328da115eb7d5da9ae1bada33960624917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/da/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/da/thunderbird-91.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "59132d98c63574619e23d49013b7e7e8927c348c2ff1a4f0b990c23e1434bcce"; + sha256 = "f1b7fcb4b904bab9b1e669505d477225b5178dcf3b0ab7ebae5d45092284b04b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/de/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/de/thunderbird-91.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "22a6a5a2f3cf61570c52d5e531fa6ffd022f83834db61732b79cb0f801234a15"; + sha256 = "8f8c81448ec9c82d18d764ba323577687381d67b839a804eec6a48709866a334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/dsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/dsb/thunderbird-91.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9a7702a7a2872ec6088cfa0067d4c2bec9c9ebe9ff31a3ae0f50c797eea1d024"; + sha256 = "8ff175908da6d2032f47d0a74c58576b1552c0e9bf304b678c66c43f9e282289"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/el/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/el/thunderbird-91.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "13369e948d0cd936a9636e065b9455dee760c282b243b5ad4e932dd935ad0eca"; + sha256 = "da644e9386ff3526a9332869a240ed07b15f40c57a90eaa0678f1d5cad58bc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-CA/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-CA/thunderbird-91.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e5e2ed3c68f03b443874f835b8303491dff70ed30e29515013786790bf333506"; + sha256 = "fa5fbc0e60a93ec657a9c8a8140c1318423c5a58e1a6df70706095347a150780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-GB/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-GB/thunderbird-91.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "35422b96dabf6dc2baf470916459dcfc672ad9fb1a6fb842c28f761963766357"; + sha256 = "db11e5ce13b48cb2d8456c2c542eb24adc51fb6d0151b49459b894266fb62b4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-US/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-US/thunderbird-91.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "27c43ab01a49c936c3864282c54bb952f0e62330afac3eefd8848e58f99c43b5"; + sha256 = "b76a3db6b41ed843471fdec8394b58ddfd231d6ff7575ebe650f0c5fa91535e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-AR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-AR/thunderbird-91.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "205fc7ba9311aee475c4057b933246bf98bb06164fc1a0128d96cbb42cc4ee4a"; + sha256 = "f1182cbc6f3760555ba41a4d2db415519f2a2f2c6c7c6abde94f6c72b5864a52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-ES/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-ES/thunderbird-91.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a560e4a2d1ece441f122dab0a27a25ba0d3b46cdebd9ebaa9b63f1e4d293c563"; + sha256 = "19e538e90ee435ee29e347720fea42eca5533e4025ef285820c18c62e981023a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/et/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/et/thunderbird-91.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "60016f69a705c7f953014cbd546d483d3261cc70be2d10a5c3c1012fcc1d88f0"; + sha256 = "c3ca7abbd340306b30ed4a60c8f238d18d06be11fe3ffaa9b1bb917f629bdd31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/eu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/eu/thunderbird-91.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2c2da546ac66bad5e4e86fc417407497b9248529528d0c348a9be45ad50ff95e"; + sha256 = "27c4d06f073e52c631a46174eff52b4dbc8db509f08e1e394a46552a56a8798b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fi/thunderbird-91.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ff8ecc121ef8c05e38f75b44602ae27363f9c27002507ddc263b0fd133a3a6d1"; + sha256 = "57ef2dff097e9cb32ffd4540925c798e13174ee3f6d08473c745952cc2efcf71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fr/thunderbird-91.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bbe6c436894d25a1becb9e83b1640b63a35316468a55a20acc6991b3856c12f4"; + sha256 = "3e4bf7cef09c1c2f787ff37f07fb3284b03d5b579330b6cb0fd1a3d9f5ac137f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fy-NL/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fy-NL/thunderbird-91.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bf5dbed617af49fd952f21ec795c9970956277a7f380802f8cf28705dff5d045"; + sha256 = "867e4f64830ddd7918fd6f1e1f5a4814b174d4ac21ce1755691493b852732742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ga-IE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ga-IE/thunderbird-91.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b04348cbdce3b99cc0de580ef6aded2a946e4f338873c1069c86feab35f8341d"; + sha256 = "6e5bc42c2e923d37c843b1b971a8afccdaf1de3b271bdde003f58aa2c43c09c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gd/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gd/thunderbird-91.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "350b1806e3504a57cd54ef89f424f634f89781670427773bec00bbeb9d4712a5"; + sha256 = "d0138ebe2ae5550f5d911d6ca8f0a27aa27338de7cd948b0665ec3e0cdee0947"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gl/thunderbird-91.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d9196254a829834a222e007177218a295629efc635052336a8c855e08f1bccd4"; + sha256 = "233b0fc6394a3dd6c96fa3fd800e4254c5cff026bc6d91e53d872f46de06895a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/he/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/he/thunderbird-91.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "47fb607ce180dd9dea8ee1e011c8a37c02e23a10e2c4de6c40e0c86ae069e533"; + sha256 = "73b9546fb5b7a98be1f4431b374e0ebe59557a765747e04688b0a0319b30c845"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hr/thunderbird-91.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a3c3266a345bd6a8443059d11c9dedd3471b5904812d8ff08d94283d439f32a7"; + sha256 = "c500cf6adb60131010054d5f99976559ac2f7f2e83799715c5de0e62765df71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hsb/thunderbird-91.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "10e599806fa3064a57482d4c4b69e7fa3c98327fdc47c0a0e4709f9ee385ad01"; + sha256 = "e67b1e15c968334476ec5775e68893dcffd1dae7ce012ef95a9c97edd506be3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hu/thunderbird-91.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d57356a47cebcc96c57199363df10a0aca1178683343021e79c9e7e0c03f62f9"; + sha256 = "7b452c3dcf394c04f534c03f55f5fd0cad1c4026a818676e85ac57a988f6ca3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hy-AM/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hy-AM/thunderbird-91.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "32773d9daa46251c1eed72eba229d7567b693681fb46d2da966eb67d025bd020"; + sha256 = "36b89d8d88a80fc1964eb56895df0da4e75ec64837fdca3cfd0681ec14375889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/id/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/id/thunderbird-91.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6d205b1905d193285a2ad1cbcbb1fbf4e1c71cccc9a54f63daa120179e77bba6"; + sha256 = "f91517767696f5b248cdea262dfaf7b7a2fb6a0542481cb1ceba6360c0aa5497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/is/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/is/thunderbird-91.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0fa18f5b9e9e1e3549fcd109fd4dd8392d7573b9429a61053b54b0538efd5b94"; + sha256 = "427f4e82a60587ebfe30987c21731840010dcb92471814501237ed5efe78e866"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/it/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/it/thunderbird-91.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "67034f9a604606cf6a90b5699b46d12b76957da77336255dee1adcf6dfb4a2e0"; + sha256 = "92f3e2bda56bdd4fccf431103ecfbfd897959e3bc2c15ef64fb1bafe3f8ff15c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ja/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ja/thunderbird-91.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "259a236852334eed51f3e922c3e4e74810b8d9d82f2b6e1486cfdfb9dc659ed9"; + sha256 = "9fb9f0f323246dc94045c6bb09c74d98bfba1005b8b0e68bca843ef34d363b73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ka/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ka/thunderbird-91.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "93bac3418c44519c9b9eae6d2cb030b18262f6c586b4480b3e5d828faf18afcd"; + sha256 = "5b4d7c8a6d8818fb9e336e0b595139138be5a4fedcbafa0895a62aceb8ef6007"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kab/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kab/thunderbird-91.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1487aeef3d2b2eecdaac1463e35f04789e155e2d1f0f43e47be81da3abe96e33"; + sha256 = "7661d1af8b25f727219f75ddc0e9c5c75f36d2a84b2af27ac09b548767f01c5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kk/thunderbird-91.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1d3b7a92a8206d1fc0af0f86e26af218f073cb6f4f4dc3519366552f48bb932d"; + sha256 = "a0db8097caceb8f3d58e4c77ee137790b087c569587a06c78cbd5aa2d9b2819d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ko/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ko/thunderbird-91.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "913757dee44a98d85b337f07a743d588a1bdf9425c3f5cd2fb4985fa59340e5f"; + sha256 = "5352f1d9fdff63913c137aa54b5d16893a374c0f1ca245f6de3a4f17ed7d8f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lt/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lt/thunderbird-91.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c3ad9eccb96a5762bff235f95640c01c7a55d09e8ee613aace4cc26ad36aa60e"; + sha256 = "a3bc0caeb2c1c3f81e3d705186ccc83e831c2f094742e93304483cc61666e3ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lv/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lv/thunderbird-91.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "125e2c82c1daed6ce109f3585e471d4037e531aec7a4998438cfe5f0614884ed"; + sha256 = "4bf8b846a0ffa95a3e74a9dc7a05f5283abdb907529dac2ea346570d7e5e4d97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ms/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ms/thunderbird-91.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "17deff39fb4dcbbb23d932db247f12528a994ec48d9ce32831148841c38e2b58"; + sha256 = "4d0678116562ab28a7a4bd1ca39b94f87e2f09d79acf2baac51b69c179cf8207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nb-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nb-NO/thunderbird-91.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e6f19f4fa520c092db1c0eee28393ff13e38e2214d7073f98cc68a56c5d4575d"; + sha256 = "4f3e467cb652e2c92631723ce599716f6e1b6ba9137aa2fd51bfdda2016b75b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nl/thunderbird-91.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3935d7bb85663ec84c6cab1c42406663b63e883c2fcb35673c156f38f3388a34"; + sha256 = "522186f15b6ff574e8b5a7c64d7f376d2bfcd148fb54b5faddb5647a23703076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nn-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nn-NO/thunderbird-91.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a3dc079d6c64bf913728b70be84b9ee7266e368b287660f09e458a1c08ddf0b2"; + sha256 = "3dc1dadd4cb1af7bb11b4c77ebab20a7c43bd75639a866fcdc3a51099e078b0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pa-IN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pa-IN/thunderbird-91.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e3587c4a2a6c479edadbd58228c5438af81ffe0031332a99bfc0d53b62794def"; + sha256 = "586e6a3fd41903dd4eef357207839d195c1eb7e40b152baa2394880db539499a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pl/thunderbird-91.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f5c231f36c59669b7f8f2aa7936a29f0e0c459158fe271142c28561eb9586e09"; + sha256 = "2a064b763ae9b0b11d266cf413cec98f00ab6d350f44469a2dea4713ba17521a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-BR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-BR/thunderbird-91.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7c6286427fe27eae8f98ebca95ee36befe110012026909ee95e42b3bc9aae637"; + sha256 = "a897c43eccb7c91732e1fa623ff675877de014a176119ea049e9eadc579e59e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-PT/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-PT/thunderbird-91.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95ef322cf560ac3f428db9e2872168007691862e0a3f2d145713d52ab9da1a50"; + sha256 = "4aa4f70dad8116e2f6fe4dbd6c7bf7cf3c090b6f0e776dfde34c594bc785f33b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/rm/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/rm/thunderbird-91.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "68c40f4800e7cb24b2281eb5f69351b0592bea4a725a8abc2b634d00a1e8c759"; + sha256 = "f437ac48a9888abc4c63aa14c1e5561ea06a3e0287596fdae10f0f3dd071b0e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ro/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ro/thunderbird-91.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "00e216d87a7a0bd4b3f852051449f130f98133c40dd5360bedae8322e6a270ab"; + sha256 = "dfc376eb4baac472c634b4b25c43f6eaebb27c98bbda68a5fbe905b545bcf858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ru/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ru/thunderbird-91.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "997f644eca0b6341002c15b72f4c76e925c6581ccb90a2d1d8f2982527125688"; + sha256 = "3707b961d3b42b23a3883ebf091f7456521257f16fbf906aeda436e85019679e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sk/thunderbird-91.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "147af1d186d27113544f4c23d0158389ce349a40d4996ab0897e28809f914244"; + sha256 = "6361c53e1908c308929054a87a276e5a43d2eefda75edc4991e845e4055a59c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sl/thunderbird-91.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bc5bcdd54e391b380035450f89439c2338bc4aae8d79c4a553e580dababddc86"; + sha256 = "de5d84cacd50edd00184316d9122e881217017e78f0a73a79b745b130c58fb6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sq/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sq/thunderbird-91.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5700bda1ecd8aec35638aa007216079146a627ef330b901f919f177007e6bbd2"; + sha256 = "2ab70162fd53943f6a46c1c9459dadcd6e7ca5ee19c1bca161368739c74068b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sr/thunderbird-91.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "648ac37b029ad458ff6759bf6cd06a696d3c02899f6e0d44ecab7a196bbb439b"; + sha256 = "4baaa9d43c1f4c9db85b2a12fa52cbe2d2807b5781ac5c7287901153c1b6c81f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sv-SE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sv-SE/thunderbird-91.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "38c88fe79c505e9b14a778ae6a8f0ab8d291656ef7cdd1a995a7fe199811098f"; + sha256 = "6151beb596c9742345ee749239e1fcf983feaa8bebc06908fbfefbe169d8cb3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/th/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/th/thunderbird-91.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "bead245a51de35bdc4474c04b813c4ce2175c01b7ad999f4f3b2f4587d811c77"; + sha256 = "e063338beec45e1d4ec69ac4c3502df243d98802dd1ce0df28634e003e5a0477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/tr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/tr/thunderbird-91.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "184dd779df35de1906022b32ef0c0b7c4e9555a38eb9ec432772a754efb4c1e1"; + sha256 = "38be40e163b0b0426318d20dca127f257861441e29b9d282f2fa352cfa2c2ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uk/thunderbird-91.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8778aba1428169a7a2195040a9c7e1d91d86f15bff554f18d402e1f3447a140d"; + sha256 = "ac1bdb90a15bc245b55e0dcda57e381ce9521d0fbcac240a55806c5ee859d90f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uz/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uz/thunderbird-91.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2cf61ce3a966c41f5085a097dc0cda9136ae1d624d68e97a01d867ec14ad4d94"; + sha256 = "584cd95cc34193c868949d9aac3213a779cdedde14f6f3088657ab61d32197c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/vi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/vi/thunderbird-91.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8f9a2b344b25b4cb91f2506515382729c27fd7e1de37c5d16dae51345cee790b"; + sha256 = "1725bbed0bba4e6c3fa7a44df700c4a04b47eaffda3189b8b6efff33d6e30c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-CN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-CN/thunderbird-91.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "131c829617c6732d29e1a68499f190a80d464b3ede4f10caa153bdf8e59e7f3c"; + sha256 = "9afeaf173047c708595e0e58cbd6cdbd8a55b390420e100f4aea33597803c01a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-TW/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-TW/thunderbird-91.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "049625db5facdd176ac7fced757db678e9afb0d143d775f4c9f79d2cd334eaa0"; + sha256 = "60367168ee3e92774b040f82b5ec733be00c958ac6c2fa07f7821020a571158f"; } ]; } From ee015c55bc34be7a4b9fc96766b93dab723e828d Mon Sep 17 00:00:00 2001 From: taku0 Date: Thu, 26 Aug 2021 03:12:50 +0900 Subject: [PATCH 160/220] thunderbird: 91.0.2 -> 91.0.3 --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 1bc2c8b4a1b0..fe6ead5c8d3b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.0.2"; + version = "91.0.3"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "468be2f5024fd32eb22a661ed5f30de5d74231ee736e6743a9fb84e747bf45fceaaf286a5cbb20eb41f8ab98e0c56310eab3d2e6077fd81ee0ef52b28c33a3f2"; + sha512 = "1c7b4c11066ab64ee1baa9f07bc6bd4478c2ece0bcf8ac381c2f0774582bb781b8151b54326cd38742d039c5de718022649d804dfceaf142863249b1edb68e1e"; }; patches = [ ./no-buildconfig-90.patch From bd13a03e7e1df10803ef1473e67a7835540dbb96 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Thu, 26 Aug 2021 13:34:29 +0200 Subject: [PATCH 161/220] dbeaver: 21.1.4 -> 21.1.5 --- pkgs/applications/misc/dbeaver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index e1ce1f2f2156..963da1839fe6 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "jW4ZSHnjBHckfbcvhl+uTuNJb1hu77D6dzoSTA6y8l4="; + sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1K3GvNUT+zC7e8pD15UUCHDRWD7dtxtl8MfAJIsuaYs="; + outputHash = "L8kfYkMCbQOZDrSNIfshR/00qYQLTf8WOGQvxmaIwBg="; }; nativeBuildInputs = [ From 13ea123c74cdcb33cdc376b16677044512615afa Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 16:45:51 +1000 Subject: [PATCH 162/220] treewide: buildFlagsArray -> ldflags --- pkgs/applications/editors/glow/default.nix | 2 +- pkgs/applications/editors/micro/default.nix | 2 +- pkgs/applications/logging/humioctl/default.nix | 2 +- pkgs/applications/misc/archiver/default.nix | 2 +- pkgs/applications/misc/charm/default.nix | 2 +- pkgs/applications/misc/dstask/default.nix | 10 +++++----- pkgs/applications/misc/expenses/default.nix | 4 ++-- pkgs/applications/misc/wtf/default.nix | 2 +- .../networking/cloudflared/default.nix | 2 +- .../networking/cluster/argocd/default.nix | 5 ++--- .../cluster/cloudfoundry-cli/default.nix | 3 +-- .../networking/cluster/fluxcd/default.nix | 2 +- .../networking/cluster/fluxctl/default.nix | 2 +- .../networking/cluster/helmfile/default.nix | 2 +- .../networking/cluster/hetzner-kube/default.nix | 7 +++---- .../networking/cluster/istioctl/default.nix | 4 ++-- .../networking/cluster/jx/default.nix | 13 ++++++------- .../networking/cluster/k9s/default.nix | 11 +++++------ .../networking/cluster/kpt/default.nix | 2 +- .../networking/cluster/kubelogin/default.nix | 9 ++++----- .../networking/cluster/kubeseal/default.nix | 2 +- .../networking/cluster/kuttl/default.nix | 8 ++++---- .../networking/cluster/multus-cni/default.nix | 4 ++-- .../networking/cluster/popeye/default.nix | 9 ++++----- .../networking/cluster/qbec/default.nix | 11 +++++------ .../networking/cluster/sonobuoy/default.nix | 14 +++++++------- .../networking/cluster/stern/default.nix | 4 ++-- .../networking/cluster/tanka/default.nix | 2 +- .../networking/cluster/tilt/default.nix | 2 +- .../networking/cluster/velero/default.nix | 11 +++++------ .../networking/dnscontrol/default.nix | 2 +- pkgs/applications/networking/nextdns/default.nix | 2 +- .../networking/shellhub-agent/default.nix | 2 +- .../git-and-tools/ghorg/default.nix | 2 +- .../git-and-tools/ghq/default.nix | 7 +++---- .../git-and-tools/git-bug/default.nix | 11 +++++------ .../git-and-tools/git-chglog/default.nix | 3 +-- .../git-and-tools/lab/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../applications/video/go-chromecast/default.nix | 2 +- .../virtualization/imgcrypt/default.nix | 4 ++-- .../nvidia-container-toolkit/default.nix | 2 +- .../embedded/arduino/arduino-cli/default.nix | 4 ++-- pkgs/development/tools/bazelisk/default.nix | 2 +- .../build-managers/bazel/buildtools/default.nix | 2 +- .../tools/build-managers/mage/default.nix | 3 +-- pkgs/development/tools/buildpack/default.nix | 2 +- pkgs/development/tools/butane/default.nix | 6 +++--- pkgs/development/tools/cloud-nuke/default.nix | 2 +- pkgs/development/tools/conftest/default.nix | 3 +-- .../buildkite-cli/default.nix | 2 +- .../tools/continuous-integration/fly/default.nix | 7 +++---- pkgs/development/tools/cue/default.nix | 4 ++-- pkgs/development/tools/dive/default.nix | 2 +- pkgs/development/tools/earthly/default.nix | 11 +++++------ pkgs/development/tools/fission/default.nix | 2 +- pkgs/development/tools/github/bump/default.nix | 5 ++--- pkgs/development/tools/go-minimock/default.nix | 4 ++-- pkgs/development/tools/go-swagger/default.nix | 2 +- pkgs/development/tools/go-task/default.nix | 4 ++-- pkgs/development/tools/gomplate/default.nix | 3 +-- pkgs/development/tools/gosec/default.nix | 3 +-- pkgs/development/tools/gotestsum/default.nix | 2 +- pkgs/development/tools/hcloud/default.nix | 2 +- .../tools/jsonnet-bundler/default.nix | 2 +- pkgs/development/tools/kubepug/default.nix | 6 +++--- pkgs/development/tools/kustomize/default.nix | 12 ++++++------ pkgs/development/tools/lazygit/default.nix | 2 +- .../tools/misc/circleci-cli/default.nix | 2 +- pkgs/development/tools/misc/k2tf/default.nix | 2 +- pkgs/development/tools/misc/mkcert/default.nix | 6 +++--- .../development/tools/misc/reviewdog/default.nix | 2 +- .../tools/misc/terracognita/default.nix | 2 +- pkgs/development/tools/renderizer/default.nix | 4 ++-- pkgs/development/tools/skaffold/default.nix | 13 ++++++------- pkgs/development/tools/tf2pulumi/default.nix | 6 +++--- pkgs/development/tools/yj/default.nix | 2 +- pkgs/development/web/flyctl/default.nix | 2 +- pkgs/development/web/minify/default.nix | 2 +- pkgs/os-specific/darwin/smimesign/default.nix | 2 +- pkgs/servers/blockbook/default.nix | 11 +++++------ pkgs/servers/dex/default.nix | 4 ++-- pkgs/servers/hasura/cli.nix | 10 +++++----- pkgs/servers/http/pomerium/default.nix | 4 ++-- pkgs/servers/maddy/default.nix | 2 +- pkgs/servers/matrix-corporal/default.nix | 4 ++-- pkgs/servers/miniflux/default.nix | 6 +++--- pkgs/servers/misc/gobgpd/default.nix | 7 +++---- .../alertmanager-irc-relay/default.nix | 2 +- pkgs/servers/monitoring/cadvisor/default.nix | 2 +- pkgs/servers/monitoring/do-agent/default.nix | 7 +++---- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- .../monitoring/mackerel-agent/default.nix | 9 ++++----- pkgs/servers/monitoring/mtail/default.nix | 4 ++-- .../prometheus/artifactory-exporter.nix | 15 +++++++-------- .../monitoring/prometheus/mysqld-exporter.nix | 16 ++++++++-------- pkgs/servers/monitoring/prometheus/promscale.nix | 2 +- .../monitoring/prometheus/redis-exporter.nix | 9 ++++----- .../monitoring/prometheus/smokeping-prober.nix | 4 ++-- pkgs/servers/monitoring/sensu-go/default.nix | 11 +++++------ pkgs/servers/monitoring/thanos/default.nix | 15 +++++++-------- pkgs/servers/monitoring/unifi-poller/default.nix | 14 +++++++------- pkgs/servers/nosql/influxdb/default.nix | 2 +- pkgs/servers/nosql/victoriametrics/default.nix | 2 +- pkgs/servers/oauth2-proxy/default.nix | 2 +- pkgs/servers/pg_featureserv/default.nix | 2 +- pkgs/servers/pg_tileserv/default.nix | 2 +- pkgs/servers/reproxy/default.nix | 4 ++-- pkgs/servers/rtsp-simple-server/default.nix | 8 ++++---- pkgs/shells/elvish/default.nix | 2 +- pkgs/shells/zsh/antibody/default.nix | 2 +- pkgs/tools/admin/aws-vault/default.nix | 7 +++---- pkgs/tools/admin/awsweeper/default.nix | 2 +- pkgs/tools/admin/chamber/default.nix | 2 +- pkgs/tools/admin/credhub-cli/default.nix | 3 +-- pkgs/tools/admin/fioctl/default.nix | 6 +++--- pkgs/tools/admin/iamy/default.nix | 6 +++--- pkgs/tools/admin/lego/default.nix | 4 ++-- pkgs/tools/admin/ssmsh/default.nix | 2 +- pkgs/tools/backup/kopia/default.nix | 9 ++++----- pkgs/tools/filesystems/gocryptfs/default.nix | 11 +++++------ pkgs/tools/misc/chezmoi/default.nix | 4 ++-- pkgs/tools/misc/duf/default.nix | 2 +- pkgs/tools/misc/goreleaser/default.nix | 3 +-- pkgs/tools/misc/gotify-cli/default.nix | 4 ++-- pkgs/tools/misc/lf/default.nix | 2 +- pkgs/tools/misc/microplane/default.nix | 6 +++--- pkgs/tools/misc/pgcenter/default.nix | 2 +- pkgs/tools/misc/pgmetrics/default.nix | 2 +- pkgs/tools/misc/pistol/default.nix | 2 +- pkgs/tools/misc/tfk8s/default.nix | 3 +-- pkgs/tools/misc/vsh/default.nix | 2 +- pkgs/tools/networking/cassowary/default.nix | 2 +- pkgs/tools/networking/chisel/default.nix | 2 +- pkgs/tools/networking/clash/default.nix | 3 +-- pkgs/tools/networking/gobgp/default.nix | 7 +++---- pkgs/tools/networking/grpcui/default.nix | 2 +- pkgs/tools/networking/grpcurl/default.nix | 2 +- pkgs/tools/networking/nebula/default.nix | 2 +- pkgs/tools/networking/shadowfox/default.nix | 4 ++-- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- pkgs/tools/networking/termshark/default.nix | 7 +++---- pkgs/tools/networking/yggdrasil/default.nix | 11 +++++------ .../package-management/holo-build/default.nix | 2 +- pkgs/tools/package-management/morph/default.nix | 8 +++----- pkgs/tools/package-management/nfpm/default.nix | 2 +- .../security/aws-iam-authenticator/default.nix | 2 +- pkgs/tools/security/cfssl/default.nix | 9 ++++----- pkgs/tools/security/doppler/default.nix | 2 +- pkgs/tools/security/gopass/default.nix | 2 +- pkgs/tools/security/gopass/git-credential.nix | 8 +++----- pkgs/tools/security/gopass/jsonapi.nix | 8 +++----- pkgs/tools/security/saml2aws/default.nix | 6 +++--- pkgs/tools/security/step-ca/default.nix | 2 +- pkgs/tools/security/subjs/default.nix | 2 +- pkgs/tools/system/ctop/default.nix | 2 +- pkgs/tools/system/hostctl/default.nix | 3 +-- pkgs/tools/system/netdata/go.d.plugin.nix | 2 +- pkgs/tools/text/mark/default.nix | 2 +- pkgs/tools/text/vale/default.nix | 2 +- pkgs/tools/virtualization/shipyard/default.nix | 4 ++-- 161 files changed, 342 insertions(+), 388 deletions(-) diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 728f5e54a3c6..dde5083d9c8d 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index c10a436b7396..c3c42ac24cba 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' installManPage assets/packaging/micro.1 diff --git a/pkgs/applications/logging/humioctl/default.nix b/pkgs/applications/logging/humioctl/default.nix index 5ec33d88cddb..b5d0578b1220 100644 --- a/pkgs/applications/logging/humioctl/default.nix +++ b/pkgs/applications/logging/humioctl/default.nix @@ -20,7 +20,7 @@ in buildGoModule { sha256 = sha256; }; - buildFlagsArray = "-ldflags=-X main.version=${humioCtlVersion}"; + ldflags = [ "-X main.version=${humioCtlVersion}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 4d46047bb964..cf76eda2720c 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; doCheck = false; diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 97e8227e6c96..224336dffabf 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; diff --git a/pkgs/applications/misc/dstask/default.nix b/pkgs/applications/misc/dstask/default.nix index c17ed9b3af5e..4e03059a8cc4 100644 --- a/pkgs/applications/misc/dstask/default.nix +++ b/pkgs/applications/misc/dstask/default.nix @@ -24,11 +24,11 @@ buildGoModule rec { # The other variables are set so that the output of dstask version shows the # git ref and the release version from github. # Ref - buildFlagsArray = [ '' - -ldflags=-w -s - -X "github.com/naggie/dstask.VERSION=${version}" - -X "github.com/naggie/dstask.GIT_COMMIT=v${version}" - '' ]; + ldflags = [ + "-w" "-s" + "-X github.com/naggie/dstask.VERSION=${version}" + "-X github.com/naggie/dstask.GIT_COMMIT=v${version}" + ]; subPackages = [ "cmd/dstask.go" ]; diff --git a/pkgs/applications/misc/expenses/default.nix b/pkgs/applications/misc/expenses/default.nix index cd40b381cb74..052a7905f5b3 100644 --- a/pkgs/applications/misc/expenses/default.nix +++ b/pkgs/applications/misc/expenses/default.nix @@ -23,8 +23,8 @@ buildGoModule rec { buildInputs = [ sqlite ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" + ldflags = [ + "-s" "-w" "-X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; meta = with lib; { diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 867dee5bcd30..30ae2d9be0f6 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index ebc1144e1576..617d84e43db6 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; meta = with lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index d82537beac85..4101ac9f3fd0 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -22,11 +22,10 @@ buildGoModule rec { packr ''; - buildFlagsArray = + ldflags = let package_url = "github.com/argoproj/argo-cd/v2/common"; in [ - "-ldflags=" - "-s -w" + "-s" "-w" "-X ${package_url}.version=${version}" "-X ${package_url}.buildDate=unknown" "-X ${package_url}.gitCommit=${commit}" diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 287640bf5a54..619b2834e5c6 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -25,8 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" diff --git a/pkgs/applications/networking/cluster/fluxcd/default.nix b/pkgs/applications/networking/cluster/fluxcd/default.nix index a4699bacba9c..729f7e472280 100644 --- a/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { subPackages = [ "cmd/flux" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 003f6722d1da..4fe8bea90717 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "cmd/fluxctl" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' for shell in bash fish zsh; do diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index af2771f98587..6d70b405e168 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index f66e5f88e729..bf4183268e53 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/xetys/hetzner-kube/cmd.version=${version} - ''; + ldflags = [ + "-X github.com/xetys/hetzner-kube/cmd.version=${version}" + ]; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 747523103af8..e4ef8d1aa8d7 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -17,14 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata - buildFlagsArray = let + ldflags = let attrs = [ "istio.io/pkg/version.buildVersion=${version}" "istio.io/pkg/version.buildStatus=Nix" "istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildHub=docker.io/istio" ]; - in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + in ["-s" "-w" "${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; subPackages = [ "istioctl/cmd/istioctl" ]; diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index d7fc1cb22429..d9b04aaf7fc6 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -19,13 +19,12 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} - -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean - ''; + ldflags = [ + "-s -w" + "-X github.com/jenkins-x/jx/pkg/version.Version=${version}" + "-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}" + "-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean" + ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 3c7b232cc214..871ab8b93456 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -11,12 +11,11 @@ buildGoModule rec { sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/k9s/cmd.version=${version} - -X github.com/derailed/k9s/cmd.commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/derailed/k9s/cmd.version=${version}" + "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + ]; vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; diff --git a/pkgs/applications/networking/cluster/kpt/default.nix b/pkgs/applications/networking/cluster/kpt/default.nix index be91a64b74f9..3e6475ca6586 100644 --- a/pkgs/applications/networking/cluster/kpt/default.nix +++ b/pkgs/applications/networking/cluster/kpt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index f8bec6e0b109..d5f04c14d572 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X main.version=${version}" + "-X main.goVersion=${lib.getVersion go}" + ]; meta = with lib; { description = "A Kubernetes credential plugin implementing Azure authentication"; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 15670188f14e..13fc7a9605e4 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/kubeseal" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; diff --git a/pkgs/applications/networking/cluster/kuttl/default.nix b/pkgs/applications/networking/cluster/kuttl/default.nix index fe92a5ddf9f2..64f13ad6b60f 100644 --- a/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/pkgs/applications/networking/cluster/kuttl/default.nix @@ -16,10 +16,10 @@ buildGoModule rec { subPackages = [ "cmd/kubectl-kuttl" ]; - buildFlagsArray = '' - -ldflags=-s -w - -X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}" + ]; meta = with lib; { description = "The KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators"; diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix index 9e91589478b4..3a8a26af3ff9 100644 --- a/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; }; - buildFlagsArray = let + ldflags = let multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; in [ - "-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'" + "-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}" ]; preInstall = '' diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 3751ad25c784..1a7c56bd18b4 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -11,11 +11,10 @@ buildGoModule rec { sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=${version} + ldflags = '' + "-s" "-w" + "-X github.com/derailed/popeye/cmd.version=${version}" + "-X github.com/derailed/popeye/cmd.commit=${version}" ''; vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 6f8e5640539d..3c00bc1eedbe 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -15,12 +15,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/splunk/qbec/internal/commands.version=${version} - -X github.com/splunk/qbec/internal/commands.commit=${src.rev} - -X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go} + ldflags = '' + "-s" "-w" + "-X github.com/splunk/qbec/internal/commands.version=${version}" + "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}" + "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}" ''; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/sonobuoy/default.nix b/pkgs/applications/networking/cluster/sonobuoy/default.nix index fc30699f225f..b82b6cf610de 100644 --- a/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.53.2"; # Do not forget to update `rev` above - buildFlagsArray = + ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; - in '' - -ldflags= - -s -X ${t}/pkg/buildinfo.Version=v${version} - -X ${t}/pkg/buildinfo.GitSHA=${rev} - -X ${t}/pkg/buildDate=unknown - ''; + in [ + "-s" + "-X ${t}/pkg/buildinfo.Version=v${version}" + "-X ${t}/pkg/buildinfo.GitSHA=${rev}" + "-X ${t}/pkg/buildDate=unknown" + ]; src = fetchFromGitHub { sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 602ac8ae5368..74508a73227d 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = - [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ]; + ldflags = + [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; postInstall = let stern = if isCrossBuild then buildPackages.stern else "$out"; diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index bf11b35d71aa..6aee37c57ed4 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tk" ]; - buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; + ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index d717bd42652b..b4e44a05d82e 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tilt" ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 80d02eb19ed2..2c7300573c74 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,12 +14,11 @@ buildGoModule rec { sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean + ldflags = '' + "-s" "-w" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" ''; vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 494a40c6bfe0..d767a381ea49 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index 025c58a9383d..4c0f9c1a0fb3 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "NextDNS DNS/53 to DoH Proxy"; diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index aa5175fca9ed..ae2dee21fb26 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { updateScript = genericUpdater { 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 74f644e23ad2..6a765f8e8b52 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 28020f85369d..b2f5346bbfce 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -15,10 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; postInstall = '' install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq diff --git a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index a90390ddd3b3..c08e68cc28a1 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -16,12 +16,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev} - -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version} - -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version} - ''; + ldflags = [ + "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" + "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" + "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" + ]; postInstall = '' install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" 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 19de4b28bfea..143ab6cac9db 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 @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; subPackages = [ "cmd/git-chglog" ]; @@ -24,4 +24,3 @@ buildGoModule rec { maintainers = with maintainers; [ ldenefle ]; }; } - diff --git a/pkgs/applications/version-management/git-and-tools/lab/default.nix b/pkgs/applications/version-management/git-and-tools/lab/default.nix index a373d3dbf897..63f42963089a 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ffd6ff7d16c8..46caac00c4fa 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ="; buildInputs = [ git ]; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; doCheck = false; meta = with lib; { diff --git a/pkgs/applications/video/go-chromecast/default.nix b/pkgs/applications/video/go-chromecast/default.nix index 5b0ddf717362..7c0894ee06d8 100644 --- a/pkgs/applications/video/go-chromecast/default.nix +++ b/pkgs/applications/video/go-chromecast/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; meta = with lib; { homepage = "https://github.com/vishen/go-chromecast"; diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix index c985632b9ebc..ce12fb8f387b 100644 --- a/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/pkgs/applications/virtualization/imgcrypt/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; }; - buildFlagsArray = [ - "-ldflags=-X github.com/containerd/containerd/version.Version=${version}" + ldflags = [ + "-X github.com/containerd/containerd/version.Version=${version}" ]; vendorSha256 = null; diff --git a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 4276f71a409b..8cb470d2fa4c 100644 --- a/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index 84c39dba9000..8fd4cf0a35ae 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -19,8 +19,8 @@ let doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" + ldflags = [ + "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; meta = with lib; { diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index d2de1bcc063b..00852a4c90f1 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ]; meta = with lib; { description = "A user-friendly launcher for Bazel"; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e181917c417a..4ff5c39fac67 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { excludedPackages = [ "generatetables" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.buildVersion=${version}" "-X main.buildScmRevision=${src.rev}" ]; meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index d8ccd3ad2fe0..cf719f2c0ca1 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/magefile/mage/mage.commitHash=v${version}" "-X github.com/magefile/mage/mage.gitTag=v${version}" "-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z" diff --git a/pkgs/development/tools/buildpack/default.nix b/pkgs/development/tools/buildpack/default.nix index 0f31f7b1b37d..a3e1b093e7b0 100644 --- a/pkgs/development/tools/buildpack/default.nix +++ b/pkgs/development/tools/buildpack/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; postInstall = '' installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) diff --git a/pkgs/development/tools/butane/default.nix b/pkgs/development/tools/butane/default.nix index ccb011360e5b..094aa5fe026c 100644 --- a/pkgs/development/tools/butane/default.nix +++ b/pkgs/development/tools/butane/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { subPackages = [ "internal" ]; - buildFlagsArray = '' - -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version} - ''; + ldflags = [ + "-X github.com/coreos/butane/internal/version.Raw=v${version}" + ]; postInstall = '' mv $out/bin/{internal,butane} diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index aa6472494733..2979ae9f5d1c 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80="; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; doCheck = false; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 1ba8cb0a9d3d..74e823ad9b84 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 73aefdd0cda7..4604cca7cfc8 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/bk" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A command line interface for Buildkite"; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 741bcfbe5a87..0b000b0f4d83 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { subPackages = [ "fly" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/concourse/concourse.Version=${version} - ''; + ldflags = [ + "-X github.com/concourse/concourse.Version=${version}" + ]; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 5170297a4330..f177ced3092d 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -16,8 +16,8 @@ buildGoModule rec { subPackages = [ "cmd/cue" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}" + ldflags = [ + "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; meta = { diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 3b04c0fb8992..581b0db3b35a 100644 --- a/pkgs/development/tools/dive/default.nix +++ b/pkgs/development/tools/dive/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for exploring each layer in a docker image"; diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix index aa1de8acd583..53da9c1fb4ef 100644 --- a/pkgs/development/tools/earthly/default.nix +++ b/pkgs/development/tools/earthly/default.nix @@ -13,12 +13,11 @@ buildGoModule rec { vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4="; - buildFlagsArray = '' - -ldflags= - -s -w - -X main.Version=v${version} - -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} - ''; + ldflags = [ + "-s" "-w" + "-X main.Version=v${version}" + "-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}" + ]; BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; preBuild = '' diff --git a/pkgs/development/tools/fission/default.nix b/pkgs/development/tools/fission/default.nix index a87b20402d95..0151a6fb38ba 100644 --- a/pkgs/development/tools/fission/default.nix +++ b/pkgs/development/tools/fission/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s="; - buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; + ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; subPackages = [ "cmd/fission-cli" ]; diff --git a/pkgs/development/tools/github/bump/default.nix b/pkgs/development/tools/github/bump/default.nix index 791b8b7aa916..3531926e4bc4 100644 --- a/pkgs/development/tools/github/bump/default.nix +++ b/pkgs/development/tools/github/bump/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01" + ldflags = [ + "-X main.buildVersion=${version}" "-X main.buildCommit=${version}" "-X main.buildDate=1970-01-01" ]; meta = with lib; { @@ -26,4 +26,3 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; }; } - diff --git a/pkgs/development/tools/go-minimock/default.nix b/pkgs/development/tools/go-minimock/default.nix index 60f53e1e253c..1ec03ed2a69d 100644 --- a/pkgs/development/tools/go-minimock/default.nix +++ b/pkgs/development/tools/go-minimock/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA="; diff --git a/pkgs/development/tools/go-swagger/default.nix b/pkgs/development/tools/go-swagger/default.nix index 2147ed00c77c..20c2a2b9e991 100644 --- a/pkgs/development/tools/go-swagger/default.nix +++ b/pkgs/development/tools/go-swagger/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/swagger" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version} -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; meta = with lib; { description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; diff --git a/pkgs/development/tools/go-task/default.nix b/pkgs/development/tools/go-task/default.nix index c1cff6562f23..4c7d20bb74b9 100644 --- a/pkgs/development/tools/go-task/default.nix +++ b/pkgs/development/tools/go-task/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/task" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index 45602a053522..10f853a65237 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -19,8 +19,7 @@ buildGoModule rec { rm net/net_test.go ''; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 9264ac27fa2a..9f9bb882de08 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; meta = with lib; { homepage = "https://github.com/securego/gosec"; @@ -27,4 +27,3 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 1e63b07d03ed..161aba5d68f6 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index fe3dfb9a34c8..f77e3832fe78 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' for shell in bash zsh; do diff --git a/pkgs/development/tools/jsonnet-bundler/default.nix b/pkgs/development/tools/jsonnet-bundler/default.nix index 4286a454ff02..87da63f0f354 100644 --- a/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/pkgs/development/tools/jsonnet-bundler/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/jb" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "A jsonnet package manager"; diff --git a/pkgs/development/tools/kubepug/default.nix b/pkgs/development/tools/kubepug/default.nix index 639e72edb8c1..df619086861d 100644 --- a/pkgs/development/tools/kubepug/default.nix +++ b/pkgs/development/tools/kubepug/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "0jzry4znq4kcl6i9jcawilyjm8av1zxbml6nlr96v8x47ijxav5j"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/rikatz/kubepug/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" + ]; subPackages = [ "cmd/kubepug.go" ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index cae13140b04f..36c425aef18f 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -6,12 +6,12 @@ buildGoModule rec { # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; - buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in - '' - -ldflags= - -s -X ${t}.version=${version} - -X ${t}.gitCommit=${rev} - ''; + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in + [ + "-s" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; src = fetchFromGitHub { owner = "kubernetes-sigs"; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index c7e3a1fabdc9..21d9f9903d26 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = null; subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; meta = with lib; { description = "Simple terminal UI for git commands"; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 890229ebc815..6ce86c44d7f9 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version} -X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev} -X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; + ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/pkgs/development/tools/misc/k2tf/default.nix b/pkgs/development/tools/misc/k2tf/default.nix index 904256ee66a9..bc24d4563a5c 100644 --- a/pkgs/development/tools/misc/k2tf/default.nix +++ b/pkgs/development/tools/misc/k2tf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1c2mwhrj0xapc661z1nb6am4qq3rd1pvbvjaxikjyx95n0gs8gjk"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; meta = with lib; { description = "Kubernetes YAML to Terraform HCL converter"; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 0f110ae0b082..bfd551570090 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags=-s -w -X main.Version=v${version} - ''; + ldflags = [ + "-s" "-w" "-X main.Version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/FiloSottile/mkcert"; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 075698ac43dc..b39ab68f06c0 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/reviewdog" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 1d33f5929bbf..c10543e17689 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; diff --git a/pkgs/development/tools/renderizer/default.nix b/pkgs/development/tools/renderizer/default.nix index 18d5cae542cc..d9987137ce65 100644 --- a/pkgs/development/tools/renderizer/default.nix +++ b/pkgs/development/tools/renderizer/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" ]; vendorSha256 = null; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 2490c3a3ce27..dcacd997d7de 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -15,13 +15,12 @@ buildGoModule rec { subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' - -ldflags= - -s -w - -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${src.rev} - -X ${t}/version.buildDate=unknown - ''; + ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [ + "-s" "-w" + "-X ${t}/version.version=v${version}" + "-X ${t}/version.gitCommit=${src.rev}" + "-X ${t}/version.buildDate=unknown" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/tf2pulumi/default.nix b/pkgs/development/tools/tf2pulumi/default.nix index 8a1a03c16359..6f195d86849a 100644 --- a/pkgs/development/tools/tf2pulumi/default.nix +++ b/pkgs/development/tools/tf2pulumi/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-wsgNrDnFXbpanEULEjf6OxOeMYmWzjE7vpVUB/UFNp8="; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/pulumi/tf2pulumi/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/tf2pulumi/version.Version=${src.rev}" + ]; subPackages = [ "." ]; diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 303f325dec18..017434134ca1 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Convert YAML <=> TOML <=> JSON <=> HCL"; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 71db0f89cd73..c222d5232bac 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; + ldflags = [ "-s" "-w" "-X github.com/superfly/flyctl/flyctl.Version=${version}" "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" "-X github.com/superfly/flyctl/flyctl.Environment=production" ]; meta = with lib; { description = "Command line tools for fly.io services"; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index ac040d0a9156..31c6ba9253bb 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Minifiers for web formats"; diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 6b7e38891619..d50e00f984e5 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; - buildFlagsArray = "-ldflags=-X main.versionString=v${version}"; + ldflags = [ "-X main.versionString=v${version}" ]; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index 8d75b89d0d8a..b10f8919af7a 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -33,12 +33,11 @@ buildGoModule rec { buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; - buildFlagsArray = '' - -ldflags= - -X github.com/trezor/blockbook/common.version=${version} - -X github.com/trezor/blockbook/common.gitcommit=${commit} - -X github.com/trezor/blockbook/common.buildDate=unknown - ''; + ldflags = [ + "-X github.com/trezor/blockbook/common.version=${version}" + "-X github.com/trezor/blockbook/common.gitcommit=${commit}" + "-X github.com/trezor/blockbook/common.buildDate=unknown" + ]; preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 9d577047ee21..0f4282699ee2 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { "cmd/dex" ]; - buildFlagsArray = [ - "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" + ldflags = [ + "-w" "-s" "-X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 4338f1bcaed8..a65d4bb38234 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -13,11 +13,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} - -s - -w - '']; + ldflags = [ + "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version}" + "-s" + "-w" + ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/pkgs/servers/http/pomerium/default.nix b/pkgs/servers/http/pomerium/default.nix index ea9628417d7d..7b28200b284e 100644 --- a/pkgs/servers/http/pomerium/default.nix +++ b/pkgs/servers/http/pomerium/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { "cmd/pomerium-cli" ]; - buildFlagsArray = let + ldflags = let # Set a variety of useful meta variables for stamping the build with. setVars = { Version = "v${version}"; @@ -35,7 +35,7 @@ buildGoModule rec { }; varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags}" + "${varFlags}" ]; nativeBuildInputs = [ diff --git a/pkgs/servers/maddy/default.nix b/pkgs/servers/maddy/default.nix index bc6071bff0d2..c5fa1b5e670a 100644 --- a/pkgs/servers/maddy/default.nix +++ b/pkgs/servers/maddy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; diff --git a/pkgs/servers/matrix-corporal/default.nix b/pkgs/servers/matrix-corporal/default.nix index e489e774be5e..ae455168778f 100644 --- a/pkgs/servers/matrix-corporal/default.nix +++ b/pkgs/servers/matrix-corporal/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ldflags = [ + "-s" "-w" "-X main.GitCommit=${version}" "-X main.GitBranch=${version}" "-X main.GitState=nixpkgs" "-X main.GitSummary=${version}" "-X main.Version=${version}" ]; vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4="; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index f66468b240f8..fe61e5fc8b84 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -22,9 +22,9 @@ in buildGoModule { go test $(go list ./... | grep -v client) ''; # skip client tests as they require network access - buildFlagsArray = '' - -ldflags=-s -w -X miniflux.app/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X miniflux.app/version.Version=${version}" + ]; postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 0a09293226ed..75bc9f8e6088 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgpd" ]; diff --git a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index f5d4f6ca88f3..5a2fcc4a8976 100644 --- a/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 8501aa5e02cd..2db3cd084470 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; postInstall = '' mv $out/bin/{cmd,cadvisor} diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index d6e3accdf41d..5f70bf702a6b 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -11,10 +11,9 @@ buildGoModule rec { sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; vendorSha256 = null; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 56f8b30fbb44..996637f51b9e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -43,9 +43,9 @@ buildGoModule rec { rm -r scripts/go ''; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' tar -xvf $srcStatic diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index d8987f9e5adc..21776c352af1 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -19,11 +19,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X=main.version=${version} - -X=main.gitcommit=v${version} - ''; + ldflags = [ + "-X=main.version=${version}" + "-X=main.gitcommit=v${version}" + ]; postInstall = '' wrapProgram $out/bin/mackerel-agent \ diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index c0a7e1129a14..e5a3179a86c0 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -21,8 +21,8 @@ buildGoModule rec { go generate -x ./internal/vm/ ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + ldflags = [ + "-X main.Version=${version}" ]; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 5e7d386d7e1c..a91a267bb210 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=19700101-00:00:00 - ''; + ldflags = [ + "-s" "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; }; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index e31800f43c0e..894fbd1ab3f1 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,14 +14,14 @@ buildGoModule rec { vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -s -w -X ${t}.Version=${version} - -X ${t}.Revision=${rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; # skips tests with external dependencies, e.g. on mysqld checkFlags = [ "-short" ]; diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 0727616de311..546bfbb7e28c 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon doInstallCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a2636d9f7147..d209f52ef585 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - -X main.BuildCommitSha=unknown - -X main.BuildDate=unknown + ldflags = '' + "-X main.BuildVersion=${version}" + "-X main.BuildCommitSha=unknown" + "-X main.BuildDate=unknown" ''; # needs a redis server diff --git a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b998e1d24c6c..8b1cbb962ade 100644 --- a/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "smokeping_prober"; version = "${baseVersion}-g${commit}"; - buildFlagsArray = let + ldflags = let setVars = { Version = baseVersion; Revision = commit; @@ -17,7 +17,7 @@ buildGoModule rec { }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags} -s -w" + "${varFlags}" "-s" "-w" ]; src = fetchFromGitHub { diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 881d677b3e59..23294dfb88c4 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -20,13 +20,12 @@ let doCheck = false; - buildFlagsArray = let + ldflags = let versionPkg = "github.com/sensu/sensu-go/version"; - in '' - -ldflags= - -X ${versionPkg}.Version=${version} - -X ${versionPkg}.BuildSHA=${shortRev} - ''; + in [ + "-X ${versionPkg}.Version=${version}" + "-X ${versionPkg}.BuildSHA=${shortRev}" + ]; meta = { homepage = "https://sensu.io"; diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 03811314f456..fef179945b38 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = "cmd/thanos"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; diff --git a/pkgs/servers/monitoring/unifi-poller/default.nix b/pkgs/servers/monitoring/unifi-poller/default.nix index 992a92a2733c..745cfdd34595 100644 --- a/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/pkgs/servers/monitoring/unifi-poller/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; - buildFlagsArray = '' - -ldflags=-w -s - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=unknown - -X github.com/prometheus/common/version.Revision=${src.rev} - -X github.com/prometheus/common/version.Version=${version}-0 - ''; + ldflags = [ + "-w" "-s" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=unknown" + "-X github.com/prometheus/common/version.Revision=${src.rev}" + "-X github.com/prometheus/common/version.Version=${version}-0" + ]; meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index df3e116ab74a..4f10beda85cc 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = "test"; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index 12ad70375121..4ef8fe9575f2 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; diff --git a/pkgs/servers/oauth2-proxy/default.nix b/pkgs/servers/oauth2-proxy/default.nix index a5aee60d8bb1..dfc1756b3746 100644 --- a/pkgs/servers/oauth2-proxy/default.nix +++ b/pkgs/servers/oauth2-proxy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile - buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + ldflags = [ "-X main.VERSION=${version}" ]; meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; diff --git a/pkgs/servers/pg_featureserv/default.nix b/pkgs/servers/pg_featureserv/default.nix index fd31d728a3b2..9a4fd071338e 100644 --- a/pkgs/servers/pg_featureserv/default.nix +++ b/pkgs/servers/pg_featureserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix index b7f1fa0c1c9d..a380af0311b3 100644 --- a/pkgs/servers/pg_tileserv/default.nix +++ b/pkgs/servers/pg_tileserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; - buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; doCheck = false; diff --git a/pkgs/servers/reproxy/default.nix b/pkgs/servers/reproxy/default.nix index 0d25b4267838..25fb5268c146 100644 --- a/pkgs/servers/reproxy/default.nix +++ b/pkgs/servers/reproxy/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=-s -w -X main.revision=${version}" + ldflags = [ + "-s" "-w" "-X main.revision=${version}" ]; installPhase = '' diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 58b565851236..c6897167cefa 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -19,10 +19,10 @@ buildGoModule rec { # Tests need docker doCheck = false; - buildFlagsArray = [ - # In the future, we might need to switch to `main.Version`, considering: - # https://github.com/aler9/rtsp-simple-server/issues/503 - "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + ldflags = [ + "-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 6ef08992f963..0916c9b25b59 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { excludedPackages = [ "website" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/elves/elvish/pkg/buildinfo.Version==${version} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; + ldflags = [ "-s" "-w" "-X github.com/elves/elvish/pkg/buildinfo.Version==${version}" "-X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; src = fetchFromGitHub { owner = "elves"; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index d5c197d5da6e..1db4321259df 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "The fastest shell plugin manager"; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index c17160152817..afc493c3b6a1 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -34,10 +34,9 @@ buildGoModule rec { subPackages = [ "." ]; # set the version. see: aws-vault's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + ldflags = [ + "-X main.Version=v${version}" + ]; doInstallCheck = true; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 0ff42ca20fcf..7d1935415ab7 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; + ldflags = [ "-s" "-w" "-X github.com/jckuester/awsweeper/internal.version=${version}" "-X github.com/jckuester/awsweeper/internal.commit=${src.rev}" "-X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix index 524970925ddc..d69e96a45551 100644 --- a/pkgs/tools/admin/chamber/default.nix +++ b/pkgs/tools/admin/chamber/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; meta = with lib; { description = diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 0c71850f849e..9cfb23ab9daa 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -28,8 +28,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}" diff --git a/pkgs/tools/admin/fioctl/default.nix b/pkgs/tools/admin/fioctl/default.nix index 6e20a32cf21b..98e68c10fb9d 100644 --- a/pkgs/tools/admin/fioctl/default.nix +++ b/pkgs/tools/admin/fioctl/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { runVend = true; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" + ]; meta = with lib; { description = "A simple CLI to manage your Foundries Factory "; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index dd35da451ad8..6ee5f3f880bb 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X main.Version=v${version} -s -w - '']; + ldflags = [ + "-X main.Version=v${version}" "-s" "-w" + ]; meta = with lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 78f4b8cd2cb2..685679467549 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/lego" ]; - buildFlagsArray = [ - "-ldflags=-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; meta = with lib; { diff --git a/pkgs/tools/admin/ssmsh/default.nix b/pkgs/tools/admin/ssmsh/default.nix index 3ed29af25fdc..6c4785c81c59 100644 --- a/pkgs/tools/admin/ssmsh/default.nix +++ b/pkgs/tools/admin/ssmsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = true; - buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; + ldflags = [ "-w" "-s" "-X main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/bwhaley/ssmsh"; diff --git a/pkgs/tools/backup/kopia/default.nix b/pkgs/tools/backup/kopia/default.nix index 32f051f5ad91..ad113ed615ef 100644 --- a/pkgs/tools/backup/kopia/default.nix +++ b/pkgs/tools/backup/kopia/default.nix @@ -17,11 +17,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X github.com/kopia/kopia/repo.BuildVersion=${version} - -X github.com/kopia/kopia/repo.BuildInfo=${src.rev} - ''; + ldflags = [ + "-X github.com/kopia/kopia/repo.BuildVersion=${version}" + "-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}" + ]; meta = with lib; { homepage = "https://kopia.io"; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 4d901d688908..29750531db20 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -37,12 +37,11 @@ buildGoModule rec { propagatedBuildInputs = [ libfido2 ]; - buildFlagsArray = '' - -ldflags= - -X main.GitVersion=${version} - -X main.GitVersionFuse=[vendored] - -X main.BuildDate=unknown - ''; + ldflags = [ + "-X main.GitVersion=${version}" + "-X main.GitVersionFuse=[vendored]" + "-X main.BuildDate=unknown" + ]; subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index ff9e7a001333..a60a84475b06 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/duf/default.nix b/pkgs/tools/misc/duf/default.nix index 076eb33fbb19..e95edb08b84a 100644 --- a/pkgs/tools/misc/duf/default.nix +++ b/pkgs/tools/misc/duf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; - buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 35fc8343b5a1..62c184d6be59 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -13,8 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk="; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 36a7055f875c..05a93b44b94e 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ldflags = [ + "-X main.Version=${version}" "-X main.Commit=${version}" "-X main.BuildDate=1970-01-01" ]; meta = with lib; { diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 8aa8e9a663b7..b135ed061dee 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ]; + ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/pkgs/tools/misc/microplane/default.nix b/pkgs/tools/misc/microplane/default.nix index 26ae9f4f16db..a44ae344bf59 100644 --- a/pkgs/tools/misc/microplane/default.nix +++ b/pkgs/tools/misc/microplane/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' ln -s $out/bin/microplane $out/bin/mp diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index c5ca7e8c911b..ac1c0bd356d2 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd" ]; - buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + ldflags = [ "-w" "-s" "-X main.gitTag=${src.rev}" "-X main.gitCommit=${src.rev}" "-X main.gitBranch=master" ]; postInstall = '' mv $out/bin/cmd $out/bin/pgcenter diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 955444ff8c87..c5a240f714ea 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://pgmetrics.io/"; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 52c83abdf688..6d91a54e56dc 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { installManPage pistol.1 ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; diff --git a/pkgs/tools/misc/tfk8s/default.nix b/pkgs/tools/misc/tfk8s/default.nix index 086a05c90169..8ca102444a9d 100644 --- a/pkgs/tools/misc/tfk8s/default.nix +++ b/pkgs/tools/misc/tfk8s/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.toolVersion=${tag}" diff --git a/pkgs/tools/misc/vsh/default.nix b/pkgs/tools/misc/vsh/default.nix index 13a3df4d6b94..416dd4bfcc13 100644 --- a/pkgs/tools/misc/vsh/default.nix +++ b/pkgs/tools/misc/vsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = null; # make sure version gets set at compile time - buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; meta = with lib; { description = "HashiCorp Vault interactive shell"; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 527ecfbf98d3..6280b923ec0c 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; diff --git a/pkgs/tools/networking/chisel/default.nix b/pkgs/tools/networking/chisel/default.nix index 5d82a549e889..9df5625c2355 100644 --- a/pkgs/tools/networking/chisel/default.nix +++ b/pkgs/tools/networking/chisel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; # tests require access to the network doCheck = false; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 61e529dc8729..221a6c280b26 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index 98925489e548..6ba0752222ac 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgp" ]; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index a9fb7c823f9e..1fa47ba917fc 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/grpcui" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index 734a751daf09..e6cd09dc2fd7 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 06615ae25fae..2aec2fb50c76 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; + ldflags = [ "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index e6b1c823eb88..a75936a15204 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.tag=v${version}" + ldflags = [ + "-X main.tag=v${version}" ]; meta = with lib; { diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 2cbe5fd91849..e7ae903e8682 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" + ]; subPackages = [ "cmd/telepresence" ]; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index 7b9a3c42d606..d35e70ad52e4 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; - buildFlagsArray = '' - -ldflags= - -X github.com/gcla/termshark.Version=${version} - ''; + ldflags = [ + "-X github.com/gcla/termshark.Version=${version}" + ]; meta = with lib; { homepage = "https://termshark.io/"; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 506869238e57..874205f592bd 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -22,12 +22,11 @@ buildGoModule rec { subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version} - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname} - -s -w - ''; + ldflags = [ + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" + "-s" "-w" + ]; passthru.tests.basic = nixosTests.yggdrasil; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 20e3b555fd2f..847c8a726d0f 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { subPackages = [ "src/holo-build" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; postBuild = '' make build/man/holo-build.8 VERSION=${version} diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index 56d824059f53..e7b6b3adf1f2 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -15,11 +15,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper go-bindata ]; - buildFlagsArray = '' - -ldflags= - -X - main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; postPatch = '' go-bindata -pkg assets -o assets/assets.go data/ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 69d2f0d29f78..9331bdba6843 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple deb and rpm packager written in Go"; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index d9f4f4a01735..476d248c4343 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { deleteVendor = true; vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; subPackages = [ "cmd/aws-iam-authenticator" ]; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 6ef07c2c355b..1e95d1d6f2f9 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -34,11 +34,10 @@ buildGoModule rec { popd ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/cloudflare/cfssl/cli/version.version=v${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/cloudflare/cfssl/cli/version.version=v${version}" + ]; meta = with lib; { homepage = "https://cfssl.org/"; diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index ad49251aae86..18ca909cd5e0 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8="; - buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; + ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ]; postInstall = '' mv $out/bin/cli $out/bin/doppler diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 358acf376b48..9e56b4c1a4bb 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; wrapperPath = lib.makeBinPath ( [ diff --git a/pkgs/tools/security/gopass/git-credential.nix b/pkgs/tools/security/gopass/git-credential.nix index fb0da2c1a093..0b15e9b02353 100644 --- a/pkgs/tools/security/gopass/git-credential.nix +++ b/pkgs/tools/security/gopass/git-credential.nix @@ -22,11 +22,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/pkgs/tools/security/gopass/jsonapi.nix b/pkgs/tools/security/gopass/jsonapi.nix index e060adbf5bcf..c138bde2cc3c 100644 --- a/pkgs/tools/security/gopass/jsonapi.nix +++ b/pkgs/tools/security/gopass/jsonapi.nix @@ -23,11 +23,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/gopass-jsonapi --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 8ee2c9a4c4e4..55862623f494 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -20,9 +20,9 @@ buildGoModule rec { subPackages = [ "." "cmd/saml2aws" ]; - buildFlagsArray = '' - -ldflags=-X main.Version=${version} - ''; + ldflags = [ + "-X main.Version=${version}" + ]; meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 63291946e38c..9b645dcba927 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI="; - buildFlagsArray = [ "-ldflags=-buildid=" ]; + ldflags = [ "-buildid=" ]; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; diff --git a/pkgs/tools/security/subjs/default.nix b/pkgs/tools/security/subjs/default.nix index 1b7986c0a77a..65d3f18be794 100644 --- a/pkgs/tools/security/subjs/default.nix +++ b/pkgs/tools/security/subjs/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "1y01k8pvv7y9zb15wbk068cvkx0g83484jak2dvcvghqcf5j1fr1"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; meta = with lib; { description = "Fetcher for Javascript files"; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 45cbca172fa7..36dfd02c33f6 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.build=v${version}" ]; meta = with lib; { description = "Top-like interface for container metrics"; diff --git a/pkgs/tools/system/hostctl/default.nix b/pkgs/tools/system/hostctl/default.nix index 3c366d56fca9..fb3a293a80fd 100644 --- a/pkgs/tools/system/hostctl/default.nix +++ b/pkgs/tools/system/hostctl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -33,4 +33,3 @@ buildGoModule rec { maintainers = with maintainers; [ blaggacao ]; }; } - diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index be6e8f267637..53ab6d6982d6 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' mkdir -p $out/lib/netdata/conf.d diff --git a/pkgs/tools/text/mark/default.nix b/pkgs/tools/text/mark/default.nix index 04b08488ee91..653af8b79692 100644 --- a/pkgs/tools/text/mark/default.nix +++ b/pkgs/tools/text/mark/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for syncing your markdown documentation with Atlassian Confluence pages"; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index a665e35fdd55..d5c64aa9f7b2 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { cp -r styles $data/share/vale ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://docs.errata.ai/vale/about"; diff --git a/pkgs/tools/virtualization/shipyard/default.nix b/pkgs/tools/virtualization/shipyard/default.nix index cd8a4c36a920..9c67b5462bbf 100644 --- a/pkgs/tools/virtualization/shipyard/default.nix +++ b/pkgs/tools/virtualization/shipyard/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { }; vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; # Tests require a large variety of tools and resources to run including From 3360a376cb905ac40e77d5424089d4893e9cd157 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 23 Aug 2021 14:55:51 +1000 Subject: [PATCH 163/220] buildGoModule: warn if buildFlagsArray is used --- pkgs/applications/networking/cluster/popeye/default.nix | 4 ++-- pkgs/applications/networking/cluster/qbec/default.nix | 4 ++-- pkgs/applications/networking/cluster/velero/default.nix | 4 ++-- pkgs/development/go-modules/generic/default.nix | 7 ++++--- pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 1a7c56bd18b4..910317bd9673 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/derailed/popeye/cmd.version=${version}" "-X github.com/derailed/popeye/cmd.commit=${version}" - ''; + ]; vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 3c00bc1eedbe..f5fb6ee234c5 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -15,12 +15,12 @@ buildGoModule rec { doCheck = false; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/splunk/qbec/internal/commands.version=${version}" "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}" "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}" - ''; + ]; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 2c7300573c74..76babadc023c 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -14,12 +14,12 @@ buildGoModule rec { sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; - ldflags = '' + ldflags = [ "-s" "-w" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" - ''; + ]; vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index a7852bcc7e5d..3b645f9ce8b9 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -46,8 +46,9 @@ # Not needed with buildGoModule , goPackagePath ? "" -# needed for buildFlags warning +# needed for buildFlags{,Array} warning , buildFlags ? "" +, buildFlagsArray ? "" , ... }@args': @@ -271,6 +272,6 @@ let }; }); in -lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" +lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix index d209f52ef585..e87c6354ae55 100644 --- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,11 +13,11 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - ldflags = '' + ldflags = [ "-X main.BuildVersion=${version}" "-X main.BuildCommitSha=unknown" "-X main.BuildDate=unknown" - ''; + ]; # needs a redis server doCheck = false; From 6e758d0e819bffd7fb14b72ea40977e0a8216ab4 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Wed, 25 Aug 2021 23:42:21 +0200 Subject: [PATCH 164/220] fstar: 0.9.6.0 -> 2021.07.31 --- pkgs/development/compilers/fstar/default.nix | 54 +++++++++++++++----- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 43 insertions(+), 15 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 7abdf132b51e..fec71dc46fdc 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,36 +1,66 @@ { lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +let + # FStar requires sedlex < 2.4 + # see https://github.com/FStarLang/FStar/issues/2343 + sedlex-2_3 = ocamlPackages.sedlex_2.overrideAttrs (_: rec { + pname = "sedlex"; + version = "2.3"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = "sedlex"; + rev = "v${version}"; + sha256 = "WXUXUuIaBUrFPQOKtZ7dgDZYdpEVnoJck0dkrCi8g0c="; + }; + }); +in + stdenv.mkDerivation rec { pname = "fstar"; - version = "0.9.6.0"; + version = "2021.07.31"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; + sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = with ocamlPackages; [ - z3 ocaml findlib batteries menhir menhirLib stdint - zarith camlp4 yojson pprint - ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild - ]; + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ + ocaml + findlib + ocamlbuild + batteries + zarith + stdint + yojson + fileutils + menhir + menhirLib + pprint + sedlex-2_3 + ppxlib + ppx_deriving + ppx_deriving_yojson + process + ]); makeFlags = [ "PREFIX=$(out)" ]; - preBuild = '' - patchShebangs src/tools - patchShebangs bin + buildFlags = [ "libs" ]; + + postPatch = '' + patchShebangs ulib/gen_mllib.sh + substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}' ''; - buildFlags = [ "-C" "src/ocaml-output" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; - installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" installShellCompletion --bash .completion/bash/fstar.exe.bash diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9212b97ec9ce..72ee7e00ec60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11519,9 +11519,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); From 79e5c4b77b191631c1c540871aef7dcafd3abd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 13:50:05 +0200 Subject: [PATCH 165/220] python39Packages.sounddevice: add import check --- pkgs/development/python-modules/sounddevice/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 7787e8b16b85..ea57f91653cd 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -23,6 +23,8 @@ buildPythonPackage rec { # No tests included nor upstream available. doCheck = false; + pythonImportsCheck = [ "sounddevice" ]; + patches = [ (substituteAll { src = ./fix-portaudio-library-path.patch; From 58dcdf34fa5dc3cdcdc7891db3bf42f7b23e3c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 13:54:36 +0200 Subject: [PATCH 166/220] python39Packages.websockify: update meta, add import check --- pkgs/development/python-modules/websockify/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index af1cb3260475..e1f311ba027b 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -15,10 +15,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; + # Ran 0 tests in 0.000s + doCheck = false; + + pythonImportsCheck = [ "websockify" ]; + meta = with lib; { description = "WebSockets support for any application/server"; homepage = "https://github.com/kanaka/websockify"; license = licenses.lgpl3; + maintainers = with maintainers; [ ]; }; - } From 566823e49394a672541d568e9cdd553481340e52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 13:56:05 +0200 Subject: [PATCH 167/220] python39Packages.rq: add import check --- pkgs/development/python-modules/rq/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index c634aedce1ae..abed10521d92 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -15,6 +15,8 @@ buildPythonPackage rec { # test require a running redis rerver, which is something we can't do yet doCheck = false; + pythonImportsCheck = [ "rq" ]; + propagatedBuildInputs = [ click redis ]; meta = with lib; { From 6282d21790f1ad6d584019042b5d643545f2db99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:03:43 +0200 Subject: [PATCH 168/220] python39Packages.stripe: update meta, add imports check, remove unused checkInputs --- pkgs/development/python-modules/stripe/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 144be6c554ee..e02da9a07ca5 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -1,13 +1,9 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "stripe"; version = "2.60.0"; - # Tests require network connectivity and there's no easy way to disable - # them. ~ C. - doCheck = false; - src = fetchPypi { inherit pname version; sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; @@ -15,11 +11,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; + # Tests require network connectivity and there's no easy way to disable them + doCheck = false; + + pythonImportsCheck = [ "stripe" ]; meta = with lib; { description = "Stripe Python bindings"; homepage = "https://github.com/stripe/stripe-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 2f7071098251cdad39872a4f949e0a1d6cdbb606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:08:50 +0200 Subject: [PATCH 169/220] python39Packages.virtualenv-clone: update meta, remove test only depedencies --- .../development/python-modules/virtualenv-clone/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index d5f33d07614b..e49c35ebd8bb 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pytest , virtualenv }: @@ -14,16 +13,15 @@ buildPythonPackage rec { sha256 = "997c7d225eabc4d09e77672461f4bdf9f3a8ea9dc9e4a847b0e83dc8bad9573a"; }; - buildInputs = [ pytest ]; propagatedBuildInputs = [ virtualenv ]; - # needs tox to run the tests + # tests are not included in pypi tarball and no module to import doCheck = false; meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From a825afdc3e18d77627a3b17ad5c4b9e3a892612a Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Wed, 25 Aug 2021 20:26:02 +0200 Subject: [PATCH 170/220] ocamlPackages.vlq: init at 0.2.1 --- .../development/ocaml-modules/vlq/default.nix | 25 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/ocaml-modules/vlq/default.nix diff --git a/pkgs/development/ocaml-modules/vlq/default.nix b/pkgs/development/ocaml-modules/vlq/default.nix new file mode 100644 index 000000000000..41991cbf7486 --- /dev/null +++ b/pkgs/development/ocaml-modules/vlq/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl +, dune-configurator +}: + +buildDunePackage rec { + pname = "vlq"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz"; + sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi"; + }; + + useDune2 = true; + + buildInputs = [ dune-configurator ]; + + meta = { + description = "encoding variable-length quantities, in particular base64"; + license = lib.licenses.mit; + homepage = "https://github.com/flowtype/ocaml-vlq"; + maintainers = [ lib.maintainers.nomeata ]; + }; + +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 160c810840e7..364aed68e22f 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1304,6 +1304,8 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + vlq = callPackage ../development/ocaml-modules/vlq { }; + visitors = callPackage ../development/ocaml-modules/visitors { }; wasm = callPackage ../development/ocaml-modules/wasm { }; From d4fff5ecec41fa26eef49bccc36e4e487fb51bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:14:39 +0200 Subject: [PATCH 171/220] python39Packages.pyviz-comms: add import check --- pkgs/development/python-modules/pyviz-comms/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index 3b96fbc50ec3..71b9b064aaab 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { # there are not tests with the package doCheck = false; + pythonImportsCheck = [ "pyviz_comms" ]; + passthru.tests = { inherit panel; }; From 455d2341ffa64372b4c468938e6eaa808e7edf1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:18:23 +0200 Subject: [PATCH 172/220] python39Packages.pyodbc: add import check --- pkgs/development/python-modules/pyodbc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix index 37e7137d3b8f..59457d6fcca6 100644 --- a/pkgs/development/python-modules/pyodbc/default.nix +++ b/pkgs/development/python-modules/pyodbc/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "pyodbc"; version = "4.0.32"; - disabled = isPyPy; # use pypypdbc instead + disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; @@ -14,6 +14,8 @@ buildPythonPackage rec { doCheck = false; # tests require a database server + pythonImportsCheck = [ "pyodbc" ]; + meta = with lib; { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; From 1323718753e4e5be1fc440ee9cbea7e2f4852640 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 26 Aug 2021 20:20:08 +0800 Subject: [PATCH 173/220] minder: 1.11.3 -> 1.13.1 --- pkgs/applications/misc/minder/default.nix | 61 ++++++++++++++++++----- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 16fa17609e1e..607eeb5eaa3c 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -1,24 +1,62 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, meson, ninja, python3 -, wrapGAppsHook, vala, shared-mime-info -, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive -, discount, gtksourceview3 +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, shared-mime-info +, vala +, wrapGAppsHook +, cairo +, discount +, glib +, gtk3 +, gtksourceview4 , hicolor-icon-theme # for setup-hook +, libarchive +, libgee +, libhandy +, libxml2 +, pantheon }: stdenv.mkDerivation rec { pname = "minder"; - version = "1.11.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; + sha256 = "07mq595c1vxwsnwkr2zdci0r06yhs75ph2db09mc63k5fjvi8rya"; }; - nativeBuildInputs = [ pkg-config meson ninja python3 wrapGAppsHook vala shared-mime-info ]; - buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + python3 + shared-mime-info + vala + wrapGAppsHook + ]; + + buildInputs = [ + cairo + discount + glib + gtk3 + gtksourceview4 + hicolor-icon-theme + libarchive + libgee + libhandy + libxml2 + pantheon.granite + ]; postPatch = '' chmod +x meson/post_install.py @@ -32,11 +70,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Mind-mapping application for Elementary OS"; + description = "Mind-mapping application for elementary OS"; homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; }; } - From 8cf0809cfb24da1997725662c9943f27780cd0b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 14:29:44 +0200 Subject: [PATCH 174/220] python3Packages.pysmappee: 0.2.25 -> 0.2.27 --- pkgs/development/python-modules/pysmappee/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysmappee/default.nix b/pkgs/development/python-modules/pysmappee/default.nix index c053e5592282..028d591ac924 100644 --- a/pkgs/development/python-modules/pysmappee/default.nix +++ b/pkgs/development/python-modules/pysmappee/default.nix @@ -6,19 +6,20 @@ , pytz , requests , requests_oauthlib +, schedule , pythonOlder }: buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.25"; + version = "0.2.27"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "0ld3pb86dq61fcvr6zigdz1vjjcwf7izzkajyg82nmb508a570d7"; + sha256 = "sha256-CzdkeC53ye+IMeGUiD1mK84h2ruC1/ZpjlDjuWMVoyQ="; }; propagatedBuildInputs = [ @@ -27,10 +28,12 @@ buildPythonPackage rec { pytz requests requests_oauthlib + schedule ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pysmappee" ]; meta = with lib; { From bfa24f70138024ea6ae16b24c70ac3c218c6cbcc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 12:45:17 +0000 Subject: [PATCH 175/220] rehex: 0.3.91 -> 0.3.92 --- pkgs/applications/editors/rehex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/rehex/default.nix b/pkgs/applications/editors/rehex/default.nix index baf8b93d7fed..6a52c7efc27f 100644 --- a/pkgs/applications/editors/rehex/default.nix +++ b/pkgs/applications/editors/rehex/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.3.91"; + version = "0.3.92"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - sha256 = "sha256-lemak/sGff346IOzOnMB4L4TkDRA/1L3KV3VNdWxIFA="; + sha256 = "sha256-yZvJlomUpJwDJOBVSl49lU+JE1YMMs/BSzHepXoFlIY="; }; postPatch = '' From 62c18ce480d453784b1e5fcb4a523df4a25daff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:55:10 +0200 Subject: [PATCH 176/220] python39Packages.django-ipware: update meta, comment why imports check can't be done --- .../python-modules/django-ipware/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 50a4dcd829f9..d773c1490bcc 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -4,12 +4,6 @@ buildPythonPackage rec { pname = "django-ipware"; version = "4.0.0"; - meta = { - description = "A Django application to retrieve user's IP address"; - homepage = "https://github.com/un33k/django-ipware"; - license = lib.licenses.mit; - }; - src = fetchPypi { inherit pname version; sha256 = "1294f916f3b3475e40e1b0ec1bd320aa2397978eae672721c81cbc2ed517e9ee"; @@ -19,4 +13,14 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; + + # pythonImportsCheck fails with: + # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_META_PRECEDENCE_ORDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + + meta = with lib; { + description = "A Django application to retrieve user's IP address"; + homepage = "https://github.com/un33k/django-ipware"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } From 2e453be783966ee4dcd6c0a9394ce421f0804c1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 26 Aug 2021 09:55:43 -0300 Subject: [PATCH 177/220] nordic: unstable-2021-06-04 -> unstable-2021-08-13 --- pkgs/data/themes/nordic/default.nix | 34 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/data/themes/nordic/default.nix b/pkgs/data/themes/nordic/default.nix index 1014d483440c..3fb2ae45f501 100644 --- a/pkgs/data/themes/nordic/default.nix +++ b/pkgs/data/themes/nordic/default.nix @@ -2,70 +2,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2021-06-04"; + version = "unstable-2021-08-13"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9a98c05f4d4f6c9e701ac20b0bf5c18284ad0015"; - sha256 = "0ghgr7fr7anm8hdq6n46xhkjxydqkr0qlk1q7mdg08j43f0yra7b"; + rev = "937ca200e8148a61c73228030ec260abecc27fb2"; + sha256 = "0h7z7jh5p0916i9lx4n94r6vbydafnikdi6d9p4djvpyhn5nizgy"; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "90ce6f539735af1f231c4fa07708cef602e1c8a2"; - sha256 = "1g6sz7ifpc8jf4iplcsmihqhjdc7yp5xygw8584n122jmh8mak47"; + rev = "e736846a130be7907e977b16d0b3a0ab19631015"; + sha256 = "0dv7z31zw1r3iac5bvwapf9lm99y5l0xfzaw93hn8msh10w5crx8"; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "529cdb86b4d4474a67a56eb9377e3c7907b452db"; - sha256 = "06li44i5wh4h06fbhvjf5cjma5czjdgnwvm79d8hg6vmi2101b0a"; + rev = "8ff12077f28e25f4e57f055a51e5e3b9b1bf53fd"; + sha256 = "082k0na39qb97kbvc15g3mdfh8d8ricql84i4wdjy3rjfbfwq0pl"; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "1d16f37de315c298a6c3d79a552ed6f18cbb7fb4"; - sha256 = "0nxzygnysg4ciib337vay0qcc80hpryjnclwjwjzj51i95366k25"; + rev = "8c422e4bfdf5680ff323938f49f411680154d3d6"; + sha256 = "1w540zlmsxpwa455wpxy1dpgv2fjr36xwjqbyc8x4y0ya0qfify0"; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "78a30080bc50ee88c23d393049306ef1925bcdb8"; - sha256 = "10w4815fcf3pd24ar7jp0wcdiwn3zzrdj2p6fqlgx26biz7kf3iv"; + rev = "ce31d794fe1c6b72d3cff2e9513e08ddce014118"; + sha256 = "09d41wllr9hgxshgvpgngx9rlg8pvx5aqgkk5q8jra4jz2a92fhq"; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e4363da8d457e8b14f6e4340979225db92d34aa9"; - sha256 = "1sjw2hvg4jgxqzgqhqixq216a7vv5licbc8ii1rsz88ycafsbr7j"; + rev = "8ca4fe244c31775effacc77f0a25ae10c6bee60c"; + sha256 = "1cby8wmaqdqpd9c40wiy7i9wmrazwfhb3h818hg0ni7yfcm2fr58"; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "a38fd7d440309573947d3e53ea3ed295cf027ce7"; - sha256 = "1r6hz0m0y7c1d0ka1x9cd47r0jvpgkld6x3gf2b7w7yvqpmh6a44"; + rev = "a2d1c633ac2bfe261e8f612c8af14af0311c7f67"; + sha256 = "05llvix671i6128vbr3jiik8mipaab7bn0v9i89ydwyfhw822n7v"; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "b86d43c48bcac57c49d891b967311fd90f6d4bcd"; - sha256 = "0c725kf5ql42zrqk6dwk6i7wyrhr3gddipvhy6692nv0dszqm0ml"; + rev = "62a1702a17e7ea96e9b692832d68a0a7f26aabb6"; + sha256 = "0r1qn1rj322b44h15hcfbx79hhmb1m4pkv2fpdsn3s2klcxwr1ql"; name = "Nordic-Polar-standard-buttons"; }) ]; From d09222e48f0a7124522a4d8c484d27a5125efef3 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 26 Aug 2021 09:12:17 -0400 Subject: [PATCH 178/220] lib.compose{Many,}Extensions: Make compatible with nix flake check --- lib/fixed-points.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index f998bc74e1db..bf1567a22a66 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -72,10 +72,10 @@ rec { # into one where changes made in the first are available in the # 'super' of the second composeExtensions = - f: g: self: super: - let fApplied = f self super; - super' = super // fApplied; - in fApplied // g self super'; + f: g: final: prev: + let fApplied = f final prev; + prev' = prev // fApplied; + in fApplied // g final prev'; # Compose several extending functions of the type expected by 'extends' into # one where changes made in preceding functions are made available to @@ -84,7 +84,7 @@ rec { # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet # ^final ^prev ^overrides ^final ^prev ^overrides composeManyExtensions = - lib.foldr (x: y: composeExtensions x y) (self: super: {}); + lib.foldr (x: y: composeExtensions x y) (final: prev: {}); # Create an overridable, recursive attribute set. For example: # From a0cf73d8d8f3d490c0b96d63f6381636f711d1a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:04:59 +0200 Subject: [PATCH 179/220] python39Packages.parsedatetime: fix typo, update meta --- pkgs/development/python-modules/parsedatetime/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/parsedatetime/default.nix b/pkgs/development/python-modules/parsedatetime/default.nix index c6a4d193920b..4b42071f01fb 100644 --- a/pkgs/development/python-modules/parsedatetime/default.nix +++ b/pkgs/development/python-modules/parsedatetime/default.nix @@ -29,11 +29,12 @@ buildPythonPackage rec { "testFloat" ]; - pythonImportChecks = [ "parsedatetime" ]; + pythonImportsCheck = [ "parsedatetime" ]; meta = with lib; { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From fa61f7635d071e0ddf4088160466119177b90e1c Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Thu, 26 Aug 2021 15:32:15 +0200 Subject: [PATCH 180/220] replace dead links --- lib/licenses.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 57939308c3a3..772985f9509d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -452,13 +452,13 @@ in mkLicense lset) ({ inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; - url = "http://compcert.inria.fr/doc/LICENSE"; # https is broken + url = "https://compcert.org/doc/LICENSE.txt"; free = false; }; inria-icesl = { fullName = "INRIA Non-Commercial License Agreement for IceSL"; - url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; # https is broken + url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf"; free = false; }; From 7030f2c92a115492c302b3515bd286143eb2f1f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 14:25:14 +0000 Subject: [PATCH 181/220] python38Packages.omegaconf: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/omegaconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 13f3981955cd..14fc824f5cd8 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "omegaconf"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "omry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0aDlqPXELxQ/lnw4Hd9es8ldYhUP/TacH9AIyaffwnI="; + sha256 = "0hh6pk4q6nb94bz9rwa6cysf3nj50rmqkjh34pqkh28nzg44afjw"; }; postPatch = '' From bd3377d9d2911182ee98be39f87918faa2730bf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:29:11 +0200 Subject: [PATCH 182/220] git-delete-merged-branches: 6.3.0 -> 6.4.0 --- .../git-and-tools/git-delete-merged-branches/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index fca3200dce8b..3e49af5bbb9c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = version; - sha256 = "sha256-mUgSIwU39BT0bCA2UQANe2Yzkgl2xAmXQQ9P2bLoEMc="; + sha256 = "sha256-swAc8ObZY78nVQyjTrVG81xBqTYnWHVDFpiUApbowqU="; }; propagatedBuildInputs = with python3Packages; [ From 51f738d65ff1d05c3e0e90ccb1b23108d642a596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sch=C3=A4fer=2C=20Denny?= Date: Thu, 26 Aug 2021 16:27:15 +0200 Subject: [PATCH 183/220] complete-alias: 1.10.0 -> 1.18.0 --- pkgs/tools/misc/complete-alias/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/complete-alias/default.nix b/pkgs/tools/misc/complete-alias/default.nix index 721e99427bb6..c23ed9771f23 100644 --- a/pkgs/tools/misc/complete-alias/default.nix +++ b/pkgs/tools/misc/complete-alias/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "complete-alias"; - version = "1.10.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cykerway"; repo = pname; rev = version; - sha256 = "1s0prdnmb2qnzc8d7ddldzqa53yc10qq0lbgx2l9dzmz8pdwylyc"; + sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x"; }; buildPhase = '' From deabb57e15cad652f255526a22b906d299231bf3 Mon Sep 17 00:00:00 2001 From: Alvar Penning Date: Thu, 26 Aug 2021 16:38:14 +0200 Subject: [PATCH 184/220] lens: 4.2.4 -> 5.1.3 Lens does no longer ships its AppImages via GitHub. The new URL also contains some more detailed build tag, indicating a date. --- .../networking/cluster/lens/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index e6af0146ca5a..6e04391d7a8a 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -2,12 +2,13 @@ let pname = "lens"; - version = "4.2.4"; + version = "5.1.3"; + build = "${version}-latest.20210722.1"; name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; - sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw"; + url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; + sha256 = "1iwwyqpn1x1m8n22f99snlhcbcr65i4przx697hlbpmnm40dw7q9"; name="${pname}.AppImage"; }; @@ -22,12 +23,12 @@ in appimageTools.wrapType2 { '' mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=kontena-lens' 'Icon=${pname}' \ + --replace 'Icon=lens' 'Icon=${pname}' \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; From 689183c006446e5134bf699df022f8c22832211f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:39:18 +0200 Subject: [PATCH 185/220] python39Packages.django-versatileimagefield: remove unused input, add import check --- .../python-modules/django-versatileimagefield/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-versatileimagefield/default.nix b/pkgs/development/python-modules/django-versatileimagefield/default.nix index f7bbccf93c8d..eefda80f18e4 100644 --- a/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , django -, python , pillow , python_magic }: @@ -22,6 +21,8 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; + pythonImportsCheck = [ "versatileimagefield" ]; + meta = with lib; { description = "Replaces django's ImageField with a more flexible interface"; homepage = "https://github.com/respondcreate/django-versatileimagefield/"; From 43dfcd24e2ffae028c2a261d501c832125b3792c Mon Sep 17 00:00:00 2001 From: Sandro Date: Thu, 26 Aug 2021 12:29:00 +0200 Subject: [PATCH 186/220] python3Packages.aiofiles: skip failing test on darwin --- pkgs/development/python-modules/aiofiles/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 289da1fb2cc7..05027dc0170d 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , fetchFromGitHub , poetry-core @@ -30,6 +31,10 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_sendfile_file" + ]; + pythonImportsCheck = [ "aiofiles" ]; meta = { From 8ff90c392ce008708b494867b26c2922731925b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:49:10 +0200 Subject: [PATCH 187/220] wezterm: load shell integration automatically which follows the upstream RPM packaging https://github.com/wez/wezterm/blob/main/ci/deploy.sh#L83-L121 --- pkgs/applications/terminal-emulators/wezterm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index e67e28662fd1..19e3a1c37e16 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml # helper scripts - install -Dm644 assets/shell-integration/wezterm.sh $out/share/wezterm/shell-integration/wezterm.sh + install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d ''; preFixup = lib.optionalString stdenv.isLinux '' From fc526397d767a84bb6c51017a98c5fc9dac06947 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Thu, 26 Aug 2021 10:58:18 -0400 Subject: [PATCH 188/220] starship: 0.56.0 -> 0.57.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 052e6198d4fb..7ad62ab9d2e0 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj"; + sha256 = "sha256-cxTBK6eZTlqEaVfWYARQk6BjNuANy39eaXC6qFs/+6k="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9"; + cargoSha256 = "sha256-TFHRDgIxqJCkcSwpdbcx8vguKU1QuTyslmAsRznxt2s="; preCheck = '' HOME=$TMPDIR From c2d20d0b5947751c2d3873492eb0ec9b2ddb023e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:58:39 +0200 Subject: [PATCH 189/220] docker-buildx: fix wrong source hash calculated by r-ryantm --- pkgs/applications/virtualization/docker/buildx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 89b6ed483840..242d6b37d764 100644 --- a/pkgs/applications/virtualization/docker/buildx.nix +++ b/pkgs/applications/virtualization/docker/buildx.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-HaQJAVH8N5wZ7G/LcmGYz3Hph0/pHfEY3KObv18K1qg="; + sha256 = "sha256-X/oTL/CfMunGcS3HDoH/g1gZcJWnVU93OkcGC36KuA4="; }; vendorSha256 = null; From 8a1d57f6d798331074ad39dfe568fd3472543214 Mon Sep 17 00:00:00 2001 From: Guillaume Cugnet <82266037+legrec14@users.noreply.github.com> Date: Thu, 26 Aug 2021 15:25:51 +0200 Subject: [PATCH 190/220] exodus: 21.5.25 -> 21.8.19 --- pkgs/applications/blockchains/exodus/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 442683946244..2d5a3130c655 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.5.25"; + version = "21.8.19"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-2EIElhQGA0UprPF2pdIfYM9SWYIteD+kH+rupjxCiz4="; + sha256 = "1ssacadx5hdxq0cljb869ds3d11i4fyy3qd5hzh8wk5mlpdnba6k"; }; sourceRoot = "."; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXi xorg.libXrender + xorg.libxshmfence xorg.libXtst xorg_sys_opengl util-linux From 22dbae5f7e3a86ed127ddc1ec2b1cc8b2883f75b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 05:46:39 +0000 Subject: [PATCH 191/220] python38Packages.pyacoustid: 1.2.0 -> 1.2.1 --- pkgs/development/python-modules/pyacoustid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 5bebb1d5bc7e..9caa3c8c292c 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0c3dsnfyldnsmyzczp5s5aqvbzcn360s0h4l3gm3k53lg57f762z"; + sha256 = "e62b2929fbc5ead508758d2f700f5d355f7d83d14f5efe33c1d4fc59cbdeba84"; }; propagatedBuildInputs = [ requests audioread ]; From fbf8b3149383e8f4595e3283965eab276f407830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 16:04:03 +0200 Subject: [PATCH 192/220] python39Packages.pyacoustid: update meta, disable checks, add import check --- pkgs/development/python-modules/pyacoustid/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyacoustid/default.nix b/pkgs/development/python-modules/pyacoustid/default.nix index 9caa3c8c292c..752c276415f9 100644 --- a/pkgs/development/python-modules/pyacoustid/default.nix +++ b/pkgs/development/python-modules/pyacoustid/default.nix @@ -23,10 +23,15 @@ buildPythonPackage rec { acoustid.py ''; + # package has no tests + doCheck = false; + + pythonImportsCheck = [ "acoustid" ]; + meta = with lib; { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } From 308935c3ef34f50e614a8cafa577b8a17c7be9dd Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Thu, 26 Aug 2021 16:56:37 +0200 Subject: [PATCH 193/220] vscode-extensions.jnoortheen.nix-ide: 0.1.7 -> 0.1.16 --- 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 94f9f5b6903f..84dc60093d60 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -852,8 +852,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.7"; - sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; + version = "0.1.16"; + sha256 = "04ky1mzyjjr1mrwv3sxz4mgjcq5ylh6n01lvhb19h3fmwafkdxbp"; }; }; From d201550ffa71e1cea4e5fb6424322f8d5b8d9ec5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 07:57:53 +0000 Subject: [PATCH 194/220] python38Packages.zeroc-ice: 3.7.5 -> 3.7.6 --- pkgs/development/python-modules/zeroc-ice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 2786fc979f1a..7e02a175643a 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.5"; + version = "3.7.6"; src = fetchPypi { inherit version pname; - sha256 = "3b4897cc3f2adf3d03802368cedb72a038aa33c988663a667c1c48e42ea10797"; + sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827"; }; buildInputs = [ openssl bzip2 ]; From a7e419661dded31dc629c3728830192753803d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:48:21 +0200 Subject: [PATCH 195/220] python39Packages.zeroc-ice: add import check --- pkgs/development/python-modules/zeroc-ice/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index 7e02a175643a..92d9a4a84873 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { buildInputs = [ openssl bzip2 ]; + pythonImportsCheck = [ "Ice" ]; + meta = with lib; { homepage = "https://zeroc.com/"; license = licenses.gpl2; From 35452764acd2fd8b212a0366da0672c79d5feb9b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Aug 2021 15:17:46 +0000 Subject: [PATCH 196/220] tiledb: 2.2.9 -> 2.3.3 --- pkgs/development/libraries/tiledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index 7746fbc23bfa..6bc0d3ef7534 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.9"; + version = "2.3.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-kiidUvSff0drmIl6sXdqj2pjoFZL+ReCDOTtMEW3P3g="; + sha256 = "sha256-3Z5+QUzo2f24q11j6s8KX2vHLFkipFvGk2VFComWW/o="; }; # (bundled) blosc headers have a warning on some archs that it will be using From a24907728d1ef7c1797c39a2f0e76796fad277e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 23 Aug 2021 04:54:13 +0000 Subject: [PATCH 197/220] python38Packages.titlecase: 2.2.0 -> 2.3 --- 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 7a250c680e3c..02c04fa496c6 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 = "2.2.0"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "5d97ee51da37fb57c8753b79efa8edfdf3f10c0060de926efee970081e28d52f"; + sha256 = "9a1595ed9b88f3ce4362a7602ee63cf074e10ac80d1256b32ea1ec5ffa265fa0"; }; propagatedBuildInputs = [ regex ]; From fd6a69535df3918553eec173ce84abc265f9ec34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:52:23 +0200 Subject: [PATCH 198/220] python39Packages.titlecase: update meta, add import check, cleanup tests --- .../development/python-modules/titlecase/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index 02c04fa496c6..48fbf84e93a9 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage, lib, nose, fetchPypi, regex }: +{ buildPythonPackage, lib, fetchPypi, regex }: buildPythonPackage rec { pname = "titlecase"; @@ -11,11 +11,15 @@ buildPythonPackage rec { propagatedBuildInputs = [ regex ]; - checkInputs = [ nose ]; + # no tests run + doCheck = false; - meta = { + pythonImportsCheck = [ "titlecase" ]; + + meta = with lib; { homepage = "https://github.com/ppannuto/python-titlecase"; description = "Python Port of John Gruber's titlecase.pl"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From af526aba934b982094fcd1e16d610d70a2234a13 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 10:55:57 +0000 Subject: [PATCH 199/220] python38Packages.onnx: 1.9.0 -> 1.10.1 --- pkgs/development/python-modules/onnx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index cf1d595d90cd..3c1cce980fd9 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.9.0"; + version = "1.10.1"; # Python 2 is not supported as of Onnx v1.8 disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0yjv2axz2vc2ysniwislsp53fsb8f61y1warrr2ppn2d9ijml1d9"; + sha256 = "9d941ba76cab55db8913ecad9dc50cefeb368460f6338a91783a5d7643f3a044"; }; nativeBuildInputs = [ cmake ]; From 9bb087ec5bf8ff9fbb5709d7972bef59fdff9559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:50:15 +0200 Subject: [PATCH 200/220] python39Packages.onnx: remove unused import --- pkgs/development/python-modules/onnx/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3c1cce980fd9..3f6a86928bc3 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , isPy27 , cmake , protobuf From e0510af4ac02fa0ae16eb183d3dbe64854117ffb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:20:54 +0000 Subject: [PATCH 201/220] python38Packages.snowflake-sqlalchemy: 1.2.4 -> 1.3.1 --- .../python-modules/snowflake-sqlalchemy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 9ec17443dd81..fd3385e858c5 100644 --- a/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.2.4"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "e79d83d4947a0945488699324802eda4ad4a63c7680ad5b2a42c71f4faa2cd8b"; + sha256 = "f7c220db11c1abf3df67177fbcf0ea58d33d8531963f2d5df5f09fdac09b912f"; }; propagatedBuildInputs = [ From 08c44bee2b27c35fa075de0337760a505d34a97e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Aug 2021 09:16:10 +0000 Subject: [PATCH 202/220] python38Packages.snowflake-connector-python: 2.4.5 -> 2.5.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 0007b4380b4a..fab1ff4e2ef9 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.4.5"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f5bd11228e192b4754587869ebd85752327ecb945fcc19c2ed1f66958443ad08"; + sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; }; propagatedBuildInputs = [ From 9755196b72286d049beb0bba6e99b519ceb389a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 14:16:20 +0200 Subject: [PATCH 203/220] python39Packages.snowflake-connector-python: remove outdated postPatch, unused inputs, update meta --- .../snowflake-connector-python/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index fab1ff4e2ef9..0b0c961e7d09 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -10,7 +10,6 @@ , future , idna , ijson -, isPy3k , oscrypto , pyarrow , pyasn1-modules @@ -54,14 +53,6 @@ buildPythonPackage rec { urllib3 ]; - postPatch = '' - # https://github.com/snowflakedb/snowflake-connector-python/issues/705 - substituteInPlace setup.py \ - --replace "idna>=2.5,<3" "idna" \ - --replace "certifi<2021.0.0" "certifi" \ - --replace "chardet>=3.0.2,<4" "chardet" - ''; - # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; @@ -75,5 +66,6 @@ buildPythonPackage rec { description = "Snowflake Connector for Python"; homepage = "https://www.snowflake.com/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } From 31655f8f8bc9f9a2adf5002192ada4c1b8b705a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 26 Aug 2021 18:51:37 +0200 Subject: [PATCH 204/220] python3Packages.pelican: 4.5.4 -> 4.6.0 (#134787) Co-authored-by: Sandro --- .../python-modules/pelican/default.nix | 93 +++++++++++++------ 1 file changed, 65 insertions(+), 28 deletions(-) diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index 5419407d610e..3f9d2e0ceb0a 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, glibcLocales, git -, mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator -, blinker, pillow, beautifulsoup4, markupsafe, pandoc }: +{ lib +, beautifulsoup4 +, blinker +, buildPythonPackage +, docutils +, feedgenerator +, fetchFromGitHub +, git +, glibcLocales +, isPy27 +, jinja2 +, lxml +, markdown +, markupsafe +, mock +, pytestCheckHook +, pandoc +, pillow +, pygments +, python-dateutil +, pythonOlder +, pytz +, rich +, pytest-xdist +, six +, typogrify +, unidecode +}: buildPythonPackage rec { pname = "pelican"; - version = "4.5.4"; - - disabled = isPy27; + version = "4.6.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; - repo = "pelican"; + repo = pname; rev = version; - sha256 = "08l8kk3c7ca1znxmgdmfgzn28dzjcziwflzq80fn9zigqj0y7fi8"; + sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -22,18 +44,6 @@ buildPythonPackage rec { ''; }; - doCheck = true; - - # Exclude custom locale test, which files were removed above to fix the source checksum - checkPhase = '' - nosetests -s \ - --exclude=test_basic_generation_works \ - --exclude=test_custom_generation_works \ - --exclude=test_custom_locale_generation_works \ - --exclude=test_log_filter \ - pelican - ''; - buildInputs = [ glibcLocales pandoc @@ -44,21 +54,46 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator - blinker pillow beautifulsoup4 markupsafe lxml + beautifulsoup4 + blinker + docutils + feedgenerator + jinja2 + lxml + markupsafe + pillow + pygments + python-dateutil + pytz + rich + six + unidecode ]; checkInputs = [ - nose + pytest-xdist + pytestCheckHook pandoc ]; - postPatch= '' + postPatch = '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" ''; - LC_ALL="en_US.UTF-8"; + pytestFlagsArray = [ + # DeprecationWarning: 'jinja2.Markup' is deprecated and... + "-W ignore::DeprecationWarning" + ]; + + disabledTests = [ + # AssertionError + "test_basic_generation_works" + "test_custom_generation_works" + "test_custom_locale_generation_works" + ]; + + LC_ALL = "en_US.UTF-8"; # We only want to patch shebangs in /bin, and not those # of the project scripts that are created by Pelican. @@ -69,8 +104,10 @@ buildPythonPackage rec { patchShebangs $out/bin ''; + pythonImportsCheck = [ "pelican" ]; + meta = with lib; { - description = "A tool to generate a static blog from reStructuredText or Markdown input files"; + description = "Static site generator that requires no database or server-side logic"; homepage = "http://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; From bd4acec3bc51ac6c0be3e4ece714f227e582c80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 19:03:44 +0200 Subject: [PATCH 205/220] python39Packages.holoviews: add import check --- pkgs/development/python-modules/holoviews/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index e83bb4157ff8..1b4996f4cb47 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -40,6 +40,8 @@ buildPythonPackage rec { # tests not fully included with pypi release doCheck = false; + pythonImportsCheck = [ "holoviews" ]; + meta = with lib; { description = "Python data analysis and visualization seamless and simple"; homepage = "http://www.holoviews.org/"; From c54165ed6c0b3ca8c3e968cad0f52ad54fa048a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 19:04:59 +0200 Subject: [PATCH 206/220] python39Packages.django_reversion: add import check, update meta --- pkgs/development/python-modules/django_reversion/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index c470c863dfd6..348228a8c028 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -18,10 +18,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; + pythonImportsCheck = [ "reversion" ]; + meta = with lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = "https://github.com/etianen/django-reversion"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } From 594b2e7cd7e9245358172cc1aa8095d83b14b9cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 19:06:32 +0200 Subject: [PATCH 207/220] python39Packages.django-auth-ldap: add import check --- pkgs/development/python-modules/django-auth-ldap/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index f83bef6e931a..ab329cd37aba 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; + pythonImportsCheck = [ "django_auth_ldap" ]; + meta = with lib; { description = "Django authentication backend that authenticates against an LDAP service"; homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; From 138321d3738a77653b9f642731980acb21175e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 19:09:41 +0200 Subject: [PATCH 208/220] python39Packages.django_redis: format, add import check, update meta --- .../python-modules/django_redis/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index 8b689c19fc4b..61101cc8a929 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -1,5 +1,11 @@ -{ lib, fetchPypi, buildPythonPackage, - mock, django, redis, msgpack }: +{ lib +, fetchPypi +, buildPythonPackage +, mock +, django +, redis +, msgpack +}: buildPythonPackage rec { pname = "django-redis"; version = "5.0.0"; @@ -9,19 +15,21 @@ buildPythonPackage rec { sha256 = "048f665bbe27f8ff2edebae6aa9c534ab137f1e8fa7234147ef470df3f3aa9b8"; }; - doCheck = false; - - buildInputs = [ mock ]; - propagatedBuildInputs = [ django redis msgpack ]; + # django.core.exceptions.ImproperlyConfigured: Requested setting DJANGO_REDIS_SCAN_ITERSIZE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + doCheck = false; + + pythonImportsCheck = [ "django_redis" ]; + meta = with lib; { description = "Full featured redis cache backend for Django"; homepage = "https://github.com/niwibe/django-redis"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } From fdcece3bf5fa320e10da14b33b7ab9822c38c904 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Thu, 26 Aug 2021 12:38:19 -0600 Subject: [PATCH 209/220] python3Packages.dataclasses-json: 0.5.4 -> 0.5.5 --- .../development/python-modules/dataclasses-json/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dataclasses-json/default.nix b/pkgs/development/python-modules/dataclasses-json/default.nix index f97217cd29ea..bfb179f035dc 100644 --- a/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, stringcase , typing-inspect , marshmallow-enum , hypothesis @@ -11,17 +10,16 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv"; + sha256 = "sha256-b8oWl8AteVuGYb4E+M9aDS2ERgnKN8wS17Y/Bs7ajcI="; }; propagatedBuildInputs = [ - stringcase typing-inspect marshmallow-enum ]; From a5b943fc0920e7a7d125f1cd26133fb77c924d42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 20:49:10 +0200 Subject: [PATCH 210/220] python3Packages.virtualenv-clone: enable tests --- .../virtualenv-clone/default.nix | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index e49c35ebd8bb..0cd5d6a7fe22 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,22 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , virtualenv +, pytestCheckHook }: buildPythonPackage rec { pname = "virtualenv-clone"; version = "0.5.6"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "997c7d225eabc4d09e77672461f4bdf9f3a8ea9dc9e4a847b0e83dc8bad9573a"; + src = fetchFromGitHub { + owner = "edwardgeorge"; + repo = pname; + rev = version; + sha256 = "0xb20fhl99dw5vnyb43sjpj9628nbdnwp5g7m8f2id7w8kpwzvfw"; }; - propagatedBuildInputs = [ virtualenv ]; + postPatch = '' + substituteInPlace tests/__init__.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" - # tests are not included in pypi tarball and no module to import - doCheck = false; + substituteInPlace tests/test_virtualenv_sys.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" + ''; + + propagatedBuildInputs = [ + virtualenv + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; From 252669adcc51651b716c714de25bc162683bf24d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 26 Aug 2021 20:49:31 +0200 Subject: [PATCH 211/220] virtualenv, virtualenv-clone: add top-level attributes --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b72f062a14e8..dbb50ebd6cfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20609,6 +20609,10 @@ with pkgs; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtualenv = with python3Packages; toPythonApplication virtualenv; + + virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { openssl = openssl_1_0_2; }; From 69a333ab313e7c5cc04599c46914ec6766df4311 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:13:56 +1000 Subject: [PATCH 212/220] docker-proxy: remove invalid `godeps = null` --- pkgs/applications/virtualization/docker/proxy.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 59fc80eefbf7..a247e2cecfaf 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -13,8 +13,6 @@ buildGoPackage rec { goPackagePath = "github.com/docker/libnetwork"; - goDeps = null; - installPhase = '' install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; From 34c83abd530b3ee915e79f8992e5551981f19799 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:17:29 +1000 Subject: [PATCH 213/220] gopkgs: remove unused deps.nix --- pkgs/development/tools/gopkgs/deps.nix | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 pkgs/development/tools/gopkgs/deps.nix diff --git a/pkgs/development/tools/gopkgs/deps.nix b/pkgs/development/tools/gopkgs/deps.nix deleted file mode 100644 index e813a5b22564..000000000000 --- a/pkgs/development/tools/gopkgs/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "5cc8b3875be6c21825a1b54d3029ed415c93c4f7"; - sha256 = "02nlyr0sa0lj1f27fsrxlspcsrx7fs60qwr33l5r6yq52axcikcd"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] From 90f127cce89ebb222d1f923ddade7ee02f3f75d0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:17:29 +1000 Subject: [PATCH 214/220] morph: remove unused deps.nix --- pkgs/tools/package-management/morph/deps.nix | 66 -------------------- 1 file changed, 66 deletions(-) delete mode 100644 pkgs/tools/package-management/morph/deps.nix diff --git a/pkgs/tools/package-management/morph/deps.nix b/pkgs/tools/package-management/morph/deps.nix deleted file mode 100644 index fdae5ef39ee2..000000000000 --- a/pkgs/tools/package-management/morph/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/dbcdk/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/dbcdk/kingpin"; - rev = "8554767bc91254c59c7297a99e9867c770e4eadb"; - sha256 = "05hfpgylv5mfnjz2mdd3jl8p3psmczvdbs4ydf9xvvc17c9mlrpq"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0e37d006457bf46f9e6692014ba72ef82c33022c"; - sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ee1b12c67af419cf5a9be3bdbeea7fc1c5f32f11"; - sha256 = "0cgp0xzbhg3fr77n2qrfmmsvhc287srnwi4mghwcjdxp6rx0s988"; - }; - } - { - goPackagePath = "gopkg.in/mattes/go-expand-tilde.v1"; - fetch = { - type = "git"; - url = "https://github.com/mattes/go-expand-tilde"; - rev = "cb884138e64c9a8bf5c7d6106d74b0fca082df0c"; - sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; - }; - } -] From b8540b9d0213879d7329e6e9a8ea332a1ba1f59a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 26 Aug 2021 22:17:29 +1000 Subject: [PATCH 215/220] distrobuilder: remove unused deps.nix --- .../virtualization/distrobuilder/deps.nix | 228 ------------------ 1 file changed, 228 deletions(-) delete mode 100644 pkgs/tools/virtualization/distrobuilder/deps.nix diff --git a/pkgs/tools/virtualization/distrobuilder/deps.nix b/pkgs/tools/virtualization/distrobuilder/deps.nix deleted file mode 100644 index 7f79d8931fcc..000000000000 --- a/pkgs/tools/virtualization/distrobuilder/deps.nix +++ /dev/null @@ -1,228 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/antchfx/xpath"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/xpath"; - rev = "b6dbe470e10224a23b2f69db0d4449bc6627ece6"; - sha256 = "1959kzmjijpll6432da84rmzgd7p3yyqdq9chyxnm8318pr5znji"; - }; - } - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "043cb4b8af871b49563291e32c66bb84378a60ac"; - sha256 = "03jarnkaf42xgfamb0jlya4c1cyk8gnxhcd21m3fx145vz4px398"; - }; - } - { - goPackagePath = "github.com/gobuffalo/logger"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/logger"; - rev = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1"; - sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packd"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packd"; - rev = "54ea459691466cfb630ccc276723fe3963f3e9d5"; - sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "dc520c910ea91354b3ae131bbb029270e4fc1af4"; - sha256 = "1ph05pkbq0ggdab152f7hjlc758nkrw22fqgslnf1nvggadjkvqs"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ae1634f6a98965ded3b8789c626cb4e0bd78c3de"; - sha256 = "0nw0mdcs75ghr9a5asrk9a7yc00703yvv4xf6wyd3z44ihs4hrjv"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941"; - sha256 = "0zfs69q7f5xlkqhd4wzjc8gfdisahapz5g94sa8lzr5b4jg9ycbw"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "e65537c515d77e35697c471d6c2755375cb3adc4"; - sha256 = "119806fhl4isbxc3g52335jgiv6cddfbapr1absd4v4kkq55i5qh"; - }; - } - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "73c17a9b9528eb3ce857b782a2816c0cda581e62"; - sha256 = "0l0m5zi2mf649knxgmch1cblz3a3xiny1c9ki2241phkpwzspjq1"; - }; - } - { - goPackagePath = "github.com/lxc/lxd"; - fetch = { - type = "git"; - url = "https://github.com/lxc/lxd"; - rev = "fd924cb85d99475f9a0349208a8d7d0f30bdb6f0"; - sha256 = "1v246x0bi6ljkfjfjkfjbfh0imfbps2zd0m55cxdsl8y96pfx1hs"; - }; - } - { - goPackagePath = "github.com/mudler/docker-companion"; - fetch = { - type = "git"; - url = "https://github.com/mudler/docker-companion"; - rev = "6a693e9b9eaf2cd08ba628350613f2e08e9af57d"; - sha256 = "06ch1xhfd62dwkmh1z0ihifpmvgnki97k8s7gzivincy80xj0xpc"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; - sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "3670dca80da881cddd5377fb9496daaabb8dec9f"; - sha256 = "0h01adrajbl3h0yx3bkig79ap9n6ikz90cpszhqwvgr63a0xbn13"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "07a84ee7412e7a28663d92930a1d46f81b124ee1"; - sha256 = "00hms8fnbhxb5lir3ykhl5lf1n2yqxddmd47cxp6d5ziv6k5swc8"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "2d7544ebdeb5f926805c57af8dccc6c359de28d4"; - sha256 = "04b2bq8g948mn020l4cwhdnqffag29r21x2nyyg6cjqj306gs4vs"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "24fa6976df40757dce6aea913e7b81ade90530e1"; - sha256 = "0rf6prz6gl0l1b3wijzdgq887cdwigvzxvz6gqbm5l8pkq3fx1m9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; - sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da137c7871d730100384dbcf36e6f8fa493aef5b"; - sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; - sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "gopkg.in/antchfx/htmlquery.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/antchfx/htmlquery.v1"; - rev = "b8d36292614567671decfe6f96c7b8c432d3249b"; - sha256 = "1rsvngqlqyg86g1ff59zmrkn7s8b3c2vpl533amwcv5s2h8npmxy"; - }; - } - { - goPackagePath = "gopkg.in/flosch/pongo2.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/flosch/pongo2.v3"; - rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; - sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; - }; - } - { - goPackagePath = "gopkg.in/robfig/cron.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/robfig/cron.v2"; - rev = "be2e0b0deed5a68ffee390b4583a13aff8321535"; - sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] From 76182a28c95da17c97becfaefcddddc0e1316f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 22:46:25 +0200 Subject: [PATCH 216/220] python39Packages.azure-synapse-artifacts: disable checkPhase --- .../python-modules/azure-synapse-artifacts/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 2b1f3b17ee5e..8be13364e1b0 100644 --- a/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -20,6 +20,9 @@ buildPythonPackage rec { msrest ]; + # zero tests run + doCheck = false; + pythonImportsCheck = [ "azure.synapse.artifacts" ]; meta = with lib; { From 7670dd4b7e31410192627f09e593824c1e664139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:20:58 +0200 Subject: [PATCH 217/220] python39Packages.dropbox: remove pytest-runner, update meta, add import check --- pkgs/development/python-modules/dropbox/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index 88b7a1e09708..73b0b87b0108 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, pytest-runner, requests, urllib3, mock, setuptools, stone }: +, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; @@ -12,18 +12,20 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner == 5.2.0" "pytest-runner" + --replace "'pytest-runner == 5.2.0'," "" ''; + propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; + # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; + pythonImportsCheck = [ "dropbox" ]; meta = with lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = "https://www.dropbox.com/developers/core/docs"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 75c8841f75dd201e3b05b76d7bac37ac0f2bbf5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:35:55 +0200 Subject: [PATCH 218/220] python39Packages.jupyter-repo2docker: simplify disabled --- .../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 7597df0d76aa..1b352f1e24c9 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonOlder , docker , escapism , jinja2 @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "2021.3.0"; pname = "jupyter-repo2docker"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; From 4ba7ccf5015b5aea35c6201e26570adafdd36418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:46:13 +0200 Subject: [PATCH 219/220] python39Packages.inform: remove pytest-runner, use pytestCheckHook phase --- .../development/python-modules/inform/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix index 9f78d86a2be6..2397c0bc4db6 100644 --- a/pkgs/development/python-modules/inform/default.nix +++ b/pkgs/development/python-modules/inform/default.nix @@ -2,8 +2,6 @@ , arrow , six , hypothesis -, pytest -, pytest-runner , pytestCheckHook }: @@ -18,13 +16,18 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=2.0" "" + ''; + propagatedBuildInputs = [ arrow six ]; - checkInputs = [ pytest hypothesis ]; - checkPhase = '' + checkInputs = [ pytestCheckHook hypothesis ]; + preCheck = '' patchShebangs test.doctests.py test.inform.py - ./test.doctests.py && ./test.inform.py && pytest + ./test.doctests.py + ./test.inform.py ''; meta = with lib; { From 03eec0aef355e7c66492bb4039cf6de6832143b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 26 Aug 2021 23:57:44 +0200 Subject: [PATCH 220/220] python39Packages.aioprocessing: simplify disabled, add import check --- pkgs/development/python-modules/aioprocessing/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index 04963f1d09b1..50e4140c183e 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -1,13 +1,13 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "aioprocessing"; version = "1.1.0"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; @@ -17,6 +17,8 @@ buildPythonPackage rec { # Tests aren't included in pypi package doCheck = false; + pythonImportsCheck = [ "aioprocessing" ]; + meta = { description = "A library that integrates the multiprocessing module with asyncio"; homepage = "https://github.com/dano/aioprocessing";