From 3e96fd980db95ad6268cb5ea79dcff6aaa21e098 Mon Sep 17 00:00:00 2001 From: Molly Miller Date: Tue, 27 Jun 2023 15:18:52 +0200 Subject: [PATCH 01/63] nixos/network-interfaces: restrict IPv6 privacy address overrides to interface Only trigger the privacy address override for a given interface when that interface is added. Without restricting the rule to the interface, this command would be run when any interface is added. --- nixos/modules/tasks/network-interfaces.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 954d7ffba71d..eb1c7512d920 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1496,7 +1496,7 @@ in in '' # override to ${msg} for ${i.name} - ACTION=="add", SUBSYSTEM=="net", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr=${val}" + ACTION=="add", SUBSYSTEM=="net", NAME=="${i.name}", RUN+="${pkgs.procps}/bin/sysctl net.ipv6.conf.${replaceStrings ["."] ["/"] i.name}.use_tempaddr=${val}" '') (filter (i: i.tempAddress != cfg.tempAddresses) interfaces); }) ] ++ lib.optional (cfg.wlanInterfaces != {}) From 1130d57afb05ef863cb2dfdadae917fd6cc957c7 Mon Sep 17 00:00:00 2001 From: Joscha Loos Date: Sun, 2 Jul 2023 13:23:05 +0200 Subject: [PATCH 02/63] gollum: add maintainer --- maintainers/maintainer-list.nix | 5 +++++ nixos/modules/services/misc/gollum.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a4b05b741837..45b190329051 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8009,6 +8009,11 @@ github = "jorsn"; githubId = 4646725; }; + joscha = { + name = "joscha Loos"; + email = "j.loos@posteo.net"; + githubId = 57965027; + }; joshniemela = { name = "Joshua Niemelä"; email = "josh@jniemela.dk"; diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix index b73528abaf65..d607e92e5ec9 100644 --- a/nixos/modules/services/misc/gollum.nix +++ b/nixos/modules/services/misc/gollum.nix @@ -154,5 +154,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ erictapen bbenno ]; + meta.maintainers = with lib.maintainers; [ erictapen bbenno joscha ]; } From 144afddc0b100305efe35c555f8f02cc30a54db3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jul 2023 08:57:31 +0200 Subject: [PATCH 03/63] python310Packages.cachecontrol: 0.12.11 -> 0.13.1 Diff: https://github.com/ionrock/cachecontrol/compare/refs/tags/v0.12.11...v0.13.1 Changelog: https://github.com/psf/cachecontrol/releases/tag/v0.13.1 --- .../python-modules/cachecontrol/default.nix | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 225ee7efd010..61ed10390bd5 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , cherrypy , fetchFromGitHub -, lockfile +, flit-core +, filelock , mock , msgpack , pytestCheckHook @@ -13,8 +14,8 @@ buildPythonPackage rec { pname = "cachecontrol"; - version = "0.12.11"; - format = "setuptools"; + version = "0.13.1"; + format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ionrock"; repo = pname; - rev = "v${version}"; - hash = "sha256-uUPIQz/n347Q9G7NDOGuB760B/KxOglUxiS/rYjt5Po="; + rev = "refs/tags/v${version}"; + hash = "sha256-4N+vk65WxOrT+IJRn+lEnbs5vlWQh9ievVHWWe3BKJ0="; }; postPatch = '' @@ -34,29 +35,39 @@ buildPythonPackage rec { "urllib3.response.HTTPResponse.from_httplib" ''; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ msgpack requests ]; + passthru.optional-dependencies = { + filecache = [ + filelock + ]; + redis = [ + redis + ]; + }; + nativeCheckInputs = [ cherrypy mock pytestCheckHook - ] ++ passthru.optional-dependencies.filecache; + requests + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "cachecontrol" ]; - passthru.optional-dependencies = { - filecache = [ lockfile ]; - redis = [ redis ]; - }; - meta = with lib; { description = "Httplib2 caching for requests"; homepage = "https://github.com/ionrock/cachecontrol"; + changelog = "https://github.com/psf/cachecontrol/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; From 61301ffc9ed71b3d83258181a43c9334904b637c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jul 2023 08:59:03 +0200 Subject: [PATCH 04/63] pip-audit: 2.5.6 -> 2.6.0 Diff: https://github.com/trailofbits/pip-audit/compare/refs/tags/v2.5.6...v2.6.0 Changelog: https://github.com/pypa/pip-audit/releases/tag/v2.6.0 --- pkgs/development/tools/pip-audit/default.nix | 29 ++++---------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index b14f35a62583..a7d7d8c8c58e 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -2,41 +2,24 @@ , fetchFromGitHub , python3 }: -let - py = python3.override { - packageOverrides = self: super: { - cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { - version = "2.7.1"; - src = fetchFromGitHub { - owner = "CycloneDX"; - repo = "cyclonedx-python-lib"; - rev = "v${version}"; - hash = "sha256-c/KhoJOa121/h0n0GUazjUFChnUo05ThD+fuZXc5/Pk="; - }; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "pip-audit"; - version = "2.5.6"; + version = "2.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "trailofbits"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hpzJtKtvhudT7OzZnuv6LbnMHnHIBYmQsAR1oRglvT0="; + hash = "sha256-Ja3LPKfrqs1evNzjOJ3oxh2vxqw8oZJDIsyZGT0q3PY="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ flit-core ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ cachecontrol cyclonedx-python-lib html5lib @@ -47,7 +30,7 @@ buildPythonApplication rec { toml ] ++ cachecontrol.optional-dependencies.filecache; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook ]; From bf84aea48ef964f59e652b57ff5b63e044dfec64 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 3 Jul 2023 17:46:17 +0200 Subject: [PATCH 05/63] tdb: fix `install_name` on Darwin --- pkgs/development/libraries/tdb/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 4a0c8a6cad08..c166d36d5a60 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; - sha256 = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; + hash = "sha256-hDTJyFfRPOP6hGb3VgHyXDaTZ2s2kZ8VngrWEhuvXOg="; }; nativeBuildInputs = [ @@ -48,6 +48,10 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + postFixup = if stdenv.isDarwin + then ''install_name_tool -id $out/lib/libtdb.dylib $out/lib/libtdb.dylib'' + else null; + # python-config from build Python gives incorrect values when cross-compiling. # If python-config is not found, the build falls back to using the sysconfig # module, which works correctly in all cases. From 03ccaf6743c1b149f680a7426578052723d9b855 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 3 Jul 2023 17:47:54 +0200 Subject: [PATCH 06/63] fdm: enable on Darwin --- pkgs/tools/networking/fdm/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index 731fe83dc9bc..7ef5cf0b4edd 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -8,17 +8,16 @@ stdenv.mkDerivation rec { owner = "nicm"; repo = pname; rev = version; - sha256 = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; + hash = "sha256-Gqpz+N1ELU5jQpPJAG9s8J9UHWOJNhkT+s7+xuQazd0="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ openssl tdb zlib flex bison ]; - meta = with lib; { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ raskin ]; - platforms = with platforms; linux; + platforms = with platforms; linux ++ darwin; homepage = "https://github.com/nicm/fdm"; downloadPage = "https://github.com/nicm/fdm/releases"; license = licenses.isc; From 3431aef0e0267807b536f3163bb6555ec3397522 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 4 Jul 2023 13:59:31 -0400 Subject: [PATCH 07/63] tidy-viewer: 1.4.30 -> 1.5.2 Diff: https://github.com/alexhallam/tv/compare/1.4.30...1.5.2 Changelog: https://github.com/alexhallam/tv/blob/1.5.2/CHANGELOG.md --- pkgs/tools/text/tidy-viewer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/tidy-viewer/default.nix b/pkgs/tools/text/tidy-viewer/default.nix index 47fabde6068c..6c38007b3f26 100644 --- a/pkgs/tools/text/tidy-viewer/default.nix +++ b/pkgs/tools/text/tidy-viewer/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tidy-viewer"; - version = "1.4.30"; + version = "1.5.2"; src = fetchFromGitHub { owner = "alexhallam"; repo = "tv"; rev = version; - sha256 = "sha256-z1H27D0DYQieU91FBZreN6XQCFvwxBJBIWBZRO50cnw="; + sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4="; }; - cargoSha256 = "sha256-rLRyzQkwbjIMhLLHSuDKQznBIDV9iAqCUVg6q5gRhsA="; + cargoSha256 = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM="; # this test parses command line arguments # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context From f6799dcd4ba8d5d0ac3da65a273e77fe01c94018 Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 5 Jul 2023 06:51:54 +0900 Subject: [PATCH 08/63] python310Packages.matplotx: fix darwin build --- pkgs/development/python-modules/matplotx/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index 7acb17c93667..fd477d7c259f 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -42,6 +43,9 @@ buildPythonPackage rec { }; checkInputs = passthru.optional-dependencies.all; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook @@ -61,4 +65,3 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ swflint ]; }; } - From fafd1a8123197c9d79367642541eed8af673e03b Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 5 Jul 2023 06:52:17 +0900 Subject: [PATCH 09/63] python310Packages.matplotx: move checkInputs to nativeCheckInputs --- pkgs/development/python-modules/matplotx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matplotx/default.nix b/pkgs/development/python-modules/matplotx/default.nix index fd477d7c259f..f20812606869 100644 --- a/pkgs/development/python-modules/matplotx/default.nix +++ b/pkgs/development/python-modules/matplotx/default.nix @@ -42,14 +42,13 @@ buildPythonPackage rec { ]; }; - checkInputs = passthru.optional-dependencies.all; # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; nativeCheckInputs = [ pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.all; disabledTestPaths = [ "tests/test_spy.py" # Requires meshzoo (non-free) and pytest-codeblocks (not packaged) @@ -65,3 +64,4 @@ buildPythonPackage rec { maintainers = with lib.maintainers; [ swflint ]; }; } + From d12dded201ac123407923ed457be06cdc0c5d28f Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 5 Jul 2023 01:30:58 +0900 Subject: [PATCH 10/63] python310Packages.perfplot: fix darwin build --- pkgs/development/python-modules/perfplot/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 96fa5309a81d..db8b4cd572b3 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , flit-core @@ -35,6 +36,10 @@ buildPythonPackage rec { rich ]; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + nativeCheckInputs = [ pytestCheckHook ]; From ea6f9de7e04fe1e45121da6054a92d944c2034fa Mon Sep 17 00:00:00 2001 From: natsukium Date: Wed, 5 Jul 2023 01:31:18 +0900 Subject: [PATCH 11/63] python310Packages.accupy: fix darwin build --- pkgs/development/python-modules/accupy/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index dfe47d306811..7c6d33512bb7 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -56,6 +57,10 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ''; + # This variable is needed to suppress the "Trace/BPT trap: 5" error in Darwin's checkPhase. + # Not sure of the details, but we can avoid it by changing the matplotlib backend during testing. + env.MPLBACKEND = lib.optionalString stdenv.isDarwin "Agg"; + # performance tests aren't useful to us and disabling them allows us to # decouple ourselves from an unnecessary build dep preCheck = '' From b8651c2099b54a3bf0b20af5008a575c21cde32b Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Wed, 5 Jul 2023 14:19:49 +0200 Subject: [PATCH 12/63] rng-tools: 6.15 -> 6.16 Signed-off-by: Markus Theil --- pkgs/tools/security/rng-tools/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index ec7a387af244..92774bd716b8 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -7,23 +7,25 @@ , psmisc , argp-standalone , openssl +, libcap , jitterentropy, withJitterEntropy ? true # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS # https://www.nist.gov/programs-projects/nist-randomness-beacon , curl, jansson, libxml2, withNistBeacon ? false , libp11, opensc, withPkcs11 ? true , rtl-sdr, withRtlsdr ? true +, withQrypt ? false }: stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.15"; + version = "6.16"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - hash = "sha256-km+MEng3VWZF07sdvGLbAG/vf8/A1DxhA/Xa2Y+LAEQ="; + hash = "sha256-9pXQhG2nbu6bq4BnBgEOyyUBNkQTI5RhWmJIoLtFU+c="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; @@ -33,14 +35,16 @@ stdenv.mkDerivation rec { (lib.withFeature (withNistBeacon) "nistbeacon") (lib.withFeature (withPkcs11) "pkcs11") (lib.withFeature (withRtlsdr) "rtlsdr") + (lib.withFeature (withQrypt) "qrypt") ]; - buildInputs = [ openssl ] + buildInputs = [ openssl libcap ] ++ lib.optionals stdenv.hostPlatform.isMusl [ argp-standalone ] ++ lib.optionals withJitterEntropy [ jitterentropy ] ++ lib.optionals withNistBeacon [ curl jansson libxml2 ] ++ lib.optionals withPkcs11 [ libp11 libp11.passthru.openssl ] - ++ lib.optionals withRtlsdr [ rtl-sdr ]; + ++ lib.optionals withRtlsdr [ rtl-sdr ] + ++ lib.optionals withQrypt [ curl jansson ]; enableParallelBuilding = true; From 787af0f79f128cb21b113d2eb37e64d913f18aae Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 5 Jul 2023 18:10:09 +0300 Subject: [PATCH 13/63] kitty: make possible to override goModules go-modules name had to be changed to goModules so it becomes a env var (bash vars can't contain -) enables overriding the build without overriding configurePhase ``` pkgs.kitty.overrideAttrs (finalAttrs: previousAttrs: { name = "kitty-master"; version = "master"; src = pkgs.fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "66a2efd191f98a1a5b3c2d4fdc9569204b445a2f"; sha256 = "sha256-pJuhnJOjGBflHXOOYKrg9/e3c+VGEESZtfka84ARCd4="; }; goModules = (pkgs.buildGoModule { pname = "kitty-go-modules"; inherit (finalAttrs) src version; vendorHash = "sha256-eAovZ/7JnvXlnlFyt0skhYJ1Nrzy2XCpRlQvSmWCyaY="; }).go-modules; }) ``` --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index e693e51c9360..ea7fc0e3e71e 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -100,7 +100,7 @@ buildPythonApplication rec { CGO_ENABLED = 0; GOFLAGS = "-trimpath"; - go-modules = (buildGoModule { + goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src vendorHash version; }).go-modules; @@ -109,7 +109,7 @@ buildPythonApplication rec { export GOCACHE=$TMPDIR/go-cache export GOPATH="$TMPDIR/go" export GOPROXY=off - cp -r --reflink=auto ${go-modules} vendor + cp -r --reflink=auto $goModules vendor ''; buildPhase = let From ff781b9ae8cce85479f8c1958e2712bd6c195ae1 Mon Sep 17 00:00:00 2001 From: holyparzival Date: Wed, 5 Jul 2023 22:50:22 +0500 Subject: [PATCH 14/63] restic: add fish completions --- pkgs/tools/backup/restic/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index b60ea95302b6..28379107ada7 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -34,9 +34,10 @@ buildGoModule rec { '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $out/bin/restic generate \ --bash-completion restic.bash \ + --fish-completion restic.fish \ --zsh-completion restic.zsh \ --man . - installShellCompletion restic.{bash,zsh} + installShellCompletion restic.{bash,fish,zsh} installManPage *.1 ''; From 775a79f96ec625d86309fd364cb471d1d2192c0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 5 Jul 2023 18:30:34 +0000 Subject: [PATCH 15/63] desync: 0.9.3 -> 0.9.4 --- pkgs/applications/networking/sync/desync/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 487b3e2fc878..71008daeda94 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "desync"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "sha256-vyW5zR6Dw860LUj7sXFgwzU1AZDoPMoQ4G0xsK4L6+w="; + sha256 = "sha256-kwYRspzfTBl9FtPrpd55VBYiCzaG7M83EM5nbqdBG/Q="; }; - vendorSha256 = "sha256-RMM/WFIUg2Je3yAgshif3Nkhm8G3bh6EhHCHTAvMXUc="; + vendorHash = "sha256-1RuqlDU809mtGn0gOFH/AW6HJo1cQqt8spiLp3/FpcI="; # nix builder doesn't have access to test data; tests fail for reasons unrelated to binary being bad. doCheck = false; From 0d3299462724cdd56a95ef5549fa180f8f7b14f8 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Wed, 5 Jul 2023 21:05:38 +0200 Subject: [PATCH 16/63] asmjit: unstable-2022-11-10 -> unstable-2023-04-28 Signed-off-by: Markus Theil --- pkgs/development/libraries/asmjit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/asmjit/default.nix b/pkgs/development/libraries/asmjit/default.nix index 5335363c9ba3..7edc7c666a9c 100644 --- a/pkgs/development/libraries/asmjit/default.nix +++ b/pkgs/development/libraries/asmjit/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation { pname = "asmjit"; - version = "unstable-2022-11-10"; + version = "unstable-2023-04-28"; src = fetchFromGitHub { owner = "asmjit"; repo = "asmjit"; - rev = "0c03ed2f7497441ac0de232bda2e6b8cc041b2dc"; - hash = "sha256-CfTtdgb+ZCLHwCRa+t2O4CG9rhHgqPLcfHDqLBvI9Tg="; + rev = "3577608cab0bc509f856ebf6e41b2f9d9f71acc4"; + hash = "sha256-EIfSruaM2Z64XOYAeEaf/wFy6/7UO6Sth487R1Q0yhI="; }; nativeBuildInputs = [ From b6defcaf959158511eef4de9b033451ae8a52dee Mon Sep 17 00:00:00 2001 From: Quentin Machu Date: Wed, 5 Jul 2023 01:15:56 -0400 Subject: [PATCH 17/63] faq: init at unstable-2022-01-09 --- pkgs/development/tools/faq/default.nix | 48 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/tools/faq/default.nix diff --git a/pkgs/development/tools/faq/default.nix b/pkgs/development/tools/faq/default.nix new file mode 100644 index 000000000000..9ea3372f24e8 --- /dev/null +++ b/pkgs/development/tools/faq/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, jq +, oniguruma +}: + +buildGoModule rec { + pname = "faq"; + # Latest git release (0.0.7) presents vendor issues - using latest commit instead. + version = "unstable-2022-01-09"; + + src = fetchFromGitHub { + owner = "jzelinskie"; + repo = "faq"; + rev = "594bb8e15dc4070300f39c168354784988646231"; + sha256 = "1lqrchj4sj16n6y5ljsp8v4xmm57gzkavbddq23dhlgkg2lfyn91"; + }; + vendorSha256 = "sha256-731eINkboZiuPXX/HQ4r/8ogLedKBWx1IV7BZRKwU3A"; + + buildInputs = [ + jq + oniguruma + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/jzelinskie/faq/internal/version.Version=${version}" + ]; + + tags = [ + "netgo" + ]; + + subPackages = [ + "cmd/faq" + ]; + + doCheck = true; + + meta = with lib; { + description = "faq is a tool intended to be a more flexible jq, supporting additional formats"; + homepage = "https://github.com/jzelinskie/faq"; + license = licenses.asl20; + maintainers = with maintainers; [ quentin-m ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b42eeb42cdb..aa4c9a1dd3a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -585,6 +585,8 @@ with pkgs; expressvpn = callPackage ../applications/networking/expressvpn { }; + faq = callPackage ../development/tools/faq { }; + figma-agent = callPackage ../applications/graphics/figma-agent { }; figma-linux = callPackage ../applications/graphics/figma-linux { }; From 3905ca1cf076f2f462e0a8704f53a09f52a6be66 Mon Sep 17 00:00:00 2001 From: Quentin Machu Date: Wed, 5 Jul 2023 01:16:22 -0400 Subject: [PATCH 18/63] maintainers: add quentin-m --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 23e585871ace..1575d71def7d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13444,6 +13444,12 @@ githubId = 18196237; name = "Quentin Inkling"; }; + quentin-m = { + email = "me+nix@quentin-machu.fr"; + github = "Quentin-M"; + githubId = 1332289; + name = "Quentin Machu"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; From a761e8b0604d4ff93b517bdbbdcbc32eed3e5de7 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 5 Jul 2023 23:58:48 +0200 Subject: [PATCH 19/63] forgejo: format file --- .../version-management/forgejo/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index d21097df07b1..444b75b85166 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -16,11 +16,10 @@ , stdenv , fetchFromGitea , buildNpmPackage -, writeShellApplication }: let - frontend = buildNpmPackage rec { + frontend = buildNpmPackage { pname = "forgejo-frontend"; inherit (forgejo) src version; @@ -111,12 +110,12 @@ buildGoModule rec { tests = nixosTests.forgejo; }; - meta = with lib; { + meta = { description = "A self-hosted lightweight software forge"; homepage = "https://forgejo.org"; - changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ emilylange urandom ]; + changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ emilylange urandom ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; From 6d5727af81b54a235ced02958377efb633e1fbb1 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 5 Jul 2023 23:58:50 +0200 Subject: [PATCH 20/63] forgejo: add bendlas as maintainer I asked bendlas in private :) --- pkgs/applications/version-management/forgejo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 444b75b85166..5b7843657382 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -115,7 +115,7 @@ buildGoModule rec { homepage = "https://forgejo.org"; changelog = "https://codeberg.org/forgejo/forgejo/releases/tag/${src.rev}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ emilylange urandom ]; + maintainers = with lib.maintainers; [ emilylange urandom bendlas ]; broken = stdenv.isDarwin; mainProgram = "gitea"; }; From 6a59b83865c0c2ea219fae6bd2979fd2a83e8cec Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 5 Jul 2023 23:58:52 +0200 Subject: [PATCH 21/63] forgejo: 1.19.3-0 -> 1.19.4-0 https://codeberg.org/forgejo/forgejo/releases/tag/v1.19.4-0 https://codeberg.org/forgejo/forgejo/src/commit/36bae6a1b4937f04e9ab073d63d38446e331b71a/RELEASE-NOTES.md#1-19-4-0 --- pkgs/applications/version-management/forgejo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 5b7843657382..b571d0a48dba 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -38,17 +38,17 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.19.3-0"; + version = "1.19.4-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-0T26EsU5lJ+Rxy/jSDn8nTk5IdHO8oK3LvN7tPArPgs="; + hash = "sha256-pTcnST8A4gADPBkNago9uwRFEmTx8vNONL/Emer4xLI="; }; - vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec="; + vendorHash = "sha256-LKxhNbSIRaP4EGWX6mE26G9CWfoFTrPRjrL4ShpRHWo="; subPackages = [ "." ]; From 32e74779f56ec25d5317f76d9ba7f0e4bf64fda2 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Wed, 5 Jul 2023 18:36:36 -0400 Subject: [PATCH 22/63] nyxt: 3.1.0 -> 3.3.0 --- pkgs/development/lisp-modules/packages.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index a752f713043f..1e581c65e2dd 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -273,14 +273,14 @@ let }; }; - cl-colors2_0_5_3 = build-asdf-system { + cl-colors2_0_5_4 = build-asdf-system { inherit (super.cl-colors2) pname systems lispLibs; - version = "0.5.3"; + version = "0.5.4"; src = pkgs.fetchgit { url = "https://notabug.org/cage/cl-colors2"; - rev = "refs/tags/v0.5.3"; - sha256 = "sha256-anYkLJoNOVBQoXzWVBgbEusQDdud0RA8nZzedl8V93w="; + rev = "refs/tags/v0.5.4"; + sha256 = "sha256-JbT1BKjaXDwdlzHLPjX1eg0RMIOT86R17SPgbe2h+tA="; }; }; @@ -396,12 +396,12 @@ let nyxt-gtk = build-asdf-system { inherit (super.nyxt) pname; - version = "3.1.0"; + version = "3.3.0"; lispLibs = with super; [ self.nasdf-unstable self.prompter - self.cl-colors2_0_5_3 + self.cl-colors2_0_5_4 self.njson_1_0_0 self.nsymbols_0_3_1 self.nclasses_0_5_0 @@ -464,8 +464,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.1.0"; - sha256 = "sha256-H3AlslECb/VvIC6zAGkLNTaGJ/nb97J6RXAN8sEgAgY="; + rev = "3.3.0"; + sha256 = "sha256-hSu+XGb87yzZPbJgcUhU81VGhNdMiN6GKspGQJU+SxY="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; From 138beed99abdc6f63ee886f880ea3099664a4954 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 6 Jul 2023 03:52:20 +0000 Subject: [PATCH 23/63] fnm: 1.33.1 -> 1.34.0 --- pkgs/development/tools/fnm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix index 6509f371e4fc..338371e36c72 100644 --- a/pkgs/development/tools/fnm/default.nix +++ b/pkgs/development/tools/fnm/default.nix @@ -10,20 +10,20 @@ rustPlatform.buildRustPackage rec { pname = "fnm"; - version = "1.33.1"; + version = "1.34.0"; src = fetchFromGitHub { owner = "Schniz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dwnPFbgfrc+1qF3u5Nm1KQu84UWK6H6VerSUaQacbRs="; + sha256 = "sha256-ttzfyTfv0835w4BaSWxT17/e/fjNCxWABW/kZKpy7q8="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ]; - cargoSha256 = "sha256-T88C5oYyVfepUw0cdNRhEwrvEI0t1gw/5qZL1E46pkY="; + cargoHash = "sha256-hYRVlCQ9+FCQFtT6uku7FynzHMdHvKATqkr5tCJoZCU="; doCheck = false; From fc4810bfca66fc4f3a8f5d4cceb1621e79bc91bb Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 6 Jul 2023 04:20:00 +0000 Subject: [PATCH 24/63] nodejs_20: 20.3.1 -> 20.4.0 Changelog: https://github.com/nodejs/node/releases/tag/v20.4.0 --- pkgs/development/web/nodejs/v20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index fe7a0b328a9d..07fb168eeb9a 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -9,8 +9,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.3.1"; - sha256 = "sha256-EqgtswZpeVm0OJs1Gl+XhImGsTE/mQGw4LPYz08/mZE="; + version = "20.4.0"; + sha256 = "sha256-Cb0Lc8UmtjwCnV3f2IXRCWLnrYfJdblFg8H4zpDuU0g="; patches = [ ./revert-arm64-pointer-auth.patch ./disable-darwin-v8-system-instrumentation-node19.patch From 19d5344007fdbae7e0627ce24c15bb7eda9c163b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 09:46:58 +0200 Subject: [PATCH 25/63] exploitdb: 2023-07-04 -> 2023-07-05 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2023-07-04...2023-07-05 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index a72c2f032c96..8462a153da50 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-07-04"; + version = "2023-07-05"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-a6ELQlfer7kmeWxjiuAelT2TcmwXoAD3s/x3f1JsRlQ="; + hash = "sha256-YJ7RR4PMa87Fw8dtRK4t+rDI1uyLfW8vQ/Rp1gr/Qw0="; }; nativeBuildInputs = [ From 71e0934beb2d8fb9e673ae29235eea05bad0ca3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 09:47:17 +0200 Subject: [PATCH 26/63] python311Packages.kasa-crypt: 0.2.0 -> 0.2.1 Diff: https://github.com/bdraco/kasa-crypt/compare/refs/tags/v0.2.0...v0.2.1 Changelog: https://github.com/bdraco/kasa-crypt/blob/0.2.1/CHANGELOG.md --- pkgs/development/python-modules/kasa-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index ae208f61c663..a761c9785932 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-w/LA3BqxUcu1+nwq55g+v/QMhz8/uCTz2aRDYIdGPtk="; + hash = "sha256-VAm/jHeG/LfLpouHc3mSX8Kr8u/keHY552dLzoGaPrQ="; }; postPatch = '' From e79da0534bc435e98bf6d213e211b5245b437629 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 09:49:19 +0200 Subject: [PATCH 27/63] python311Packages.pyrainbird: 2.0.1 -> 2.1.0 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/2.1.0 --- pkgs/development/python-modules/pyrainbird/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 4b082e22d61d..ef5da81ddcaa 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -1,4 +1,5 @@ { lib +, aiohttp-retry , buildPythonPackage , fetchFromGitHub , freezegun @@ -21,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "2.0.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -30,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ssm/nFciUeWexgsKUpF4qZHz/grG8OYJV7roBAjMsac="; + hash = "sha256-JTZtRh7Ecsq0DUpGt5AxAVnN79i/nppsEjoHWcpTOsM="; }; postPatch = '' @@ -42,6 +43,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ + aiohttp-retry ical pycryptodome pydantic From e6ebe64c7b92891c7c741922c111091fd5364d75 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 09:49:23 +0200 Subject: [PATCH 28/63] checkov: 2.3.311 -> 2.3.312 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.311...2.3.312 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.312 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 595fed924d5f..be5e669c4d94 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.311"; + version = "2.3.312"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QVh3dJYIR3n1fmhZviI6ohb6SDQsQQPk1k8KpwKvghU="; + hash = "sha256-SskpDZosJOPF2HhzclRI+8xd3ELtoxdeW8nWXrmI4hM="; }; patches = [ From c9df316a82f11266e8fc5ab10c8b7b63209ee70c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 Jul 2023 22:14:49 +0200 Subject: [PATCH 29/63] desync: add changelog to meta - minor changes and modifications --- pkgs/applications/networking/sync/desync/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index 71008daeda94..6fb0570e04b7 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -1,14 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib +, buildGoModule +, fetchFromGitHub +}: buildGoModule rec { pname = "desync"; version = "0.9.4"; src = fetchFromGitHub { - rev = "v${version}"; owner = "folbricht"; repo = "desync"; - sha256 = "sha256-kwYRspzfTBl9FtPrpd55VBYiCzaG7M83EM5nbqdBG/Q="; + rev = "refs/tags/v${version}"; + hash = "sha256-kwYRspzfTBl9FtPrpd55VBYiCzaG7M83EM5nbqdBG/Q="; }; vendorHash = "sha256-1RuqlDU809mtGn0gOFH/AW6HJo1cQqt8spiLp3/FpcI="; @@ -20,7 +23,8 @@ buildGoModule rec { description = "Content-addressed binary distribution system"; longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; homepage = "https://github.com/folbricht/desync"; + changelog = "https://github.com/folbricht/desync/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = [ maintainers.chaduffy ]; + maintainers = with maintainers; [ chaduffy ]; }; } From af9cf1a17eb4fa7efc59f43d6c3f550b519f6c3b Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:13:34 +0300 Subject: [PATCH 30/63] python311Packages.eth-abi: 3.0.1 -> 4.1.0 --- pkgs/development/python-modules/eth-abi/default.nix | 6 +++--- pkgs/development/python-modules/web3/default.nix | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/eth-abi/default.nix b/pkgs/development/python-modules/eth-abi/default.nix index 43d5401ce58f..03c5cc63127b 100644 --- a/pkgs/development/python-modules/eth-abi/default.nix +++ b/pkgs/development/python-modules/eth-abi/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "eth-abi"; - version = "3.0.1"; + version = "4.1.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-abi"; rev = "v${version}"; - hash = "sha256-xrZpT/9zwDtjSwSPDDse+Aq8plPm26OR/cIrliZUpLY="; + hash = "sha256-CGAfu3Ovz2WPJOD+4W2+cOAz+wYvuIyFL333Jw66ozA="; }; postPatch = '' substituteInPlace setup.py \ - --replace "parsimonious>=0.8.0,<0.9.0" "parsimonious" + --replace "parsimonious>=0.9.0,<0.10.0" "parsimonious" ''; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 0b285bd514d1..1c88f51345de 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -37,10 +37,6 @@ buildPythonPackage rec { hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; }; - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - propagatedBuildInputs = [ aiohttp eth-abi From 9091f56422f509c7f60ed727d8087656de5f60b9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 11:18:13 +0200 Subject: [PATCH 31/63] trufflehog: 3.42.0 -> 3.43.0 Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.42.0...v3.43.0 Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.43.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 37b0cf7a1e73..010d142837e6 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.42.0"; + version = "3.43.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-ZPlIuWprlB9Xp3aD4AjWfYMEnDwyoijNqhBGgq3BJ5M="; + hash = "sha256-QZFn9O5feTrw+/vW0n4oqVJUbsOBFnvbXWdnVWVoc2Y="; }; - vendorHash = "sha256-gIiG9fULEEqWLdCoPOtbE6bSYyZv8I36vBRB6b3KOI8="; + vendorHash = "sha256-G+G8Rlgn2GICXHtGSKZ1jzMJ8ERWZr/w5z9CtLo3L+E="; ldflags = [ "-s" From 1e7ee96d1fb48408b1400cbbd7a5a13ad5adf2b6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:16:41 +0200 Subject: [PATCH 32/63] python311Packages.google-cloud-websecurityscanner: 1.12.1 -> 1.12.2 Changelog: https://github.com/googleapis/python-websecurityscanner/blob/v1.12.2/CHANGELOG.md --- .../google-cloud-websecurityscanner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix index 771cbcf01969..702ba0d2103c 100644 --- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "1.12.1"; + version = "1.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-CCfxIwACFxMuFjxJG7v5e/WXvN0V4QysPYD2NtkKnEU="; + hash = "sha256-C2WQmyQjoe2t6RZ8HtnNkzN3V8FuYQwgtlhCOwaHNt8="; }; propagatedBuildInputs = [ From 96f373cc982ec530a3732ef6c86aa4794924df5b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:17:37 +0200 Subject: [PATCH 33/63] python311Packages.google-cloud-vision: 3.4.3 -> 3.4.4 Changelog: https://github.com/googleapis/python-vision/blob/v3.4.4/CHANGELOG.md --- .../python-modules/google-cloud-vision/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix index 6743c32fe8e0..21760337af41 100644 --- a/pkgs/development/python-modules/google-cloud-vision/default.nix +++ b/pkgs/development/python-modules/google-cloud-vision/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "3.4.3"; + version = "3.4.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-RSe/saqfidAn20INQN6fquSCS2QGyANzpt2CfnmJwJ4="; + hash = "sha256-QFdErlCFIDTMR7MqmxuuUNP7Cc0eIWABQYKJHvV2ZpU="; }; propagatedBuildInputs = [ From d934af16eddaa72dfaacb7bb823d909856dd386b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:19:02 +0200 Subject: [PATCH 34/63] python311Packages.google-cloud-translate: 3.11.1 -> 3.11.2 Changelog: https://github.com/googleapis/python-translate/blob/v3.11.2/CHANGELOG.md --- .../python-modules/google-cloud-translate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix index efb8a4250cc8..3b29befab95b 100644 --- a/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.11.1"; + version = "3.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-keQK0Lc34yphEQZFEU6T/7rfXS/9clwSreE0frWO+s8="; + hash = "sha256-CZluS7DfpcICMYWvhxkvHSwANmj4yfT6xDJCMQskQj4="; }; propagatedBuildInputs = [ From 7e22b61f31b93c1d7ba1733121bbd5fb550fabec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:19:43 +0200 Subject: [PATCH 35/63] python311Packages.google-cloud-trace: 1.11.1 -> 1.11.2 Changelog: https://github.com/googleapis/python-trace/blob/v1.11.2/CHANGELOG.md --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index 5cabd25b9af1..d8f8b1a28441 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.11.1"; + version = "1.11.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-twaJlx/2W1BQCWZMTQbZOp74oFecL2vwZkAxK/XwE8E="; + hash = "sha256-pn2ofYfcHBxAw7IK5lKqf1AGj8e+DU8W++9XVFPZ5Ws="; }; propagatedBuildInputs = [ From b6d3f81f39c32b30f7e6844dfb843afe4135b8bd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:20:43 +0200 Subject: [PATCH 36/63] python311Packages.google-cloud-tasks: 2.13.1 -> 2.13.2 Changelog: https://github.com/googleapis/python-tasks/blob/v2.13.2/CHANGELOG.md --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index f69cb6709fda..ad654c6e2ad9 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.13.1"; + version = "2.13.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-mbhFBVx6Gye3M0lCny1vag659Am0ze7InfmeFr0ZeDM="; + hash = "sha256-VXYUs5PQ+bH97d/vOAxag4CAn8ROMvPZewF05e/k7PM="; }; propagatedBuildInputs = [ From d6e370cfd92323bf552415e52c1482658ddbb000 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:22:14 +0200 Subject: [PATCH 37/63] python311Packages.google-cloud-speech: 2.20.0 -> 2.21.0 Changelog: https://github.com/googleapis/python-speech/blob/v2.21.0/CHANGELOG.md --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index 224f98f47173..462bcba9dfc6 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.20.0"; + version = "2.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5sW4b/6OR0ucgraZ75AvdclHjnfkTqOd45l7PvivPi4="; + hash = "sha256-Zhw5u7bysha6VqzjsIcmDpd43Rmt6e+jcAre6SWACa0="; }; propagatedBuildInputs = [ From cd7462dd714cc9a83d8301cbca3fc5e184e07f7f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:22:59 +0200 Subject: [PATCH 38/63] python311Packages.google-cloud-securitycenter: 1.23.0 -> 1.23.1 Changelog: https://github.com/googleapis/python-securitycenter/blob/v1.23.1/CHANGELOG.md --- .../python-modules/google-cloud-securitycenter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix index 7b44b02199d4..90d692094f02 100644 --- a/pkgs/development/python-modules/google-cloud-securitycenter/default.nix +++ b/pkgs/development/python-modules/google-cloud-securitycenter/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "1.23.0"; + version = "1.23.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-4mzQ2mUc7cdBYI7F+VCjsF7nyMn2JSf0sELHUI50w9U="; + hash = "sha256-GlFoeifExNS7pd+vDnYWsGWPNDkQ4SmnFFnTnsjTN6Q="; }; propagatedBuildInputs = [ From d241c87a45e16376a421fd2ed0ce13912b69afcb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:23:47 +0200 Subject: [PATCH 39/63] python311Packages.google-cloud-secret-manager: 2.16.1 -> 2.16.2 Changelog: https://github.com/googleapis/python-secret-manager/blob/v2.16.2/CHANGELOG.md --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 772ca69dda65..5c9997225f7a 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.16.1"; + version = "2.16.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-FJ0Rzpvn6oHUrDVE0/zUxxap7bLLd12cB1IxVwsHn7s="; + hash = "sha256-WWUhCRw5uUomDYFHdkIcigCfZGOzkogAQe+oAoO1/Sk="; }; propagatedBuildInputs = [ From 561cfab9d879d1f2db5fe5ef774d797c73f4b014 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:25:13 +0200 Subject: [PATCH 40/63] python311Packages.google-cloud-resource-manager: 1.10.1 -> 1.10.2 Changelog: https://github.com/googleapis/python-resource-manager/blob/v1.10.2/CHANGELOG.md --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 5389fd3cce3e..930c5805e6fc 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.10.1"; + version = "1.10.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-yXT7b5gQR2z3tj6ok5TBqN9H9/LcIwPnKLt0tQC83mc="; + hash = "sha256-mnvdA0etVTN2zGatMXxSI9GuBL3PdO3L/NEmBc/3tRA="; }; propagatedBuildInputs = [ From d1cd6c9c49e8917fb480cf6ff167e54c2d8b8e2c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:26:03 +0200 Subject: [PATCH 41/63] python311Packages.google-cloud-redis: 2.13.0 -> 2.13.1 Changelog: https://github.com/googleapis/python-redis/blob/v2.13.1/CHANGELOG.md --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index f830ed3b6a6b..860a65207eec 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.13.0"; + version = "2.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-BKDbtyn1wnzTXM6B7lgUCe17NLB9yaj1XhMbP4zE3Qo="; + hash = "sha256-UtT1z5zMzc7+Xhqcx5u77IS8GC8KaNOpYstZ8BlrFGc="; }; propagatedBuildInputs = [ From 2a1eb93af6c8dc0d3d862a94fe2ddffe196c5869 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:26:48 +0200 Subject: [PATCH 42/63] python311Packages.google-cloud-os-config: 1.15.1 -> 1.15.2 Changelog: https://github.com/googleapis/python-os-config/blob/v1.15.2/CHANGELOG.md --- .../python-modules/google-cloud-os-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix index 6333f2f72df0..a2185b7a429e 100644 --- a/pkgs/development/python-modules/google-cloud-os-config/default.nix +++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-os-config"; - version = "1.15.1"; + version = "1.15.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-OaF1pzRY5k5SvXNCxTviP/2lhC7Up+oXaQB14f2tGj8="; + hash = "sha256-WgrqxnVsbA0ppvfcqxW+kA8vjn71bMU9qAyZraqYt8g="; }; propagatedBuildInputs = [ From 513d58d9c1588060b9a1aec7a498420052fa1839 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:27:28 +0200 Subject: [PATCH 43/63] python311Packages.google-cloud-org-policy: 1.8.1 -> 1.8.2 Changelog: https://github.com/googleapis/python-org-policy/blob/v1.8.2/CHANGELOG.md --- .../python-modules/google-cloud-org-policy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix index 2b54e9b8fdeb..b90e3263e7f2 100644 --- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix +++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-org-policy"; - version = "1.8.1"; + version = "1.8.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JVXRVq7yrRLj15ZMKVCBvCsrRP8KcRj9XNvfeH0rXVc="; + hash = "sha256-SJpjS72keOf9QF1imsWLbgMSzxCDloO4tuc4vUy8ZBk="; }; propagatedBuildInputs = [ From 47f102ffcfdeea26e54dd017f9f7869de88c9602 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:28:24 +0200 Subject: [PATCH 44/63] python311Packages.google-cloud-monitoring: 2.15.0 -> 2.15.1 Changelog: https://github.com/googleapis/python-monitoring/blob/v2.15.1/CHANGELOG.md --- .../python-modules/google-cloud-monitoring/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/pkgs/development/python-modules/google-cloud-monitoring/default.nix index 66a49625d1a3..5c2494e5b689 100644 --- a/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.15.0"; + version = "2.15.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-w6BCbs0lpw2lOyqQedcXMSKahJak7a6NN4Xsy7+CjVs="; + hash = "sha256-CGqEWjSm4QWrijpICTkupjZ6ZbKLdWHCYQFTSocF7Tc="; }; propagatedBuildInputs = [ From 89a9344ba7f461c5727871bb29ae1c49c3270e59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:29:36 +0200 Subject: [PATCH 45/63] python311Packages.google-cloud-language: 2.10.0 -> 2.10.1 Changelog: https://github.com/googleapis/python-language/blob/v2.10.1/CHANGELOG.md --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 367987b82307..4a2e0277924a 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-lC3Hp1fBK09aYUv4hO77FOlPOqQb+W2h/2MGJ9MhZ/Q="; + hash = "sha256-FAwHU1haRZd7ucfRxwfn+KtWM8/1a97Z74UvkBa3Mq8="; }; propagatedBuildInputs = [ From be96b03f3858dc7279bb394074353752e888a192 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:33:26 +0200 Subject: [PATCH 46/63] python311Packages.google-cloud-kms: 2.17.0 -> 2.18.0 Changelog: https://github.com/googleapis/python-kms/blob/v2.18.0/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-kms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix index 57390756eec6..0cd8a9d28dd1 100644 --- a/pkgs/development/python-modules/google-cloud-kms/default.nix +++ b/pkgs/development/python-modules/google-cloud-kms/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.17.0"; + version = "2.18.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-AoIoGmOvL0mAD5dhsWxIkIFAw4G+1i9SyNF4D5I4Fz0="; + hash = "sha256-GqcYccqc6yAfuN3ntTypXvMNricr0cfCmCwnU0zJBoE="; }; propagatedBuildInputs = [ From 3ffb56a7a464dd3e5b8885a9983e088dd0726d19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:34:09 +0200 Subject: [PATCH 47/63] python311Packages.google-cloud-iot: 2.9.1 -> 2.9.2 Changelog: https://github.com/googleapis/python-iot/blob/v2.9.2/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-iot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iot/default.nix b/pkgs/development/python-modules/google-cloud-iot/default.nix index ba3cc3dfe246..b64354fc7d03 100644 --- a/pkgs/development/python-modules/google-cloud-iot/default.nix +++ b/pkgs/development/python-modules/google-cloud-iot/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iot"; - version = "2.9.1"; + version = "2.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-6+6EsRdj38jD+i3nhVHOI1wVGWYKMIGDILHgO3wN7zg="; + hash = "sha256-pLQgcwR89F+9jcSDtW/5+6Gy+Wk7XQf4iD49vDPkN9U="; }; propagatedBuildInputs = [ From 0ab3df1f9e322e74b1eef21b104ca36b53470731 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:35:08 +0200 Subject: [PATCH 48/63] python311Packages.google-cloud-iam: 2.12.0 -> 2.12.1 Changelog: https://github.com/googleapis/python-iam/releases/tag/v2.12.1 --- pkgs/development/python-modules/google-cloud-iam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix index 26247453cc7a..1afb505c4210 100644 --- a/pkgs/development/python-modules/google-cloud-iam/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-iam"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-lfT4lgW4n3k5Fs2Owng8JoHGYDwjoKTzaKhEf35O+VA="; + hash = "sha256-/lBwhUR+z0Ydr9LNS4AWxYmeWOUgvQS1G7Orb2sI+v8="; }; propagatedBuildInputs = [ From 2239bf96204f8cbcbbf7b56b42a298bf806541be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:35:48 +0200 Subject: [PATCH 49/63] python311Packages.google-cloud-error-reporting: 1.9.1 -> 1.9.2 Changelog: https://github.com/googleapis/python-error-reporting/blob/v1.9.2/CHANGELOG.md --- .../python-modules/google-cloud-error-reporting/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index ae30c9714922..4b3ecdcab5fc 100644 --- a/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.9.1"; + version = "1.9.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3N7LtFKvTdV0zBGIyUgi6tCVZX7+rbJD5Lb+xZafJNw="; + hash = "sha256-S+7x6gIxJDfV7Xe6DOBVbJNMREYlRFLyGo8BEpIdIow="; }; propagatedBuildInputs = [ From cbd454204f616b902052fe44e25bf93d9be681e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:36:35 +0200 Subject: [PATCH 50/63] python311Packages.google-cloud-dlp: 3.12.1 -> 3.12.2 Changelog: https://github.com/googleapis/python-dlp/blob/v3.12.2/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index a0ed249d47bc..8f602f974d9d 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.12.1"; + version = "3.12.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU="; + hash = "sha256-+Ab1XD45m3PqQ0LHBIRVId5wARJ9KOjClEk9C2c2NBY="; }; propagatedBuildInputs = [ From 43e9789706cd99428bb08ade106e91250900f28b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:38:06 +0200 Subject: [PATCH 51/63] python311Packages.google-cloud-dataproc: 5.4.1 -> 5.4.2 Changelog: https://github.com/googleapis/python-dataproc/blob/v5.4.2/CHANGELOG.md --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index 522d466bdad0..4bdd783af81e 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.4.1"; + version = "5.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-GJbhT2PBIaPx4sIhKHzH/QBlDSpz+LOPggQK5tWqt78="; + hash = "sha256-YxxOyvPlUfSeIS8aUrULWnD6XgPh+nJuPHIywmgYMQU="; }; propagatedBuildInputs = [ From fa3e655680dbdfac628f93b2e47dcc33f06a0a72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:39:03 +0200 Subject: [PATCH 52/63] python311Packages.google-cloud-datacatalog: 3.13.0 -> 3.13.1 Changelog: https://github.com/googleapis/python-datacatalog/blob/v3.13.1/CHANGELOG.md --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index cb6c238154c8..4d3acc891f25 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.13.0"; + version = "3.13.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-YdEMSLC6qz79t/caG2DUMhSxxjCh40Cu3+aABvVxQow="; + hash = "sha256-alCuqR65Xpa5RYsUMouJrmyYJ52AFWlyN/rO1Nue+ZU="; }; propagatedBuildInputs = [ From cfd4b7b35b543c5e190c182bae8803663a8cb9a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:40:16 +0200 Subject: [PATCH 53/63] python311Packages.google-cloud-core: 2.3.2 -> 2.3.3 Changelog: https://github.com/googleapis/python-cloud-core/blob/v2.3.3/CHANGELOG.md --- pkgs/development/python-modules/google-cloud-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-core/default.nix b/pkgs/development/python-modules/google-cloud-core/default.nix index 8d54e68bab72..9e45b46c5f74 100644 --- a/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "2.3.2"; + version = "2.3.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-uVKe5wR/2NS/SiGC3mGRVCQN8X++YOrTmQeMGuFSr5o="; + hash = "sha256-N7gCc8jX7uGugWs6IK5DWF6lBQbLDmDzz1vl+H8Tc8s="; }; propagatedBuildInputs = [ From e9b9d5c94f5e6625dadca13abe317497a4f02f76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 6 Jul 2023 12:40:56 +0200 Subject: [PATCH 54/63] python311Packages.google-cloud-container: 2.25.0 -> 2.26.0 Changelog: https://github.com/googleapis/python-container/blob/v2.26.0/CHANGELOG.md --- .../python-modules/google-cloud-container/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix index dcb22d820236..6739b356fcee 100644 --- a/pkgs/development/python-modules/google-cloud-container/default.nix +++ b/pkgs/development/python-modules/google-cloud-container/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.25.0"; + version = "2.26.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VJ+iu3cd+iVFLT3v/sLUeh0wbpKjaVP/KY1YbwPXKtM="; + hash = "sha256-fUqX5n/tQ7BgtIo3/1jyOGvkIUiVltbfLpzwIZ0YJ0M="; }; propagatedBuildInputs = [ From 1498dbb8d3fc24a38226acd54a5435df103a20df Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Jul 2023 12:54:38 +0200 Subject: [PATCH 55/63] python311Packages.homeassistant-stubs: 2023.6.3 -> 2023.7.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.7.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 85f7cce8d3ac..eeb1d18f7c17 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.6.3"; + version = "2023.7.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-Ia+y9I92XqPcoRFXfEmoAmzU2LUH5oP+A5Uu/8DdUAc="; + hash = "sha256-N/3Gja6WPNdRsWl4XYMo9skCTJiHFkhr9y+T0MFrUTc="; }; nativeBuildInputs = [ From 2ad0f0d092ccf887dc23439c73064cdb9d3dc7e4 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:14:10 +0300 Subject: [PATCH 56/63] python311Packages.eth-utils: 2.0.0 -> 2.1.1 * Fixes: - use disabledTestPaths to remove the culprit test case * Changes: - remove mypy to avoid having linter stage in nixpkgs builds --- pkgs/development/python-modules/eth-utils/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 42aa421accf1..08648ab32ecd 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "eth-utils"; - version = "2.0.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - hash = "sha256-E2vUROc2FcAv00k50YpdxaaYIRDk1yGSPB8cHHw+7Yw="; + hash = "sha256-Ogp4o99smw5qVwDec6zd/xVqqKMyNk41iBfRNzrwuvE="; }; propagatedBuildInputs = [ @@ -29,12 +29,17 @@ buildPythonPackage rec { ] ++ lib.optional (!isPyPy) cytoolz ++ lib.optional isPyPy toolz; - nativeCheckInputs = [ hypothesis pytestCheckHook ] ++ eth-hash.optional-dependencies.pycryptodome; + # Removing a poorly written test case from test suite. + # TODO work with the upstream + disabledTestPaths = [ + "tests/functional-utils/test_type_inference.py" + ]; + pythonImportsCheck = [ "eth_utils" ]; meta = { From 76922ee8503f1eff5862e9867e85d9ac14159453 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:14:42 +0300 Subject: [PATCH 57/63] python311Packages.eth-account: 0.6.1 -> 0.9.0 --- .../python-modules/eth-account/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/eth-account/default.nix b/pkgs/development/python-modules/eth-account/default.nix index 38389fc31fe8..fc4062f01c8b 100644 --- a/pkgs/development/python-modules/eth-account/default.nix +++ b/pkgs/development/python-modules/eth-account/default.nix @@ -7,6 +7,7 @@ , eth-keys , eth-rlp , eth-utils +, websockets , hexbytes , pythonOlder , rlp @@ -14,21 +15,16 @@ buildPythonPackage rec { pname = "eth-account"; - version = "0.6.1"; + version = "0.9.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-account"; rev = "v${version}"; - hash = "sha256-cjQvTKC4lDbKnAvbmnTGHQiJZsZFhXc/+UH5rUdlGxs="; + hash = "sha256-Ps/vzJv0W1+wy1mSJaqRNNU6CoCMchReHIocB9kPrGs="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "bitarray>=1.2.1,<1.3.0" "bitarray>=2.4.0,<3" - ''; - propagatedBuildInputs = [ bitarray eth-abi @@ -38,6 +34,7 @@ buildPythonPackage rec { eth-utils hexbytes rlp + websockets ]; # require buildinga npm project From 7e9d3a7f4642432637d01db8ff2592b7d698afa3 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:15:05 +0300 Subject: [PATCH 58/63] python311Packages.eth-hash: 0.3.2 -> 0.5.2 --- pkgs/development/python-modules/eth-hash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index aabd3b38f429..ab5d023f5124 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "eth-hash"; - version = "0.3.2"; + version = "0.5.2"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "ethereum"; repo = "eth-hash"; rev = "v${version}"; - hash = "sha256-LMDtFUrsPYgj/Fl9aBW1todlj1D3LlFxAkzNFAzCGLQ="; + hash = "sha256-6UN+kvLjjAtkmLgUaovjZC/6n3FZtXCwyXZH7ijQObU="; }; nativeCheckInputs = [ From b7128ef551494b9fc992ca55b56d6f54998edf09 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Tue, 27 Jun 2023 00:16:01 +0300 Subject: [PATCH 59/63] python311Packages.web3: 6.3.0 -> 6.5.0 --- .../python-modules/web3/default.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix index 1c88f51345de..f4afe0646158 100644 --- a/pkgs/development/python-modules/web3/default.nix +++ b/pkgs/development/python-modules/web3/default.nix @@ -16,16 +16,12 @@ , requests , typing-extensions , websockets -# , eth-tester -# , py-geth -, pytestCheckHook , pythonOlder -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "web3"; - version = "6.3.0"; + version = "6.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -34,7 +30,7 @@ buildPythonPackage rec { owner = "ethereum"; repo = "web3.py"; rev = "v${version}"; - hash = "sha256-p3Dpmb0BST1nbh42q/eK/DjQqoIPHvNr2KllRpTgFFw="; + hash = "sha256-RNWCZQjcse415SSNkHhMWckDcBJGFZnjisckF7gbYY8="; }; propagatedBuildInputs = [ @@ -56,16 +52,7 @@ buildPythonPackage rec { typing-extensions ] ++ eth-hash.optional-dependencies.pycryptodome; - pythonRelaxDeps = true; - - # TODO: package eth-tester - #nativeCheckInputs = [ - # eth-tester - # eth-tester.optional-dependencies.py-evm - # py-geth - # pytestCheckHook - #]; - + # TODO: package eth-tester required for tests doCheck = false; postPatch = '' From 3b29138b25456a8f868279ac6ce2a1b6c69fef2b Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Thu, 6 Jul 2023 11:54:03 +0300 Subject: [PATCH 60/63] python311Packages.py-eth-sig-utils: mark broken --- pkgs/development/python-modules/py-eth-sig-utils/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/pkgs/development/python-modules/py-eth-sig-utils/default.nix index 3db729884035..162b2d157069 100644 --- a/pkgs/development/python-modules/py-eth-sig-utils/default.nix +++ b/pkgs/development/python-modules/py-eth-sig-utils/default.nix @@ -40,5 +40,7 @@ buildPythonPackage rec { homepage = "https://github.com/rmeissner/py-eth-sig-utils"; license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; + # TODO: upstream is stale and doesn't not work with the new `eth-abi` package any more. + broken = true; }; } From 81fae6294b7eee8b816b072ec9b8add848ca1b50 Mon Sep 17 00:00:00 2001 From: Laurent CaniBot Date: Thu, 6 Jul 2023 12:34:33 +0000 Subject: [PATCH 61/63] ligo: 0.68.0 -> 0.69.0 --- pkgs/development/compilers/ligo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index a176ddf9b42e..05fea9caddbb 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -15,12 +15,12 @@ ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.68.0"; + version = "0.69.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-XHfpYX0lXzT15fuFQcmRBhhaKI9Y4bYOy6kXR320BV0="; + sha256 = "sha256-Swt4uihsAtHVMkc0DxATwB8FvgxwtSJTN3E5cBtyXf8="; fetchSubmodules = true; }; From db15bc807130925688f0c2c3b78fddabf3a8a9bd Mon Sep 17 00:00:00 2001 From: Sophie Tauchert Date: Thu, 6 Jul 2023 15:27:14 +0200 Subject: [PATCH 62/63] mastodon: 4.1.2 -> 4.1.3 --- pkgs/servers/mastodon/gemset.nix | 96 +++++++++++++++---------------- pkgs/servers/mastodon/source.nix | 4 +- pkgs/servers/mastodon/version.nix | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix index 3e1632860b56..faefc611fce4 100644 --- a/pkgs/servers/mastodon/gemset.nix +++ b/pkgs/servers/mastodon/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y9lj7ra9xf4q4mryydmd498grsndqmz1zwasb4ai9gv62igvw3s"; + sha256 = "10y18l67i6ry7v9w0qwh26477g4gm0qrjjpa87pa5a42hzkglnc7"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bzacsr93sxv90nljv3ajw54nmyz1v9k2v2wx1pxsi0jasqg5fvn"; + sha256 = "1ihayijdgasf0rp10x6h335k3y1hgqr6c9s8lxqmhm4gpczajaac"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1rjddp1a5l4amsbibhnf7g2rb69qvq0nc0a2dvr6r57bpkf82hj4"; + sha256 = "03557cskby5alpncnhgm1j1kq43xqq75sdd6r2x22q3j2jv68pj5"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c2y6sqpan68lrx78pvhbxb2917m75s808r6cg1kyygwvg31niza"; + sha256 = "1x7ffyan8sbv4ywjghiyiv077vfxyf6i6y0h4k0mfpdmf76l0i86"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jx8wi961i34v7x0j3h4wjw3qbyx9bkzb598vg42kidzk2f90dyj"; + sha256 = "0g5gw9ywirw7814wn8cdnnv1df58x5gplgpb15gaw5gzkw9cgvd8"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10g5gk8h4mfhvgqylzbf591fqf5p78ca35cb97p9bclpv9jfy0za"; + sha256 = "0cmzc2c00lsdr5hpmsgs8axs5pbhv5xyqiyi69wf81pqypd2cy3l"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; active_model_serializers = { dependencies = ["actionpack" "activemodel" "case_transform" "jsonapi-renderer"]; @@ -92,10 +92,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ililjwy4x52a6x5fidh1iyllf6vx49nz93fd2hxypc5bpryx9mz"; + sha256 = "153z9lmkip3v243xxa5rcc8am82ma73ar46q4vxbmzi850a5yjj2"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activemodel = { dependencies = ["activesupport"]; @@ -103,10 +103,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nn17y72fhsynwn11bqg75bazqp6r1g8mpwwyv64harwvh3fh5qj"; + sha256 = "1bpr0zspih2rf2ppzjxaw8sq6gfqg9vss5h0fs4r85p03579swin"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k69m3b0lb4jx20jx8vsvdqm1ki1r6riq9haabyddkcpvmgz1wh7"; + sha256 = "06403rkjnyr80yj4g05lb5hn04yfzipa7bm0gplbqrrykr3hvh5r"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -125,10 +125,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0c3cvc01azfkccg5hsl96wafsxb5hf1nva3cn8rif2mlwx17p8n3"; + sha256 = "094kvh8bp792xccql54kky8prmvqvfzwwv9xas2pnh8s4v3avbzl"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -136,10 +136,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14pjq2k761qaywaznpqq8ziivjk2ks1ma2cjwdflkxqgndxjmsr2"; + sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; addressable = { dependencies = ["public_suffix"]; @@ -609,10 +609,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qnsflsbjj38im8xq35g0vihlz96h09wjn2dad5g543l3vvrkrx5"; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.2"; }; connection_pool = { groups = ["default" "test"]; @@ -768,10 +768,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fxrvqv3l5w9p20s129rg41zc6agf1n4yrmganancnvykbkygki2"; + sha256 = "1q2pywgyn6cbnm0fh3dln5z1qgd1g8hvb4x8rppjc1bpfxnfhi13"; type = "gem"; }; - version = "5.6.4"; + version = "5.6.6"; }; dotenv = { groups = ["default"]; @@ -1566,10 +1566,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n0pijrc465zzrv5flxc41375zwaz9yfc2n0r80zjwarc1ixkdx1"; + sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc"; type = "gem"; }; - version = "2.8.0.1"; + version = "2.8.1"; }; makara = { dependencies = ["activerecord"]; @@ -1669,10 +1669,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.2"; }; minitest = { groups = ["default" "development" "pam_authentication" "production" "test"]; @@ -1720,10 +1720,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d996zf3g8xz244791b0qsl9vr7zg4lqnnmf9k2kshr9lki5jam8"; + sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; type = "gem"; }; - version = "0.3.4"; + version = "0.3.6"; }; net-ldap = { groups = ["default"]; @@ -1794,10 +1794,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; type = "gem"; }; - version = "2.5.8"; + version = "2.5.9"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -1805,10 +1805,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qr6psd9qgv83pklpw7cpmshkcasnv8d777ksmvwsacwfvvkmnxj"; + sha256 = "1g6wvxab4qwnbny983n9bckc0afy6y6s3g5v3csdbsp8n7g9vxi3"; type = "gem"; }; - version = "1.14.1"; + version = "1.14.5"; }; nsa = { dependencies = ["activesupport" "concurrent-ruby" "sidekiq" "statsd-ruby"]; @@ -2132,10 +2132,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qvp6h2abmlsl4sqjsvac03cr2mxq6143gbx4kq52rpazp021qsb"; + sha256 = "16w217k9z02c4hqizym8dkj6bqmmzx4qdvqpnskgzf174a5pwdxk"; type = "gem"; }; - version = "2.2.6.2"; + version = "2.2.7"; }; rack-attack = { dependencies = ["rack"]; @@ -2198,10 +2198,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7ggchi3d7pwzmj8jn9fhbazr5fr4dy304f0hz7kqbg23s9c1ym"; + sha256 = "17ympjpkhz06xqsay18hskpbs64nh05hzrsckx8va6ikrxhs2ksq"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -2264,10 +2264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mm3nf3y715ln6v8k6g4351ggkr1bcwc5637vr979yw8vsmdi42k"; + sha256 = "0g92if3cxxysl9h6x6ibs7y9dsbcniiwgcldvg00kib02b3pxkbb"; type = "gem"; }; - version = "6.1.7.2"; + version = "6.1.7.4"; }; rainbow = { groups = ["default" "development" "test"]; @@ -2893,10 +2893,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; tilt = { groups = ["default"]; @@ -2913,10 +2913,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lnh0kr7f43m1cjzc2jvggfsl1rzsaj2rd3pn6vp7mcqliymzaza"; + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; type = "gem"; }; - version = "0.3.1"; + version = "0.3.2"; }; tpm-key_attestation = { dependencies = ["bindata" "openssl" "openssl-signature_algorithm"]; @@ -3202,10 +3202,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09pqhdi6q4sqv0p1gnjpbcy4az0yv8hrpykjngdgh9qiqd87nfdv"; + sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; type = "gem"; }; - version = "2.6.6"; + version = "2.6.8"; }; } diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 8809483fe17d..f8b37d94cfa0 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -3,8 +3,8 @@ src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; - rev = "v4.1.2"; - sha256 = "mkcGEQVE+sF4jYdEubHTGK9mp9O/Ny08AUqnnwW736M="; + rev = "v4.1.3"; + sha256 = "F+cpL+ZFfe52f82qtJxuxRCILW3zr6K5OMrvaOgWe58="; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index d80cafca6d6d..309d01fc75af 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"4.1.2" +"4.1.3" From fcea105698ee51f1af71f764d03d300b229ada7c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 6 Jul 2023 16:13:38 +0200 Subject: [PATCH 63/63] buildEnv: Nix's buildEnv should be stable It's mostly used by nix-env, but Nix should remain simple and small for reproducibility. --- pkgs/build-support/buildenv/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index 006fc2aff923..786a2ad5da02 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -1,6 +1,5 @@ # buildEnv creates a tree of symlinks to the specified paths. This is -# a fork of the buildEnv in the Nix distribution. Most changes should -# eventually be merged back into the Nix distribution. +# a fork of the hardcoded buildEnv in the Nix distribution. { buildPackages, runCommand, lib, substituteAll }: