From 930addba50d1f5447499c4eb9af9a1b938fa7dff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 13:40:21 +0000 Subject: [PATCH 001/212] python312Packages.textual-universal-directorytree: 1.1.0 -> 1.5.0 --- .../textual-universal-directorytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix index 0e9e3e6d002c..1c911d0795d1 100644 --- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix +++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "textual-universal-directorytree"; - version = "1.1.0"; + version = "1.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "juftin"; repo = "textual-universal-directorytree"; rev = "refs/tags/v${version}"; - hash = "sha256-ncQ3IRaZaCv1rMUWT9dkUKo6OAEC5pziMCM7adIBGWo="; + hash = "sha256-hUig0aJWSS0FsgRIrs74/uVaQgH6tczJWO5rj6TVOvQ="; }; nativeBuildInputs = [ From 356aab4ceba7cafa5d374837b790573e822fcebd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Jul 2024 02:11:53 +0000 Subject: [PATCH 002/212] php82Extensions.phalcon: 5.7.0 -> 5.8.0 --- pkgs/development/php-packages/phalcon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/phalcon/default.nix b/pkgs/development/php-packages/phalcon/default.nix index 86252ec028e0..b5d89ee6a0d2 100644 --- a/pkgs/development/php-packages/phalcon/default.nix +++ b/pkgs/development/php-packages/phalcon/default.nix @@ -9,13 +9,13 @@ buildPecl rec { pname = "phalcon"; - version = "5.7.0"; + version = "5.8.0"; src = fetchFromGitHub { owner = "phalcon"; repo = "cphalcon"; rev = "v${version}"; - hash = "sha256-nckc7LPhXuUBJJvsqWEhH37K8fKdm9hIdkmVdiM3vcc="; + hash = "sha256-Jgl/sBWgP4N4rYloaGn78T6XWF/yTYYCsSC9Q6gD6Wg="; }; internalDeps = [ From 7e3e47048619efe9027bb494ff11e130c25ad717 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 31 Jul 2024 06:51:24 +0000 Subject: [PATCH 003/212] fwts: 24.03.00 -> 24.07.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 2d438a8a88c6..8d7cf3313ff6 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "24.03.00"; + version = "24.07.00"; src = fetchzip { url = "https://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "sha256-UKL5q5sURSVXvEOzoZdG+wWBSS5f9YWo5stViY3F2vg="; + sha256 = "sha256-h+KDXa5wQsT0HMgd0WDfsZM4Tg3Un+CWKa0slZ5cVbA="; stripRoot = false; }; From 6266094e825c95395368331aa76d857909505a42 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Fri, 2 Aug 2024 16:15:03 -0700 Subject: [PATCH 004/212] pythonPackages.mako: disable broken tests in llvm --- pkgs/development/python-modules/jedi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index a47398cb9ca3..ddc0caea5555 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -61,6 +61,14 @@ buildPythonPackage rec { ++ lib.optionals (stdenv.isAarch64 && pythonOlder "3.9") [ # AssertionError: assert 'foo' in ['setup'] "test_init_extension_module" + ] + ++ lib.optionals (stdenv.targetPlatform.useLLVM or false) [ + # InvalidPythonEnvironment: The python binary is potentially unsafe. + "test_create_environment_executable" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_keys_completions" + # AssertionError: assert ['', '.1000000000000001'] == ['', '.1'] + "test_dict_completion" ]; meta = with lib; { From 9059a37d41fb5ffb2a0b7b1e01025a4761a175ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 15:24:17 +0000 Subject: [PATCH 005/212] python312Packages.pynetbox: 7.3.4 -> 7.4.0 --- pkgs/development/python-modules/pynetbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e58ae0afdf45..e31759ec981c 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pynetbox"; - version = "7.3.4"; + version = "7.4.0"; format = "setuptools"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ie309I19BhzASrmc3Ws1zV/BySc49AhFPNrNKQhTD0U="; + hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI="; }; nativeBuildInputs = [ setuptools-scm ]; From b24de4052b76d01d3db49c2b5ca13d96359a09ac Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 15 Aug 2024 11:11:07 +0200 Subject: [PATCH 006/212] doc: refactor documentation for lib.{composeExtensions,composeManyExtensions} --- lib/fixed-points.nix | 95 ++++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 30 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 2a31b44f27c1..5f97a3face49 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -311,28 +311,8 @@ rec { ); /** - Compose two extending functions of the type expected by 'extends' - into one where changes made in the first are available in the - 'super' of the second - - - # Inputs - - `f` - - : 1\. Function argument - - `g` - - : 2\. Function argument - - `final` - - : 3\. Function argument - - `prev` - - : 4\. Function argument + Compose two overlay functions and return a single overlay function that combines them. + For more details see: [composeManyExtensions](#function-library-lib.fixedPoints.composeManyExtensions). */ composeExtensions = f: g: final: prev: @@ -341,14 +321,69 @@ rec { 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 - subsequent ones. + Composes a list of [`overlays`](#chap-overlays) and returns a single overlay function that combines them. + + :::{.note} + The result is produced by using the update operator `//`. + This means nested values of previous overlays are not merged recursively. + In other words, previously defined attributes are replaced, ignoring the previous value, unless referenced by the overlay; for example `final: prev: { foo = final.foo + 1; }`. + ::: + + # Inputs + + `extensions` + + : A list of overlay functions + :::{.note} + The order of the overlays in the list is important. + ::: + + : Each overlay function takes two arguments, by convention `final` and `prev`, and returns an attribute set. + - `final` is the result of the fixed-point function, with all overlays applied. + - `prev` is the result of the previous overlay function. + + + # Type ``` - composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet - ^final ^prev ^overrides ^final ^prev ^overrides + # Pseudo code + let + # final prev + # ↓ ↓ + OverlayFn :: ( { ... } -> { ... } -> { ... } ); + in + composeManyExtensions :: [ OverlayFn ] -> OverlayFn ``` + + # Examples + :::{.example} + ## `lib.fixedPoints.composeManyExtensions` usage example + + ```nix + let + # The "original function" that is extended by the overlays. + # Note that it doesn't have prev: as argument since it can be thought of as the first function. + original = final: { a = 1; }; + + # Each overlay function has 'final' and 'prev' as arguments. + overlayA = final: prev: { b = final.c; c = 3; }; + overlayB = final: prev: { c = 10; x = prev.c or 5; }; + + extensions = composeManyExtensions [ overlayA overlayB ]; + + # Caluculate the fixed point of all composed overlays. + fixedpoint = lib.fix (lib.extends extensions original ); + + in fixedpoint + => + { + a = 1; + b = 10; + c = 10; + x = 3; + } + ``` + ::: */ composeManyExtensions = lib.foldr (x: y: composeExtensions x y) (final: prev: {}); @@ -357,17 +392,17 @@ rec { Create an overridable, recursive attribute set. For example: ``` - nix-repl> obj = makeExtensible (self: { }) + nix-repl> obj = makeExtensible (final: { }) nix-repl> obj { __unfix__ = «lambda»; extend = «lambda»; } - nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) + nix-repl> obj = obj.extend (final: prev: { foo = "foo"; }) nix-repl> obj { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; } - nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) + nix-repl> obj = obj.extend (final: prev: { foo = prev.foo + " + "; bar = "bar"; foobar = final.foo + final.bar; }) nix-repl> obj { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; } From dea395bbad7239f25761b615fd24f0607c77f644 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 15 Aug 2024 11:11:52 +0200 Subject: [PATCH 007/212] format: lib/fixed-points --- lib/fixed-points.nix | 57 +++++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 24 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 5f97a3face49..429ea7720056 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -63,7 +63,6 @@ rec { See [`extends`](#function-library-lib.fixedPoints.extends) for an example use case. There `self` is also often called `final`. - # Inputs `f` @@ -90,7 +89,12 @@ rec { ::: */ - fix = f: let x = f x; in x; + fix = + f: + let + x = f x; + in + x; /** A variant of `fix` that records the original recursive attribute set in the @@ -99,14 +103,20 @@ rec { This is useful in combination with the `extends` function to implement deep overriding. - # Inputs `f` : 1\. Function argument */ - fix' = f: let x = f x // { __unfix__ = f; }; in x; + fix' = + f: + let + x = f x // { + __unfix__ = f; + }; + in + x; /** Return the fixpoint that `f` converges to when called iteratively, starting @@ -117,7 +127,6 @@ rec { 0 ``` - # Inputs `f` @@ -134,13 +143,12 @@ rec { (a -> a) -> a -> a ``` */ - converge = f: x: + converge = + f: x: let x' = f x; in - if x' == x - then x - else converge f x'; + if x' == x then x else converge f x'; /** Extend a function using an overlay. @@ -149,7 +157,6 @@ rec { A fixed-point function is a function which is intended to be evaluated by passing the result of itself as the argument. This is possible due to Nix's lazy evaluation. - A fixed-point function returning an attribute set has the form ```nix @@ -257,7 +264,6 @@ rec { ``` ::: - # Inputs `overlay` @@ -299,8 +305,7 @@ rec { ::: */ extends = - overlay: - f: + overlay: f: # The result should be thought of as a function, the argument of that function is not an argument to `extends` itself ( final: @@ -316,9 +321,11 @@ rec { */ composeExtensions = f: g: final: prev: - let fApplied = f final prev; - prev' = prev // fApplied; - in fApplied // g final prev'; + let + fApplied = f final prev; + prev' = prev // fApplied; + in + fApplied // g final prev'; /** Composes a list of [`overlays`](#chap-overlays) and returns a single overlay function that combines them. @@ -342,7 +349,6 @@ rec { - `final` is the result of the fixed-point function, with all overlays applied. - `prev` is the result of the previous overlay function. - # Type ``` @@ -385,8 +391,7 @@ rec { ``` ::: */ - composeManyExtensions = - lib.foldr (x: y: composeExtensions x y) (final: prev: {}); + composeManyExtensions = lib.foldr (x: y: composeExtensions x y) (final: prev: { }); /** Create an overridable, recursive attribute set. For example: @@ -414,7 +419,6 @@ rec { Same as `makeExtensible` but the name of the extending attribute is customized. - # Inputs `extenderName` @@ -425,8 +429,13 @@ rec { : 2\. Function argument */ - makeExtensibleWithCustomName = extenderName: rattrs: - fix' (self: (rattrs self) // { - ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); - }); + makeExtensibleWithCustomName = + extenderName: rattrs: + fix' ( + self: + (rattrs self) + // { + ${extenderName} = f: makeExtensibleWithCustomName extenderName (extends f rattrs); + } + ); } From 403ddc3beee04ed0230413b36173690553c84f36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 04:56:53 +0000 Subject: [PATCH 008/212] rain: 1.12.0 -> 1.15.0 --- pkgs/development/tools/rain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rain/default.nix b/pkgs/development/tools/rain/default.nix index 91f5c0f6ab85..11e143dfda23 100644 --- a/pkgs/development/tools/rain/default.nix +++ b/pkgs/development/tools/rain/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "rain"; - version = "1.12.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "aws-cloudformation"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oj9/xVbb8+J4g/ul2CEs5LH7OKJdEqTTZonCHVlDc7M="; + sha256 = "sha256-B+LSwZ1AugYhMlt1XcG8i8SIORO0vFMUxJrF6z3Crus="; }; - vendorHash = "sha256-NcM+SdIgqtSRg7Fcwml/V73qYHcowBdOtmuF7EMSBB8="; + vendorHash = "sha256-JTKoEuO3D+/MO7FeSu1tiVqERkQiu2nG/KiEth1ylG0="; subPackages = [ "cmd/rain" ]; From a0bda77e6a849d393fb8765bd2b95f57f4cf1000 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 26 Aug 2024 09:12:49 +0100 Subject: [PATCH 009/212] socat: 1.8.0.0 -> 1.8.0.1 Changes: http://www.dest-unreach.org/socat/CHANGES --- pkgs/tools/networking/socat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 58d33bc886f5..653f4b6e39a5 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "socat"; - version = "1.8.0.0"; + version = "1.8.0.1"; src = fetchurl { url = "http://www.dest-unreach.org/socat/download/${pname}-${version}.tar.bz2"; - hash = "sha256-4d5oPdIu4OOmxrv/Jpq+GKsMnX62UCBPElFVuQBfrKc="; + hash = "sha256-aig1Zdt8+GKSxvcFBMWKuwPimIit7tWmxfNFfoA8G4E="; }; postPatch = '' From ab8a1f839c6ae8f06d8ff9b6d756b4e159471a75 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:06:55 +0200 Subject: [PATCH 010/212] scotch: 7.0.4 -> 7.0.5 Diff: https://gitlab.inria.fr/scotch/scotch/-/compare/v7.0.4...v7.0.5 --- pkgs/by-name/sc/scotch/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 8455b4d22648..c06276883090 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.4"; + version = "7.0.5"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-uaox4Q9pTF1r2BZjvnU2LE6XkZw3x9mGSKLdRVUobGU="; + hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; nativeBuildInputs = [ From 84defedf7edec6803d632481cd9e0e2cd362350e Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:17:21 +0200 Subject: [PATCH 011/212] scotch: split outputs --- pkgs/by-name/sc/scotch/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index c06276883090..62b4d917fa1f 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -24,6 +24,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-XXkVwTr8cbYfzXWWkPERTmjfE86JHUUuU6yxjp9k6II="; }; + outputs = [ + "bin" + "dev" + "out" + ]; + nativeBuildInputs = [ cmake gfortran From 229f3bb6d7f2688adc6295fd18fc1b522167c592 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 26 Aug 2024 23:18:48 +0200 Subject: [PATCH 012/212] scotch: shared libs --- pkgs/by-name/sc/scotch/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 62b4d917fa1f..e089a0666072 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + nativeBuildInputs = [ cmake gfortran From 981629a05b844bbfc775ac141c692e95fd6a61f7 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 27 Aug 2024 11:15:25 +0200 Subject: [PATCH 013/212] mumps: update scotch include dir --- pkgs/by-name/mu/mumps/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index a02d7901617e..17c005946f57 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ [ "LSCOTCHDIR=${scotch}/lib" - "ISCOTCH=-I${scotch}/include" + "ISCOTCH=-I${scotch.dev}/include" "LMETISDIR=${metis}/lib" "IMETIS=-I${metis}/include" "allshared" From 6bea9fece4985067988abd589b9f6f9a2ead6e7e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 29 Aug 2024 21:10:46 +0200 Subject: [PATCH 014/212] dart: 3.5.1 -> 3.5.2 --- pkgs/development/compilers/dart/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix index c169f32f221f..9246628d0199 100644 --- a/pkgs/development/compilers/dart/sources.nix +++ b/pkgs/development/compilers/dart/sources.nix @@ -1,24 +1,24 @@ -let version = "3.5.1"; in +let version = "3.5.2"; in { fetchurl }: { versionUsed = version; "${version}-x86_64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip"; - sha256 = "18v73dr61033g0x27vb0fdjwyzc1d04fifmwwnv4157nfpb68ijc"; + sha256 = "0k1h7kbcagm7s0n8696lzws814rabz3491khd7z78mb3ivahxw35"; }; "${version}-aarch64-darwin" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip"; - sha256 = "1vjsnwlkvsb0xvap45fdd81vdsjkpl2yxr8xh39v77dxbpybi0qh"; + sha256 = "036jw4qq3wicyfpamy7v6qsbrj0m7dyny45yzdgil4snvfagvfsv"; }; "${version}-aarch64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip"; - sha256 = "0lwnvky3p37d81ib6qwxra7lxn19l5x30c7aycixd9yaslq1bc0v"; + sha256 = "1wm1157hbsms872pp1fkn0i3khz3h4r909bdvpk2rhag2l928f0a"; }; "${version}-x86_64-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip"; - sha256 = "0zn2mw8awii0hrvyh146hb5604li0jgxxgavpi19zcdpnzdg6z7c"; + sha256 = "160dk1dpdzdh0pphmvdw7agavpyxniw8zf5w30yamkdi7r9g0l0b"; }; "${version}-i686-linux" = fetchurl { url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-ia32-release.zip"; - sha256 = "11x7yyif51hyn8yi2lqbkfm3lfalkvh54v5pi851mfdnf14hsjpw"; + sha256 = "0nrgjdzc2skqc2b52pzw78056jqrqmiwzwwd9wh699dwwfnrjcf4"; }; } From dfa73af57d60a40fc1dc7e65513e2928f811e819 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 26 Aug 2024 23:27:37 -0400 Subject: [PATCH 015/212] temurin-bin: support riscv64-linux --- .../compilers/temurin-bin/generate-sources.py | 1 + .../compilers/temurin-bin/sources.json | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py index f9e53e197c97..adeca0b73326 100755 --- a/pkgs/development/compilers/temurin-bin/generate-sources.py +++ b/pkgs/development/compilers/temurin-bin/generate-sources.py @@ -16,6 +16,7 @@ arch_to_nixos = { "aarch64": ("aarch64",), "arm": ("armv6l", "armv7l"), "ppc64le": ("powerpc64le",), + "riscv64": ("riscv64",), } def generate_sources(assets, feature_version, out): diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json index fe24b9f5199c..23d7305ea774 100644 --- a/pkgs/development/compilers/temurin-bin/sources.json +++ b/pkgs/development/compilers/temurin-bin/sources.json @@ -302,6 +302,12 @@ "sha256": "aa7fb6bb342319d227a838af5c363bfa1b4a670c209372f9e6585bd79da6220c", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "d024c100eba4709970716ddcac757ba5e3122a8ff9c6f539ff8bac5b47f51f3a", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -414,6 +420,12 @@ "sha256": "fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "b04fd7f52d18268a935f1a7144dae802b25db600ec97156ddd46b3100cbd13da", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -436,6 +448,12 @@ "sha256": "e59c6bf801cc023a1ea78eceb5e6756277f1564cd0a421ea984efe6cb96cfcf8", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "830a0d006c2dae95c0855aa70e193dba637831b491ccd67333322dea31bcf389", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { @@ -540,6 +558,12 @@ "sha256": "bcb1b7b8ad68c93093f09b591b7cb17161d39891f7d29d33a586f5a328603707", "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_x64_linux_hotspot_17.0.11_9.tar.gz", "version": "17.0.11" + }, + "riscv64": { + "build": "7", + "sha256": "2d1ed42918305a1a0754a6e1e9294c7d4d7fda4bff6dba7bc5682037d860dbc9", + "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.12_7.tar.gz", + "version": "17.0.12" } }, "openjdk18": { @@ -652,6 +676,12 @@ "sha256": "f1af100c4afca2035f446967323230150cfe5872b5a664d98c86963e5c066e0d", "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_x64_linux_hotspot_21.0.3_9.tar.gz", "version": "21.0.3" + }, + "riscv64": { + "build": "7", + "sha256": "bf814344429f53d11f8aace14d326e2580ea6e66dd81b109c79160bd41735237", + "url": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.4_7.tar.gz", + "version": "21.0.4" } }, "openjdk22": { @@ -674,6 +704,12 @@ "sha256": "154dbc7975cf765c59bdaa1e693d6c8b009635c9a182d6d6d9f0cfbec5317b4c", "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_x64_linux_hotspot_22.0.1_8.tar.gz", "version": "22.0.1" + }, + "riscv64": { + "build": "9", + "sha256": "81aacc0ae75e65846e6207edf41b8c5927673eba5588eebc5ba8076ca9a6041c", + "url": "https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.2_9.tar.gz", + "version": "22.0.2" } }, "openjdk8": { From 2929e5476b74bb1a9fcb95093e34131d7d6cc022 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 05:02:45 +0000 Subject: [PATCH 016/212] verifast: 21.04 -> 24.08.30 --- pkgs/applications/science/logic/verifast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index a1f5ec65a3be..9515bda467cf 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "verifast"; - version = "21.04"; + version = "24.08.30"; src = fetchurl { url = "https://github.com/verifast/verifast/releases/download/${version}/${pname}-${version}-linux.tar.gz"; - sha256 = "sha256-PlRsf4wFXoM+E+60SbeKzs/RZK0HNVirX47AnI6NeYM="; + sha256 = "sha256-hIS5e+zVlxSOqr1/ZDy0PangyWjB9uLCvN8Qr688msg="; }; dontConfigure = true; From dbeb07693d084746010d8f0247ef8baa967419ad Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 17:32:50 -0300 Subject: [PATCH 017/212] czkawka: refactor - use explicit self-reference - so that we don't need to refer to czkawka in the input set - nixfmt-rfc-style --- .../cz/czkawka/{time.patch => 0000-time.diff} | 0 pkgs/by-name/cz/czkawka/package.nix | 187 +++++++++--------- 2 files changed, 99 insertions(+), 88 deletions(-) rename pkgs/by-name/cz/czkawka/{time.patch => 0000-time.diff} (100%) diff --git a/pkgs/by-name/cz/czkawka/time.patch b/pkgs/by-name/cz/czkawka/0000-time.diff similarity index 100% rename from pkgs/by-name/cz/czkawka/time.patch rename to pkgs/by-name/cz/czkawka/0000-time.diff diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index cc3396125f40..32477d9b60cd 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -1,95 +1,106 @@ -{ lib -, stdenv -, atk -, cairo -, czkawka -, darwin -, fetchFromGitHub -, gdk-pixbuf -, glib -, gobject-introspection -, gtk4 -, pango -, overrideSDK -, pkg-config -, rustPlatform -, testers -, wrapGAppsHook4 -, xvfb-run +{ + lib, + atk, + cairo, + darwin, + fetchFromGitHub, + gdk-pixbuf, + glib, + gobject-introspection, + gtk4, + overrideSDK, + pango, + pkg-config, + rustPlatform, + stdenv, + testers, + wrapGAppsHook4, + xvfb-run, }: let - pname = "czkawka"; - version = "7.0.0"; - - src = fetchFromGitHub { - owner = "qarmin"; - repo = "czkawka"; - rev = version; - hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; - }; - cargoPatches = [ ./time.patch ]; - cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; - buildRustPackage' = rustPlatform.buildRustPackage.override { stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; }; + + self = buildRustPackage' { + pname = "czkawka"; + version = "7.0.0"; + + src = fetchFromGitHub { + owner = "qarmin"; + repo = "czkawka"; + rev = self.version; + hash = "sha256-SOWtLmehh1F8SoDQ+9d7Fyosgzya5ZztCv8IcJZ4J94="; + }; + + cargoPatches = [ + # Updates time and time-macros from Cargo.lock + ./0000-time.diff + ]; + + cargoHash = "sha256-cQv8C0P3xizsvnJODkTMJQA98P4nYSCHFT75isJE6es="; + + nativeBuildInputs = [ + gobject-introspection + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = + [ + atk + cairo + gdk-pixbuf + glib + gtk4 + pango + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + AppKit + Foundation + ] + ); + + nativeCheckInputs = [ xvfb-run ]; + + strictDeps = true; + + doCheck = stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform); + + checkPhase = '' + runHook preCheck + xvfb-run cargo test + runHook postCheck + ''; + + # Desktop items, icons and metainfo are not installed automatically + postInstall = '' + install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg + install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg + install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml + ''; + + passthru.tests.version = testers.testVersion { + package = self; + command = "czkawka_cli --version"; + }; + + meta = { + homepage = "https://github.com/qarmin/czkawka"; + description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; + changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md"; + license = with lib.licenses; [ mit ]; + mainProgram = "czkawka_gui"; + maintainers = with lib.maintainers; [ + AndersonTorres + yanganto + _0x4A6F + ]; + }; + }; in -buildRustPackage' { - inherit pname version src cargoPatches cargoHash; - - nativeBuildInputs = [ - gobject-introspection - pkg-config - wrapGAppsHook4 - ]; - - buildInputs = [ - atk - cairo - gdk-pixbuf - glib - gtk4 - pango - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Foundation - AppKit - ]); - - nativeCheckInputs = [ - xvfb-run - ]; - - strictDeps = true; - - checkPhase = '' - runHook preCheck - xvfb-run cargo test - runHook postCheck - ''; - - doCheck = stdenv.hostPlatform.isLinux - && (stdenv.hostPlatform == stdenv.buildPlatform); - - passthru.tests.version = testers.testVersion { - package = czkawka; - command = "czkawka_cli --version"; - }; - - # Desktop items, icons and metainfo are not installed automatically - postInstall = '' - install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg - install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml - ''; - - meta = { - changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; - description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; - homepage = "https://github.com/qarmin/czkawka"; - license = with lib.licenses; [ mit ]; - mainProgram = "czkawka_gui"; - maintainers = with lib.maintainers; [ AndersonTorres yanganto _0x4A6F ]; - }; -} +self From 9cc5c5ec1db3e1f67992afd34f82608f53917ef6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 3 Sep 2024 19:00:46 -0300 Subject: [PATCH 018/212] czkawka-full: "init" This meta-package is a convenient wrapper for czkawka, useful to include extra auxiliary packages - like ffmpeg. Many thanks for `parallel` package keepers! The idea is nice! --- pkgs/by-name/cz/czkawka/package.nix | 12 ++++++++--- pkgs/by-name/cz/czkawka/wrapper.nix | 33 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/cz/czkawka/wrapper.nix diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index 32477d9b60cd..6e8cf21d298a 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -2,6 +2,7 @@ lib, atk, cairo, + callPackage, darwin, fetchFromGitHub, gdk-pixbuf, @@ -84,9 +85,14 @@ let install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml ''; - passthru.tests.version = testers.testVersion { - package = self; - command = "czkawka_cli --version"; + passthru = { + tests.version = testers.testVersion { + package = self; + command = "czkawka_cli --version"; + }; + wrapper = callPackage ./wrapper.nix { + czkawka = self; + }; }; meta = { diff --git a/pkgs/by-name/cz/czkawka/wrapper.nix b/pkgs/by-name/cz/czkawka/wrapper.nix new file mode 100644 index 000000000000..0b2e7bf0ed0e --- /dev/null +++ b/pkgs/by-name/cz/czkawka/wrapper.nix @@ -0,0 +1,33 @@ +{ + lib, + czkawka, + makeWrapper, + symlinkJoin, + # configurable options + extraPackages ? [ ], +}: + +symlinkJoin { + name = "czkawka-wrapped-${czkawka.version}"; + inherit (czkawka) pname version outputs; + + nativeBuildInputs = [ makeWrapper ]; + + paths = [ czkawka ]; + + postBuild = '' + ${lib.concatMapStringsSep "\n" ( + output: "ln --symbolic --no-target-directory ${czkawka.${output}} \$${output}" + ) (lib.remove "out" czkawka.outputs)} + + pushd $out/bin + for f in *; do + rm -v $f + makeWrapper ${lib.getBin czkawka}/bin/$f $out/bin/$f \ + --prefix PATH ":" "${lib.makeBinPath extraPackages}" + done + popd + ''; + + meta = czkawka.meta; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c734ccfa5358..5ebe37f8e83e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4471,6 +4471,10 @@ with pkgs; cz-cli = callPackage ../applications/version-management/cz-cli { }; + czkawka-full = czkawka.wrapper.override { + extraPackages = [ ffmpeg ]; + }; + comma = callPackage ../tools/package-management/comma { }; commitizen = with python3Packages; toPythonApplication commitizen; From 619551a371d2cc1cb7288e65a11c943c7e5a55fc Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Thu, 5 Sep 2024 15:38:36 -0400 Subject: [PATCH 019/212] aldente: 1.27.3 -> 1.28.2 --- pkgs/by-name/al/aldente/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 9759dba06ebd..73d4ae9614e8 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "aldente"; - version = "1.27.3"; + version = "1.28.2"; src = fetchurl { url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg"; - hash = "sha256-G6Kpfy1LE1VG/nTks4KU6doTKZeJT6gk6JtKmUEy6FI="; + hash = "sha256-CgBH5PRlq6USfdE8ubHKAYNq1YzUmfIN7wAS4HfJvZU="; }; dontBuild = true; @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://apphousekitchen.com"; changelog = "https://github.com/davidwernhart/aldente-charge-limiter/releases/tag/${finalAttrs.version}"; license = lib.licenses.unfree; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" From 361379d6fa741e3ab64a905d9ff8127476446954 Mon Sep 17 00:00:00 2001 From: brokenpip3 Date: Fri, 6 Sep 2024 15:36:53 +0200 Subject: [PATCH 020/212] bats.libraries.bats-detik: fix 1.3.2 hash --- pkgs/development/interpreters/bats/libraries.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/bats/libraries.nix b/pkgs/development/interpreters/bats/libraries.nix index 3e17a931270e..b780bce13fd0 100644 --- a/pkgs/development/interpreters/bats/libraries.nix +++ b/pkgs/development/interpreters/bats/libraries.nix @@ -58,7 +58,7 @@ owner = "bats-core"; repo = "bats-detik"; rev = "v${finalAttrs.version}"; - hash = "sha256-Lz5BPKHtgdakKRALPZFFgz91d07Ubk5rUgA+Ep2aoG8="; + hash = "sha256-f8PN+VsUdUXrR9JiQgVuYDy2QgOtaxE8tkkxOUF0uC4="; }; dontBuild = true; installPhase = '' From 309d9fa4f3955ed36b897e3ec0d127b33765edde Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 16:17:40 +0000 Subject: [PATCH 021/212] python312Packages.libagent: 0.14.8 -> 0.15.0 --- pkgs/development/python-modules/libagent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index 4cfe74118908..a674782a7b8d 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "libagent"; - version = "0.14.8"; + version = "0.15.0"; format = "setuptools"; src = fetchFromGitHub { owner = "romanz"; repo = "trezor-agent"; - rev = "v${version}"; - hash = "sha256-tcVott/GlHsICQf640Gm5jx89fZWsCdcYnBxi/Kh2oc="; + rev = "refs/tags/v${version}"; + hash = "sha256-NmpFyLjLdR9r1tc06iDNH8Tc7isUelTg13mWPrQvxSc="; }; # hardcode the path to gpgconf in the libagent library From 1e768b6903ead463ced282b436cfb7355987d2a5 Mon Sep 17 00:00:00 2001 From: pinage404 Date: Sat, 7 Sep 2024 01:37:40 +0200 Subject: [PATCH 022/212] git-igitt: fix on Mac --- pkgs/by-name/gi/git-igitt/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index f44d33f4f4ea..a8c281991686 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -6,6 +6,8 @@ libgit2, oniguruma, zlib, + stdenv, + darwin, nix-update-script, }: @@ -31,7 +33,7 @@ rustPlatform.buildRustPackage { libgit2 oniguruma zlib - ]; + ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; env = { RUSTONIG_SYSTEM_LIBONIG = true; From 9428f1ebee82e3c82e2403d224722d93577820e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 03:07:24 +0000 Subject: [PATCH 023/212] gemmi: 0.6.6 -> 0.6.7 --- pkgs/by-name/ge/gemmi/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ge/gemmi/package.nix b/pkgs/by-name/ge/gemmi/package.nix index f574f30a9c85..d48e9b6ea9ac 100644 --- a/pkgs/by-name/ge/gemmi/package.nix +++ b/pkgs/by-name/ge/gemmi/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gemmi"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "project-gemmi"; repo = "gemmi"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S31oCp6kLSYgmRaW7Q9/dMhjJ5Y0sK3WPpg2/ZMPyMg="; + hash = "sha256-Y7gQSh9C7smoXuGWgpJI3hPIg06Jns+1dBpmMxuCrKE="; }; nativeBuildInputs = From 558e682820a8a2439efe3cb2d61f389fec9d2482 Mon Sep 17 00:00:00 2001 From: Jack Foltz Date: Sat, 7 Sep 2024 03:15:36 -0400 Subject: [PATCH 024/212] factorio: 1.1.109 -> 1.1.110 https://wiki.factorio.com/Version_history/1.1.0#1.1.110 --- pkgs/games/factorio/versions.json | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json index 0e436ed4a741..60e88c026f9d 100644 --- a/pkgs/games/factorio/versions.json +++ b/pkgs/games/factorio/versions.json @@ -2,56 +2,56 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_alpha_x64-1.1.109.tar.xz", + "name": "factorio_alpha_x64-1.1.110.tar.xz", "needsAuth": true, - "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h", + "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/alpha/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/alpha/linux64", + "version": "1.1.110" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_demo_x64-1.1.109.tar.xz", + "name": "factorio_demo_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx", + "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/demo/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/demo/linux64", + "version": "1.1.110" } }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" }, "stable": { - "name": "factorio_headless_x64-1.1.109.tar.xz", + "name": "factorio_headless_x64-1.1.110.tar.xz", "needsAuth": false, - "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh", + "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.109/headless/linux64", - "version": "1.1.109" + "url": "https://factorio.com/get-download/1.1.110/headless/linux64", + "version": "1.1.110" } } } From 0dc1c7294c13f5d1dd6eccab4f75d268d7296efe Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sat, 31 Aug 2024 19:16:54 +0300 Subject: [PATCH 025/212] etesync-dav: 0.32.1 -> 0.32.1-unstable-2024-09-02 Diff: https://github.com/etesync/etesync-dav/compare/v0.32.1...b9b23bf6fba60d42012008ba06023bccd9109c08 - contains commit pulled previously pulled with fetchpatch: https://www.github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e - contains commit with changes to log.set_level() from radicale 3.2.2 update (additional second arg - backtrace_on_debug): https://www.github.com/Kozea/Radicale/pull/1519 https://www.github.com/etesync/etesync-dav/pull/318 --- .../applications/misc/etesync-dav/default.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 85ff399ac83f..6b68334f20f4 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,29 +1,22 @@ { lib , stdenv -, fetchpatch , nixosTests , python3 -, fetchPypi +, fetchFromGitHub , radicale3 }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication { pname = "etesync-dav"; - version = "0.32.1"; + version = "0.32.1-unstable-2024-09-02"; - src = fetchPypi { - inherit pname version; - hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; + src = fetchFromGitHub { + owner = "etesync"; + repo = "etesync-dav"; + rev = "b9b23bf6fba60d42012008ba06023bccd9109c08"; + hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ="; }; - patches = [ - (fetchpatch { - name = "add-missing-comma-in-setup.py.patch"; - url = "https://github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e.patch"; - hash = "sha256-87IpIQ87rgpinvbRwUlWd0xeegn0zfVSiDFYNUqPerg="; - }) - ]; - propagatedBuildInputs = with python3.pkgs; [ appdirs etebase From b7c311d3a5f66cb2a564f7294ac8c551d3a9726d Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 8 Sep 2024 09:13:46 +0900 Subject: [PATCH 026/212] python312Packages.libagent: refactor - switch to pypa build - enable tests --- .../python-modules/libagent/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index a674782a7b8d..3422ae2ced2d 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, bech32, buildPythonPackage, + setuptools, cryptography, ed25519, ecdsa, @@ -11,7 +12,7 @@ mnemonic, unidecode, mock, - pytest, + pytestCheckHook, backports-shutil-which, configargparse, python-daemon, @@ -24,7 +25,7 @@ buildPythonPackage rec { pname = "libagent"; version = "0.15.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "romanz"; @@ -40,7 +41,9 @@ buildPythonPackage rec { --replace "'gpg-connect-agent'" "'${gnupg}/bin/gpg-connect-agent'" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ unidecode backports-shutil-which configargparse @@ -55,14 +58,17 @@ buildPythonPackage rec { cryptography ]; + pythonImportsCheck = [ "libagent" ]; + nativeCheckInputs = [ mock - pytest + pytestCheckHook ]; - checkPhase = '' - py.test libagent/tests - ''; + disabledTests = [ + # test fails in sandbox + "test_get_agent_sock_path" + ]; meta = with lib; { description = "Using hardware wallets as SSH/GPG agent"; From 6a7bc2048e649a3ad0f918aed3fc396d9a0e3d03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 02:26:28 +0000 Subject: [PATCH 027/212] python312Packages.universal-pathlib: 0.2.3 -> 0.2.4 --- pkgs/development/python-modules/universal-pathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index b01e2dab57f1..ba1eb83c4706 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.2.3"; + version = "0.2.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-IvXyif7exLZjlWWWdCZS4hd7yiRmG2yKFz9ZdM/uAFI="; + hash = "sha256-VXChH9iMrRu8YiCz5yP92K38XF4AhlIJ6IrwP/SqFUs="; }; nativeBuildInputs = [ From 37cf9cbb22e43e3cc851c6a70033f2a6c39e544b Mon Sep 17 00:00:00 2001 From: phaer Date: Tue, 14 May 2024 00:41:32 +0200 Subject: [PATCH 028/212] security/dhparams: shellcheck fixes --- nixos/modules/security/dhparams.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/dhparams.nix b/nixos/modules/security/dhparams.nix index 738062c95c47..c501ea70d05c 100644 --- a/nixos/modules/security/dhparams.nix +++ b/nixos/modules/security/dhparams.nix @@ -157,7 +157,7 @@ in { continue fi '') cfg.params)} - rm $file + rm "$file" done # TODO: Ideally this would be removing the *former* cfg.path, though From a0e1d1fd6c57eb2282b2d96b007d3536c0c5316a Mon Sep 17 00:00:00 2001 From: ghpzin Date: Sun, 8 Sep 2024 16:09:41 +0300 Subject: [PATCH 029/212] nixos/tests/gitdaemon: fix user and group - change tmpfiles rule user/group to default daemon user/group set by gitDaemon module - git:git - add chown of created repo to user/group of daemon after local subtest on server (that run from root user) pass. Without it next subtest doing clone from remote fails with "detected dubious ownership in repository" on server side. --- nixos/tests/gitdaemon.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix index 052fa902b450..2211960b457f 100644 --- a/nixos/tests/gitdaemon.nix +++ b/nixos/tests/gitdaemon.nix @@ -20,7 +20,7 @@ in { systemd.tmpfiles.rules = [ # type path mode user group age arg - " d /git 0755 root root - -" + " d /git 0755 git git - -" ]; services.gitDaemon = { @@ -56,6 +56,10 @@ in { "rm -r /project", ) + # Change user/group to default daemon user/group from module + # to avoid "fatal: detected dubious ownership in repository at '/git/project.git'" + server.succeed("chown git:git -R /git/project.git") + with subtest("git daemon starts"): server.wait_for_unit("git-daemon.service") From 68263b9ab8113ccea1fdbcc3616826552e338be7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 16:17:01 +0000 Subject: [PATCH 030/212] glance: 0.5.1 -> 0.6.0 --- pkgs/by-name/gl/glance/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glance/package.nix b/pkgs/by-name/gl/glance/package.nix index 11ba4a35406d..6d6b0bb03dfa 100644 --- a/pkgs/by-name/gl/glance/package.nix +++ b/pkgs/by-name/gl/glance/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "glance"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "glanceapp"; repo = "glance"; rev = "v${version}"; - hash = "sha256-ebHSnzTRmWw2YBnVIR4h2zdZvbUHbKVzmQYPHDTvZDQ="; + hash = "sha256-0P1f7IDEPSlVHtrygIsD502lIHqLISsSAi9pqB/gFdA="; }; - vendorHash = "sha256-Okme73vLc3Pe9+rNlmG8Bj1msKaVb5PaIBsAAeTer6s="; + vendorHash = "sha256-BLWaYiWcLX+/DW7Zzp6/Mtw5uVxIVtfubB895hrZ+08="; excludedPackages = [ "scripts/build-and-ship" ]; From f6564dde2f9cf262c9ea7c8aef7ec31973252a40 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 18:54:54 +0000 Subject: [PATCH 031/212] microsoft-edge: 128.0.2739.54 -> 128.0.2739.67 --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 2dee22ef74fe..3946aff88551 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { beta = import ./browser.nix { channel = "beta"; - version = "129.0.2792.12"; + version = "129.0.2792.21"; revision = "1"; - hash = "sha256-LWu5DKCoGSFqUZqgvKx3aoZRzAf6FR3hJnk/agAV9sI="; + hash = "sha256-NrDRroKyjY9zC9KoMWaEPAPnu+JNNDZwLVbuDvoUG1M="; }; dev = import ./browser.nix { channel = "dev"; - version = "129.0.2792.10"; + version = "130.0.2808.0"; revision = "1"; - hash = "sha256-jw/muaunLlrtZADrD7asVH+o/u3cp3NyvjRXqPWyHJI="; + hash = "sha256-6mqStxS9HJvfKbrGqQGlqQKXc2SnvOycirPihfnkaLI="; }; stable = import ./browser.nix { channel = "stable"; - version = "128.0.2739.54"; + version = "128.0.2739.67"; revision = "1"; - hash = "sha256-qiLZExLU3f6l+qPEGiqOuDgjqOtSyhPwSt7kQfBBSyg="; + hash = "sha256-Y8PxyAibuEhwKJpqnhtBy1F2Kn+ONw6NVtC25R+fFVo="; }; } From 32d76082eca50b296b42de88c61d31048e1920e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 9 Sep 2024 08:38:45 +0200 Subject: [PATCH 032/212] python312Packages.universal-pathlib: refactor --- .../python-modules/universal-pathlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index ba1eb83c4706..32b79b3e22ce 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; version = "0.2.4"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -21,12 +21,12 @@ buildPythonPackage rec { hash = "sha256-VXChH9iMrRu8YiCz5yP92K38XF4AhlIJ6IrwP/SqFUs="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ fsspec ]; + dependencies = [ fsspec ]; pythonImportsCheck = [ "upath" ]; From d27ff4322a6c365986a89a16e31011de811a350b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 10:29:51 +0000 Subject: [PATCH 033/212] morgen: 3.5.5 -> 3.5.6 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 5454eea2fd07..797a1ca2ea67 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-xT/mV54L2tXiQnUR7K/h61FsHtF16siEExM/I0mSy+8="; + hash = "sha256-knguIcvGCwlI83DIaX/EYt/15azMoxEWNtFIXYqLops="; }; nativeBuildInputs = [ From 4019f1156bec733cb2285a7fe768877d2450e440 Mon Sep 17 00:00:00 2001 From: aktaboot Date: Fri, 6 Sep 2024 20:33:30 +0200 Subject: [PATCH 034/212] xdg-utils: remove mimi reasons for this change: - mimi is old and unmaintained - enabling mimiSupport currently does not build - if we really want this, we should probably add mimi in nixpkgs first and then use it as an input --- pkgs/tools/X11/xdg-utils/default.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 9d3274195977..5b3a1a5367c0 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -5,17 +5,9 @@ , resholve, bash, coreutils, dbus, file, gawk, glib, gnugrep, gnused, jq, nettools, procmail, procps, which, xdg-user-dirs , shared-mime-info , perl, perlPackages -, mimiSupport ? false , withXdgOpenUsePortalPatch ? true }: let - # A much better xdg-open - mimisrc = fetchFromGitHub { - owner = "march-linux"; - repo = "mimi"; - rev = "8e0070f17bcd3612ee83cb84e663e7c7fabcca3d"; - sha256 = "15gw2nyrqmdsdin8gzxihpn77grhk9l97jp7s7pr7sl4n9ya2rpj"; - }; # Required by the common desktop detection code commonDeps = [ dbus coreutils gnugrep gnused ]; @@ -268,10 +260,6 @@ stdenv.mkDerivation (self: { # explicitly provide a runtime shell so patchShebangs is consistent across build platforms buildInputs = [ bash ]; - postInstall = lib.optionalString mimiSupport '' - cp ${mimisrc}/xdg-open $out/bin/xdg-open - ''; - preFixup = lib.concatStringsSep "\n" (map (resholve.phraseSolution "xdg-utils-resholved") solutions); passthru.tests.xdg-mime = runCommand "xdg-mime-test" { @@ -305,7 +293,7 @@ stdenv.mkDerivation (self: { meta = with lib; { homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "Set of command line tools that assist applications with a variety of desktop integration tasks"; - license = if mimiSupport then licenses.gpl2Only else licenses.mit; + license = licenses.mit; maintainers = [ ]; platforms = platforms.all; }; From 45bb5cea1e824749eba9e9460d7c8bc90a703c1b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 05:43:31 +0000 Subject: [PATCH 035/212] bun: 1.1.20 -> 1.1.27 --- pkgs/development/web/bun/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix index 0cc03477db96..66f0bd7a6431 100644 --- a/pkgs/development/web/bun/default.nix +++ b/pkgs/development/web/bun/default.nix @@ -12,7 +12,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.1.20"; + version = "1.1.27"; pname = "bun"; src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); @@ -51,19 +51,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-ErutjiXBjC9GDvb0F39AgbbsSo6zhRzpDEvDor/xRbI="; + hash = "sha256-I/axYOXXLU5V+82jfNwsmhjwGOMkK+e5Sx7pKqQlvBE="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-vqL/H5t0elgT9fSk0Op7Td69eP9WPY2XVo1a8sraTwM="; + hash = "sha256-LvIjCWx7fd0EOLEY9qy26SS5/5ztAvEPKdv8mUG+TCA="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-5PLk8q3di5TW8HUfo7P3xrPWLhleAiSv9jp2XeL47Kk="; + hash = "sha256-/YgDnB8m0ZhkKpqPvFL8Hd6IBitySD+jMOJCn/7xxG8="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-bLcK0DSaLOzJSrIRPNHQeld5qud8ccqxzyDIgawMB3U="; + hash = "sha256-Ir0EQH+bnHPwOTakrO/ZQ6pyeOWvhu5bK5j+YLN8Myc="; }; }; updateScript = writeShellScript "update-bun" '' From c4043f3ad5b0b64445f1cebc61de8524992698bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:43:20 +0000 Subject: [PATCH 036/212] typescript: 5.5.4 -> 5.6.2 --- pkgs/development/compilers/typescript/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/typescript/default.nix b/pkgs/development/compilers/typescript/default.nix index 9cf8cb530cda..513f8a99180f 100644 --- a/pkgs/development/compilers/typescript/default.nix +++ b/pkgs/development/compilers/typescript/default.nix @@ -2,20 +2,20 @@ buildNpmPackage rec { pname = "typescript"; - version = "5.5.4"; + version = "5.6.2"; src = fetchFromGitHub { owner = "microsoft"; repo = "TypeScript"; rev = "v${version}"; - hash = "sha256-U4lFR2SJQYqJYptVf3/QMD7ufa3r7Zm704gcwFKM/7s="; + hash = "sha256-aomoO/1E7zdhRNTCKqbA7ktor03zjg5HZXPxhH8iris="; }; patches = [ ./disable-dprint-dstBundler.patch ]; - npmDepsHash = "sha256-JYNFAOTN0WvYkr20J6tFM1KSIDTm1LlFw7w1bLkdg6k="; + npmDepsHash = "sha256-I44XhQzUsbf6Q4r2o40l9qBU8FMRZuYhb7dLVvFDyJc="; passthru.tests = { version = testers.testVersion { From 7fc75e024224b8ad1c9238f9100f880b825344c8 Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Tue, 10 Sep 2024 06:34:47 +0200 Subject: [PATCH 037/212] Revert "vimPlugins.nvim-treesitter: collate grammars" This reverts PR #319233. It caused a lot of weird regressions and a lot of headaches for me. Even a 20% improvement isn't worth it. Also see https://github.com/NixOS/nixpkgs/pull/319233#issuecomment-2339271761 --- .../vim/plugins/nvim-treesitter/overrides.nix | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index c7cd3266d9c7..8e3b39e6c177 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -36,22 +36,8 @@ let # pkgs.vimPlugins.nvim-treesitter.withAllGrammars withPlugins = f: self.nvim-treesitter.overrideAttrs { - passthru.dependencies = - let - grammars = map grammarToPlugin - (f (tree-sitter.builtGrammars // builtGrammars)); - copyGrammar = grammar: - let name = lib.last (lib.splitString "-" grammar.name); in - "ln -sf ${grammar}/parser/${name}.so $out/parser/${name}.so"; - in - [ - (runCommand "vimplugin-treesitter-grammars" - { meta.platforms = lib.platforms.all; } - '' - mkdir -p $out/parser - ${lib.concatMapStringsSep "\n" copyGrammar grammars} - '') - ]; + passthru.dependencies = map grammarToPlugin + (f (tree-sitter.builtGrammars // builtGrammars)); }; withAllGrammars = withPlugins (_: allGrammars); From 1ba931d6e74482bf51b74a073e7702b465380acc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:58:59 +0000 Subject: [PATCH 038/212] netpbm: 11.7.0 -> 11.7.1 --- pkgs/tools/graphics/netpbm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 8ad43c0326c0..bbd24d056bdb 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.7.0"; + version = "11.7.1"; outputs = [ "bin" "out" "dev" ]; src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "4925"; - sha256 = "Y6o/9nq9ICqlKCDh59eiT38CZ+cfB1ezb8arF0uBYsk="; + rev = "4932"; + sha256 = "bmPqUPOlkQ0vKim+t8ct2ErFU4uWw6L5foODGWrrExs="; }; nativeBuildInputs = [ From 98ca865c9dce24c4eba0c163448a9b171453da1c Mon Sep 17 00:00:00 2001 From: PerchunPak Date: Tue, 10 Sep 2024 06:43:26 +0200 Subject: [PATCH 039/212] vimPlugins.nvim-treesitter: add workaround for #332580 A #319233 accidentally reverted #321550. Last one caused a very annoying regression to any Nix user (see #332580). I suppose this is a bug in upstream grammar, so I workaround it this way until it is properly resolved. --- .../editors/vim/plugins/nvim-treesitter/overrides.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 8e3b39e6c177..137d364e5472 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,9 +4,17 @@ self: super: let inherit (neovimUtils) grammarToPlugin; - generatedGrammars = callPackage ./generated.nix { + + initialGeneratedGrammars = callPackage ./generated.nix { inherit (tree-sitter) buildGrammar; }; + grammarOverrides = final: prev: { + nix = prev.nix.overrideAttrs { + # workaround for https://github.com/NixOS/nixpkgs/issues/332580 + prePatch = "rm queries/highlights.scm"; + }; + }; + generatedGrammars = lib.fix (lib.extends grammarOverrides (_: initialGeneratedGrammars)); generatedDerivations = lib.filterAttrs (_: lib.isDerivation) generatedGrammars; From ae1c373082b167ddae9e93b3392952b39ac7089e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 10 Sep 2024 21:39:52 +0100 Subject: [PATCH 040/212] nano: 8.1 -> 8.2 Changes: https://lists.gnu.org/archive/html/info-gnu/2024-09/msg00001.html --- pkgs/applications/editors/nano/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index e2defc9f8325..432d297aea5e 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "8.1"; + version = "8.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-k7Pj6RVa44n+nM+ct6s4DqwpYCg1ujB3si9k0PDL6Ms="; + hash = "sha256-1a0H3YYvrK4DBRxUxlNeVMftdAcxh4P8rRrS1wdv/+s="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; From 49b369e78ac9913ca68c833981e584cd37e7e33f Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 7 Sep 2024 15:23:12 -0300 Subject: [PATCH 041/212] rio: 0.1.10 -> 0.1.13 Signed-off-by: Otavio Salvador --- pkgs/applications/terminal-emulators/rio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index b232bec2c5b2..5c867120aa94 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -55,16 +55,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.1.10"; + version = "0.1.13"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "refs/tags/v${version}"; - hash = "sha256-S42is3wqjBvYgysQ6yDUAn7ZEy9xJBmQD/emYAQfCkw="; + hash = "sha256-JrmjQjKpL9di66z4IYTcWhNBL0CgalqOhQgVDpkh6b0="; }; - cargoHash = "sha256-ILX3xrcz3tMnl7mUrwUAXv9ffaZKjSoSf8cZVQB10zk="; + cargoHash = "sha256-KWdkpQY1F0RU3JViFrXEp+JW6xdaofEmp2SlAkzPMPU="; nativeBuildInputs = [ ncurses @@ -123,7 +123,7 @@ rustPlatform.buildRustPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ tornax otavio oluceps ]; platforms = lib.platforms.unix; - changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/raphamorim/rio/blob/v${version}/docs/docs/releases.md"; mainProgram = "rio"; # ---- corcovado/src/sys/unix/eventedfd.rs - sys::unix::eventedfd::EventedFd (line 31) stdout ---- # Test executable failed (exit status: 101). From 77b1adaa62635608635c229420bdc8e9876c949f Mon Sep 17 00:00:00 2001 From: Josh Heinrichs Date: Tue, 10 Sep 2024 14:55:41 -0600 Subject: [PATCH 042/212] libgee, libgda, zile: fix compiling with clang -Wno-incompatible-function-pointer-types was removed from vala's setup hook in b2d88d4. Without it, we're unable to compile libgee[1], libgda, and zile on Darwin. The libgda and zile failures were masked by libgee failing. [1]: https://hydra.nixos.org/build/271035513 --- pkgs/applications/editors/zile/default.nix | 2 ++ pkgs/development/libraries/libgda/6.x.nix | 2 ++ pkgs/development/libraries/libgda/default.nix | 2 ++ pkgs/development/libraries/libgee/default.nix | 1 + 4 files changed, 7 insertions(+) diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index bafb1aa30385..b7d7099a3472 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -39,6 +39,8 @@ stdenv.mkDerivation rec { # fiddle with the terminal. doCheck = false; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + # XXX: Work around cross-compilation-unfriendly `gl_FUNC_FSTATAT' macro. gl_cv_func_fstatat_zero_flag="yes"; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 1f551ec9b4b1..af05b23080eb 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -85,6 +85,8 @@ stdenv.mkDerivation rec { postgresql ]; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + postPatch = '' patchShebangs \ providers/raw_spec.py \ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 1ef0a397c8e7..aa136ed0adbd 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -82,6 +82,8 @@ stdenv.mkDerivation rec { "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" ]; + env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + enableParallelBuilding = true; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 0ae1886ebb62..4cbaf916897c 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; env = { + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_GIRDIR = "${placeholder "dev"}/share/gir-1.0"; PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; }; From 6665ee1b5031e2568266300ae28f86d60c4877f9 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 10 Sep 2024 15:07:32 +0800 Subject: [PATCH 043/212] jogger: init at 1.2.4-unstable-2024-04-05 --- pkgs/by-name/jo/jogger/package.nix | 72 ++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 pkgs/by-name/jo/jogger/package.nix diff --git a/pkgs/by-name/jo/jogger/package.nix b/pkgs/by-name/jo/jogger/package.nix new file mode 100644 index 000000000000..465e5478ff2c --- /dev/null +++ b/pkgs/by-name/jo/jogger/package.nix @@ -0,0 +1,72 @@ +{ + lib, + stdenv, + fetchFromGitea, + rustPlatform, + meson, + ninja, + pkg-config, + cargo, + rustc, + blueprint-compiler, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + libshumate, + alsa-lib, + espeak, + sqlite, + glib-networking, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "jogger"; + version = "1.2.4-unstable-2024-04-05"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "baarkerlounger"; + repo = "jogger"; + rev = "09386b9503a9b996b86ea4638268403868b24d6a"; + hash = "sha256-oGjqYRHkYk22/RzDc5c0066SlOPGRGC6z/BTn1DM03o="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit (finalAttrs) pname version src; + hash = "sha256-+8mMJgLHLUdFLOwjhXolHcVUP+s/j6PlWeRh8sGRYTc="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook + cargo + rustc + blueprint-compiler + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + libshumate + alsa-lib + espeak + sqlite + glib-networking + ]; + + meta = { + description = "App for Gnome Mobile to Track running and other workouts"; + homepage = "https://codeberg.org/baarkerlounger/jogger"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "jogger"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +}) From aeaf865ea991a0ee4c1699d7b65ae47f8cbe29c8 Mon Sep 17 00:00:00 2001 From: Hentioe Date: Wed, 11 Sep 2024 21:58:05 +0800 Subject: [PATCH 044/212] graphicsmagick: add heif support --- pkgs/by-name/gr/graphicsmagick/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index 1bed406de757..5a449d959f75 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -14,6 +14,7 @@ , libtool , libwebp , libxml2 +, libheifSupport ? true, libheif , nukeReferences , pkg-config , quantumdepth ? 8 @@ -47,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { libwebp libxml2 zlib - ]; + ] ++ lib.optionals libheifSupport [ libheif ]; nativeBuildInputs = [ nukeReferences From b8c8cbbbdf66809daacb459e08f4a7d06b6ace73 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 11 Sep 2024 17:01:31 +0200 Subject: [PATCH 045/212] Apply suggestions from code review Co-authored-by: Robert Hensing --- lib/fixed-points.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fixed-points.nix b/lib/fixed-points.nix index 429ea7720056..c8d2d1f03acb 100644 --- a/lib/fixed-points.nix +++ b/lib/fixed-points.nix @@ -347,7 +347,7 @@ rec { : Each overlay function takes two arguments, by convention `final` and `prev`, and returns an attribute set. - `final` is the result of the fixed-point function, with all overlays applied. - - `prev` is the result of the previous overlay function. + - `prev` is the result of the previous overlay function(s). # Type @@ -356,9 +356,9 @@ rec { let # final prev # ↓ ↓ - OverlayFn :: ( { ... } -> { ... } -> { ... } ); + OverlayFn = { ... } -> { ... } -> { ... }; in - composeManyExtensions :: [ OverlayFn ] -> OverlayFn + composeManyExtensions :: ListOf OverlayFn -> OverlayFn ``` # Examples @@ -368,7 +368,7 @@ rec { ```nix let # The "original function" that is extended by the overlays. - # Note that it doesn't have prev: as argument since it can be thought of as the first function. + # Note that it doesn't have prev: as argument since no overlay function precedes it. original = final: { a = 1; }; # Each overlay function has 'final' and 'prev' as arguments. From 0b85766161e1c245c23f10a32bed17e1a3499dae Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 10 Sep 2024 12:29:37 +0200 Subject: [PATCH 046/212] yosys: 0.44 -> 0.45 https://github.com/YosysHQ/yosys/releases/tag/0.45 --- pkgs/development/compilers/yosys/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index a312114e6abd..43e941824fa7 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -75,13 +75,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/yosys-${finalAttrs.version}"; - hash = "sha256-aMVWmryMbVlEm1RNj1ENpLHOpuKRQTJMFZCn+WuaR04="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' From dd32ffd55c629def8bb4d013b4f3779d0418fcd1 Mon Sep 17 00:00:00 2001 From: Spencer Heywood Date: Wed, 11 Sep 2024 14:24:17 -0600 Subject: [PATCH 047/212] beeper-bridge-manager: fix styling and typo --- pkgs/by-name/be/beeper-bridge-manager/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index d138e5de0e2e..3beaa9cfc512 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -17,11 +17,11 @@ buildGoModule rec { vendorHash = "sha256-uz4pao8Y/Sb3fffi9d0lbWQEUMohbthA6t6k6PfQz2M="; meta = { - description = "Tool for running self-hosted bridges with the Beeper Matrix server. "; + description = "Tool for running self-hosted bridges with the Beeper Matrix server."; homepage = "https://github.com/beeper/bridge-manager"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.heywoodlh ]; mainProgram = "bbctl"; - changelog = "https://github.com/beeper/bridge-manager/releases/tag/v{version}"; + changelog = "https://github.com/beeper/bridge-manager/releases/tag/v${version}"; }; } From 2b6ef00729447c8d88aaca7b457c3f137677d5ca Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 28 Aug 2024 22:59:17 +0200 Subject: [PATCH 048/212] nixos/services.xserver.desktopManager.phosh: remove `with lib;` --- .../services/x11/desktop-managers/phosh.nix | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix index 12b39f927c01..e16eace5407c 100644 --- a/nixos/modules/services/x11/desktop-managers/phosh.nix +++ b/nixos/modules/services/x11/desktop-managers/phosh.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.xserver.desktopManager.phosh; @@ -21,29 +18,29 @@ let }; }; - phocConfigType = types.submodule { + phocConfigType = lib.types.submodule { options = { - xwayland = mkOption { + xwayland = lib.mkOption { description = '' Whether to enable XWayland support. To start XWayland immediately, use `immediate`. ''; - type = types.enum [ "true" "false" "immediate" ]; + type = lib.types.enum [ "true" "false" "immediate" ]; default = "false"; }; - cursorTheme = mkOption { + cursorTheme = lib.mkOption { description = '' Cursor theme to use in Phosh. ''; - type = types.str; + type = lib.types.str; default = "default"; }; - outputs = mkOption { + outputs = lib.mkOption { description = '' Output configurations. ''; - type = types.attrsOf phocOutputType; + type = lib.types.attrsOf phocOutputType; default = { DSI-1 = { scale = 2; @@ -53,34 +50,34 @@ let }; }; - phocOutputType = types.submodule { + phocOutputType = lib.types.submodule { options = { - modeline = mkOption { + modeline = lib.mkOption { description = '' One or more modelines. ''; - type = types.either types.str (types.listOf types.str); + type = lib.types.either lib.types.str (lib.types.listOf lib.types.str); default = []; example = [ "87.25 720 776 848 976 1440 1443 1453 1493 -hsync +vsync" "65.13 768 816 896 1024 1024 1025 1028 1060 -HSync +VSync" ]; }; - mode = mkOption { + mode = lib.mkOption { description = '' Default video mode. ''; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; default = null; example = "768x1024"; }; - scale = mkOption { + scale = lib.mkOption { description = '' Display scaling factor. ''; - type = types.nullOr ( - types.addCheck - (types.either types.int types.float) + type = lib.types.nullOr ( + lib.types.addCheck + (lib.types.either lib.types.int lib.types.float) (x : x > 0) ) // { description = "null or positive integer or float"; @@ -88,11 +85,11 @@ let default = null; example = 2; }; - rotate = mkOption { + rotate = lib.mkOption { description = '' Screen transformation. ''; - type = types.enum [ + type = lib.types.enum [ "90" "180" "270" "flipped" "flipped-90" "flipped-180" "flipped-270" null ]; default = null; @@ -100,7 +97,7 @@ let }; }; - optionalKV = k: v: optionalString (v != null) "${k} = ${builtins.toString v}"; + optionalKV = k: v: lib.optionalString (v != null) "${k} = ${builtins.toString v}"; renderPhocOutput = name: output: let modelines = if builtins.isList output.modeline @@ -109,18 +106,18 @@ let renderModeline = l: "modeline = ${l}"; in '' [output:${name}] - ${concatStringsSep "\n" (map renderModeline modelines)} + ${lib.concatStringsSep "\n" (map renderModeline modelines)} ${optionalKV "mode" output.mode} ${optionalKV "scale" output.scale} ${optionalKV "rotate" output.rotate} ''; renderPhocConfig = phoc: let - outputs = mapAttrsToList renderPhocOutput phoc.outputs; + outputs = lib.mapAttrsToList renderPhocOutput phoc.outputs; in '' [core] xwayland = ${phoc.xwayland} - ${concatStringsSep "\n" outputs} + ${lib.concatStringsSep "\n" outputs} [cursor] theme = ${phoc.cursorTheme} ''; @@ -129,37 +126,37 @@ in { options = { services.xserver.desktopManager.phosh = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = "Enable the Phone Shell."; }; - package = mkPackageOption pkgs "phosh" { }; + package = lib.mkPackageOption pkgs "phosh" { }; - user = mkOption { + user = lib.mkOption { description = "The user to run the Phosh service."; - type = types.str; + type = lib.types.str; example = "alice"; }; - group = mkOption { + group = lib.mkOption { description = "The group to run the Phosh service."; - type = types.str; + type = lib.types.str; example = "users"; }; - phocConfig = mkOption { + phocConfig = lib.mkOption { description = '' Configurations for the Phoc compositor. ''; - type = types.oneOf [ types.lines types.path phocConfigType ]; + type = lib.types.oneOf [ lib.types.lines lib.types.path phocConfigType ]; default = {}; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { systemd.defaultUnit = "graphical.target"; # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service systemd.services.phosh = { @@ -216,7 +213,7 @@ in security.pam.services.phosh = {}; - hardware.graphics.enable = mkDefault true; + hardware.graphics.enable = lib.mkDefault true; services.gnome.core-shell.enable = true; services.gnome.core-os-services.enable = true; From 62b76687631bd3052bd7f06a2ad08179d87d9f60 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Sun, 25 Aug 2024 11:25:18 +0200 Subject: [PATCH 049/212] python311Packages.tensorflow-probability: 0.21.0 -> 0.24.0 Diff: https://github.com/tensorflow/probability/compare/v0.21.0...v0.24.0 Changelog: https://github.com/tensorflow/probability/releases/tag/v0.24.0 --- .../tensorflow-probability/default.nix | 72 +++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 587f6b683a7d..dd80ee581ee6 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -1,34 +1,45 @@ { lib, stdenv, - fetchFromGitHub, - bazel_6, + + # bazel wheel buildBazelPackage, - buildPythonPackage, - cctools, + fetchFromGitHub, + + # nativeBuildInputs python, setuptools, wheel, absl-py, - tensorflow, - six, - numpy, - dm-tree, - keras, - decorator, + + bazel_6, + cctools, + + # python package + buildPythonPackage, + + # dependencies cloudpickle, + decorator, + dm-tree, gast, + keras, + numpy, + six, + tensorflow, + + # tests hypothesis, - scipy, - pandas, - mpmath, matplotlib, mock, + mpmath, + pandas, pytest, + scipy, }: let - version = "0.21.0"; + version = "0.24.0"; pname = "tensorflow-probability"; # first build all binaries and generate setup.py using bazel @@ -38,15 +49,15 @@ let owner = "tensorflow"; repo = "probability"; rev = "refs/tags/v${version}"; - hash = "sha256-DsJd1E5n86xNS7Ci0DXxoUxQ9jH8OwTZq2UuLlQtMUU="; + hash = "sha256-V6aw4NtGOHlvcbgLWMH29x81eck1PyzV93ANelvpL4c="; }; nativeBuildInputs = [ + absl-py # needed to create the output wheel in installPhase python setuptools - wheel - absl-py tensorflow + wheel ]; bazel = bazel_6; @@ -83,27 +94,27 @@ buildPythonPackage { src = bazel-wheel; - propagatedBuildInputs = [ - tensorflow - six - numpy - decorator + dependencies = [ cloudpickle - gast + decorator dm-tree + gast keras + numpy + six + tensorflow ]; # Listed here: # https://github.com/tensorflow/probability/blob/f3777158691787d3658b5e80883fe1a933d48989/testing/dependency_install_lib.sh#L83 nativeCheckInputs = [ hypothesis - pytest - scipy - pandas - mpmath matplotlib mock + mpmath + pandas + pytest + scipy ]; # Ideally, we run unit tests with pytest, but in checkPhase, only the Bazel-build wheel is available. @@ -114,10 +125,11 @@ buildPythonPackage { # sanity check pythonImportsCheck = [ "tensorflow_probability" ]; - meta = with lib; { + meta = { description = "Library for probabilistic reasoning and statistical analysis"; homepage = "https://www.tensorflow.org/probability/"; - license = licenses.asl20; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/tensorflow/probability/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } From 5543645978aad3d26e9da77fc6e24363af494c4d Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Sep 2024 02:13:36 +0300 Subject: [PATCH 050/212] openmpi: fix cross eval `error: attribute 'gfortran' missing` because `__raw` `targetPackages` only contains `stdenv` --- pkgs/development/libraries/openmpi/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index ea98064820c2..7725be4c8000 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -175,7 +175,9 @@ stdenv.mkDerivation (finalAttrs: { // lib.optionalAttrs fortranSupport { "fort" = [ "gfortran" - "${targetPackages.gfortran}/bin/${targetPackages.gfortran.targetPrefix}gfortran" + "${targetPackages.gfortran or gfortran}/bin/${ + targetPackages.gfortran.targetPrefix or gfortran.targetPrefix + }gfortran" ]; }; # The -wrapper-data.txt files that are not symlinks, need to be iterated as From 66538a85a0fcbd2ef0afba3465068c93ecfaf1a0 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Sep 2024 02:18:43 +0300 Subject: [PATCH 051/212] openmpi: fix `pkgsStatic` eval The dependencies to `openmpi` don't build anyways, so it's fine if this doesn't work as long as it evals without attribute missing errors. `error: attribute 'sharedLibrary' missing` --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 7725be4c8000..0ae1118a36b0 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -240,11 +240,11 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString (lib.elem "man" finalAttrs.outputs) '' - remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t "''${!outputMan}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library}) '' + lib.optionalString (lib.elem "dev" finalAttrs.outputs) '' remove-references-to -t "''${!outputDev}" $out/bin/mpirun - remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.sharedLibrary}) + remove-references-to -t "''${!outputDev}" $(readlink -f $out/lib/libopen-pal${stdenv.hostPlatform.extensions.library}) # The path to the wrapper is hard coded in libopen-pal.so, which we just cleared. wrapProgram "''${!outputDev}/bin/opal_wrapper" \ From 6a65627a05be25ff0091b38d845b32f92a4b83d6 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:02:44 +0530 Subject: [PATCH 052/212] louvre: 2.2.0-1 -> 2.9.0-1 --- pkgs/by-name/lo/louvre/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 668e1e2d1a25..28e0c17d2d23 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -22,16 +22,22 @@ }: stdenv.mkDerivation (self: { pname = "louvre"; - version = "2.2.0-1"; - rev = "v${self.version}"; - hash = "sha256-Ds1TTxHFq0Z88djdpAunhtKAipOCTodKIKOh5oxF568="; + version = "2.9.0-1"; src = fetchFromGitHub { - inherit (self) rev hash; owner = "CuarzoSoftware"; repo = "Louvre"; + rev = "v${self.version}"; + hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; + sourceRoot = "${self.src.name}/src"; + + postPatch = '' + substituteInPlace examples/meson.build \ + --replace-fail "/usr/local/share/wayland-sessions" "${placeholder "out"}/share/wayland-sessions" + ''; + nativeBuildInputs = [ meson ninja @@ -58,11 +64,6 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; - preConfigure = '' - # The root meson.build file is in src/ - cd src - ''; - meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; From dce85e24f87730c6400486bd5c78f435634e04e9 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:04:46 +0530 Subject: [PATCH 053/212] louvre: add update script cleanup --- pkgs/by-name/lo/louvre/package.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/louvre/package.nix b/pkgs/by-name/lo/louvre/package.nix index 28e0c17d2d23..1852a7dc3990 100644 --- a/pkgs/by-name/lo/louvre/package.nix +++ b/pkgs/by-name/lo/louvre/package.nix @@ -19,19 +19,20 @@ , udev , wayland , xorgproto +, nix-update-script }: -stdenv.mkDerivation (self: { +stdenv.mkDerivation (finalAttrs: { pname = "louvre"; version = "2.9.0-1"; src = fetchFromGitHub { owner = "CuarzoSoftware"; repo = "Louvre"; - rev = "v${self.version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-0M1Hl5kF8r4iFflkGBb9CWqwzauSZPVKSRNWZKFZC4U="; }; - sourceRoot = "${self.src.name}/src"; + sourceRoot = "${finalAttrs.src.name}/src"; postPatch = '' substituteInPlace examples/meson.build \ @@ -64,6 +65,10 @@ stdenv.mkDerivation (self: { outputs = [ "out" "dev" ]; + passthru = { + updateScript = nix-update-script { }; + }; + meta = { description = "C++ library for building Wayland compositors"; homepage = "https://github.com/CuarzoSoftware/Louvre"; From 007bae199446601f1828adac0e580bdca100a1b1 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 12 Sep 2024 11:17:26 +0530 Subject: [PATCH 054/212] flyctl: 0.2.125 -> 0.3.1 Changes: https://github.com/superfly/flyctl/releases/tag/v0.3.1 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ba55fc5bda7f..90351bc317b5 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.125"; + version = "0.3.1"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-7jMti/NShvo6T3JLzRM9FKqRXkgS8jeUitZq5SU4sHE="; + hash = "sha256-5P6B52ekrAupoQh2K3LhC4ydwuKOTPfpjOVlGiDxQb0="; }; - vendorHash = "sha256-uYGOXXeNfe2rYtJh2ggNv2TbVJul4RbiBQ1KSbEjqW8="; + vendorHash = "sha256-QfequNmKLbZqMKcwhRXKaTflQYWKu8ucjaGcBM7Jn6g="; subPackages = [ "." ]; From 0eb5526b69c0bad0a3795308cd7d4ba7c93284ae Mon Sep 17 00:00:00 2001 From: edef Date: Wed, 11 Sep 2024 07:39:52 +0000 Subject: [PATCH 055/212] ollama: don't build llama.cpp twice buildGoModules runs preBuild hooks in the module download fixed-output derivation, so llama.cpp got built and immediately discarded, to then immediately be built again for the actual Go build. --- pkgs/by-name/ol/ollama/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index cb00def2cbfd..c8bc1cf0d2f9 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -181,6 +181,14 @@ goBuild ( # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' ''; + + overrideModAttrs = ( + finalAttrs: prevAttrs: { + # don't run llama.cpp build in the module fetch phase + preBuild = ""; + } + ); + preBuild = '' # disable uses of `git`, since nix removes the git directory export OLLAMA_SKIP_PATCHING=true From 0f319902bb7130d7fbac9ec391cf3f20d788ea90 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Thu, 12 Sep 2024 15:02:06 +0800 Subject: [PATCH 056/212] linuxPackages_latest.prl-tools: 19.4.1-54985 -> 20.0.0-55653 --- pkgs/os-specific/linux/prl-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 9b2d6778f925..bb8a81d46056 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -8,6 +8,7 @@ , perl , undmg , dbus-glib +, fuse , glib , xorg , zlib @@ -36,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "19.4.1-54985"; + version = "20.0.0-55653"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-VBHCsxaMI6mfmc/iQ4hJW/592rKck9HilTX2Hq7Hb5s="; + hash = "sha256-ohGhaLVzXuR/mQ6ToeGbTixKy01F14JSgTs128vGZXM="; }; hardeningDisable = [ "pic" "format" ]; @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dbus-glib + fuse glib xorg.libX11 xorg.libXcomposite From ee0753f986855808d69bda58452c335599eff6a9 Mon Sep 17 00:00:00 2001 From: casaca24 Date: Thu, 12 Sep 2024 01:12:17 -0600 Subject: [PATCH 057/212] got: 0.102 -> 0.103 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index 942e758972ff..29931498ccaf 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -27,11 +27,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "got"; - version = "0.102"; + version = "0.103"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-qstQ6mZLCdYL5uQauMt7nGlEdPkPneGfu36RbaboN3c="; + hash = "sha256-MkBek/NTpU+rylSS5abFQl8Vm3phRFCQkpnI3INJKHg="; }; nativeBuildInputs = [ pkg-config bison ] From 5db909d4272322eb6ca056f703913f390f674675 Mon Sep 17 00:00:00 2001 From: edef Date: Thu, 12 Sep 2024 06:29:20 +0000 Subject: [PATCH 058/212] ollama: apply llama.cpp patches in postPatch This removes the absurd mechanism introduced to jam them into the patches attribute, along with the pointless busywork of updating the list of patches and their hashes on every release. --- pkgs/by-name/ol/ollama/package.nix | 31 ++++++------------------------ 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index c8bc1cf0d2f9..8519d7cd1287 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - fetchpatch, buildEnv, linkFarm, overrideCC, @@ -52,28 +51,6 @@ let vendorHash = "sha256-hSxcREAujhvzHVNwnRTfhi0MKI3s8HNavER2VLz6SYk="; - # ollama's patches of llama.cpp's example server - # `ollama/llm/generate/gen_common.sh` -> "apply temporary patches until fix is upstream" - # each update, these patches should be synchronized with the contents of `ollama/llm/patches/` - llamacppPatches = [ - (preparePatch "01-load-progress.diff" "sha256-UTmnBS5hQjIL3eXDZc8RBDNJunLlkqJWH20LpXNiGRQ=") - (preparePatch "02-clip-log.diff" "sha256-rMWbl3QgrPlhisTeHwD7EnGRJyOhLB4UeS7rqa0tdXM=") - (preparePatch "03-load_exception.diff" "sha256-NJkT/k8Mf8HcEMb0XkaLmyUNKV3T+384JRPnmwDI/sk=") - (preparePatch "04-metal.diff" "sha256-bPBCfoT3EjZPjWKfCzh0pnCUbM/fGTj37yOaQr+QxQ4=") - (preparePatch "05-default-pretokenizer.diff" "sha256-mxqHnDbiy8yfKFUYryNTj/xay/lx9KDiZAiekFSkxr8=") - (preparePatch "06-embeddings.diff" "sha256-+4yAEAX1JJenOksG2OxDCwiLEoLj1glJQLIgV08BI5Q=") - (preparePatch "07-clip-unicode.diff" "sha256-1qMJoXhDewxsqPbmi+/7xILQfGaybZDyXc5eH0winL8=") - ]; - - preparePatch = - patch: hash: - fetchpatch { - url = "file://${src}/llm/patches/${patch}"; - inherit hash; - stripLen = 1; - extraPrefix = "llm/llama.cpp/"; - }; - validateFallback = lib.warnIf (config.rocmSupport && config.cudaSupport) (lib.concatStrings [ "both `nixpkgs.config.rocmSupport` and `nixpkgs.config.cudaSupport` are enabled, " "but they are mutually exclusive; falling back to cpu" @@ -174,12 +151,16 @@ goBuild ( # disable uses of `git` in the `go generate` script # ollama's build script assumes the source is a git repo, but nix removes the git directory # this also disables necessary patches contained in `ollama/llm/patches/` - # those patches are added to `llamacppPatches`, and reapplied here in the patch phase + # those patches are applied in `postPatch` ./disable-git.patch - ] ++ llamacppPatches; + ]; + postPatch = '' # replace inaccurate version number with actual release version substituteInPlace version/version.go --replace-fail 0.0.0 '${version}' + + # apply llama.cpp patches + for cur in llm/patches/*; do patch -p1 -d llm/llama.cpp < $cur; done ''; overrideModAttrs = ( From 88950412bcdc0fde3811444024b46a79ffc56068 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Wed, 11 Sep 2024 21:57:54 +0100 Subject: [PATCH 059/212] gcc49, gcc49Stdenv, gfortran49: remove old implementation gcc-4.9.4 was released in Aug 3, 2016, 8 years ago. It's a branch that went out of support years ago. Numerous bugs never get backported to this version. Let's remove it. --- pkgs/by-name/gf/gfortran49/package.nix | 10 - pkgs/development/compilers/gcc/all.nix | 4 +- pkgs/development/compilers/gcc/default.nix | 8 +- .../gcc/patches/4.9/libsanitizer.patch | 24 --- .../gcc/patches/4.9/parallel-strsignal.patch | 61 ------ .../compilers/gcc/patches/default.nix | 55 +---- .../patches/gfortran-darwin-NXConstStr.patch | 27 --- .../gcc/patches/struct-sigaltstack-4.9.patch | 78 ------- .../gcc/patches/struct-ucontext.patch | 190 ------------------ pkgs/development/compilers/gcc/versions.nix | 2 - pkgs/test/default.nix | 1 - pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 3 +- 13 files changed, 13 insertions(+), 453 deletions(-) delete mode 100644 pkgs/by-name/gf/gfortran49/package.nix delete mode 100644 pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch delete mode 100644 pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch delete mode 100644 pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch delete mode 100644 pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch delete mode 100644 pkgs/development/compilers/gcc/patches/struct-ucontext.patch diff --git a/pkgs/by-name/gf/gfortran49/package.nix b/pkgs/by-name/gf/gfortran49/package.nix deleted file mode 100644 index 8016f9ff42ba..000000000000 --- a/pkgs/by-name/gf/gfortran49/package.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ wrapCC, gcc49 }: -wrapCC ( - gcc49.cc.override { - name = "gfortran"; - langFortran = true; - langCC = false; - langC = false; - profiledCompiler = false; - } -) diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix index 8b447015f7fe..deb2cf8cfdb7 100644 --- a/pkgs/development/compilers/gcc/all.nix +++ b/pkgs/development/compilers/gcc/all.nix @@ -29,11 +29,11 @@ let else if atLeast "9" then isl_0_20 else if atLeast "7" then isl_0_17 else if atLeast "6" then (if stdenv.targetPlatform.isRedox then isl_0_17 else isl_0_14) - else /* "4.9" */ isl_0_11; + else /* "5" */ isl_0_11; } // lib.optionalAttrs (!(atLeast "6")) { cloog = if stdenv.isDarwin then null - else /* 4.9 */ cloog_0_18_0; + else /* 5 */ cloog_0_18_0; } // lib.optionalAttrs (atLeast "6" && !(atLeast "9")) { # gcc 10 is too strict to cross compile gcc <= 8 stdenv = if (stdenv.targetPlatform != stdenv.buildPlatform) && stdenv.cc.isGNU then gcc7Stdenv else stdenv; diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix index 7eb5dae616a9..9dda950dc125 100644 --- a/pkgs/development/compilers/gcc/default.nix +++ b/pkgs/development/compilers/gcc/default.nix @@ -82,7 +82,6 @@ let atLeast8 = versionAtLeast version "8"; atLeast7 = versionAtLeast version "7"; atLeast6 = versionAtLeast version "6"; - atLeast49 = versionAtLeast version "4.9"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -92,7 +91,6 @@ let is8 = majorVersion == "8"; is7 = majorVersion == "7"; is6 = majorVersion == "6"; - is49 = majorVersion == "4" && versions.minor version == "9"; disableBootstrap = atLeast11 && !stdenv.hostPlatform.isDarwin && (atLeast12 -> !profiledCompiler); @@ -277,7 +275,7 @@ pipe ((callFile ./common/builder.nix {}) ({ outputs = if atLeast7 then [ "out" "man" "info" ] ++ optional (!langJit) "lib" - else if atLeast49 && (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"] + else if (langJava || langGo || (if atLeast6 then langJit else targetPlatform.isDarwin)) then ["out" "man" "info"] else [ "out" "lib" "man" "info" ]; setOutputFlags = false; @@ -460,7 +458,7 @@ pipe ((callFile ./common/builder.nix {}) ({ badPlatforms = # avr-gcc8 is maintained for the `qmk` package if (is8 && targetPlatform.isAvr) then [] - else if !(is49 || is6) then [ "aarch64-darwin" ] + else if !(is6) then [ "aarch64-darwin" ] else platforms.darwin; } // optionalAttrs is10 { badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ]; @@ -474,7 +472,7 @@ pipe ((callFile ./common/builder.nix {}) ({ doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv } // optionalAttrs enableMultilib { dontMoveLib64 = true; -} // optionalAttrs (((is49 && !stdenv.hostPlatform.isDarwin) || is6) && langJava) { +} // optionalAttrs (is6 && langJava) { postFixup = '' target="$(echo "$out/libexec/gcc"/*/*/ecj*)" patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" diff --git a/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch b/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch deleted file mode 100644 index f1a438a4e5f0..000000000000 --- a/pkgs/development/compilers/gcc/patches/4.9/libsanitizer.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -index aec950454..5bda9b3a3 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h -@@ -156,18 +156,13 @@ namespace __sanitizer { - #elif defined(__sparc__) - # if defined(__arch64__) - unsigned mode; -- unsigned short __pad1; --# else -- unsigned short __pad1; -- unsigned short mode; - unsigned short __pad2; - # endif - unsigned short __seq; - unsigned long long __unused1; - unsigned long long __unused2; - #else -- unsigned short mode; -- unsigned short __pad1; -+ unsigned int mode; - unsigned short __seq; - unsigned short __pad2; - #if defined(__x86_64__) && !defined(_LP64) diff --git a/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch b/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch deleted file mode 100644 index 4c98ca273a54..000000000000 --- a/pkgs/development/compilers/gcc/patches/4.9/parallel-strsignal.patch +++ /dev/null @@ -1,61 +0,0 @@ -gcc/Makefile.in: fix parallel building failure - -The gcc-ar.o, gcc-nm.o, gcc-ranlib.o and errors.o included -config.h which was a generated file. But no explicity rule -to clarify the dependency. There was potential building -failure while parallel make. - -For gcc-ar.o, gcc-nm.o and gcc-ranlib.o, they were compiled from one C -source file gcc-ar.c, we add them to ALL_HOST_BACKEND_OBJS, so the -'$(ALL_HOST_OBJS) : | $(generated_files)' rule could work for these -objects. - -For errors.o, it is part of gengtype, and the gengtype generator program -is special: Two versions are built. One is for the build machine, and one -is for the host. We refered what gengtype-parse.o did (which also is part -of gengtype). - -[GCC #61899] -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61899 - -Upstream-Status: Send to gcc-patches@gcc.gnu.org mailing list - -Signed-off-by: Hongxu Jia ---- - gcc/Makefile.in | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 6475cba..56e50bb 100644 ---- a/gcc/Makefile.in -+++ b/gcc/Makefile.in -@@ -1481,13 +1481,16 @@ OBJS-libcommon-target = $(common_out_object_file) prefix.o params.o \ - opts.o opts-common.o options.o vec.o hooks.o common/common-targhooks.o \ - hash-table.o file-find.o - -+# Objects compiled from one C source file gcc-ar.c -+OBJS-gcc-ar = gcc-ar.o gcc-nm.o gcc-ranlib.o -+ - # This lists all host objects for the front ends. - ALL_HOST_FRONTEND_OBJS = $(foreach v,$(CONFIG_LANGUAGES),$($(v)_OBJS)) - - ALL_HOST_BACKEND_OBJS = $(GCC_OBJS) $(OBJS) $(OBJS-libcommon) \ - $(OBJS-libcommon-target) @TREEBROWSER@ main.o c-family/cppspec.o \ - $(COLLECT2_OBJS) $(EXTRA_GCC_OBJS) $(GCOV_OBJS) $(GCOV_DUMP_OBJS) \ -- lto-wrapper.o -+ lto-wrapper.o $(OBJS-gcc-ar) - - # This lists all host object files, whether they are included in this - # compilation or not. -@@ -2437,6 +2440,8 @@ gengtype-parse.o: $(CONFIG_H) - CFLAGS-build/gengtype-parse.o += -DGENERATOR_FILE - build/gengtype-parse.o: $(BCONFIG_H) - -+errors.o : $(CONFIG_H) -+ - gengtype-state.o build/gengtype-state.o: gengtype-state.c $(SYSTEM_H) \ - gengtype.h errors.h double-int.h version.h $(HASHTAB_H) $(OBSTACK_H) \ - $(XREGEX_H) --- -1.8.1.2 - diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix index 124232b2614f..db4a756733cb 100644 --- a/pkgs/development/compilers/gcc/patches/default.nix +++ b/pkgs/development/compilers/gcc/patches/default.nix @@ -34,7 +34,6 @@ let atLeast8 = lib.versionAtLeast version "8"; atLeast7 = lib.versionAtLeast version "7"; atLeast6 = lib.versionAtLeast version "6"; - atLeast49 = lib.versionAtLeast version "4.9"; is14 = majorVersion == "14"; is13 = majorVersion == "13"; is12 = majorVersion == "12"; @@ -44,7 +43,6 @@ let is8 = majorVersion == "8"; is7 = majorVersion == "7"; is6 = majorVersion == "6"; - is49 = majorVersion == "4" && lib.versions.minor version == "9"; inherit (lib) optionals optional; in @@ -239,8 +237,7 @@ in ## gcc 8.0 and older ############################################################################## -# for 49 this is applied later -++ optional (atLeast49 && !is49 && !atLeast9) ./libsanitizer-no-cyclades-9.patch +++ optional (!atLeast9) ./libsanitizer-no-cyclades-9.patch ++ optional (is7 || is8) ./9/fix-struct-redefinition-on-glibc-2.36.patch # Make Darwin bootstrap respect whether the assembler supports `--gstabs`, @@ -280,8 +277,8 @@ in ## gcc 6.0 and older ############################################################################## ++ optional (is6 && langGo) ./gogcc-workaround-glibc-2.36.patch -++ optional (is49 || is6) ./9/fix-struct-redefinition-on-glibc-2.36.patch -++ optional (is49 || (is6 && !stdenv.targetPlatform.isRedox)) ./use-source-date-epoch.patch +++ optional is6 ./9/fix-struct-redefinition-on-glibc-2.36.patch +++ optional (is6 && !stdenv.targetPlatform.isRedox) ./use-source-date-epoch.patch ++ optional (is6 && !stdenv.targetPlatform.isRedox) ./6/0001-Fix-build-for-glibc-2.31.patch ++ optionals (is6 && langAda) [ ./gnat-cflags.patch @@ -297,51 +294,7 @@ in # defaults to the impure, system location and causes the build to fail. ++ optional (is6 && hostPlatform.isDarwin) ./6/libstdc++-disable-flat_namespace.patch -## gcc 4.9 and older ############################################################################## +## gcc 5.0 and older ############################################################################## ++ optional (!atLeast6) ./parallel-bconfig.patch -++ optionals (is49) [ - (./. + "/${lib.versions.major version}.${lib.versions.minor version}/parallel-strsignal.patch") - (./. + "/${lib.versions.major version}.${lib.versions.minor version}/libsanitizer.patch") - (fetchpatch { - name = "avoid-ustat-glibc-2.28.patch"; - url = "https://gitweb.gentoo.org/proj/gcc-patches.git/plain/4.9.4/gentoo/100_all_avoid-ustat-glibc-2.28.patch?id=55fcb515620a8f7d3bb77eba938aa0fcf0d67c96"; - sha256 = "0b32sb4psv5lq0ij9fwhi1b4pjbwdjnv24nqprsk14dsc6xmi1g0"; - }) - # has to be applied after "avoid-ustat-glibc-2.28.patch" - ./libsanitizer-no-cyclades-9.patch - # glibc-2.26 - ./struct-ucontext.patch - ./struct-sigaltstack-4.9.patch -] -# Retpoline patches pulled from the branch hjl/indirect/gcc-4_9-branch (by H.J. Lu, the author of GCC upstream retpoline commits) -++ optionals is49 - (builtins.map ({commit, sha256}: fetchpatch {url = "https://github.com/hjl-tools/gcc/commit/${commit}.patch"; inherit sha256;}) - [{ commit = "e623d21608e96ecd6b65f0d06312117d20488a38"; sha256 = "1ix8i4d2r3ygbv7npmsdj790rhxqrnfwcqzv48b090r9c3ij8ay3"; } - { commit = "2015a09e332309f12de1dadfe179afa6a29368b8"; sha256 = "0xcfs0cbb63llj2gbcdrvxim79ax4k4aswn0a3yjavxsj71s1n91"; } - { commit = "6b11591f4494f705e8746e7d58b7f423191f4e92"; sha256 = "0aydyhsm2ig0khgbp27am7vq7liyqrq6kfhfi2ki0ij0ab1hfbga"; } - { commit = "203c7d9c3e9cb0f88816b481ef8e7e87b3ecc373"; sha256 = "0wqn16y7wy5kg8ngfcni5qdwfphl01axczibbk49bxclwnzvldqa"; } - { commit = "f039c6f284b2c9ce97c8353d6034978795c4872e"; sha256 = "13fkgdb17lpyxfksz1zanxhgpsm0jrss9w61nbl7an4im22hz7ci"; } - { commit = "ed42606bdab1c5d9e5ad828cd6fe1a0557f193b7"; sha256 = "0gdnn8v3p03imj3qga2mzdhpgbmjcklkxdl97jvz5xia2ikzknxm"; } - { commit = "5278e062ef292fd2fbf987d25389785f4c5c0f99"; sha256 = "0j81x758wf8v7j4rx5wc1cy7yhkvhlhv3wmnarwakxiwsspq0vrs"; } - { commit = "76f1ffbbb6cd9f6ecde6c82cd16e20a27242e890"; sha256 = "1py56y6gp7fjf4f8bbsfwh5bs1gnmlqda1ycsmnwlzfm0cshdp0c"; } - { commit = "4ca48b2b688b135c0390f54ea9077ef10aedd52c"; sha256 = "15r019pzr3k0lpgyvdc92c8fayw8b5lrzncna4bqmamcsdz7vsaw"; } - { commit = "98c7bf9ddc80db965d69d61521b1c7a1cec32d9a"; sha256 = "1d7pfdv1q23nf0wadw7jbp6d6r7pnzjpbyxgbdfv7j1vr9l1bp60"; } - { commit = "3dc76b53ad896494ca62550a7a752fecbca3f7a2"; sha256 = "0jvdzfpvfdmklfcjwqblwq1i22iqis7ljpvm7adra5d7zf2xk7xz"; } - { commit = "1e961ed49b18e176c7457f53df2433421387c23b"; sha256 = "04dnqqs4qsvz4g8cq6db5id41kzys7hzhcaycwmc9rpqygs2ajwz"; } - { commit = "e137c72d099f9b3b47f4cc718aa11eab14df1a9c"; sha256 = "1ms0dmz74yf6kwgjfs4d2fhj8y6mcp2n184r3jk44wx2xc24vgb2"; }]) -++ optional (is49 && !atLeast6) [ - # gcc-11 compatibility - (fetchpatch { - name = "gcc4-char-reload.patch"; - url = "https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=d57c99458933a21fdf94f508191f145ad8d5ec58"; - includes = [ "gcc/reload.h" ]; - sha256 = "sha256-66AMP7/ajunGKAN5WJz/yPn42URZ2KN51yPrFdsxEuM="; - }) -] - - -## gcc 4.8 only ############################################################################## - -++ optional (!atLeast49 && hostPlatform.isDarwin) ./gfortran-darwin-NXConstStr.patch diff --git a/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch b/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch deleted file mode 100644 index a7e158ca364b..000000000000 --- a/pkgs/development/compilers/gcc/patches/gfortran-darwin-NXConstStr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 82f81877458ea372176eabb5de36329431dce99b Mon Sep 17 00:00:00 2001 -From: Iain Sandoe -Date: Sat, 21 Dec 2013 00:30:18 +0000 -Subject: [PATCH] don't try to mark local symbols as no-dead-strip - ---- - gcc/config/darwin.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c -index 40804b8..0080299 100644 ---- a/gcc/config/darwin.c -+++ b/gcc/config/darwin.c -@@ -1259,6 +1259,11 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED) - void - darwin_mark_decl_preserved (const char *name) - { -+ /* Actually we shouldn't mark any local symbol this way, but for now -+ this only happens with ObjC meta-data. */ -+ if (darwin_label_is_anonymous_local_objc_name (name)) -+ return; -+ - fprintf (asm_out_file, "\t.no_dead_strip "); - assemble_name (asm_out_file, name); - fputc ('\n', asm_out_file); --- -2.2.1 diff --git a/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch b/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch deleted file mode 100644 index fc126b4813d6..000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-sigaltstack-4.9.patch +++ /dev/null @@ -1,78 +0,0 @@ -hand-resolved trivial conflicts for 4.9 from the upstream patch -72edc2c02f8b4768ad660f46a1c7e2400c0a8e06 -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc -index 69c9c10..8e53673 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc -@@ -599,8 +599,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) { - return internal_syscall(__NR_prctl, option, arg2, arg3, arg4, arg5); - } - --uptr internal_sigaltstack(const struct sigaltstack *ss, -- struct sigaltstack *oss) { -+uptr internal_sigaltstack(const void *ss, void *oss) { - return internal_syscall(__NR_sigaltstack, (uptr)ss, (uptr)oss); - } - -diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.h b/libsanitizer/sanitizer_common/sanitizer_linux.h -index 6422df1..8e111d1 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_linux.h -+++ b/libsanitizer/sanitizer_common/sanitizer_linux.h -@@ -18,7 +18,6 @@ - #include "sanitizer_platform_limits_posix.h" - - struct link_map; // Opaque type returned by dlopen(). --struct sigaltstack; - - namespace __sanitizer { - // Dirent structure for getdents(). Note that this structure is different from -@@ -28,8 +27,7 @@ struct linux_dirent; - // Syscall wrappers. - uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count); - uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5); --uptr internal_sigaltstack(const struct sigaltstack* ss, -- struct sigaltstack* oss); -+uptr internal_sigaltstack(const void* ss, void* oss); - uptr internal_sigaction(int signum, const __sanitizer_kernel_sigaction_t *act, - __sanitizer_kernel_sigaction_t *oldact); - uptr internal_sigprocmask(int how, __sanitizer_kernel_sigset_t *set, -diff --git a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -index 891386dc..234e8c6 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc -@@ -273,7 +273,7 @@ static int TracerThread(void* argument) { - - // Alternate stack for signal handling. - InternalScopedBuffer handler_stack_memory(kHandlerStackSize); -- struct sigaltstack handler_stack; -+ stack_t handler_stack; - internal_memset(&handler_stack, 0, sizeof(handler_stack)); - handler_stack.ss_sp = handler_stack_memory.data(); - handler_stack.ss_size = kHandlerStackSize; -diff --git a/libsanitizer/tsan/tsan_platform_linux.cc b/libsanitizer/tsan/tsan_platform_linux.cc -index 2ed5718..6f972ab 100644 ---- a/libsanitizer/tsan/tsan_platform_linux.cc -+++ b/libsanitizer/tsan/tsan_platform_linux.cc -@@ -287,7 +287,7 @@ void InitializePlatform() { - int ExtractResolvFDs(void *state, int *fds, int nfd) { - #if SANITIZER_LINUX && !SANITIZER_ANDROID - int cnt = 0; -- __res_state *statp = (__res_state*)state; -+ struct __res_state *statp = (struct __res_state*)state; - for (int i = 0; i < MAXNS && cnt < nfd; i++) { - if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1) - fds[cnt++] = statp->_u._ext.nssocks[i]; - -error: 'SIGSEGV' was not declared in this scope -diff --git a/libsanitizer/asan/asan_linux.cc b/libsanitizer/asan/asan_linux.cc -index 0692eb1..472f734 100644 ---- a/libsanitizer/asan/asan_linux.cc -+++ b/libsanitizer/asan/asan_linux.cc -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/development/compilers/gcc/patches/struct-ucontext.patch b/pkgs/development/compilers/gcc/patches/struct-ucontext.patch deleted file mode 100644 index c7fb6d1f71cf..000000000000 --- a/pkgs/development/compilers/gcc/patches/struct-ucontext.patch +++ /dev/null @@ -1,190 +0,0 @@ -From b685411208e0aaa79190d54faf945763514706b8 Mon Sep 17 00:00:00 2001 -From: jsm28 -Date: Tue, 4 Jul 2017 10:23:57 +0000 -Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files. - -Current glibc no longer gives the ucontext_t type the tag struct -ucontext, to conform with POSIX namespace rules. This requires -various linux-unwind.h files in libgcc, that were previously using -struct ucontext, to be fixed to use ucontext_t instead. This is -similar to the removal of the struct siginfo tag from siginfo_t some -years ago. - -This patch changes those files to use ucontext_t instead. As the -standard name that should be unconditionally safe, so this is not -restricted to architectures supported by glibc, or conditioned on the -glibc version. - -Tested compilation together with current glibc with glibc's -build-many-glibcs.py. - - * config/aarch64/linux-unwind.h (aarch64_fallback_frame_state), - config/alpha/linux-unwind.h (alpha_fallback_frame_state), - config/bfin/linux-unwind.h (bfin_fallback_frame_state), - config/i386/linux-unwind.h (x86_64_fallback_frame_state, - x86_fallback_frame_state), config/m68k/linux-unwind.h (struct - uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext), - config/pa/linux-unwind.h (pa32_fallback_frame_state), - config/sh/linux-unwind.h (sh_fallback_frame_state), - config/tilepro/linux-unwind.h (tile_fallback_frame_state), - config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use - ucontext_t instead of struct ucontext. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@249957 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - libgcc/ChangeLog (REMOVED) | 14 ++++++++++++++ - libgcc/config/aarch64/linux-unwind.h | 2 +- - libgcc/config/alpha/linux-unwind.h | 2 +- - libgcc/config/bfin/linux-unwind.h | 2 +- - libgcc/config/i386/linux-unwind.h | 4 ++-- - libgcc/config/m68k/linux-unwind.h | 2 +- - libgcc/config/nios2/linux-unwind.h | 2 +- - libgcc/config/pa/linux-unwind.h | 2 +- - libgcc/config/sh/linux-unwind.h | 2 +- - libgcc/config/tilepro/linux-unwind.h | 2 +- - libgcc/config/xtensa/linux-unwind.h | 2 +- - 11 files changed, 25 insertions(+), 11 deletions(-) - -diff --git a/libgcc/config/aarch64/linux-unwind.h b/libgcc/config/aarch64/linux-unwind.h -index 4512efb..06de45a 100644 ---- a/libgcc/config/aarch64/linux-unwind.h -+++ b/libgcc/config/aarch64/linux-unwind.h -@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe - { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - }; - - struct rt_sigframe *rt_; -diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h -index bdbba4a..e84812e 100644 ---- a/libgcc/config/alpha/linux-unwind.h -+++ b/libgcc/config/alpha/linux-unwind.h -@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; - } -diff --git a/libgcc/config/bfin/linux-unwind.h b/libgcc/config/bfin/linux-unwind.h -index 77b7c23..8bf5e82 100644 ---- a/libgcc/config/bfin/linux-unwind.h -+++ b/libgcc/config/bfin/linux-unwind.h -@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - void *puc; - char retcode[8]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h -index 540a0a2..29efbe3 100644 ---- a/libgcc/config/i386/linux-unwind.h -+++ b/libgcc/config/i386/linux-unwind.h -@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context, - if (*(unsigned char *)(pc+0) == 0x48 - && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL) - { -- struct ucontext *uc_ = context->cfa; -+ ucontext_t *uc_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem - because it does not alias anything. */ -@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - siginfo_t *pinfo; - void *puc; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/m68k/linux-unwind.h b/libgcc/config/m68k/linux-unwind.h -index 75b7cf7..f964e24 100644 ---- a/libgcc/config/m68k/linux-unwind.h -+++ b/libgcc/config/m68k/linux-unwind.h -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - /* is unfortunately broken right now. */ - struct uw_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - mcontext_t uc_mcontext; - unsigned long uc_filler[80]; -diff --git a/libgcc/config/nios2/linux-unwind.h b/libgcc/config/nios2/linux-unwind.h -index 2304142..30f25ea 100644 ---- a/libgcc/config/nios2/linux-unwind.h -+++ b/libgcc/config/nios2/linux-unwind.h -@@ -38,7 +38,7 @@ struct nios2_mcontext { - - struct nios2_ucontext { - unsigned long uc_flags; -- struct ucontext *uc_link; -+ ucontext_t *uc_link; - stack_t uc_stack; - struct nios2_mcontext uc_mcontext; - sigset_t uc_sigmask; /* mask last for extensibility */ -diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h -index 9a2657f..e47493d 100644 ---- a/libgcc/config/pa/linux-unwind.h -+++ b/libgcc/config/pa/linux-unwind.h -@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *frame; - - /* rt_sigreturn trampoline: -diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h -index e389cac..0bf43ba 100644 ---- a/libgcc/config/sh/linux-unwind.h -+++ b/libgcc/config/sh/linux-unwind.h -@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. - The aliasing warning is correct, but should not be a problem -diff --git a/libgcc/config/tilepro/linux-unwind.h b/libgcc/config/tilepro/linux-unwind.h -index 796e976..75f8890 100644 ---- a/libgcc/config/tilepro/linux-unwind.h -+++ b/libgcc/config/tilepro/linux-unwind.h -@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - unsigned char save_area[C_ABI_SAVE_AREA_SIZE]; - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* Return if this is not a signal handler. */ -diff --git a/libgcc/config/xtensa/linux-unwind.h b/libgcc/config/xtensa/linux-unwind.h -index 9872492..586a9d4 100644 ---- a/libgcc/config/xtensa/linux-unwind.h -+++ b/libgcc/config/xtensa/linux-unwind.h -@@ -67,7 +67,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - - struct rt_sigframe { - siginfo_t info; -- struct ucontext uc; -+ ucontext_t uc; - } *rt_; - - /* movi a2, __NR_rt_sigreturn; syscall */ --- -2.9.3 - diff --git a/pkgs/development/compilers/gcc/versions.nix b/pkgs/development/compilers/gcc/versions.nix index 287d1fd4aa53..7aa8b558f358 100644 --- a/pkgs/development/compilers/gcc/versions.nix +++ b/pkgs/development/compilers/gcc/versions.nix @@ -9,7 +9,6 @@ let "8" = "8.5.0"; "7" = "7.5.0"; "6" = "6.5.0"; - "4.9"= "4.9.4"; }; fromMajorMinor = majorMinorVersion: @@ -26,7 +25,6 @@ let "8.5.0" = "0l7d4m9jx124xsk6xardchgy2k5j5l2b15q322k31f0va4d8826k"; "7.5.0" = "0qg6kqc5l72hpnj4vr6l0p69qav0rh4anlkk3y55540zy3klc6dq"; "6.5.0" = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; - "4.9.4" = "14l06m7nvcvb0igkbip58x59w3nq6315k6jcz3wr9ch1rn9d44bc"; }."${version}"; in { diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 29125f1d2979..0a9df68ecc95 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -48,7 +48,6 @@ with pkgs; sets = lib.pipe gccTests ([ (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc)) # Broken - (filterAttrs (n: _: n != "gcc49Stdenv")) (filterAttrs (n: _: n != "gccMultiStdenv")) ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # fails with things like diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ce21eab77ab6..12900cac405c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -510,11 +510,14 @@ mapAliases ({ garmin-plugin = throw "garmin-plugin has been removed, as it is unmaintained upstream and no longer works with modern browsers."; # Added 2024-01-12 garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gcc48 = throw "'gcc48' has been removed from nixpkgs"; # Added 2024-09-10 + gcc49 = throw "'gcc49' has been removed from nixpkgs"; # Added 2024-09-11 + gcc49Stdenv = throw "'gcc49Stdenv' has been removed from nixpkgs"; # Added 2024-09-11 gcc10StdenvCompat = if stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11" then gcc10Stdenv else stdenv; # Added 2024-03-21 gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11 geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10 geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10 gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10 + gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11 ghostwriter = libsForQt5.kdeGear.ghostwriter; # Added 2023-03-18 go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04 gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c95ae085c06..525e7b12c0c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14917,7 +14917,6 @@ with pkgs; extraBuildInputs = lib.optional stdenv.hostPlatform.isDarwin clang.cc; }; - gcc49Stdenv = overrideCC gccStdenv buildPackages.gcc49; gcc6Stdenv = overrideCC gccStdenv buildPackages.gcc6; gcc7Stdenv = overrideCC gccStdenv buildPackages.gcc7; gcc8Stdenv = overrideCC gccStdenv buildPackages.gcc8; @@ -15012,7 +15011,7 @@ with pkgs; }; inherit (callPackage ../development/compilers/gcc/all.nix { inherit noSysDirs; }) - gcc49 gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; + gcc6 gcc7 gcc8 gcc9 gcc10 gcc11 gcc12 gcc13 gcc14; gcc_latest = gcc14; From 0439241c5418e7200675a2c4705393d19e7702d2 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 12 Sep 2024 18:31:33 +0800 Subject: [PATCH 060/212] dart.super_native_extensions: init --- .../dart/package-source-builders/default.nix | 1 + .../super_native_extensions/Cargo-0.8.22.lock | 1996 +++++++++++++++++ .../super_native_extensions/default.nix | 77 + 3 files changed, 2074 insertions(+) create mode 100644 pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock create mode 100644 pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix index 89108420b549..48c31cc28cdd 100644 --- a/pkgs/development/compilers/dart/package-source-builders/default.nix +++ b/pkgs/development/compilers/dart/package-source-builders/default.nix @@ -9,4 +9,5 @@ sqlcipher_flutter_libs = callPackage ./sqlcipher_flutter_libs { }; sqlite3 = callPackage ./sqlite3 { }; system_tray = callPackage ./system-tray { }; + super_native_extensions = callPackage ./super_native_extensions { }; } diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock new file mode 100644 index 000000000000..14340ef0c654 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/Cargo-0.8.22.lock @@ -0,0 +1,1996 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "android_log-sys" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85965b6739a430150bdd138e2374a98af0c3ee0d030b3bb7fc3bddff58d0102e" + +[[package]] +name = "android_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8619b80c242aa7bd638b5c7ddd952addeecb71f69c75e33f1d47b2804f8f883a" +dependencies = [ + "android_log-sys", + "env_logger", + "log", + "once_cell", +] + +[[package]] +name = "anyhow" +version = "1.0.86" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" + +[[package]] +name = "async-trait" +version = "0.1.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "atk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba16453d10c712284061a05f6510f75abeb92b56ba88dfeb48c74775020cc22" +dependencies = [ + "atk-sys", + "bitflags 1.3.2", + "glib", + "libc", +] + +[[package]] +name = "atk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf0a7ca572fbd5762fd8f8cd65a581e06767bc1234913fe1f43e370cff6e90" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "block-sys" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e58aa60e59d8dbfcc36138f5f18be5f24394d33b38b24f7fd0b1caa33095f22f" +dependencies = [ + "block-sys", + "objc2", +] + +[[package]] +name = "block2" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" +dependencies = [ + "objc2", +] + +[[package]] +name = "byte-slice-cast" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cairo-rs" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +dependencies = [ + "bitflags 1.3.2", + "cairo-sys-rs", + "glib", + "libc", + "once_cell", + "thiserror", +] + +[[package]] +name = "cairo-sys-rs" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "cc" +version = "1.0.98" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cfg-expr" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "colored" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" +dependencies = [ + "lazy_static", + "windows-sys 0.48.0", +] + +[[package]] +name = "combine" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if", + "hashbrown", + "lock_api", + "once_cell", + "parking_lot_core", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "env_logger" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "field-offset" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" +dependencies = [ + "memoffset", + "rustc_version", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ + "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "gdk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be1df5ea52cccd7e3a0897338b5564968274b52f5fd12601e0afa44f454c74d3" +dependencies = [ + "bitflags 1.3.2", + "cairo-rs", + "gdk-pixbuf", + "gdk-sys", + "gio", + "glib", + "libc", + "pango", +] + +[[package]] +name = "gdk-pixbuf" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +dependencies = [ + "bitflags 1.3.2", + "gdk-pixbuf-sys", + "gio", + "glib", + "libc", + "once_cell", +] + +[[package]] +name = "gdk-pixbuf-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +dependencies = [ + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gdk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2152de9d38bc67a17b3fe49dc0823af5bf874df59ea088c5f28f31cf103de703" +dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "pkg-config", + "system-deps", +] + +[[package]] +name = "getrandom" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gio" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6973e92937cf98689b6a054a9e56c657ed4ff76de925e36fc331a15f0c5d30a" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys", + "glib", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "glib" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3fad45ba8d4d2cea612b432717e834f48031cd8853c8aaf43b2c79fec8d144b" +dependencies = [ + "bitflags 1.3.2", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys", + "glib-macros", + "glib-sys", + "gobject-sys", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib-macros" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eca5c79337338391f1ab8058d6698125034ce8ef31b72a442437fa6c8580de26" +dependencies = [ + "anyhow", + "heck 0.4.1", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "glib-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d80aa6ea7bba0baac79222204aa786a6293078c210abe69ef1336911d4bdc4f0" +dependencies = [ + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" +dependencies = [ + "glib-sys", + "libc", + "system-deps", +] + +[[package]] +name = "gtk" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c4222ab92b08d4d0bab90ddb6185b4e575ceeea8b8cdf00b938d7b6661d966" +dependencies = [ + "atk", + "bitflags 1.3.2", + "cairo-rs", + "field-offset", + "futures-channel", + "gdk", + "gdk-pixbuf", + "gio", + "glib", + "gtk-sys", + "gtk3-macros", + "libc", + "once_cell", + "pango", + "pkg-config", +] + +[[package]] +name = "gtk-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d8eb6a4b93e5a7e6980f7348d08c1cd93d31fae07cf97f20678c5ec41de3d7e" +dependencies = [ + "atk-sys", + "cairo-sys-rs", + "gdk-pixbuf-sys", + "gdk-sys", + "gio-sys", + "glib-sys", + "gobject-sys", + "libc", + "pango-sys", + "system-deps", +] + +[[package]] +name = "gtk3-macros" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3efb84d682c9a39c10bd9f24f5a4b9c15cc8c7edc45c19cb2ca2c4fc38b2d95e" +dependencies = [ + "anyhow", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "icrate" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb69199826926eb864697bddd27f73d9fddcffc004f5733131e15b465e30642" +dependencies = [ + "block2 0.4.0", + "objc2", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown", +] + +[[package]] +name = "irondash_dart_ffi" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ed3ea8413fd024d89154472f7aea14e820eb600d0c4318bc001b14dd9b3ddc" +dependencies = [ + "once_cell", +] + +[[package]] +name = "irondash_engine_context" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00cff90901a70987a221ba78a2d7439e5add4d34c534be60a33ab6f65b0741ae" +dependencies = [ + "android_logger", + "core-foundation", + "icrate", + "jni", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "irondash_message_channel" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "335cbcc1e4d341bf132b7b26823a03c9520fa0007a83d27f7cfbd535e616b91b" +dependencies = [ + "async-trait", + "core-foundation", + "icrate", + "irondash_dart_ffi", + "irondash_message_channel_derive", + "irondash_run_loop", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "irondash_message_channel_derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cc040dca601ea6a092d0c936dbe362863580c3537e4748ca6c17cbaf88cb0b7" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "irondash_run_loop" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b669550085d7f2ecad1811118b36f57224dd83fddbc97da17009f429d637239d" +dependencies = [ + "core-foundation", + "futures", + "icrate", + "irondash_engine_context", + "log", + "objc2", + "once_cell", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.155" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + +[[package]] +name = "lock_api" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memoffset" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "mime" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "mime_guess" +version = "2.0.4" +source = "git+https://github.com/knopp/mime_guess.git?branch=super_native_extensions#8c9abd38a5845db2d8a91a02fee16b226c364874" +dependencies = [ + "mime", + "unicase", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "objc-sys" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" + +[[package]] +name = "objc2" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" +dependencies = [ + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-app-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2 0.5.1", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2 0.5.1", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oslog" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d2043d1f61d77cb2f4b1f7b7b2295f40507f5f8e9d1c8bf10a1ca5f97a3969" +dependencies = [ + "cc", + "dashmap", + "log", +] + +[[package]] +name = "pango" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +dependencies = [ + "bitflags 1.3.2", + "gio", + "glib", + "libc", + "once_cell", + "pango-sys", +] + +[[package]] +name = "pango-sys" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +dependencies = [ + "glib-sys", + "gobject-sys", + "libc", + "system-deps", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.52.5", +] + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.83" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "redox_syscall" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +dependencies = [ + "bitflags 2.5.0", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "ryu" +version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" + +[[package]] +name = "serde" +version = "1.0.202" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.202" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "serde_json" +version = "1.0.117" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_spanned" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +dependencies = [ + "serde", +] + +[[package]] +name = "simple_logger" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48047e77b528151aaf841a10a9025f9459da80ba820e425ff7eb005708a76dc7" +dependencies = [ + "atty", + "colored", + "log", + "time", + "winapi", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "super_native_extensions" +version = "0.1.0" +dependencies = [ + "android_logger", + "anyhow", + "async-trait", + "block2 0.5.1", + "byte-slice-cast", + "core-foundation", + "core-graphics", + "gdk", + "gdk-sys", + "glib-sys", + "gobject-sys", + "gtk", + "gtk-sys", + "irondash_engine_context", + "irondash_message_channel", + "irondash_run_loop", + "jni", + "log", + "mime_guess", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", + "once_cell", + "oslog", + "rand", + "serde", + "serde_json", + "simple_logger", + "threadpool", + "url", + "velcro", + "windows", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2863d96a84c6439701d7a38f9de935ec562c8832cc55d1dde0f513b52fad106" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" +dependencies = [ + "cfg-expr", + "heck 0.5.0", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "thiserror" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.61" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" +version = "0.3.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.22.13", +] + +[[package]] +name = "toml_datetime" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.8", +] + +[[package]] +name = "unicase" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" +dependencies = [ + "version_check", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "velcro" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31c6a51883ba1034757307e06dc4856cd5439ecf6804ce6c90d13d49496196fc" +dependencies = [ + "velcro_macros", +] + +[[package]] +name = "velcro_core" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "742cf45d07989b7614877e083602a8973890c75a81f47216b238d2f326ec916c" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "velcro_macros" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b23c806d7b49977e6e12ee6d120ac01dcab702b51c652fdf1a6709ab5b8868c" +dependencies = [ + "syn 1.0.109", + "velcro_core", +] + +[[package]] +name = "version-compare" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-implement", + "windows-interface", + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-implement" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-interface" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.65", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +dependencies = [ + "memchr", +] diff --git a/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix new file mode 100644 index 000000000000..9316b7e8a852 --- /dev/null +++ b/pkgs/development/compilers/dart/package-source-builders/super_native_extensions/default.nix @@ -0,0 +1,77 @@ +{ + lib, + rustPlatform, + pkg-config, + at-spi2-atk, + gdk-pixbuf, + cairo, + gtk3, + writeText, + stdenv, +}: + +{ version, src, ... }: + +let + rustDep = rustPlatform.buildRustPackage { + pname = "super_native_extensions-rs"; + inherit version src; + + sourceRoot = "${src.name}/rust"; + + cargoLock = + rec { + _0_8_22 = { + lockFile = ./Cargo-0.8.22.lock; + outputHashes = { + "mime_guess-2.0.4" = "sha256-KSw0YUTGqNEWY9pMvQplUGajJgoP2BRwVX6qZPpB2rI="; + }; + }; + _0_8_21 = _0_8_22; + _0_8_20 = _0_8_22; + _0_8_19 = _0_8_22; + _0_8_18 = _0_8_22; + _0_8_17 = _0_8_22; + } + .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw '' + Unsupported version of pub 'super_native_extensions': '${version}' + Please add ${src}/rust/Cargo.lock + to this path, and add corresponding entry here. If the lock + is the same with existing versions, add an alias here. + ''); + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + at-spi2-atk + gdk-pixbuf + cairo + gtk3 + ]; + + passthru.libraryPath = "lib/libsuper_native_extensions.so"; + }; + + fakeCargokitCmake = writeText "FakeCargokit.cmake" '' + function(apply_cargokit target manifest_dir lib_name any_symbol_name) + target_link_libraries("''${target}" PRIVATE ${rustDep}/${rustDep.passthru.libraryPath}) + set("''${target}_cargokit_lib" ${rustDep}/${rustDep.passthru.libraryPath} PARENT_SCOPE) + endfunction() + ''; + +in +stdenv.mkDerivation { + pname = "super_native_extensions"; + inherit version src; + inherit (src) passthru; + + installPhase = '' + runHook preInstall + + cp -r "$src" "$out" + chmod +rwx $out/cargokit/cmake/cargokit.cmake + cp ${fakeCargokitCmake} $out/cargokit/cmake/cargokit.cmake + + runHook postInstall + ''; +} From decd4489bce9e865a88f0f9e4581338d35c9cb91 Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 12 Sep 2024 18:33:05 +0800 Subject: [PATCH 061/212] musicpod: init at 1.11.0 --- pkgs/by-name/mu/musicpod/package.nix | 56 + pkgs/by-name/mu/musicpod/pubspec.lock.json | 2259 ++++++++++++++++++++ 2 files changed, 2315 insertions(+) create mode 100644 pkgs/by-name/mu/musicpod/package.nix create mode 100644 pkgs/by-name/mu/musicpod/pubspec.lock.json diff --git a/pkgs/by-name/mu/musicpod/package.nix b/pkgs/by-name/mu/musicpod/package.nix new file mode 100644 index 000000000000..9809b51aa439 --- /dev/null +++ b/pkgs/by-name/mu/musicpod/package.nix @@ -0,0 +1,56 @@ +{ + lib, + flutter324, + fetchFromGitHub, + mpv-unwrapped, + libass, + pulseaudio, +}: + +flutter324.buildFlutterApplication rec { + pname = "musicpod"; + version = "1.11.0"; + + src = fetchFromGitHub { + owner = "ubuntu-flutter-community"; + repo = "musicpod"; + rev = "v${version}"; + hash = "sha256-Xs6qDSqd10mYjLNFiPV9Irthd/hK2kE4fC6i03QvOn0="; + }; + + postPatch = '' + substituteInPlace snap/gui/musicpod.desktop \ + --replace-fail 'Icon=''${SNAP}/meta/gui/musicpod.png' 'Icon=musicpod' + ''; + + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + audio_service_mpris = "sha256-QRZ4a3w4MZP8/A4yXzP4P9FPwEVNXlntmBwE8I+s2Kk="; + media_kit_native_event_loop = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; + media_kit_video = "sha256-JBtFTYlztDQvN/qQcDxkK27mka2fSG+iiIIxk2mqEpY="; + phoenix_theme = "sha256-5kgPAnK61vFi/sJ1jr3c5D2UZbxItW8YOk/IJEtHkZo="; + yaru = "sha256-3GexoQpwr7pazajAMyPl9rcYhmSgQeialZTvJsadP4k="; + }; + + buildInputs = [ + mpv-unwrapped + libass + ]; + + runtimeDependencies = [ pulseaudio ]; + + postInstall = '' + install -Dm644 snap/gui/musicpod.desktop -t $out/share/applications + install -Dm644 snap/gui/musicpod.png -t $out/share/pixmaps + ''; + + meta = { + description = "Music, radio, television and podcast player"; + homepage = "https://github.com/ubuntu-flutter-community/musicpod"; + license = lib.licenses.gpl3Only; + mainProgram = "musicpod"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/mu/musicpod/pubspec.lock.json b/pkgs/by-name/mu/musicpod/pubspec.lock.json new file mode 100644 index 000000000000..4e0bbb6ff3a2 --- /dev/null +++ b/pkgs/by-name/mu/musicpod/pubspec.lock.json @@ -0,0 +1,2259 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "72.0.0" + }, + "_macros": { + "dependency": "transitive", + "description": "dart", + "source": "sdk", + "version": "0.3.2" + }, + "analyzer": { + "dependency": "transitive", + "description": { + "name": "analyzer", + "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.7.0" + }, + "animated_emoji": { + "dependency": "direct main", + "description": { + "name": "animated_emoji", + "sha256": "0af5508ce0ccb44caa6d3776d01900be6f6e70676881bfa8ce1a1bb9bf91a6a7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "animated_vector": { + "dependency": "transitive", + "description": { + "name": "animated_vector", + "sha256": "e15c6596549ca6e2e7491c11fbe168a1dead87475a828a4bc81cf104feca0432", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "animated_vector_annotations": { + "dependency": "transitive", + "description": { + "name": "animated_vector_annotations", + "sha256": "baa6b4ed98407220f2c9634f7da3cfa5eedb46798e090466f441e666e2f7c8c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.0" + }, + "audio_metadata_reader": { + "dependency": "direct main", + "description": { + "name": "audio_metadata_reader", + "sha256": "40bd155e2ab0de725656235c51bb8441d2af49e793f0a643653801e05a693eb4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.6" + }, + "audio_service": { + "dependency": "direct main", + "description": { + "name": "audio_service", + "sha256": "9dd5ba7e77567b290c35908b1950d61485b4dfdd3a0ac398e98cfeec04651b75", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.18.15" + }, + "audio_service_mpris": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "ad6f743b73e320670449026fa1852d9978438bb9", + "resolved-ref": "ad6f743b73e320670449026fa1852d9978438bb9", + "url": "https://github.com/Feichtmeier/audio-service-mpris" + }, + "source": "git", + "version": "0.1.3" + }, + "audio_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "audio_service_platform_interface", + "sha256": "8431a455dac9916cc9ee6f7da5620a666436345c906ad2ebb7fa41d18b3c1bf4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "audio_service_web": { + "dependency": "transitive", + "description": { + "name": "audio_service_web", + "sha256": "4cdc2127cd4562b957fb49227dc58e3303fafb09bde2573bc8241b938cf759d9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "audio_session": { + "dependency": "transitive", + "description": { + "name": "audio_session", + "sha256": "343e83bc7809fbda2591a49e525d6b63213ade10c76f15813be9aed6657b3261", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.21" + }, + "basic_utils": { + "dependency": "direct main", + "description": { + "name": "basic_utils", + "sha256": "2064b21d3c41ed7654bc82cc476fd65542e04d60059b74d5eed490a4da08fc6c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.7.0" + }, + "blur": { + "dependency": "direct main", + "description": { + "name": "blur", + "sha256": "c17450404bceea429100e0838d19bbfaa6ad1f3053e7bac78a0264bbd60cfe01", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "build_runner": { + "dependency": "direct dev", + "description": { + "name": "build_runner", + "sha256": "dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.12" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.3.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.9.2" + }, + "cached_network_image": { + "dependency": "direct main", + "description": { + "name": "cached_network_image", + "sha256": "7c1183e361e5c8b0a0f21a28401eecdbde252441106a9816400dd4c2b2424916", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "cached_network_image_platform_interface": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_platform_interface", + "sha256": "35814b016e37fbdc91f7ae18c8caf49ba5c88501813f73ce8a07027a395e2829", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "cached_network_image_web": { + "dependency": "transitive", + "description": { + "name": "cached_network_image_web", + "sha256": "980842f4e8e2535b8dbd3d5ca0b1f0ba66bf61d14cc3a17a9b4788a3685ba062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "charset": { + "dependency": "transitive", + "description": { + "name": "charset", + "sha256": "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.10.0" + }, + "collection": { + "dependency": "direct main", + "description": { + "name": "collection", + "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.18.0" + }, + "connectivity_plus": { + "dependency": "direct main", + "description": { + "name": "connectivity_plus", + "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.5" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.4+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.3" + }, + "cupertino_icons": { + "dependency": "direct main", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.6" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.10" + }, + "desktop_notifications": { + "dependency": "direct main", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.1.2" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "dio": { + "dependency": "direct main", + "description": { + "name": "dio", + "sha256": "0dfb6b6a1979dac1c1245e17cef824d7b452ea29bd33d3467269f9bef3715fb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.6.0" + }, + "dio_web_adapter": { + "dependency": "transitive", + "description": { + "name": "dio_web_adapter", + "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.5" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.1" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "file": { + "dependency": "direct main", + "description": { + "name": "file", + "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "file_picker": { + "dependency": "direct main", + "description": { + "name": "file_picker", + "sha256": "167bb619cdddaa10ef2907609feb8a79c16dfa479d3afaf960f8e223f754bf12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.1.2" + }, + "file_selector": { + "dependency": "direct main", + "description": { + "name": "file_selector", + "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "file_selector_android": { + "dependency": "transitive", + "description": { + "name": "file_selector_android", + "sha256": "b8c9717a0177ca6fa035554b82cd6c83b838ddc66b7704eb6df0f77f027ecc90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1+7" + }, + "file_selector_ios": { + "dependency": "transitive", + "description": { + "name": "file_selector_ios", + "sha256": "38ebf91ecbcfa89a9639a0854ccaed8ab370c75678938eebca7d34184296f0bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.3" + }, + "file_selector_linux": { + "dependency": "direct main", + "description": { + "name": "file_selector_linux", + "sha256": "045d372bf19b02aeb69cacf8b4009555fb5f6f0b7ad8016e5f46dd1387ddd492", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.2+1" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "f42eacb83b318e183b1ae24eead1373ab1334084404c8c16e0354f9a3e55d385", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "file_selector_web": { + "dependency": "transitive", + "description": { + "name": "file_selector_web", + "sha256": "c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4+2" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "2ad726953f6e8affbc4df8dc78b77c3b4a060967a291e528ef72ae846c60fb69", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+2" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "flutter": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_cache_manager": { + "dependency": "direct main", + "description": { + "name": "flutter_cache_manager", + "sha256": "400b6592f16a4409a7f2bb929a9a7e38c72cceb8ffb99ee57bbf2cb2cecf8386", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.1" + }, + "flutter_html": { + "dependency": "direct main", + "description": { + "name": "flutter_html", + "sha256": "02ad69e813ecfc0728a455e4bf892b9379983e050722b1dce00192ee2e41d1ee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0-beta.2" + }, + "flutter_lints": { + "dependency": "direct dev", + "description": { + "name": "flutter_lints", + "sha256": "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "flutter_localizations": { + "dependency": "direct main", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_markdown": { + "dependency": "direct main", + "description": { + "name": "flutter_markdown", + "sha256": "a23c41ee57573e62fc2190a1f36a0480c4d90bde3a8a8d7126e5d5992fb53fb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.3+1" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.22" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "02720226035257ad0b571c1256f43df3e1556a499f6bcb004849a0faaa0e87f0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.82.6" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "f0b6d8c0fa7b4b444985cdde68492c0138a4fb6fc57a641b24cb234b7ee0f5c4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.1" + }, + "flutter_tabler_icons": { + "dependency": "direct main", + "description": { + "name": "flutter_tabler_icons", + "sha256": "4b74a899bf6d1ead67a3bc129f7f2be0213c72aa7bcbf4cd46dcaaa6196fd2c6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.37.0" + }, + "flutter_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "functional_listener": { + "dependency": "transitive", + "description": { + "name": "functional_listener", + "sha256": "026d1bd4f66367f11d9ec9f1f1ddb42b89e4484b356972c76d983266cf82f33f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.0" + }, + "github": { + "dependency": "direct main", + "description": { + "name": "github", + "sha256": "57f6ad78591f9638e903409977443093f862d25062a6b582a3c89e4ae44e4814", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.24.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "gtk": { + "dependency": "direct main", + "description": { + "name": "gtk", + "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "handy_window": { + "dependency": "direct main", + "description": { + "name": "handy_window", + "sha256": "56b813e58a68b0ee2ab22051400b8b1f1b5cfe88b8cd32288623defb3926245a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "html": { + "dependency": "direct main", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "http": { + "dependency": "direct main", + "description": { + "name": "http", + "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.2" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "intl": { + "dependency": "direct main", + "description": { + "name": "intl", + "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.19.0" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "irondash_engine_context": { + "dependency": "transitive", + "description": { + "name": "irondash_engine_context", + "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.4" + }, + "irondash_message_channel": { + "dependency": "transitive", + "description": { + "name": "irondash_message_channel", + "sha256": "b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.0.5" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.5" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "list_counter": { + "dependency": "transitive", + "description": { + "name": "list_counter", + "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "lottie": { + "dependency": "transitive", + "description": { + "name": "lottie", + "sha256": "6a24ade5d3d918c306bb1c21a6b9a04aab0489d51a2582522eea820b4093b62b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "m3u_parser_nullsafe": { + "dependency": "direct main", + "description": { + "name": "m3u_parser_nullsafe", + "sha256": "7f65c30d1a2cd75e4114a43c2c96ab7f8490ee53f530bf86b1725605e1677fcf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "macros": { + "dependency": "transitive", + "description": { + "name": "macros", + "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2-main.4" + }, + "markdown": { + "dependency": "transitive", + "description": { + "name": "markdown", + "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.2.2" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.16+1" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.11.1" + }, + "media_kit": { + "dependency": "direct main", + "description": { + "name": "media_kit", + "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.11" + }, + "media_kit_libs_android_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.6" + }, + "media_kit_libs_ios_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_ios_video", + "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_linux", + "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "media_kit_libs_macos_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_macos_video", + "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "direct main", + "description": { + "name": "media_kit_libs_video", + "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "media_kit_libs_windows_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_windows_video", + "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.10" + }, + "media_kit_native_event_loop": { + "dependency": "direct overridden", + "description": { + "path": "media_kit_native_event_loop", + "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "url": "https://github.com/media-kit/media-kit" + }, + "source": "git", + "version": "1.0.8" + }, + "media_kit_video": { + "dependency": "direct main", + "description": { + "path": "media_kit_video", + "ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "resolved-ref": "13f6b3f0ef9ccf8a711e396bc49cb05af9b3e497", + "url": "https://github.com/media-kit/media-kit" + }, + "source": "git", + "version": "1.2.4" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "mime": { + "dependency": "direct main", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "mime_type": { + "dependency": "direct main", + "description": { + "name": "mime_type", + "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "mockito": { + "dependency": "direct main", + "description": { + "name": "mockito", + "sha256": "6841eed20a7befac0ce07df8116c8b8233ed1f4486a7647c7fc5a02ae6163917", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.4.4" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "octo_image": { + "dependency": "transitive", + "description": { + "name": "octo_image", + "sha256": "34faa6639a78c7e3cbe79be6f9f96535867e879748ade7d17c9b1ae7536293bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "package_info_plus": { + "dependency": "direct main", + "description": { + "name": "package_info_plus", + "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.0.2" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "palette_generator": { + "dependency": "direct main", + "description": { + "name": "palette_generator", + "sha256": "d50fbcd69abb80c5baec66d700033b1a320108b1aa17a5961866a12c0abb7c0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.3+4" + }, + "path": { + "dependency": "direct main", + "description": { + "name": "path", + "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.0" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "path_provider": { + "dependency": "direct main", + "description": { + "name": "path_provider", + "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.10" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.0.2" + }, + "phoenix_theme": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "fe7b369cdf03a15c735c866584a251da68f3a716", + "resolved-ref": "fe7b369cdf03a15c735c866584a251da68f3a716", + "url": "https://github.com/ubuntu-flutter-community/phoenix_theme" + }, + "source": "git", + "version": "1.0.1" + }, + "pixel_snap": { + "dependency": "transitive", + "description": { + "name": "pixel_snap", + "sha256": "677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.5" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "platform_linux": { + "dependency": "transitive", + "description": { + "name": "platform_linux", + "sha256": "856cfc9871e3ff3df6926991729d24bba9b70d0229ae377fa08b562344baaaa8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "pls": { + "dependency": "direct main", + "description": { + "name": "pls", + "sha256": "268fc553655be2ea494789b444aa847dcb21ab5da5a174f5363c95874c0df8fa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "podcast_search": { + "dependency": "direct main", + "description": { + "name": "podcast_search", + "sha256": "ab3a98d2bb7a593cee61351fae17900d3cc6e23e21638d7ae16963bb11cf9693", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.9.1" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "puppeteer": { + "dependency": "transitive", + "description": { + "name": "puppeteer", + "sha256": "a6752d4f09b510ae41911bfd0997f957e723d38facf320dd9ee0e5661108744a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.13.0" + }, + "radio_browser_api": { + "dependency": "direct main", + "description": { + "name": "radio_browser_api", + "sha256": "73da0aa774ebfb28315d7c4590f4b231105772860fe1a4ba5c20ee05cf0e8d63", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0+1" + }, + "reorderableitemsview": { + "dependency": "direct main", + "description": { + "name": "reorderableitemsview", + "sha256": "13f1a0394e158fea6f440557b2025bba7c61364885eaa9d71e1c4ba818c8d79c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "rss_dart": { + "dependency": "transitive", + "description": { + "name": "rss_dart", + "sha256": "199fa73ce1d25c929ea9004fff77cb96734c0b715353a2e3701e8f593a69a161", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.9" + }, + "rxdart": { + "dependency": "transitive", + "description": { + "name": "rxdart", + "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.28.0" + }, + "safe_change_notifier": { + "dependency": "direct main", + "description": { + "name": "safe_change_notifier", + "sha256": "8d0645ec2706f580912c38de488439ddb491be48247826927b7bc2e54ea8f7af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "screen_brightness": { + "dependency": "transitive", + "description": { + "name": "screen_brightness", + "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "screen_brightness_android": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_android", + "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+2" + }, + "screen_brightness_ios": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_ios", + "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_macos": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_macos", + "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0+1" + }, + "screen_brightness_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_platform_interface", + "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.0" + }, + "screen_brightness_windows": { + "dependency": "transitive", + "description": { + "name": "screen_brightness_windows", + "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.9" + }, + "scroll_to_index": { + "dependency": "direct main", + "description": { + "name": "scroll_to_index", + "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.1" + }, + "shared_preferences": { + "dependency": "direct main", + "description": { + "name": "shared_preferences", + "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.2" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "shimmer": { + "dependency": "direct main", + "description": { + "name": "shimmer", + "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.99" + }, + "smtc_windows": { + "dependency": "direct main", + "description": { + "name": "smtc_windows", + "sha256": "0fd64d0c6a0c8ea4ea7908d31195eadc8f6d45d5245159fc67259e9e8704100f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.0" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "a43e5a27235518c03ca238e7b4732cf35eabe863a369ceba6cbefa537a66f16d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3+1" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "7b41b6c3507854a159e24ae90a8e3e9cc01eb26a477c118d6dca065b5f55453e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4+2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.11.1" + }, + "state_notifier": { + "dependency": "transitive", + "description": { + "name": "state_notifier", + "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.0" + }, + "super_clipboard": { + "dependency": "transitive", + "description": { + "name": "super_clipboard", + "sha256": "71d2a81e0e3a8c5d6339715a42f8dd42c6def02c0c805a23d45611010de39fbe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.20" + }, + "super_drag_and_drop": { + "dependency": "direct main", + "description": { + "name": "super_drag_and_drop", + "sha256": "334a4f1dd6cc9ed1d0279ed25d199e74beec9751be5fe1d80637bf298ca8a92c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.20" + }, + "super_native_extensions": { + "dependency": "transitive", + "description": { + "name": "super_native_extensions", + "sha256": "9d674b8c71e16f586b3967e67a6faa83c35e3d9ea4f64bca8551badfddf992cb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.20" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "a824e842b8a054f91a728b783c177c1e4731f6b124f9192468457a8913371255", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "system_theme": { + "dependency": "direct main", + "description": { + "name": "system_theme", + "sha256": "676f8e5bdbf17d5b1267592370810df8cdfaa01d3a2e121b22bd4ea30e63f17c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "system_theme_web": { + "dependency": "transitive", + "description": { + "name": "system_theme_web", + "sha256": "900c92c5c050ce58048f241ef9a17e5cd8629808325a05b473dc62a6e99bae77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.2" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "tuple": { + "dependency": "transitive", + "description": { + "name": "tuple", + "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.2" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "url_launcher": { + "dependency": "direct main", + "description": { + "name": "url_launcher", + "sha256": "21b704ce5fa560ea9f3b525b43601c678728ba46725bab9b01187b4831377ed3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.0" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "e35a698ac302dd68e41f73250bd9517fe3ab5fa4f18fe4647a0872db61bacbab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.10" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "9a1a42d5d2d95400c795b2914c36fdcb525870c752569438e4ebb09a2b5d90de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.0" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.3" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "uuid": { + "dependency": "direct overridden", + "description": { + "name": "uuid", + "sha256": "f33d6bb662f0e4f79dcd7ada2e6170f3b3a2530c28fc41f49a411ddedd576a77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.0" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "14.2.4" + }, + "volume_controller": { + "dependency": "transitive", + "description": { + "name": "volume_controller", + "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "wakelock_plus": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus", + "sha256": "bf4ee6f17a2fa373ed3753ad0e602b7603f8c75af006d5b9bdade263928c0484", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.8" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "422d1cdbb448079a8a62a5a770b69baa489f8f7ca21aef47800c726d404f9d16", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "watch_it": { + "dependency": "direct main", + "description": { + "name": "watch_it", + "sha256": "a01a9e8292c040de82670f28f8a7d35315115a22f3674d2c4a8fd811fd1ac0ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "win32": { + "dependency": "direct main", + "description": { + "name": "win32", + "sha256": "68d1e89a91ed61ad9c370f9f8b6effed9ae5e0ede22a270bdfa6daf79fc2290a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.5.4" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "723b7f851e5724c55409bb3d5a32b203b3afe8587eaf5dafb93a5fed8ecda0d6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "window_manager": { + "dependency": "direct main", + "description": { + "name": "window_manager", + "sha256": "8699323b30da4cdbe2aa2e7c9de567a6abd8a97d9a5c850a3c86dcd0b34bbfbf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.9" + }, + "xdg_directories": { + "dependency": "direct main", + "description": { + "name": "xdg_directories", + "sha256": "faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.4" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "yaru": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "8a16a69d5f9ea7b0154035f34c0863c987a98497", + "resolved-ref": "8a16a69d5f9ea7b0154035f34c0863c987a98497", + "url": "https://github.com/ubuntu/yaru.dart" + }, + "source": "git", + "version": "5.1.0" + }, + "yaru_window": { + "dependency": "direct main", + "description": { + "name": "yaru_window", + "sha256": "c9d16f78962652ad71aa160ab0a1e2e5924359439303394f980fd00eefc905eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "yaru_window_linux": { + "dependency": "direct main", + "description": { + "name": "yaru_window_linux", + "sha256": "3676355492eba0461f03acf1b7420f7885982d1bffe113fccdca9415fbe39f5d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "yaru_window_manager": { + "dependency": "transitive", + "description": { + "name": "yaru_window_manager", + "sha256": "2d358263d19ae6598df21d6d8c0d25e75c79a82f459b63b0013a13e395c48b23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "yaru_window_platform_interface": { + "dependency": "transitive", + "description": { + "name": "yaru_window_platform_interface", + "sha256": "e9f8cd34e207d7f7b771ae70dee347ed974cee06b981819c4181b3e474e52254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.2" + }, + "yaru_window_web": { + "dependency": "transitive", + "description": { + "name": "yaru_window_web", + "sha256": "3ff30758a330d7626d54643df0cca6c179782f401aba7752da9cc0d60c9a6f74", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + } + }, + "sdks": { + "dart": ">=3.5.0 <4.0.0", + "flutter": ">=3.24.0" + } +} From 5c6429c20e7eee3f1c6dfd46df0653858df950c7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 12 Sep 2024 13:17:57 +0200 Subject: [PATCH 062/212] qt6Packages.waylib: Fix build --- pkgs/development/libraries/waylib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/waylib/default.nix b/pkgs/development/libraries/waylib/default.nix index 1cc5332cf777..15ece6b3b01b 100644 --- a/pkgs/development/libraries/waylib/default.nix +++ b/pkgs/development/libraries/waylib/default.nix @@ -42,6 +42,11 @@ stdenv.mkDerivation (finalAttrs: { "${nixos-artwork.wallpapers.simple-blue}/share/backgrounds/nixos/nix-wallpaper-simple-blue.png" ''; + depsBuildBuild = [ + # To find wayland-scanner + pkg-config + ]; + nativeBuildInputs = [ cmake pkg-config From 651e55cbe0d069c23e825036a4368a28391b7294 Mon Sep 17 00:00:00 2001 From: Connor Meehan Date: Mon, 20 May 2024 13:11:36 +1000 Subject: [PATCH 063/212] zinit: Fixes missing man pages --- pkgs/shells/zsh/zinit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/zsh/zinit/default.nix b/pkgs/shells/zsh/zinit/default.nix index c226b5565451..b94619bff7ce 100644 --- a/pkgs/shells/zsh/zinit/default.nix +++ b/pkgs/shells/zsh/zinit/default.nix @@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation rec { install -m0644 zinit{,-side,-install,-autoload}.zsh "$outdir" install -m0755 share/git-process-output.zsh "$outdir" + installManPage doc/zinit.1 + # Zplugin autocompletion installShellCompletion --zsh _zinit From fd693b3fd2541b2a2f0eb6d9579ab5f63d4e6212 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 11 Sep 2024 09:05:28 +0200 Subject: [PATCH 064/212] python3Packages.desktop-notifier: 5.0.1 -> 6.0.0 --- .../python-modules/desktop-notifier/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index fd502d99eef9..a6260c35ad5f 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -4,31 +4,35 @@ fetchFromGitHub, pythonOlder, stdenv, + bidict, packaging, setuptools, - dbus-next, + dbus-fast, rubicon-objc, }: buildPythonPackage rec { pname = "desktop-notifier"; - version = "5.0.1"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; - repo = pname; + repo = "desktop-notifier"; rev = "refs/tags/v${version}"; - hash = "sha256-A+25T0xgUcE1NaOKNZgeP80VlEmqa137YGn3g/pwpxM="; + hash = "sha256-HynREkiPxv/1y1/ICVwqANIe9tAkIvdpDy4oXxQarec="; }; build-system = [ setuptools ]; dependencies = - [ packaging ] - ++ lib.optionals stdenv.isLinux [ dbus-next ] + [ + bidict + packaging + ] + ++ lib.optionals stdenv.isLinux [ dbus-fast ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ rubicon-objc ]; # no tests available, do the imports check instead From 3996cfcc77d952a42705a64d25725f1a041cedf5 Mon Sep 17 00:00:00 2001 From: Cryolitia PukNgae Date: Thu, 12 Sep 2024 21:24:24 +0800 Subject: [PATCH 065/212] wechat-uos: use libuosdevicea stub to get rid of openssl_1_1 --- pkgs/by-name/we/wechat-uos/libuosdevicea.c | 44 +++++++++++++++++ pkgs/by-name/we/wechat-uos/package.nix | 55 ++++++++++++++-------- 2 files changed, 79 insertions(+), 20 deletions(-) create mode 100644 pkgs/by-name/we/wechat-uos/libuosdevicea.c diff --git a/pkgs/by-name/we/wechat-uos/libuosdevicea.c b/pkgs/by-name/we/wechat-uos/libuosdevicea.c new file mode 100644 index 000000000000..0cdc0cecde7d --- /dev/null +++ b/pkgs/by-name/we/wechat-uos/libuosdevicea.c @@ -0,0 +1,44 @@ +// taken from https://aur.archlinux.org/cgit/aur.git/tree/libuosdevicea.c?h=wechat-universal + +/* + * licensestub - compat layer for libuosdevicea + * Copyright (C) 2024 Zephyr Lykos + * Copyright (C) 2024 Guoxin "7Ji" Pu + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +#define _GNU_SOURCE + +#include + +#define declare_string_getter(suffix, constant) void uos_get_##suffix(char *const restrict out) { if (out) strcpy(out, constant); } + +declare_string_getter(mac, // MAC address with colon stripped + "000000000000") +declare_string_getter(hddsninfo, + "SN") +declare_string_getter(hwserial, // MD5 of hddsninfo + "92666505ce75444ee14be2ebc2f10a60") +declare_string_getter(mb_sn, // hardcoded + "E50022008800015957007202c59a1a8-3981-2020-0810-204909000000") +declare_string_getter(osver, + "UnionTech OS Desktop") +declare_string_getter(licensetoken, + "djEsdjEsMSwyLDk5QUFFN0FBQVdRQjk5OFhKS0FIU1QyOTQsMTAsOTI2NjY1MDVjZTc1NDQ0ZWUxNGJlMmViYzJmMTBhNjAsQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUE6ZjA3NjAwYzZkNmMyMDkyMDBkMzE5YzU2OThmNTc3MGRlYWY1NjAyZTY5MzUxZTczNjI2NjlhNzIyZTBkNTJiOTNhYzk0MmM3YTNkZTgxNjIxMmUwMDA1NTUwODg4N2NlMDQ4ODMyNTExY2JhNGFiMjdmYzlmZjMyYzFiNTYwNjMwZDI3ZDI2NmE5ZGIxZDQ0N2QxYjNlNTNlNTVlOTY1MmU5YTU4OGY0NWYzMTMwZDE0NDc4MTRhM2FmZjRlZGNmYmNkZjhjMmFiMDc5OWYwNGVmYmQ2NjdiNGYwYzEwNDhkYzExNjYwZWU1NTdlNTdmNzBlNjA1N2I0NThkMDgyOA==") + +int uos_is_active() { + return 0; +} diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix index 959d05c9f10d..ae7899be37c3 100644 --- a/pkgs/by-name/we/wechat-uos/package.nix +++ b/pkgs/by-name/we/wechat-uos/package.nix @@ -19,7 +19,6 @@ , mesa , alsa-lib , wayland -, openssl_1_1 , atk , qt6 , at-spi2-atk @@ -112,6 +111,40 @@ let outputHash = "sha256-pNftwtUZqBsKBSPQsEWlYLlb6h2Xd9j56ZRMi8I82ME="; }; + libuosdevicea = stdenv.mkDerivation rec { + name = "libuosdevicea"; + src = ./libuosdevicea.c; + + unpackPhase = '' + runHook preUnpack + + cp ${src} libuosdevicea.c + + runHook postUnpack + ''; + + buildPhase = '' + runHook preBuild + + $CC -shared -fPIC -o libuosdevicea.so libuosdevicea.c + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp libuosdevicea.so $out/lib/ + + runHook postInstall + ''; + + meta = with lib; { + license = licenses.gpl2Plus; + }; + }; + wechat-uos-runtime = with xorg; [ # Make sure our glibc without hardening gets picked up first (lib.hiPrio glibcWithoutHardening) @@ -173,7 +206,6 @@ let wayland pulseaudio qt6.qt5compat - openssl_1_1 bzip2 ]; @@ -199,22 +231,6 @@ let }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - # Don't blame about this. WeChat requires some binary from here to work properly - uosSrc = { - x86_64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_amd64.deb"; - hash = "sha256-vVN7w+oPXNTMJ/g1Rpw/AVLIytMXI+gLieNuddyyIYE="; - }; - aarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_arm64.deb"; - hash = "sha256-XvGFPYJlsYPqRyDycrBGzQdXn/5Da1AJP5LgRVY1pzI="; - }; - loongarch64-linux = fetchurl { - url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.weixin/com.tencent.weixin_2.1.5_loongarch64.deb"; - hash = "sha256-oa6rLE6QXMCPlbebto9Tv7xT3fFqYIlXL6WHpB2U35s="; - }; - }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); - inherit uosLicense; nativeBuildInputs = [ dpkg ]; @@ -223,7 +239,6 @@ let runHook preUnpack dpkg -x $src ./wechat-uos - dpkg -x $uosSrc ./wechat-uos-old-source runHook postUnpack ''; @@ -237,7 +252,7 @@ let mkdir -pv $out/usr/lib/wechat-uos/license ln -s ${uosLicenseUnzipped}/* $out/usr/lib/wechat-uos/license/ - cp -r wechat-uos-old-source/usr/lib/license/libuosdevicea.so $out/usr/lib/wechat-uos/license/ + ln -s ${libuosdevicea}/lib/libuosdevicea.so $out/usr/lib/wechat-uos/license/ runHook postInstall ''; From 9edb0cd23a877a3c39d30ceaa0eea59b8d47d50f Mon Sep 17 00:00:00 2001 From: Yann Hamdaoui Date: Thu, 12 Sep 2024 16:39:08 +0200 Subject: [PATCH 066/212] nickel: 1.7.0 -> 1.8.0 --- pkgs/by-name/ni/nickel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index dbc004302e47..1c215f6b090a 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "nickel"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "tweag"; repo = "nickel"; rev = "refs/tags/${version}"; - hash = "sha256-EwiZg0iyF9EQ0Z65Re5WgeV7xgs/wPtTQ9XA0iEMEIQ="; + hash = "sha256-mjmT1ogvUJgy3Jb6m/npE+1if1Uy191wPU80nNlVwdM="; }; - cargoHash = "sha256-JwuBjCWETIlBX5xswdznOAmzkL0Rn6cv7pxM6DwAkOs="; + cargoHash = "sha256-XDDvuIVWvmsO09aQLF28OyH5n+9aO5J+89EQLru7Jrc="; cargoBuildFlags = [ "-p nickel-lang-cli" "-p nickel-lang-lsp" ]; From 7a5f33c57f8bf47b50e69f40f6022fb3b8eb3b75 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:45:54 +0300 Subject: [PATCH 067/212] raycast: 1.82.0 -> 1.82.5 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 5f992b9d2398..5d27c9a72cac 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -11,12 +11,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.82.0"; + version = "1.82.5"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-+USKcwmjapDH+zet7lHSWS6vT1GZ0ch+yPBRD2BrLS0="; + hash = "sha256-wqX61h6iF3yhZePLvtGL+gsGOrRIwZ1w2i1F7M52bsw="; }; dontPatch = true; From 6ed3573417ae66774e614bd4f414d8da04f4cea4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Sep 2024 16:48:28 +0200 Subject: [PATCH 068/212] python312Packages.noise: refactor --- .../python-modules/noise/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index 940447c711a8..fc00d09f8033 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -2,22 +2,33 @@ lib, buildPythonPackage, fetchPypi, + setuptools, + pythonOlder, }: buildPythonPackage rec { pname = "noise"; version = "1.2.2"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0rcv40dcshqpchwkdlhsv3n68h9swm9fh4d1cgzr2hsp6rs7k8jp"; + hash = "sha256-V6J5dDZXQ5H/Y6ER6FLlOkFk7Nga0jY5ZBdDzRogm2U="; }; + build-system = [ setuptools ]; + + # PyPI release don't contain tests + doCheck = false; + + pythonImportsCheck = [ "noise" ]; + meta = with lib; { - homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; + homepage = "https://github.com/caseman/noise"; license = licenses.mit; - platforms = platforms.all; + maintainers = [ ]; }; } From 2e347965246f95b7a5431f4c9f2e98e523e1919f Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 12 Sep 2024 16:46:40 +0200 Subject: [PATCH 069/212] gitlab: 17.2.4 -> 17.2.5 https://gitlab.com/gitlab-org/gitlab/-/blob/v17.2.5-ee/CHANGELOG.md Fixes CVE-2024-2743 Fixes CVE-2024-4283 Fixes CVE-2024-4472 Fixes CVE-2024-4612 Fixes CVE-2024-4660 Fixes CVE-2024-5435 Fixes CVE-2024-6389 Fixes CVE-2024-6446 Fixes CVE-2024-6685 Fixes CVE-2024-8124 Fixes CVE-2024-8311 Fixes CVE-2024-8631 Fixes CVE-2024-8635 Fixes CVE-2024-8640 Fixes CVE-2024-8641 --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 8 ++++---- .../version-management/gitlab/rubyEnv/gemset.nix | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9a431ad88530..8b73993462c7 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "17.2.4", - "repo_hash": "0hj1v7w68axzdy2lwwc320zpg2r2qv2f9rl23yisni6975p03ayi", + "version": "17.2.5", + "repo_hash": "0l3s3k3v306ihn47lkj49b8vlly7v11clciwpf7ly4c5mwvwjlx6", "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v17.2.4-ee", + "rev": "v17.2.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "17.2.4", - "GITLAB_PAGES_VERSION": "17.2.4", + "GITALY_SERVER_VERSION": "17.2.5", + "GITLAB_PAGES_VERSION": "17.2.5", "GITLAB_SHELL_VERSION": "14.37.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0", - "GITLAB_WORKHORSE_VERSION": "17.2.4" + "GITLAB_WORKHORSE_VERSION": "17.2.5" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index c469613ec647..68acfdcf5343 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "17.2.4"; + version = "17.2.5"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -20,7 +20,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-Y+Yi5kH/0s+yMuD/90Tdxeshp9m0Mrx080jmWnq/zZ0="; + hash = "sha256-R6GmIBU7rzLBsegcXPjc9Dxp9qe3tP6unqOsnyiozgw="; }; vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 0fecac629883..30dd1ff03d37 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "17.2.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-7sB2MjU1iwqrOK8dNb7a14NFtrJ/7yoT07tzYVyCSJ8="; + hash = "sha256-5qksHuY7EzCoCMBxF4souvUz8xFstfzOZT3CF5YsV7M="; }; vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index a7d2c7d2c0fd..5948a05158b5 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "17.2.4"; + version = "17.2.5"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f8d33908e6ca..c62ad405603a 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -813,11 +813,11 @@ GEM gapic-common (>= 0.20.0, < 2.a) google-cloud-common (~> 1.0) google-cloud-errors (~> 1.0) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.7.0) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) - google-cloud-env (1.6.0) - faraday (>= 0.17.3, < 3.0) + google-cloud-env (2.1.1) + faraday (>= 1.0, < 3.a) google-cloud-errors (1.3.0) google-cloud-location (0.6.0) gapic-common (>= 0.20.0, < 2.a) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 325a467cd624..f24b73179060 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2729,10 +2729,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; + sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -2740,10 +2740,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1"; + sha256 = "16b9yjbrzal1cjkdbn29fl06ikjn1dpg1vdsjak1xvhpsp3vhjyg"; type = "gem"; }; - version = "1.6.0"; + version = "2.1.1"; }; google-cloud-errors = { groups = ["default"]; From 4b75284a29387a6146566c3e106931f180ae1e5e Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 12 Sep 2024 16:47:12 +0200 Subject: [PATCH 070/212] gitlab-container-registry: 4.7.0 -> 4.9.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v4.9.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 6d1a3ba1a192..c567ab68b95b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "4.7.0"; + version = "4.9.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-+71mqnXRMq0vE+T6V/JqIhP//zldQOEK7694IB5RSnc="; + hash = "sha256-kBM5ICESRUwHlM9FeJEFQFTM2E2zIF6axOGOHNmloKo="; }; - vendorHash = "sha256-h4nLnmsQ52PU3tUbTCUwWN8LbYuSgzaDkqplEZcDAGM="; + vendorHash = "sha256-nePIExsIWJgBDUrkkVBzc0qsYdfxR7GL1VhdWcVJnLg="; postPatch = '' # Disable flaky inmemory storage driver test From 551038de8f7b3b17b1ba46387fd00bf34ce52ed3 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 12 Sep 2024 16:53:49 +0200 Subject: [PATCH 071/212] yewtube: 2.10.5 -> 2.12.0 Diff: https://github.com/mps-youtube/yewtube/compare/refs/tags/v2.10.5...v2.12.0 Release: https://github.com/mps-youtube/yewtube/releases/tag/v2.12.0 --- pkgs/applications/misc/yewtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/yewtube/default.nix b/pkgs/applications/misc/yewtube/default.nix index 26ce9f8f64a2..b9ec7f323b37 100644 --- a/pkgs/applications/misc/yewtube/default.nix +++ b/pkgs/applications/misc/yewtube/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "yewtube"; - version = "2.10.5"; + version = "2.12.0"; src = fetchFromGitHub { owner = "mps-youtube"; repo = "yewtube"; rev = "refs/tags/v${version}"; - hash = "sha256-a7ySRHSRHmQePaVV7HnCk8QsiAQfN4nCVRdamPMUHGo="; + hash = "sha256-66cGnEEISC+lZAYhFXuVdDtwh1TgwvCP6nBD84z2z0I="; }; postPatch = '' From 50d30adedbd03f4bd51f13e2c94dbb6146bdf237 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Thu, 12 Sep 2024 17:05:38 +0200 Subject: [PATCH 072/212] shattered-pixel-dungeon: 2.4.2 -> 2.5.0 --- pkgs/games/shattered-pixel-dungeon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index f5a8ceb20984..0de47544df89 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -5,13 +5,13 @@ callPackage ./generic.nix rec { pname = "shattered-pixel-dungeon"; - version = "2.4.2"; + version = "2.5.0"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - hash = "sha256-1msmjKDEd/pFMqLB4vJgR6GPC9z4CnNew2hlemLw2d0="; + hash = "sha256-G/g84Jl+jkmvxmQtCIPHsW9vHi3FPKt7A087SkVxNVE="; }; depsPath = ./deps.json; From 15d5ce3687725ed41921289a1ab8fdbe1a69e5e4 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Wed, 3 Jul 2024 12:51:20 +0530 Subject: [PATCH 073/212] xcodeenv: accept version & perform runtime checks - xcodewrapper nix derivation has been updated to now accept a list of acceptable versions. - allowHigher is now removed - this matches closely to what we use for building react-native with nix at status-mobile repo ref -> https://github.com/status-im/status-mobile/blob/develop/nix/pkgs/xcodeenv/compose-xcodewrapper.nix - The key change done here is that now xcodewrapper checks Xcode versions at runtime instead of build time. This helps us to show warning messages when underlying environment does not have the Xcode version we want to support. --- .../mobile/xcodeenv/compose-xcodewrapper.nix | 50 +++++++++++-------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix index f1ac578f26ef..5a888fb13b29 100644 --- a/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix +++ b/pkgs/development/mobile/xcodeenv/compose-xcodewrapper.nix @@ -1,19 +1,41 @@ -{ stdenv, lib }: -{ version ? "11.1" -, allowHigher ? false -, xcodeBaseDir ? "/Applications/Xcode.app" }: +{ lib, + stdenv, + writeShellScriptBin }: +{ versions ? [ ] , xcodeBaseDir ? "/Applications/Xcode.app" }: assert stdenv.isDarwin; +let + xcodebuildPath = "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"; + xcodebuildWrapper = writeShellScriptBin "xcodebuild" '' + currentVer="$(${xcodebuildPath} -version | awk 'NR==1{print $2}')" + wrapperVers=(${lib.concatStringsSep " " versions}) + + for ver in "''${wrapperVers[@]}"; do + if [[ "$currentVer" == "$ver" ]]; then + # here exec replaces the shell without creating a new process + # https://www.gnu.org/software/bash/manual/bash.html#index-exec + exec "${xcodebuildPath}" "$@" + fi + done + + echo "The installed Xcode version ($currentVer) does not match any of the allowed versions: ${lib.concatStringsSep ", " versions}" + echo "Please update your local Xcode installation to match one of the allowed versions" + exit 1 + ''; +in stdenv.mkDerivation { - pname = "xcode-wrapper${lib.optionalString allowHigher "-plus"}"; - inherit version; + name = "xcode-wrapper-impure"; # Fails in sandbox. Use `--option sandbox relaxed` or `--option sandbox false`. __noChroot = true; buildCommand = '' mkdir -p $out/bin cd $out/bin - ln -s /usr/bin/xcode-select + ${if versions == [ ] then '' + ln -s "${xcodebuildPath}" + '' else '' + ln -s "${xcodebuildWrapper}/bin/xcode-select" + ''} ln -s /usr/bin/security ln -s /usr/bin/codesign ln -s /usr/bin/xcrun @@ -22,23 +44,9 @@ stdenv.mkDerivation { ln -s /usr/bin/lipo ln -s /usr/bin/file ln -s /usr/bin/rev - ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild" ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator" cd .. ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs" - - # Check if we have the xcodebuild version that we want - currVer=$($out/bin/xcodebuild -version | head -n1) - ${if allowHigher then '' - if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ] - '' else '' - if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ] - ''} - then - echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}" - echo "Instead what was found: $currVer" - exit 1 - fi ''; } From c23a4e8fd03a723f9e55f13d5ca444fd969232fb Mon Sep 17 00:00:00 2001 From: aleksana Date: Thu, 12 Sep 2024 23:18:24 +0800 Subject: [PATCH 074/212] cozy: fix build --- pkgs/applications/audio/cozy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/audio/cozy/default.nix b/pkgs/applications/audio/cozy/default.nix index 677789346087..22ebd11c7725 100644 --- a/pkgs/applications/audio/cozy/default.nix +++ b/pkgs/applications/audio/cozy/default.nix @@ -24,6 +24,14 @@ python3Packages.buildPythonApplication rec { hash = "sha256-oMgdz2dny0u1XV13aHu5s8/pcAz8z/SAOf4hbCDsdjw"; }; + # FIX: The "Support Debian non-standard python paths" resolves to store path of python + postPatch = '' + substituteInPlace meson.build \ + --replace-fail \ + 'from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix=""))' \ + "print(\"$out/${python3Packages.python.sitePackages}\")" + ''; + nativeBuildInputs = [ meson ninja From a0f3c9ac5026c1a1c29d3befab8897fd7e570a0a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 5 Aug 2024 22:37:22 -0300 Subject: [PATCH 075/212] flutter: move build-support/flutter to flutter directory Rationale: With the advent of RFC 140, Nixpkgs becomes to promote self-contained package directories and strongly discourages scattering along the old and deprecated filesystem hierarchy. Further, `build-support/flutter/*` is not referenced by any other expressions in Nixpkgs besides flutter itself. Further, concentrating all Flutter-related toolset below a same directory hierarchy (arguably?) eases maintenance and future migrations. --- .../flutter/build-support/build-flutter-application.nix} | 0 pkgs/development/compilers/flutter/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/{build-support/flutter/default.nix => development/compilers/flutter/build-support/build-flutter-application.nix} (100%) diff --git a/pkgs/build-support/flutter/default.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix similarity index 100% rename from pkgs/build-support/flutter/default.nix rename to pkgs/development/compilers/flutter/build-support/build-flutter-application.nix diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c3ef3ab9db4a..bfc9597f3874 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -56,7 +56,7 @@ let (mkCustomFlutter args).overrideAttrs (prev: next: { passthru = next.passthru // rec { inherit wrapFlutter mkCustomFlutter mkFlutter; - buildFlutterApplication = callPackage ../../../build-support/flutter { flutter = wrapFlutter (mkCustomFlutter args); }; + buildFlutterApplication = callPackage ./build-support/build-flutter-application.nix { flutter = wrapFlutter (mkCustomFlutter args); }; }; }); From 864ea663407b79aa8e6e17545cb94871c7817bc7 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Wed, 11 Sep 2024 15:32:10 +0200 Subject: [PATCH 076/212] binsider: init at 0.1.0 --- pkgs/by-name/bi/binsider/package.nix | 36 ++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/bi/binsider/package.nix diff --git a/pkgs/by-name/bi/binsider/package.nix b/pkgs/by-name/bi/binsider/package.nix new file mode 100644 index 000000000000..3b85edb9b6e7 --- /dev/null +++ b/pkgs/by-name/bi/binsider/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + stdenv, +}: +rustPlatform.buildRustPackage rec { + pname = "binsider"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "binsider"; + rev = "v${version}"; + hash = "sha256-+QgbSpiDKPTVdSm0teEab1O6OJZKEDpC2ZIZ728e69Y="; + }; + + cargoHash = "sha256-lXYTZ3nvLrfEgo7AY/qSQYpXsyrdJuQQw43xREezNn0="; + + # Tests need the executable in target/debug/ + preCheck = '' + cargo build + ''; + + meta = with lib; { + description = "Analyzer of executables using a terminal user interface"; + homepage = "https://github.com/orhun/binsider"; + license = with licenses; [ + asl20 # or + mit + ]; + maintainers = with maintainers; [ samueltardieu ]; + mainProgram = "binsider"; + broken = stdenv.isDarwin || stdenv.isAarch64; + }; +} From 0d25a978f20e85815fb9f75f688a82ca2d89172b Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:47:01 +0800 Subject: [PATCH 077/212] parallels-guest: remove autoMountShares --- .../virtualisation/parallels-guest.nix | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index b92d30dcc0e2..91a0532fbaab 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -8,6 +8,10 @@ in { + imports = [ + (mkRemovedOptionModule [ "hardware" "parallels" "autoMountShares" ] "Shares are always automatically mounted since Parallels Desktop 20.") + ]; + options = { hardware.parallels = { @@ -20,17 +24,6 @@ in ''; }; - autoMountShares = mkOption { - type = types.bool; - default = true; - description = '' - Control prlfsmountd service. When this service is running, shares can not be manually - mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. - Recommended to enable for simple file sharing, but extended share use such as for code should - disable this to manually mount shares. - ''; - }; - package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; @@ -68,19 +61,6 @@ in }; }; - systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { - description = "Parallels Guest File System Sharing Tool"; - wantedBy = [ "multi-user.target" ]; - path = [ prl-tools ]; - serviceConfig = rec { - ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; - ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; - ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; - PIDFile = "/run/prlfsmountd.pid"; - WorkingDirectory = "${prl-tools}/bin"; - }; - }; - systemd.services.prlshprint = { description = "Parallels Printing Tool"; wantedBy = [ "multi-user.target" ]; From ee9a447348c43ae2eb54eda3decdc6fe4ff9ebdf Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:16:30 +0200 Subject: [PATCH 078/212] python311Packages.python-octaviaclient: 3.7.0 -> 3.8.0 https://github.com/openstack/python-octaviaclient/compare/3.7.0...3.8.0 --- .../python-modules/python-octaviaclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix index 7b9017618e8f..5c671398eed5 100644 --- a/pkgs/development/python-modules/python-octaviaclient/default.nix +++ b/pkgs/development/python-modules/python-octaviaclient/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "python-octaviaclient"; - version = "3.7.0"; + version = "3.8.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-wAGxByeRBOwdWZg2DwVpt1yGi5er3KQ/qhyRVAwaKe4="; + hash = "sha256-wrYhCY3gqcklSK8lapsgFq25Yi3awEGgarW2a7W1kO4="; }; build-system = [ From 085f08d4f2692f40aa69a7cb56166ee09d66dc68 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:17:35 +0200 Subject: [PATCH 079/212] python311Packages.tempest: 39.0.0 -> 4.0.0 https://github.com/openstack/tempest/compare/39.0.0...40.0.0 --- pkgs/development/python-modules/tempest/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 77326c7152c1..4f9e0190256f 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -28,25 +28,26 @@ bash, python, setuptools, + testscenarios, }: buildPythonPackage rec { pname = "tempest"; - version = "39.0.0"; + version = "40.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-l4qKbTfQRWiRsoHN9fiAAiGMGP+q3gwRH1pMSXV/eSU="; + hash = "sha256-s2EvD1TDoRoKrvpRc6h3P7xRyT941nW1hveucXDLB4w="; }; pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pbr cliff defusedxml @@ -67,6 +68,7 @@ buildPythonPackage rec { prettytable urllib3 debtcollector + testscenarios ]; nativeCheckInputs = [ From 846b1292a4854e718bbffb6f1c2174837e5ae7f5 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:20:05 +0200 Subject: [PATCH 080/212] python311Packages.tempest: add meta.mainProgram --- pkgs/development/python-modules/tempest/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 4f9e0190256f..deca557f448e 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -96,6 +96,7 @@ buildPythonPackage rec { description = "OpenStack integration test suite that runs against live OpenStack cluster and validates an OpenStack deployment"; homepage = "https://github.com/openstack/tempest"; license = licenses.asl20; + mainProgram = "tempest"; maintainers = teams.openstack.members; }; } From 3d218ab359393e3b03b3732191ef3658d3451842 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:20:43 +0200 Subject: [PATCH 081/212] python311Packages.tempest: reorder inputs --- .../python-modules/tempest/default.nix | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index deca557f448e..fcae826816fb 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -1,34 +1,34 @@ { lib, + bash, buildPythonPackage, + cliff, + debtcollector, defusedxml, fetchPypi, - pbr, - cliff, + fixtures, + hacking, jsonschema, - testtools, - paramiko, netaddr, oslo-concurrency, oslo-config, oslo-log, - stestr, oslo-serialization, oslo-utils, - fixtures, + oslotest, + paramiko, + pbr, + prettytable, + python, pythonOlder, pyyaml, - subunit, - stevedore, - prettytable, - urllib3, - debtcollector, - hacking, - oslotest, - bash, - python, setuptools, + stestr, + stevedore, + subunit, testscenarios, + testtools, + urllib3, }: buildPythonPackage rec { @@ -48,33 +48,33 @@ buildPythonPackage rec { build-system = [ setuptools ]; dependencies = [ - pbr cliff + debtcollector defusedxml + fixtures jsonschema - testtools - paramiko netaddr oslo-concurrency oslo-config oslo-log - stestr oslo-serialization oslo-utils - fixtures - pyyaml - subunit - stevedore + paramiko + pbr prettytable - urllib3 - debtcollector + pyyaml + stestr + stevedore + subunit testscenarios + testtools + urllib3 ]; nativeCheckInputs = [ - stestr hacking oslotest + stestr ]; checkPhase = '' From aba2d9e6ee6e9407f70243004ae931f95e01ddd6 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:25:47 +0200 Subject: [PATCH 082/212] python311Packages.osprofiler: 4.1.0 -> 4.2.0 https://github.com/openstack/osprofiler/compare/4.1.0...4.2.0 --- pkgs/development/python-modules/osprofiler/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index 546d7e5fedf6..efcf777fd8a0 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -4,6 +4,7 @@ fetchPypi, netaddr, oslo-concurrency, + oslo-config, oslo-serialization, oslo-utils, prettytable, @@ -14,12 +15,12 @@ buildPythonPackage rec { pname = "osprofiler"; - version = "4.1.0"; + version = "4.2.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-V4N7YgWBsTREouIFZHddT8c+/2fHiIr5mUftWC/lFLA="; + hash = "sha256-bdHEviZFqPJBIQVdpbtGFojcr8fmtNS6vA7xumaQJ4E="; }; build-system = [ setuptools ]; @@ -27,6 +28,7 @@ buildPythonPackage rec { dependencies = [ netaddr oslo-concurrency + oslo-config oslo-serialization oslo-utils prettytable From 008e8512579bd1e5b2b86b8d9d61ef2d0866f8c3 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:27:06 +0200 Subject: [PATCH 083/212] python311Packages.osprofiler: add meta.mainProgram --- pkgs/development/python-modules/osprofiler/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix index efcf777fd8a0..01c8c09f1c15 100644 --- a/pkgs/development/python-modules/osprofiler/default.nix +++ b/pkgs/development/python-modules/osprofiler/default.nix @@ -48,6 +48,7 @@ buildPythonPackage rec { description = "OpenStack Library to profile request between all involved services"; homepage = "https://opendev.org/openstack/osprofiler/"; license = licenses.asl20; + mainProgram = "osprofiler"; maintainers = teams.openstack.members; }; } From 64f6ecc725d0369579294906e333af82c2d13f59 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:27:41 +0200 Subject: [PATCH 084/212] python311Packages.python-openstackclient: 7.0.0 -> 7.1.0 https://github.com/openstack/python-openstackclient/compare/7.0.0...7.1.0 --- .../python-modules/python-openstackclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix index dcc7464297e8..3a1a3a56ae95 100644 --- a/pkgs/development/python-modules/python-openstackclient/default.nix +++ b/pkgs/development/python-modules/python-openstackclient/default.nix @@ -28,12 +28,12 @@ buildPythonPackage rec { pname = "python-openstackclient"; - version = "7.0.0"; + version = "7.1.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1HDjWYySnZI/12j9+Gb1G9NKkb+xfrcMoTY/q7aL0uA="; + hash = "sha256-nv/CmcVpQiC65Fd3jmzZsjrqG8O/zQTjoE+NhjhaBVQ="; }; build-system = [ From 68bf1f1208b0e793f1770111a48dad35b7735634 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Thu, 12 Sep 2024 20:28:52 +0200 Subject: [PATCH 085/212] python311Packages.swift: 2.33.0 -> 2.34.0 https://github.com/openstack/swift/compare/2.33.0...2.34.0 --- .../python-modules/swift/default.nix | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index ddcecdb3e6b3..26806dea71a8 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "swift"; - version = "2.33.0"; - format = "setuptools"; + version = "2.34.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-4TlJcquK8MC9zQfLKmb88B5xHje1kbPD2jSLiR+N8hs="; + hash = "sha256-ZvdWWvPUdZIEadxV0nhqgTXhgJJu+hD1LnYCAP+9gpM="; }; postPatch = '' @@ -38,9 +38,11 @@ buildPythonPackage rec { rm test/functional/s3api/{__init__.py,s3_test_client.py} ''; - nativeBuildInputs = [ - installShellFiles + nativeBuildInputs = [ installShellFiles ]; + + build-system = [ pbr + setuptools ]; propagatedBuildInputs = [ @@ -57,17 +59,17 @@ buildPythonPackage rec { xattr ]; - postInstall = '' - installManPage doc/manpages/* - ''; - - nativeCheckInputs = [ + dependencies = [ boto3 mock stestr swiftclient ]; + postInstall = '' + installManPage doc/manpages/* + ''; + # a lot of tests currently fail while establishing a connection doCheck = false; From eb17d5c1cb94b5c97abe713b7e1e6957eec0cf8c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 12 Sep 2024 21:15:54 +0200 Subject: [PATCH 086/212] tgt: 1.0.92 -> 1.0.93 Fixes CVE-2024-45751 https://www.openwall.com/lists/oss-security/2024/09/07/2 https://github.com/fujita/tgt/compare/v1.0.92...v1.0.93 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 1399750f4732..a26daf42649d 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.92"; + version = "1.0.93"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Axx9D4BIg68R9bDDNyIGw8n91Jg1YJ/zN1rE6aeMZcs="; + hash = "sha256-0Yfah8VxmbBe1J1OMhG6kyHlGBBAed8F9uStjMs6S2E="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From 142d8333bb3e6cc0b3927b50b2b9b1b708d831bc Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Thu, 12 Sep 2024 21:30:48 +0200 Subject: [PATCH 087/212] surrealdb: 1.5.4 -> 1.5.5 Remove patches added in b7ca9dc1 to fix 1.5.4 build on rust 1.80.1 Signed-off-by: Sirio Balmelli --- pkgs/by-name/su/surrealdb/package.nix | 10 +++------- pkgs/by-name/su/surrealdb/time.patch | 28 --------------------------- 2 files changed, 3 insertions(+), 35 deletions(-) delete mode 100644 pkgs/by-name/su/surrealdb/time.patch diff --git a/pkgs/by-name/su/surrealdb/package.nix b/pkgs/by-name/su/surrealdb/package.nix index 5f4ec81470ec..2dfa4012fcde 100644 --- a/pkgs/by-name/su/surrealdb/package.nix +++ b/pkgs/by-name/su/surrealdb/package.nix @@ -16,20 +16,16 @@ let in rustPlatform.buildRustPackage rec { pname = "surrealdb"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "surrealdb"; repo = "surrealdb"; rev = "v${version}"; - hash = "sha256-KtR+qU2Xys4NkEARZBbO8mTPa7EI9JplWvXdtuLt2vE="; + hash = "sha256-C2ppLbNv68qpl2bcqWp/PszcCeGCsD0LbEdAM9P1asg="; }; - cargoPatches = [ - ./time.patch # TODO: remove when https://github.com/surrealdb/surrealdb/pull/4565 merged - ]; - - cargoHash = "sha256-5qIIPdE6HYov5EIR4do+pMeZ1Lo3at39aKOP9scfMy8="; + cargoHash = "sha256-gLepa9JxY9AYyGepV6Uzt1g7apkKWJxf0SiNCSkjUDg="; # error: linker `aarch64-linux-gnu-gcc` not found postPatch = '' diff --git a/pkgs/by-name/su/surrealdb/time.patch b/pkgs/by-name/su/surrealdb/time.patch deleted file mode 100644 index ef0ecfe698c4..000000000000 --- a/pkgs/by-name/su/surrealdb/time.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 64b3955f..b4598827 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -6478,9 +6478,9 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.34" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", -@@ -6499,9 +6499,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.17" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ - "num-conv", - "time-core", From 0aeed624b07a0f26c3af312db089231d43d5fe33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 04:19:20 +0000 Subject: [PATCH 088/212] sink-rotate: 1.0.4 -> 2.2.0 --- pkgs/by-name/si/sink-rotate/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/si/sink-rotate/package.nix b/pkgs/by-name/si/sink-rotate/package.nix index 44fd2a7dc12d..e8eb89d38c28 100644 --- a/pkgs/by-name/si/sink-rotate/package.nix +++ b/pkgs/by-name/si/sink-rotate/package.nix @@ -6,7 +6,7 @@ , makeWrapper }: let - version = "1.0.4"; + version = "2.2.0"; in rustPlatform.buildRustPackage { pname = "sink-rotate"; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { owner = "mightyiam"; repo = "sink-rotate"; rev = "v${version}"; - hash = "sha256-q20uUr+7yLJlZc5YgEkY125YrZ2cuJrPv5IgWXaYRlo="; + hash = "sha256-ZHbisG9pdctkwfD1S3kxMZhBqPw0Ni5Q9qQG4RssnSw="; }; - cargoHash = "sha256-MPeyPTkxpi6iw/BT5m4S7jVBD0c2zG2rsv+UZWQxpUU="; + cargoHash = "sha256-TWuyU1+F3zEcFFd8ZeZmL3IvpKLLv3zimZ2WFVYFqyo="; buildInputs = [ makeWrapper ]; @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { ''; meta = with lib; { - description = "Command that rotates default between two PipeWire audio sinks"; + description = "Command that rotates the default PipeWire audio sink"; homepage = "https://github.com/mightyiam/sink-rotate"; license = licenses.mit; maintainers = with maintainers; [ mightyiam ]; From 31246e060b20a05c725bcb369b0af52cc05d61dc Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:27:49 +0200 Subject: [PATCH 089/212] gzdoom: move to pkgs/by-name --- .../gzdoom/default.nix => by-name/gz/gzdoom/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{games/doom-ports/gzdoom/default.nix => by-name/gz/gzdoom/package.nix} (100%) diff --git a/pkgs/games/doom-ports/gzdoom/default.nix b/pkgs/by-name/gz/gzdoom/package.nix similarity index 100% rename from pkgs/games/doom-ports/gzdoom/default.nix rename to pkgs/by-name/gz/gzdoom/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dda1e36002a..9bbe61e7b98a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35112,8 +35112,6 @@ with pkgs; eternity = callPackage ../games/doom-ports/eternity-engine { }; - gzdoom = callPackage ../games/doom-ports/gzdoom { }; - odamex = callPackage ../games/doom-ports/odamex { }; prboom-plus = callPackage ../games/doom-ports/prboom-plus { }; From e726b99310e6f516c6b158c595d92753f1a598a3 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:39:33 +0200 Subject: [PATCH 090/212] gzdoom: fix vulkan --- pkgs/by-name/gz/gzdoom/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index f34276c7783f..b1fef391ba6f 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -91,7 +91,8 @@ stdenv.mkDerivation rec { postInstall = '' mv $out/bin/gzdoom $out/share/games/doom/gzdoom - makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom + makeWrapper $out/share/games/doom/gzdoom $out/bin/gzdoom \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} for size in 16 24 32 48 64 128; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps From b3646e9cd998d02bf3bfedfdb787f56da0d31bb0 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:41:09 +0200 Subject: [PATCH 091/212] gzdoom: fixes --- pkgs/by-name/gz/gzdoom/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index b1fef391ba6f..2ab2b21009c3 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -68,9 +68,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace tools/updaterevision/UpdateRevision.cmake \ - --replace "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ - --replace "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ - --replace "ret_var(Hash)" "ret_var(\"${src.rev}\")" + --replace-fail "ret_var(Tag)" "ret_var(\"${src.rev}\")" \ + --replace-fail "ret_var(Timestamp)" "ret_var(\"1970-00-00 00:00:00 +0000\")" \ + --replace-fail "ret_var(Hash)" "ret_var(\"${src.rev}\")" \ + --replace-fail "" "${src.rev}" ''; cmakeFlags = [ @@ -96,8 +97,8 @@ stdenv.mkDerivation rec { for size in 16 24 32 48 64 128; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" $src/src/win32/icon1.ico -flatten \ - $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png + magick $src/src/win32/icon1.ico -background none -resize "$size"x"$size" -flatten \ + $out/share/icons/hicolor/"$size"x"$size"/apps/gzdoom.png done; ''; From 6dc99a6a1160de88b8c44ee23b75d0cf166cffdf Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:44:25 +0200 Subject: [PATCH 092/212] gzdoom: nixfmt --- pkgs/by-name/gz/gzdoom/package.nix | 67 +++++++++++++++++------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 2ab2b21009c3..50b49ddab8bc 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -1,28 +1,29 @@ -{ lib -, stdenv -, fetchFromGitHub -, makeWrapper -, makeDesktopItem -, copyDesktopItems -, SDL2 -, bzip2 -, cmake -, fluidsynth -, game-music-emu -, gtk3 -, imagemagick -, libGL -, libjpeg -, libsndfile -, libvpx -, libwebp -, mpg123 -, ninja -, openal -, pkg-config -, vulkan-loader -, zlib -, zmusic +{ + lib, + stdenv, + fetchFromGitHub, + makeWrapper, + makeDesktopItem, + copyDesktopItems, + SDL2, + bzip2, + cmake, + fluidsynth, + game-music-emu, + gtk3, + imagemagick, + libGL, + libjpeg, + libsndfile, + libvpx, + libwebp, + mpg123, + ninja, + openal, + pkg-config, + vulkan-loader, + zlib, + zmusic, }: stdenv.mkDerivation rec { @@ -37,7 +38,10 @@ stdenv.mkDerivation rec { hash = "sha256-taie1Iod3pXvuxxBC7AArmtndkIV0Di9mtJoPvPkioo="; }; - outputs = [ "out" "doc" ]; + outputs = [ + "out" + "doc" + ]; nativeBuildInputs = [ cmake @@ -102,7 +106,7 @@ stdenv.mkDerivation rec { done; ''; - meta = with lib; { + meta = { homepage = "https://github.com/ZDoom/gzdoom"; description = "Modder-friendly OpenGL and Vulkan source port based on the DOOM engine"; mainProgram = "gzdoom"; @@ -110,8 +114,11 @@ stdenv.mkDerivation rec { GZDoom is a feature centric port for all DOOM engine games, based on ZDoom, adding an OpenGL renderer and powerful scripting capabilities. ''; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ azahi lassulus ]; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + azahi + lassulus + ]; }; } From 6c31bc6af8ba2d0bb2a3eb68ddaa4c15cea834f2 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:47:01 +0200 Subject: [PATCH 093/212] gzdoom: add myself as maintainer --- pkgs/by-name/gz/gzdoom/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index 50b49ddab8bc..1856d479426d 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ azahi lassulus + Gliczy ]; }; } From 7d3e4af3bb0d9dad535ac20208bfa3fa733c4035 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Sep 2024 23:13:14 +0200 Subject: [PATCH 094/212] python312Packages.aiotankerkoenig: 0.4.1 -> 0.4.2 Diff: https://github.com/jpbede/aiotankerkoenig/compare/refs/tags/v0.4.1...v0.4.2 Changelog: https://github.com/jpbede/aiotankerkoenig/releases/tag/v0.4.2 --- pkgs/development/python-modules/aiotankerkoenig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiotankerkoenig/default.nix b/pkgs/development/python-modules/aiotankerkoenig/default.nix index a1a2fd247171..a82a963419cc 100644 --- a/pkgs/development/python-modules/aiotankerkoenig/default.nix +++ b/pkgs/development/python-modules/aiotankerkoenig/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aiotankerkoenig"; - version = "0.4.1"; + version = "0.4.2"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "jpbede"; repo = "aiotankerkoenig"; rev = "refs/tags/v${version}"; - hash = "sha256-BB1Cy4Aji5m06LlNj03as4CWF8RcYKAYy4oxPomOP68="; + hash = "sha256-WRR4CLVkHN1JR4rwNu0ULoiu0zO0M2YdvCHYp0Tt9VU="; }; postPatch = '' From 8abb5c21ef64be2ea2c7ebc18c26b4bccfdf00e7 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Tue, 10 Sep 2024 20:49:48 -0400 Subject: [PATCH 095/212] unifi8: 8.4.59 -> 8.4.62 --- pkgs/servers/unifi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index d42b076aad68..1c7684f273a9 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -54,8 +54,8 @@ in rec { }; unifi8 = generic { - version = "8.4.59"; - suffix = "-y2b2oj1o96"; - sha256 = "sha256-VwRvU+IHJs6uThdWF0uOqxz4cegBykYzB/fD0/AGPaM="; + version = "8.4.62"; + suffix = "-i3q2j125cz"; + sha256 = "sha256-7qEk6zpihJfgxCoVa8fVSMZN87sHG5XhWpuZoBvB5QU="; }; } From 3dfb694bc8f0cf92943576a03ab6b8e4c1325631 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 12 Sep 2024 23:40:52 +0200 Subject: [PATCH 096/212] python312Packages.whenever: 0.6.8 -> 0.6.9 Changelog: https://github.com/ariebovenberg/whenever/blob/refs/tags/0.6.9/CHANGELOG.rst --- pkgs/development/python-modules/whenever/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index 6034f3718fd6..cdb547e65dac 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.6.8"; + version = "0.6.9"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "ariebovenberg"; repo = "whenever"; rev = "refs/tags/${version}"; - hash = "sha256-0p2btgFLabXtW+Jaebt59KHFd63PeKwLH1YfBycL+6E="; + hash = "sha256-Y2+ZQhQpUf747OlzhQRdT1B3jZgCr0BViJ6ujPJWo3w="; }; cargoDeps = rustPlatform.fetchCargoTarball { From aac18ed2c8522dcaf2f51b8c3fe863da578a2a97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 08:24:05 +0000 Subject: [PATCH 097/212] lightgbm: 4.4.0 -> 4.5.0 --- pkgs/development/libraries/lightgbm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index 86c85e66ace2..e50e8916de0d 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation rec { # in \ # rWrapper.override{ packages = [ lgbm ]; }" pname = lib.optionalString rLibrary "r-" + pnameBase; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "microsoft"; repo = pnameBase; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-i4mtJwSwnbGMXVfQ8a9jZZPUBBibXyQPgMVJ3uXxeGQ="; + hash = "sha256-nST6+/c3Y4/hqwgEUhx03gWtjxhlmUu1XKDCy2pSsvU="; }; nativeBuildInputs = [ cmake ] From 06fc8aa4dc99aa1387566ffee212f2b27bb5c6bf Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 23 Aug 2024 14:17:17 -0400 Subject: [PATCH 098/212] python312Packages.itk: init at 5.4.0 --- pkgs/development/libraries/itk/generic.nix | 124 ++++++++++++++------ pkgs/development/libraries/itk/itk.egg-info | 5 + pkgs/top-level/python-packages.nix | 8 +- 3 files changed, 103 insertions(+), 34 deletions(-) create mode 100644 pkgs/development/libraries/itk/itk.egg-info diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index b7ff7292dc23..7ac9d6d8fbfe 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -10,6 +10,8 @@ fetchFromGitHub, fetchpatch, cmake, + castxml, + swig, expat, fftw, gdcm, @@ -20,13 +22,21 @@ libpng, libX11, libuuid, + patchelf, + python ? null, + numpy ? null, xz, vtk, + which, zlib, Cocoa, + enablePython ? false, }: let + # Python wrapper contains its own VTK support incompatible with MODULE_ITKVtkGlue + withVtk = !enablePython; + itkGenericLabelInterpolatorSrc = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITKGenericLabelInterpolator"; @@ -47,6 +57,19 @@ let rev = "bb896868fc6480835495d0da4356d5db009592a6"; hash = "sha256-MfaIA0xxA/pzUBSwnAevr17iR23Bo5iQO2cSyknS3o4="; }; + + # remove after next swig update: + swigUnstable = swig.overrideAttrs ({ + version = "4.2.1-unstable-2024-08-19"; + + src = fetchFromGitHub { + owner = "swig"; + repo = "swig"; + rev = "5ac5d90f970759fbe705fae551d0743a7c63c67e"; + hash = "sha256-32EFLHpP4l04nqrc8dt4Qsr8deTBqLt8lUlhnNnaIGU="; + }; + + }); in stdenv.mkDerivation { @@ -77,39 +100,56 @@ stdenv.mkDerivation { ln -sr ${itkSimpleITKFiltersSrc} Modules/External/ITKSimpleITKFilters ''; - cmakeFlags = [ - "-DBUILD_EXAMPLES=OFF" - "-DBUILD_SHARED_LIBS=ON" - "-DITK_FORBID_DOWNLOADS=ON" - "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. - # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, - # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" - # when compiling c3d, but maybe an ITK 5.2/eigen version issue: - "-DITK_USE_SYSTEM_EIGEN=OFF" - "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 - "-DITK_USE_SYSTEM_GDCM=ON" - "-DITK_USE_SYSTEM_MINC=ON" - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DModule_ITKMINC=ON" - "-DModule_ITKIOMINC=ON" - "-DModule_ITKIOTransformMINC=ON" - "-DModule_SimpleITKFilters=ON" - "-DModule_ITKVtkGlue=ON" - "-DModule_ITKReview=ON" - "-DModule_MGHIO=ON" - "-DModule_AdaptiveDenoising=ON" - "-DModule_GenericLabelInterpolator=ON" - ]; + cmakeFlags = + [ + "-DBUILD_EXAMPLES=OFF" + "-DBUILD_SHARED_LIBS=ON" + "-DITK_FORBID_DOWNLOADS=ON" + "-DITK_USE_SYSTEM_LIBRARIES=ON" # finds common libraries e.g. hdf5, libpng, libtiff, zlib, but not GDCM, NIFTI, MINC, etc. + # note ITK_USE_SYSTEM_EIGEN, part of ITK_USE_SYSTEM_LIBRARIES, + # causes "...-itk-5.2.1/include/ITK-5.2/itkSymmetricEigenAnalysis.h:23:31: fatal error: Eigen/Eigenvalues: No such file or directory" + # when compiling c3d, but maybe an ITK 5.2/eigen version issue: + "-DITK_USE_SYSTEM_EIGEN=OFF" + "-DITK_USE_SYSTEM_GOOGLETEST=OFF" # ANTs build failure due to https://github.com/ANTsX/ANTs/issues/1489 + "-DITK_USE_SYSTEM_GDCM=ON" + "-DITK_USE_SYSTEM_MINC=ON" + "-DLIBMINC_DIR=${libminc}/lib/cmake" + "-DModule_ITKMINC=ON" + "-DModule_ITKIOMINC=ON" + "-DModule_ITKIOTransformMINC=ON" + "-DModule_SimpleITKFilters=ON" + "-DModule_ITKReview=ON" + "-DModule_MGHIO=ON" + "-DModule_AdaptiveDenoising=ON" + "-DModule_GenericLabelInterpolator=ON" + ] + ++ lib.optionals enablePython [ + "-DITK_WRAP_PYTHON=ON" + "-DITK_USE_SYSTEM_CASTXML=ON" + "-DITK_USE_SYSTEM_SWIG=ON" + "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}" + ] + ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]; - nativeBuildInputs = [ - cmake - xz - ]; - buildInputs = [ - libX11 - libuuid - vtk - ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = + [ + cmake + xz + ] + ++ lib.optionals enablePython [ + castxml + swigUnstable + which + ]; + + buildInputs = + [ + libX11 + libuuid + ] + ++ lib.optionals stdenv.isDarwin [ Cocoa ] + ++ lib.optionals enablePython [ python ] + ++ lib.optionals withVtk [ vtk ]; # Due to ITKVtkGlue=ON and the additional dependencies needed to configure VTK 9 # (specifically libGL and libX11 on Linux), # it's now seemingly necessary for packages that configure ITK to @@ -130,12 +170,30 @@ stdenv.mkDerivation { libpng libtiff zlib - ] ++ vtk.propagatedBuildInputs; + ] ++ lib.optionals withVtk vtk.propagatedBuildInputs ++ lib.optionals enablePython [ numpy ]; + + postInstall = lib.optionalString enablePython '' + substitute \ + ${./itk.egg-info} \ + $out/${python.sitePackages}/itk-${version}.egg-info \ + --subst-var-by ITK_VER "${version}" + ''; + + # remove forbidden reference to /build which occur when building the Python wrapping + # (also remove a copy of itkTestDriver with incorrect permissions/RPATH): + preFixup = lib.optionals enablePython '' + rm $out/${python.sitePackages}/itk/itkTestDriver + find $out/${python.sitePackages}/itk -type f -name '*.so*' -exec \ + patchelf {} --shrink-rpath --allowed-rpath-prefixes "$NIX_STORE" \; + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = "https://www.itk.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bcdarwin ]; + # aarch64-linux Python wrapping fails with "error: unknown type name '_Float128'" and similar; + # compilation runs slowly and times out on Darwin + platforms = with lib.platforms; if enablePython then [ "x86_64-linux" ] else unix; }; } diff --git a/pkgs/development/libraries/itk/itk.egg-info b/pkgs/development/libraries/itk/itk.egg-info new file mode 100644 index 000000000000..2c523ec27848 --- /dev/null +++ b/pkgs/development/libraries/itk/itk.egg-info @@ -0,0 +1,5 @@ +Metadata-Version: 2.1 +Name: itk +Version: @ITK_VER@ +Summary: Insight Segmentation and Registration Toolkit +Platform: UNKNOWN diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a826cd6129c6..69513645108e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6206,6 +6206,12 @@ self: super: with self; { itanium-demangler = callPackage ../development/python-modules/itanium-demangler { }; + itk = toPythonModule (pkgs.itk.override { + inherit python numpy; + enablePython = true; + }); + + item-synchronizer = callPackage ../development/python-modules/item-synchronizer { }; itemadapter = callPackage ../development/python-modules/itemadapter { }; @@ -14477,7 +14483,7 @@ self: super: with self; { simplehound = callPackage ../development/python-modules/simplehound { }; simpleitk = callPackage ../development/python-modules/simpleitk { - inherit (pkgs) simpleitk; + inherit (pkgs) itk simpleitk; }; simplejson = callPackage ../development/python-modules/simplejson { }; From 484c1da8e96239809eb68ee08a6c919721f1e4f6 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 12 Sep 2024 23:54:49 +0200 Subject: [PATCH 099/212] lightgbm: fix build on darwin --- pkgs/development/libraries/lightgbm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index e50e8916de0d..4aa28f6461e1 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib mkdir -p $out/bin cp -r ../include $out - install -Dm755 ../lib_lightgbm.so $out/lib/lib_lightgbm.so + install -Dm755 ../lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/lib_lightgbm${stdenv.hostPlatform.extensions.sharedLibrary} '' + lib.optionalString (!rLibrary && !pythonLibrary) '' install -Dm755 ../lightgbm $out/bin/lightgbm '' + lib.optionalString javaWrapper '' From 1ef3f0b371b7e47afc07001ecef328cc2faebc54 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:55:57 +0200 Subject: [PATCH 100/212] nextcloud28: 28.0.9 -> 28.0.10 ChangeLog: https://github.com/nextcloud/server/releases/tag/v28.0.10 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index ddd8e79b5e80..c974f6899a9e 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -42,8 +42,8 @@ let }; in { nextcloud28 = generic { - version = "28.0.9"; - hash = "sha256-DZd3NkDn+A6gqTP7+L0pe/JB2ghy+hzFQ1D/F5Nmmxs="; + version = "28.0.10"; + hash = "sha256-LoAVJtKJHBhf6sWYXL084pLOcKQl9Tb5GfkBuftMwhA="; packages = nextcloud28Packages; }; From 09fe7f8690ef16c5f4cd6a2849a161d7d00e40bc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:56:15 +0200 Subject: [PATCH 101/212] nextcloud29: 29.0.6 -> 29.0.7 ChangeLog: https://github.com/nextcloud/server/releases/tag/v29.0.7 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c974f6899a9e..677359abdb09 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -48,8 +48,8 @@ in { }; nextcloud29 = generic { - version = "29.0.6"; - hash = "sha256-3GC+A/0X4wuv7ypNT+stCWqnekxrTyHJhXYOU3+EAeM="; + version = "29.0.7"; + hash = "sha256-9TL/wxvlqDdLXgcrhv/4dl7Bn9oMhQnO45hzCB2yxUQ="; packages = nextcloud29Packages; }; From 8cef266dc723368ad77c527fb7b7b854dc09322a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 12 Sep 2024 23:56:34 +0200 Subject: [PATCH 102/212] nextcloudPackages: update all --- pkgs/servers/nextcloud/packages/28.json | 34 ++++++++-------- pkgs/servers/nextcloud/packages/29.json | 54 +++++++++++++++---------- 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index a37e59e8d813..99905d159711 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz", + "version": "14.2.5", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-AMhhpzznCMW6vHc5vHkP4/wWY+NcqSvB/ZTVj2U6peM=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.8/groupfolders-v16.0.8.tar.gz", - "version": "16.0.8", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-PtxAidIono2roSVA/VLQZ13TVcqWZL069eXpY+npFB8=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.9/groupfolders-v16.0.9.tar.gz", + "version": "16.0.9", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -160,10 +160,10 @@ ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", - "version": "7.2.1", + "hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz", + "version": "7.2.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -310,9 +310,9 @@ ] }, "unsplash": { - "hash": "sha256-xfu5m5VOZZ9ATnRg44sw/MTEXitrDFCuAcm+siNilsY=", - "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.0/unsplash.tar.gz", - "version": "3.0.0", + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", "homepage": "https://github.com/nextcloud/unsplash/", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/29.json b/pkgs/servers/nextcloud/packages/29.json index e453178b33f4..a5601194ab07 100644 --- a/pkgs/servers/nextcloud/packages/29.json +++ b/pkgs/servers/nextcloud/packages/29.json @@ -1,8 +1,8 @@ { "bookmarks": { - "hash": "sha256-jByO7cJ9oQ4lQopzXCii11wqhg9tIlm/AFFViH+P3O0=", - "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.4/bookmarks-14.2.4.tar.gz", - "version": "14.2.4", + "hash": "sha256-ZWdz7Hl3wrTEHrXdOsPKRcE5GAnHYHjudbY5F0VjG4Y=", + "url": "https://github.com/nextcloud/bookmarks/releases/download/v14.2.5/bookmarks-14.2.5.tar.gz", + "version": "14.2.5", "description": "- 📂 Sort bookmarks into folders\n- 🏷 Add tags and personal notes\n- ☠ Find broken links and duplicates\n- 📲 Synchronize with all your browsers and devices\n- 📔 Store archived versions of your links in case they are depublished\n- 🔍 Full-text search on site contents\n- 👪 Share bookmarks with other users and via public links\n- ⚛ Generate RSS feeds of your collections\n- 📈 Stats on how often you access which links\n- 🔒 Automatic backups of your bookmarks collection\n- 💼 Built-in Dashboard widgets for frequent and recent links\n\nRequirements:\n - PHP extensions:\n - intl: *\n - mbstring: *\n - when using MySQL, use at least v8.0", "homepage": "https://github.com/nextcloud/bookmarks", "licenses": [ @@ -90,10 +90,10 @@ ] }, "groupfolders": { - "hash": "sha256-cWWlvuUTO4B89CDZzfJLN8MRmQwPMwj0OwFqhIUxAsQ=", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.2/groupfolders-v17.0.2.tar.gz", - "version": "17.0.2", - "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", + "hash": "sha256-fdFxsUwXM8nqb7m4pWtQVGq0SLf0zWBuyxFrzppevYI=", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v17.0.3/groupfolders-v17.0.3.tar.gz", + "version": "17.0.3", + "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ "agpl" @@ -140,8 +140,8 @@ ] }, "maps": { - "hash": "sha256-FmRhpPRpMnCHkJFaVvQuR6Y7Pd7vpP+tUVih919g/fQ=", - "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0-1-nightly/maps-1.4.0-1-nightly.tar.gz", + "hash": "sha256-BmXs6Oepwnm+Cviy4awm3S8P9AiJTt1BnAQNb4TxVYE=", + "url": "https://github.com/nextcloud/maps/releases/download/v1.4.0/maps-1.4.0.tar.gz", "version": "1.4.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -160,10 +160,10 @@ ] }, "music": { - "hash": "sha256-RnTyQYCbmkHDZhtonpvbKLUM3n93u53IhknyTrNGh9Y=", - "url": "https://github.com/owncloud/music/releases/download/v2.0.0/music_2.0.0_for_nextcloud.tar.gz", - "version": "2.0.0", - "description": "A stand-alone music player app and a \"lite\" player for the Files app\r\n\r\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\r\n- Playlist support with import from m3u, m3u8, and pls files\r\n- Browse by artists, albums, genres, or folders\r\n- Gapless play\r\n- Filter the shown content with the search function\r\n- Play internet radio and podcast channels\r\n- Setup Last.fm connection to see background information on artists, albums, and songs\r\n- Control with media control keys on the keyboard or OS\r\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\r\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", + "hash": "sha256-yexffDYu0dv/i/V0Z+U1jD1+6X/JZuWZ4/mqWny5Nxs=", + "url": "https://github.com/owncloud/music/releases/download/v2.0.1/music_2.0.1_for_nextcloud.tar.gz", + "version": "2.0.1", + "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from m3u, m3u8, and pls files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on various external apps e.g. on Android or iPhone", "homepage": "https://github.com/owncloud/music", "licenses": [ "agpl" @@ -210,9 +210,9 @@ ] }, "polls": { - "hash": "sha256-tSnR5O+OCYjoPoh2/WX3ntCagw9xanmxCR+DaMnAhJA=", - "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.1/polls-v7.2.1.tar.gz", - "version": "7.2.1", + "hash": "sha256-TBCNr57MKEe8OSXEqWohZH9zuCwFTMDnwnZ1nFZ+FWY=", + "url": "https://github.com/nextcloud-releases/polls/releases/download/v7.2.2/polls-v7.2.2.tar.gz", + "version": "7.2.2", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ @@ -250,9 +250,9 @@ ] }, "richdocuments": { - "hash": "sha256-kAY1Y4PB7AIFWNx+Yi1ovZopGEER/r5RveIlS/y6Veo=", - "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.5/richdocuments-v8.4.5.tar.gz", - "version": "8.4.5", + "hash": "sha256-S1ORUIx+rcA4UUFmPX4KiLakzPPIqvVmcABDuNX0tys=", + "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.4.6/richdocuments-v8.4.6.tar.gz", + "version": "8.4.6", "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.", "homepage": "https://collaboraoffice.com/", "licenses": [ @@ -260,9 +260,9 @@ ] }, "spreed": { - "hash": "sha256-/WD/UAtuLYdtZjBNIur2qRaPNXGTG1lfPTOlJpZfyCI=", - "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.8/spreed-v19.0.8.tar.gz", - "version": "19.0.8", + "hash": "sha256-cZYE528jSNnPFgJSnqosoPyo/7V3zdUAIxnFpcOuvh4=", + "url": "https://github.com/nextcloud-releases/spreed/releases/download/v19.0.9/spreed-v19.0.9.tar.gz", + "version": "19.0.9", "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.", "homepage": "https://github.com/nextcloud/spreed", "licenses": [ @@ -309,6 +309,16 @@ "agpl" ] }, + "unsplash": { + "hash": "sha256-kNDQk4HYkrBA+o+5/bNYj65ZJbViBjhnbSA87tsu6YE=", + "url": "https://github.com/nextcloud/unsplash/releases/download/v3.0.1/unsplash.tar.gz", + "version": "3.0.1", + "description": "Show a new random featured nature photo in your nextcloud. Now with choosable motives!", + "homepage": "https://github.com/nextcloud/unsplash/", + "licenses": [ + "agpl" + ] + }, "user_oidc": { "hash": "sha256-8e4xQjOWSVAps6dg4jvN3MGVSOhaOgjPHPpTOgXKFJY=", "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v6.0.1/user_oidc-v6.0.1.tar.gz", From c6560d9b60f6409f2d8354227f4ce76636ca2c6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Sep 2024 23:58:44 +0200 Subject: [PATCH 103/212] python312Packages.types-aiobotocore: 2.13.2 -> 2.15.0 --- pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix index b493ca0331a1..17f41b1164cd 100644 --- a/pkgs/development/python-modules/types-aiobotocore/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore/default.nix @@ -364,13 +364,13 @@ buildPythonPackage rec { pname = "types-aiobotocore"; - version = "2.13.1"; + version = "2.15.0"; pyproject = true; src = fetchPypi { pname = "types_aiobotocore"; inherit version; - hash = "sha256-iJCVMd8HK22CsAbOg3c4hlnatiyMNFw97V8XtjWJwPQ="; + hash = "sha256-65wheAyrOIe6rwrjygLF/gq3uYj0qaXEPnr/L4lNfKc="; }; build-system = [ setuptools ]; From 0dffe4104e87b7b33efcc8b1e783a22efeecb0e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:02:53 +0200 Subject: [PATCH 104/212] python312Packages.types-aiobotocore-*: 2.13.1 -> 2.15.0 --- .../types-aiobotocore-packages/default.nix | 1575 +++++++++-------- 1 file changed, 863 insertions(+), 712 deletions(-) diff --git a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix index e29c3127290a..c9c354d5dd84 100644 --- a/pkgs/development/python-modules/types-aiobotocore-packages/default.nix +++ b/pkgs/development/python-modules/types-aiobotocore-packages/default.nix @@ -1,30 +1,55 @@ -{ lib, stdenv, aiobotocore, botocore, buildPythonPackage, fetchPypi, pythonOlder -, setuptools, typing-extensions, }: +{ + lib, + stdenv, + aiobotocore, + boto3, + botocore, + buildPythonPackage, + fetchPypi, + pythonOlder, + setuptools, + typing-extensions, +}: let toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str; - buildTypesAiobotocorePackage = serviceName: version: hash: + buildTypesAiobotocorePackage = + serviceName: version: hash: buildPythonPackage rec { pname = "types-aiobotocore-${serviceName}"; inherit version; pyproject = true; + disabled = pythonOlder "3.7"; - oldStylePackages = [ "gamesparks" "iot-roborunner" "macie" ]; + oldStylePackages = [ + "gamesparks" + "iot-roborunner" + "macie" + ]; src = fetchPypi { - pname = if builtins.elem serviceName oldStylePackages then - "types-aiobotocore-${serviceName}" - else - "types_aiobotocore_${toUnderscore serviceName}"; + pname = + if builtins.elem serviceName oldStylePackages then + "types-aiobotocore-${serviceName}" + else + "types_aiobotocore_${toUnderscore serviceName}"; inherit version hash; }; + build-system = [ setuptools ]; - dependencies = [ aiobotocore botocore ] - ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + + dependencies = [ + aiobotocore + boto3 + botocore + ] ++ lib.optionals (pythonOlder "3.12") [ typing-extensions ]; + # Module has no tests doCheck = false; + pythonImportsCheck = [ "types_aiobotocore_${toUnderscore serviceName}" ]; + meta = with lib; { description = "Type annotations for aiobotocore ${serviceName}"; homepage = "https://github.com/youtype/mypy_boto3_builder"; @@ -32,1291 +57,1417 @@ let maintainers = with maintainers; [ mbalatsko ]; }; }; -in rec { +in +rec { types-aiobotocore-accessanalyzer = - buildTypesAiobotocorePackage "accessanalyzer" "2.13.1" - "sha256-Uaet2w0Re7mCVBJhbjxMv6dvBj96VfKTl5XTAG1WoaY="; + buildTypesAiobotocorePackage "accessanalyzer" "2.15.0" + "sha256-aXiUguHjVb9uw4bM1jpJLEFDSJGPEwPVBXUOSylrJUU="; - types-aiobotocore-account = buildTypesAiobotocorePackage "account" "2.13.1" - "sha256-eOfLc045Qvn5lz36My+v1vNAvQkPzSfabaVxIBC+kok="; + types-aiobotocore-account = + buildTypesAiobotocorePackage "account" "2.15.0" + "sha256-frvRCAYh+zn8k1AXzGQuH84QnhXyIiUR7BZBZfH5Vao="; - types-aiobotocore-acm = buildTypesAiobotocorePackage "acm" "2.13.1" - "sha256-+X87aqLD7+COapS6//oMv+lLxjs6ULQptAXW7FYSgcE="; + types-aiobotocore-acm = + buildTypesAiobotocorePackage "acm" "2.15.0" + "sha256-au29Nkw94QcHk1c+CCsaNBM+6bkOPPr17yj5naKlFJI="; - types-aiobotocore-acm-pca = buildTypesAiobotocorePackage "acm-pca" "2.13.1" - "sha256-vc/stXsbP5/HF4SpDZoxNJ11prW2Dg38s7v3sxWHOMg="; + types-aiobotocore-acm-pca = + buildTypesAiobotocorePackage "acm-pca" "2.15.0" + "sha256-xLhR9zReaQ4O2ka8SJh6KOEvcoWm/fs+gC7PtRNQtTw="; types-aiobotocore-alexaforbusiness = buildTypesAiobotocorePackage "alexaforbusiness" "2.13.0" - "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; + "sha256-+w/InoQR2aZ5prieGhgEEp7auBiSSghG5zIIHY5Kyao="; - types-aiobotocore-amp = buildTypesAiobotocorePackage "amp" "2.13.1" - "sha256-KybFUBaKKGfZJmJ/hdu3M7evD8yD1cwZS1AUPsy+kX4="; + types-aiobotocore-amp = + buildTypesAiobotocorePackage "amp" "2.15.0" + "sha256-nMLt8ZITr0zwrnG6v12XgpKtuvggXbhCaozMzF6Ng9c="; - types-aiobotocore-amplify = buildTypesAiobotocorePackage "amplify" "2.13.1" - "sha256-a9p6mO8N+jbuifKbeshURjlVDENL1m1XzZE7pI6OPQU="; + types-aiobotocore-amplify = + buildTypesAiobotocorePackage "amplify" "2.15.0" + "sha256-L4P4YRaKsIJkhDT1aOjEs5NxnnXyZoRSPZbIVI0iCfE="; types-aiobotocore-amplifybackend = - buildTypesAiobotocorePackage "amplifybackend" "2.13.1" - "sha256-PysfMHgo+GsSi+fK6jyk90wNVX4ItZwg1clES+ShzAM="; + buildTypesAiobotocorePackage "amplifybackend" "2.15.0" + "sha256-bgOAbDajiuw3GQ15XRK6QJoSc+RwjQY1sZt+lLhGONA="; types-aiobotocore-amplifyuibuilder = - buildTypesAiobotocorePackage "amplifyuibuilder" "2.13.1" - "sha256-tNOZIhKR8QkDBbD9baqRHqoRCJAdRJPjkW0FVj8/k0M="; + buildTypesAiobotocorePackage "amplifyuibuilder" "2.15.0" + "sha256-N4OTBb2LW3JFJLzE6OeDPAzpjUcSlwPEVezaVelE++o="; types-aiobotocore-apigateway = - buildTypesAiobotocorePackage "apigateway" "2.13.1" - "sha256-SEU6Qw0LCpYKvlnjh4XZXGogmXilbLVuN/eYEt18aO0="; + buildTypesAiobotocorePackage "apigateway" "2.15.0" + "sha256-B+QNyR9jyv1+SKTj0fq6qlq1vwQ5yxhf9yvkIjc+AWA="; types-aiobotocore-apigatewaymanagementapi = - buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.13.1" - "sha256-zUgJ0eOJkzcu0y7zcrfHwhar0wdon7antjzy0HeJuQU="; + buildTypesAiobotocorePackage "apigatewaymanagementapi" "2.15.0" + "sha256-cNIPbJvmZltZ089CfkfxenyTtJUC/+ETCyEDDlzwLOg="; types-aiobotocore-apigatewayv2 = - buildTypesAiobotocorePackage "apigatewayv2" "2.13.1" - "sha256-+8A7eXo01Z2EAaps1fFFiWWvNdO+DpTM8PV0n2whpvg="; + buildTypesAiobotocorePackage "apigatewayv2" "2.15.0" + "sha256-PfwYm2wklpMZdH/DXKOMlOmozwl8PWY/dnGKZ+vDHVM="; types-aiobotocore-appconfig = - buildTypesAiobotocorePackage "appconfig" "2.13.1" - "sha256-uhhxVP+Og+FiOoko8gjdUavhTP4o+wwrXm834wc4Lac="; + buildTypesAiobotocorePackage "appconfig" "2.15.0" + "sha256-jhXyfuEWN+hc9R3K2zU5DeiIPuz7Gl9GxQBs1VecCZo="; types-aiobotocore-appconfigdata = - buildTypesAiobotocorePackage "appconfigdata" "2.13.1" - "sha256-xCrDWBX8jR2851rMALz7itYxffvnah6yOq8S6UO4NvE="; + buildTypesAiobotocorePackage "appconfigdata" "2.15.0" + "sha256-rLhZ4JpFtHlBfWgaRl1Y1BkGdy3L0pIK52zni/Jd1UU="; types-aiobotocore-appfabric = - buildTypesAiobotocorePackage "appfabric" "2.13.1" - "sha256-oz8iPiF6L2aITqmDraIZ4vMJTHMEFfNF9gDMj21vggE="; + buildTypesAiobotocorePackage "appfabric" "2.15.0" + "sha256-PtAaUmLoCVRs2UFarVzJSdMjftYrRz4pjb7nraMIAys="; - types-aiobotocore-appflow = buildTypesAiobotocorePackage "appflow" "2.13.1" - "sha256-1rlhU3wAGvl1XSE+wkulJdyeV93en4VvnjpnaB12gi8="; + types-aiobotocore-appflow = + buildTypesAiobotocorePackage "appflow" "2.15.0" + "sha256-Yz7cnhD8peXaYwC4sLbAcjsQFDWWnq4VZKTAOJ3M5YA="; types-aiobotocore-appintegrations = - buildTypesAiobotocorePackage "appintegrations" "2.13.1" - "sha256-DB7kuMeIW9XStOSw2h9jsQPfAiwK94m7xbdOoy6cpPw="; + buildTypesAiobotocorePackage "appintegrations" "2.15.0" + "sha256-azLPzqojFnj11d8Hw45c+VuZgG/J3KGUhOYD+R7ZwK8="; types-aiobotocore-application-autoscaling = - buildTypesAiobotocorePackage "application-autoscaling" "2.13.1" - "sha256-aJaPxZXm4lBh4EDsiC7HauXmS+GNzhtQXPTF73mDHw8="; + buildTypesAiobotocorePackage "application-autoscaling" "2.15.0" + "sha256-NvY9zOt9xDFh0XgUSyAQ1obzttIj8BXOa8qBWjJ/VLs="; types-aiobotocore-application-insights = - buildTypesAiobotocorePackage "application-insights" "2.13.1" - "sha256-tZj8H/seTnIxtTybQhJ8u5p9Roiq0mbxuX/k6OriZOI="; + buildTypesAiobotocorePackage "application-insights" "2.15.0" + "sha256-g4NHKgSExk9Xb6xmNm8kTdrWP473KN+AHs1vw9l6yL0="; types-aiobotocore-applicationcostprofiler = - buildTypesAiobotocorePackage "applicationcostprofiler" "2.13.1" - "sha256-QYyROZOiHB40gRKjQnRcwQWGAX44zbwPPamfdGrpvhU="; + buildTypesAiobotocorePackage "applicationcostprofiler" "2.15.0" + "sha256-AZG2e70N6u+tYQF9rsxG/kCO/fCJiBtvmdaSQvEwLLo="; - types-aiobotocore-appmesh = buildTypesAiobotocorePackage "appmesh" "2.13.1" - "sha256-o+pcPaWXhZsVadQzDWQi/8+IHY44Sk4z7ckzGO9rPtE="; + types-aiobotocore-appmesh = + buildTypesAiobotocorePackage "appmesh" "2.15.0" + "sha256-Qn/Nw8OnHixSWzjJPxN2T7B8mzscpDdBNgjNrefOgmM="; types-aiobotocore-apprunner = - buildTypesAiobotocorePackage "apprunner" "2.13.1" - "sha256-EOv5cWNlnQkmg5iJNliw/PXBGwYdriOnuUAOpvE+QiE="; + buildTypesAiobotocorePackage "apprunner" "2.15.0" + "sha256-rjBxiphEQxs5/OZVEPDM45YIivDCrjVkkK4bLbUgvDM="; types-aiobotocore-appstream = - buildTypesAiobotocorePackage "appstream" "2.13.1" - "sha256-WD7ddhaEp6cs9wswWYvyABEVwvvn8dNGmjcQhRfOG7I="; + buildTypesAiobotocorePackage "appstream" "2.15.0" + "sha256-tlmIQ+6d7lNhZiDtSiF6SodUtwLTJJkJSofMb5YUW1Q="; - types-aiobotocore-appsync = buildTypesAiobotocorePackage "appsync" "2.13.1" - "sha256-azWY8AV3qVs70WKd8/izDCbyddAZaa+AJoWKZhOcX70="; + types-aiobotocore-appsync = + buildTypesAiobotocorePackage "appsync" "2.15.0" + "sha256-kR3BQccO7l3TixcVmDOVu41t5gJPBpFedgk5uPLuDxU="; types-aiobotocore-arc-zonal-shift = - buildTypesAiobotocorePackage "arc-zonal-shift" "2.13.1" - "sha256-auQRpYcMG/DQXNWCu4KFKqMomo2MeQENeDFvpBC864Q="; + buildTypesAiobotocorePackage "arc-zonal-shift" "2.15.0" + "sha256-o9pDedTVsRr98GZwtFbfFwKZwOA0e4zseGSFtlBEsLQ="; - types-aiobotocore-athena = buildTypesAiobotocorePackage "athena" "2.13.1" - "sha256-7caEszKVxK7pyoyqDr0kkT7rtekljZ/+E6svg99pL1E="; + types-aiobotocore-athena = + buildTypesAiobotocorePackage "athena" "2.15.0" + "sha256-AgWHakNCla5JY6zz0rWLwkorVESJCvQG6jhT1OFRNUY="; types-aiobotocore-auditmanager = - buildTypesAiobotocorePackage "auditmanager" "2.13.1" - "sha256-bNfXtBabYFgNdWu6F4tmmgHBvM5xRHpruDTPVIX10WU="; + buildTypesAiobotocorePackage "auditmanager" "2.15.0" + "sha256-U5ir/tSKwIAIF2TVJ66L1utVyh9cscc7z2VyrcsrGoI="; types-aiobotocore-autoscaling = - buildTypesAiobotocorePackage "autoscaling" "2.13.1" - "sha256-yOKRClE2ziH7YraQ/RDKuJosPmFbk6l2VyY/VNKzyPI="; + buildTypesAiobotocorePackage "autoscaling" "2.15.0" + "sha256-7ZKRN/IlUrNvFgeuGbo242Di4eyIDr9/5tJsHrgcspg="; types-aiobotocore-autoscaling-plans = - buildTypesAiobotocorePackage "autoscaling-plans" "2.13.1" - "sha256-Pq9A+24LbD/izfWjv2my7RZRmuEoEkpYnqKsJUTGVIc="; + buildTypesAiobotocorePackage "autoscaling-plans" "2.15.0" + "sha256-Va74FcUxerO1nEtm6AiWbaw8zVHDkrdsfq3fBlznM7k="; - types-aiobotocore-backup = buildTypesAiobotocorePackage "backup" "2.13.1" - "sha256-fAoxWR8TV+8boe1XHt+dhSK0e+1RDc4MEy+Wn7DZcPk="; + types-aiobotocore-backup = + buildTypesAiobotocorePackage "backup" "2.15.0" + "sha256-9k/3D58OtYwyGl/B9wepaNbj6vgxzqc9E96Tp5+qSVU="; types-aiobotocore-backup-gateway = - buildTypesAiobotocorePackage "backup-gateway" "2.13.1" - "sha256-UU3C5zdJG3OXpevSnLnWiPIQR/0ear0IC7pBvRw6SJo="; + buildTypesAiobotocorePackage "backup-gateway" "2.15.0" + "sha256-pp75wX3UeV4U7UChs3EyanPom1UD6RCYdYfVmN21MjM="; types-aiobotocore-backupstorage = buildTypesAiobotocorePackage "backupstorage" "2.13.0" - "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; + "sha256-YUKtBdBrdwL2yqDqOovvzDPbcv/sD8JLRnKz3Oh7iSU="; - types-aiobotocore-batch = buildTypesAiobotocorePackage "batch" "2.13.1" - "sha256-7K1ifpUy/tnVyOn5cT0Bpqp01LL3mFlJQjxb5BAiR28="; + types-aiobotocore-batch = + buildTypesAiobotocorePackage "batch" "2.15.0" + "sha256-vbZk1mR45gdhLVtdZTi0ZG6I72ttUwHqFAuXc4TW8o8="; types-aiobotocore-billingconductor = - buildTypesAiobotocorePackage "billingconductor" "2.13.1" - "sha256-jIddm3hMFtQ2/LYEpHCSnTUq/DfBco7TzFUN9VeO/lw="; + buildTypesAiobotocorePackage "billingconductor" "2.15.0" + "sha256-mtbJipKOB82AHWrRAfNFUgHTwNtqiU/NSn9F6eLcqok="; - types-aiobotocore-braket = buildTypesAiobotocorePackage "braket" "2.13.1" - "sha256-4icZ+SDl/c3Cnzikw+FDuNO14QxihzqcXTaGd89SOQ8="; + types-aiobotocore-braket = + buildTypesAiobotocorePackage "braket" "2.15.0" + "sha256-Hu8DNQCusy3HR5NNptB4Rwuhu3m9lcqTgR7HnZMjtwA="; - types-aiobotocore-budgets = buildTypesAiobotocorePackage "budgets" "2.13.1" - "sha256-57X0EZ8KLu3A2RYSZDEhqltgWtMEH4Hr8gXTbIAXUrY="; + types-aiobotocore-budgets = + buildTypesAiobotocorePackage "budgets" "2.15.0" + "sha256-E8f8+ONZep2G/BoOSinere9SIMetZHNK+FpmfJZtXxY="; - types-aiobotocore-ce = buildTypesAiobotocorePackage "ce" "2.13.1" - "sha256-518KyYlsHBtAimVhM6ADzQkCKZ2hMtS4sKXQZjrSZ/A="; + types-aiobotocore-ce = + buildTypesAiobotocorePackage "ce" "2.15.0" + "sha256-8FK+wf201DspWWW338aad19mh84tEqI84GqKE9zclyA="; - types-aiobotocore-chime = buildTypesAiobotocorePackage "chime" "2.13.1" - "sha256-5KtJXVleXuSVrRMb9Dc/dcIuMRlx1R2dkH8uOA8kebQ="; + types-aiobotocore-chime = + buildTypesAiobotocorePackage "chime" "2.15.0" + "sha256-mAgx2hqP0zIvMIdAlyqD6A9HVZ0l/CKDj1lAvsDP/60="; types-aiobotocore-chime-sdk-identity = - buildTypesAiobotocorePackage "chime-sdk-identity" "2.13.1" - "sha256-lGKZbWAXwEutqjkj9kV/88VqZMjDpIXeuye20E7quPY="; + buildTypesAiobotocorePackage "chime-sdk-identity" "2.15.0" + "sha256-aY7LS0tEdBVxPwUIrR10ukCybglu1iQIyohNkMHrD4I="; types-aiobotocore-chime-sdk-media-pipelines = - buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.13.1" - "sha256-nZhgUByQ/2hmY77PPPICSiOpSg5pabOFCfxUq374wqw="; + buildTypesAiobotocorePackage "chime-sdk-media-pipelines" "2.15.0" + "sha256-34bU9wxdytAbTYBGM4/sfAn1tYtYLEc2dpUN+t4RtP4="; types-aiobotocore-chime-sdk-meetings = - buildTypesAiobotocorePackage "chime-sdk-meetings" "2.13.1" - "sha256-KNZ79bAJQemRhR65c/Zruh8SRubdHcPfVeqwsf5y/vg="; + buildTypesAiobotocorePackage "chime-sdk-meetings" "2.15.0" + "sha256-X6YpdEVXPHsvDjptcowPEs71b6iVHO5s80VmO8yEG0o="; types-aiobotocore-chime-sdk-messaging = - buildTypesAiobotocorePackage "chime-sdk-messaging" "2.13.1" - "sha256-SYvTxDOoqoje4fp0V7CMMKns7PNaGF2uEuXTbhIPHFY="; + buildTypesAiobotocorePackage "chime-sdk-messaging" "2.15.0" + "sha256-6CI5unJa7Ba1agD41zvcg7hi76D5j34NF5WlPAzkZiY="; types-aiobotocore-chime-sdk-voice = - buildTypesAiobotocorePackage "chime-sdk-voice" "2.13.1" - "sha256-CZmTJGl9IXnYnlKsnq49o7TOHjFYQXf7g7H6dQ98Clg="; + buildTypesAiobotocorePackage "chime-sdk-voice" "2.15.0" + "sha256-Qz3MHsRX3k9pxSZAltP3CrwFB3jcdNQkVok3jAUbXa8="; types-aiobotocore-cleanrooms = - buildTypesAiobotocorePackage "cleanrooms" "2.13.1" - "sha256-0sxIwTUs2usAhuJ0sghw1QUDKu87pwx1zKOUdDvPCXM="; + buildTypesAiobotocorePackage "cleanrooms" "2.15.0" + "sha256-d+cISH+Wz1tnTh3hl1V0VLmHAirfi5puzLE1llIb6SY="; - types-aiobotocore-cloud9 = buildTypesAiobotocorePackage "cloud9" "2.13.1" - "sha256-4JNR2drXNI2sJ1JXkk5NQgwK1CeAxrpxTHvSbdcX7Ds="; + types-aiobotocore-cloud9 = + buildTypesAiobotocorePackage "cloud9" "2.15.0" + "sha256-4+/5CcjgXH4O2LXpOUbDNXC2xMnVzU9e4eY0n6tA39I="; types-aiobotocore-cloudcontrol = - buildTypesAiobotocorePackage "cloudcontrol" "2.13.1" - "sha256-CHdqWRL1ZIJCQ65Dts87w6IFlU4ZpRD9GSvXah78Kow="; + buildTypesAiobotocorePackage "cloudcontrol" "2.15.0" + "sha256-5yjSbImILBpPJrwJUabP/z37yocdAtASsS0sSfJq69Q="; types-aiobotocore-clouddirectory = - buildTypesAiobotocorePackage "clouddirectory" "2.13.1" - "sha256-2oXpXFuO3jJ+lvFsjuAh3pw2lhfnuRLGtIcUep4QwJw="; + buildTypesAiobotocorePackage "clouddirectory" "2.15.0" + "sha256-0+bbLpb+IIfgPFd2mltYjgDhV94hmD9nBHu+kOFPRbs="; types-aiobotocore-cloudformation = - buildTypesAiobotocorePackage "cloudformation" "2.13.1" - "sha256-M4D5z53xl8hX4q4/Co5UJIUw9JxbxTQf7hhQp/FpVA0="; + buildTypesAiobotocorePackage "cloudformation" "2.15.0" + "sha256-KV6YLm057AqItUSfZmlMro41bvzyWitf64KXh/S78BM="; types-aiobotocore-cloudfront = - buildTypesAiobotocorePackage "cloudfront" "2.13.1" - "sha256-GQrg1dPD0HgIe04znp1rajEd/Fmp7B/rP06lsLQ8uV0="; + buildTypesAiobotocorePackage "cloudfront" "2.15.0" + "sha256-G1vjQh+/51KC5GLbqu8id0vIMcllM6e249ibRWIc+50="; - types-aiobotocore-cloudhsm = buildTypesAiobotocorePackage "cloudhsm" "2.13.1" - "sha256-ASmEjSNYbZ1CANSSNw2Fi7ieKVE42WNDISpqTjBOVM4="; + types-aiobotocore-cloudhsm = + buildTypesAiobotocorePackage "cloudhsm" "2.15.0" + "sha256-zFlLFb3Kg+n4aK0laLFxbyqBh5ljI9q38Hh+tK/9o3Q="; types-aiobotocore-cloudhsmv2 = - buildTypesAiobotocorePackage "cloudhsmv2" "2.13.1" - "sha256-154gs9XMFcz2urECTUwyeZK3iafwK2OYaCKaCMjCZf8="; + buildTypesAiobotocorePackage "cloudhsmv2" "2.15.0" + "sha256-VkQmIJDWE+9VksOnEyLtktWOfNgRRw76zqr8xM7TM40="; types-aiobotocore-cloudsearch = - buildTypesAiobotocorePackage "cloudsearch" "2.13.1" - "sha256-QCm7i0wXtPBG5pT9V0WA9SCWjcT9bPDU2T2alCNfZEI="; + buildTypesAiobotocorePackage "cloudsearch" "2.15.0" + "sha256-56M9O04QpzTvwBM6kTBlq/xlKulSye55n2yTqjibAhM="; types-aiobotocore-cloudsearchdomain = - buildTypesAiobotocorePackage "cloudsearchdomain" "2.13.1" - "sha256-V39w95ufoIbbDWUIPiVtdqZPTiaosV+cMBXKljbuEWY="; + buildTypesAiobotocorePackage "cloudsearchdomain" "2.15.0" + "sha256-c2MkpaPyF+fpbQMMC2UvP8HvWOxXz1zoKlmy8mWihKg="; types-aiobotocore-cloudtrail = - buildTypesAiobotocorePackage "cloudtrail" "2.13.1" - "sha256-BB7gmQoj30OZ2PqEzwzz8XwZuuJsLRJAXETzkP/nTzg="; + buildTypesAiobotocorePackage "cloudtrail" "2.15.0" + "sha256-3oPEyW12otLcBEs3PM4ySpx8REN1XbOveu/H3/tMlyk="; types-aiobotocore-cloudtrail-data = - buildTypesAiobotocorePackage "cloudtrail-data" "2.13.1" - "sha256-FwnZNsSIHD5pLYJepyP5Vde7nd/TFNPMCEcKLsKZv28="; + buildTypesAiobotocorePackage "cloudtrail-data" "2.15.0" + "sha256-jwYk+AdycgvN5G26/e4E6xTvXqhSau5uXHOdn8QOz4A="; types-aiobotocore-cloudwatch = - buildTypesAiobotocorePackage "cloudwatch" "2.13.1" - "sha256-hgn4kDF2hEasQG2JjvQ8alzWEhfHeFvfk4mTOCHLfvs="; + buildTypesAiobotocorePackage "cloudwatch" "2.15.0" + "sha256-tSEIoJJZ3Qkta6R7urcY6o0Zmh/inayk9TFmWDtBxrI="; types-aiobotocore-codeartifact = - buildTypesAiobotocorePackage "codeartifact" "2.13.1" - "sha256-CE4aG69icMYwW/y+IpBhN1Vtkt+yIaQuIPCiZ0lnV58="; + buildTypesAiobotocorePackage "codeartifact" "2.15.0" + "sha256-Uh628mId25sRK5C1RiFFUhnm3gwoAOn1qBiYFEZawiQ="; types-aiobotocore-codebuild = - buildTypesAiobotocorePackage "codebuild" "2.13.1" - "sha256-HLKQS+IaiJsVQpgGKocHgHFews+br3qogOHw+fhGbJA="; + buildTypesAiobotocorePackage "codebuild" "2.15.0" + "sha256-Vpmwx9NLkvW8//lwYbuNn4oCuTGlOzW6ALQvkNw3zjk="; types-aiobotocore-codecatalyst = - buildTypesAiobotocorePackage "codecatalyst" "2.13.1" - "sha256-EYP61ycy0paJ/Q6H7b67aRvEvqam3q4wAtbLlG/+2zc="; + buildTypesAiobotocorePackage "codecatalyst" "2.15.0" + "sha256-hLZYCwF1SvMp2Pmhg14E/I0QmkFHdBivYL4zwbeozAc="; types-aiobotocore-codecommit = - buildTypesAiobotocorePackage "codecommit" "2.13.1" - "sha256-yFKsTfVAe6lN9WFzHRtmCuuNElQzC1LkMnvgLFayDwM="; + buildTypesAiobotocorePackage "codecommit" "2.15.0" + "sha256-ChHQF79gsoOzTA8Gzg3e7U4DRW24PsP2joi7haolI5U="; types-aiobotocore-codedeploy = - buildTypesAiobotocorePackage "codedeploy" "2.13.1" - "sha256-8W/45jb4kJhaIIr9SoSDkhsl9FLZtsijaxsPjuk7tno="; + buildTypesAiobotocorePackage "codedeploy" "2.15.0" + "sha256-CldfAcuTTh8Xf1alyNDfEaJb+7wOLhQKg+S4GrnhPT4="; types-aiobotocore-codeguru-reviewer = - buildTypesAiobotocorePackage "codeguru-reviewer" "2.13.1" - "sha256-5Uz2Cfxg1GMsoYS5i337jVcXXrZYPZEhHt7KM2OlTrA="; + buildTypesAiobotocorePackage "codeguru-reviewer" "2.15.0" + "sha256-I2WeTiUX7skEx1Ow8VQjsyBFk0ibYVqjM0SQwd+Djok="; types-aiobotocore-codeguru-security = - buildTypesAiobotocorePackage "codeguru-security" "2.13.1" - "sha256-u6h54g4yHE6rVfi7t9q8RtRZWPgEGqGOIOphOAwq/MU="; + buildTypesAiobotocorePackage "codeguru-security" "2.15.0" + "sha256-yF6I+I+KPEVXogQ4kON3OUq+G+DmxaIwykJm521Lw1I="; types-aiobotocore-codeguruprofiler = - buildTypesAiobotocorePackage "codeguruprofiler" "2.13.1" - "sha256-Ryj6wcXqRcT5qXQIvD2foKz+5HuH0VT2K3hvzoc6tx0="; + buildTypesAiobotocorePackage "codeguruprofiler" "2.15.0" + "sha256-/eRwr2fqu4i17bt9mG7Ffwh/QKBt8cx4T1IehPZNbc4="; types-aiobotocore-codepipeline = - buildTypesAiobotocorePackage "codepipeline" "2.13.1" - "sha256-CoU0OEGz2DuFLeNqCWWj8oE2MoSSdXyKB+NT3Pt942A="; + buildTypesAiobotocorePackage "codepipeline" "2.15.0" + "sha256-i1HlE4mnLkBcbH9BlEUiMswVoDvdFqkA2db/ONYTs9o="; - types-aiobotocore-codestar = buildTypesAiobotocorePackage "codestar" "2.13.1" - "sha256-bbn+UQa3FTVDSh9MkkSIzjXrJ5VRE2Cey0qsy8ayKKo="; + types-aiobotocore-codestar = + buildTypesAiobotocorePackage "codestar" "2.13.3" + "sha256-Z1ewx2RjmxbOQZ7wXaN54PVOuRs6LP3rMpsrVTacwjo="; types-aiobotocore-codestar-connections = - buildTypesAiobotocorePackage "codestar-connections" "2.13.1" - "sha256-IlKwnmjBJGg4/t/nsmNU3SHg9Bt/xUTlPHEyDyDHPP8="; + buildTypesAiobotocorePackage "codestar-connections" "2.15.0" + "sha256-ksiIt34O0vVOmlaSZjfPugnYUQDzUj9go5hIOknyvHM="; types-aiobotocore-codestar-notifications = - buildTypesAiobotocorePackage "codestar-notifications" "2.13.1" - "sha256-A50/E6erKSQWHjAJ9CpRIz5/waUwO4yqagdVULraO9o="; + buildTypesAiobotocorePackage "codestar-notifications" "2.15.0" + "sha256-vbNr4u4HAHEUaXyUruJtNRk1urlJ6W7yUJrS6ULE+2s="; types-aiobotocore-cognito-identity = - buildTypesAiobotocorePackage "cognito-identity" "2.13.1" - "sha256-GXDC1bJbPy6wWrHWQMOlMR7x9hGhO9jzWv/8JXkPyGk="; + buildTypesAiobotocorePackage "cognito-identity" "2.15.0" + "sha256-uFRD5fzIN11WLtR6KQ10IKxWpzf/Lr2q5VHHdC++h5U="; types-aiobotocore-cognito-idp = - buildTypesAiobotocorePackage "cognito-idp" "2.13.1" - "sha256-vlKEPVh/5By2I7McROQdNa8XlF3Q6nrA/pgIeDWUPgg="; + buildTypesAiobotocorePackage "cognito-idp" "2.15.0" + "sha256-Yz1fDkWhQCsDN0I/KE8mkmKsVG+pzRMbyOighcdE+68="; types-aiobotocore-cognito-sync = - buildTypesAiobotocorePackage "cognito-sync" "2.13.1" - "sha256-lFEn4TQ8ESrm0HAb+YMYiEqaZAqkX1kZLLn7hbSzAQc="; + buildTypesAiobotocorePackage "cognito-sync" "2.15.0" + "sha256-IAbAdXXV/qBLu4g4sxbk8PAlJ61fL1788sKrOCAPoyA="; types-aiobotocore-comprehend = - buildTypesAiobotocorePackage "comprehend" "2.13.1" - "sha256-F2t0c8J+h2o5fZlAwRGtF9UmHyYilrrncRkTIMA5mC4="; + buildTypesAiobotocorePackage "comprehend" "2.15.0" + "sha256-o78Qq1eZTT/+3oSdpDMFGT3VcRr3BUgTHIEv9U6zsaw="; types-aiobotocore-comprehendmedical = - buildTypesAiobotocorePackage "comprehendmedical" "2.13.1" - "sha256-nkjUjOLIuYC95pltFInfXDrvM4SckHf7+iJSQC2WQ1k="; + buildTypesAiobotocorePackage "comprehendmedical" "2.15.0" + "sha256-cdmbnC12r0nzgqHt9MZsB8z34Gh1wLr7pressaGNdok="; types-aiobotocore-compute-optimizer = - buildTypesAiobotocorePackage "compute-optimizer" "2.13.1" - "sha256-p/49yh4DHMWyetWVyLh1vqOnpWxKfQaP26UNOzQJ/U0="; + buildTypesAiobotocorePackage "compute-optimizer" "2.15.0" + "sha256-OiZkYLcHvGfgrAAG/g2DI7OfTXuowz9U9vgYnUnQ5LY="; - types-aiobotocore-config = buildTypesAiobotocorePackage "config" "2.13.1" - "sha256-JXg+fCdaGBJ++phhSjUz9tFtZTH2L8RwlGbkE00b/WE="; + types-aiobotocore-config = + buildTypesAiobotocorePackage "config" "2.15.0" + "sha256-t4TXmT50janvS0/t4x7a1Kugx+spLVtdhYXk0tbW7IA="; - types-aiobotocore-connect = buildTypesAiobotocorePackage "connect" "2.13.1" - "sha256-8eI2xD1RcI7djPKdCL1vevnFUSZPuHYEsOdqiVM0cfA="; + types-aiobotocore-connect = + buildTypesAiobotocorePackage "connect" "2.15.0" + "sha256-sqLlspZPLtilYBBOQtHV5YT3IZ2BJCenD2r8D8JUva0="; types-aiobotocore-connect-contact-lens = - buildTypesAiobotocorePackage "connect-contact-lens" "2.13.1" - "sha256-n8vtERLR98IyPF7jOBdzkEz+Jf+A234MbORfcVN0wRw="; + buildTypesAiobotocorePackage "connect-contact-lens" "2.15.0" + "sha256-B2MqOOHJs3cHIuPKPJPdGsw/htwbTdqhF3vX2ErhSUs="; types-aiobotocore-connectcampaigns = - buildTypesAiobotocorePackage "connectcampaigns" "2.13.1" - "sha256-QSOX1MYrg+L1ESOEzE296Ne8d5F3aaKztiBlxJtsAiE="; + buildTypesAiobotocorePackage "connectcampaigns" "2.15.0" + "sha256-ILLDJbAD7jQdyUop5NzZA5YOzCvDLS5DwjRaPqiHFZc="; types-aiobotocore-connectcases = - buildTypesAiobotocorePackage "connectcases" "2.13.1" - "sha256-4EdnxtOLZDryEUaMulCkenje8zSt8mujs0QPvl7MhpA="; + buildTypesAiobotocorePackage "connectcases" "2.15.0" + "sha256-XM58yx4FP5mfVcdXpGOCXk3HrYbhiPbKhFLYMjKJfjE="; types-aiobotocore-connectparticipant = - buildTypesAiobotocorePackage "connectparticipant" "2.13.1" - "sha256-6iMw+gk9HIPv6l7j6lwSKmQPeHs07bhEL7eY5TnIEJk="; + buildTypesAiobotocorePackage "connectparticipant" "2.15.0" + "sha256-nEouxJuZHsnNuIXSFpW1r5eWp7wiM525jaqkrHKy27o="; types-aiobotocore-controltower = - buildTypesAiobotocorePackage "controltower" "2.13.1" - "sha256-vPCIltZMsBBEqHCKh5BQ9ZuwZrjqzhUIpLfS1KGCtz4="; + buildTypesAiobotocorePackage "controltower" "2.15.0" + "sha256-pI3tNm75uKX9qYGq0wdINP/ikm1Q11Y2Y+buuSUhMqU="; - types-aiobotocore-cur = buildTypesAiobotocorePackage "cur" "2.13.1" - "sha256-PPFJQ2Hh3KCTTe6dGAyuTNjYSQ8s42lvf4/ZIhLxVnk="; + types-aiobotocore-cur = + buildTypesAiobotocorePackage "cur" "2.15.0" + "sha256-YE6vdELZULQU8zYRFd97IEWw+guKLJM24VhxRjbCHNk="; types-aiobotocore-customer-profiles = - buildTypesAiobotocorePackage "customer-profiles" "2.13.1" - "sha256-qckqfZP20Rlg/MiZUsFV+mBmrbRNob5jm655l2Osons="; + buildTypesAiobotocorePackage "customer-profiles" "2.15.0" + "sha256-Gq+W7nn4AaMd51nYd0uzDfDNWqMsqwYTBR8JA63NCtI="; - types-aiobotocore-databrew = buildTypesAiobotocorePackage "databrew" "2.13.1" - "sha256-qmh7lRfGBt6YsyC08BDAFyPsJ/h4JqCqUNup5Fmymbg="; + types-aiobotocore-databrew = + buildTypesAiobotocorePackage "databrew" "2.15.0" + "sha256-cKk8cRR2XcMCIbBeg9g2Zgwun5/RRNQaiAKoIv8WvEk="; types-aiobotocore-dataexchange = - buildTypesAiobotocorePackage "dataexchange" "2.13.1" - "sha256-A+FeXDt+0noA2GwfHYiq7qyZ1/qYS+WlIn/ZmJvkPPs="; + buildTypesAiobotocorePackage "dataexchange" "2.15.0" + "sha256-0ZZcNnUh2X/K7t65yy0CJS7JDNqn//a/CEn/ujyBpjU="; types-aiobotocore-datapipeline = - buildTypesAiobotocorePackage "datapipeline" "2.13.1" - "sha256-5IEPIDBzw3BnFjMpuBhPxjPwcWoKBEhGcYIv7BFHzjk="; + buildTypesAiobotocorePackage "datapipeline" "2.15.0" + "sha256-DeudpMd35JzfAn2Oi9J8IQdLzoL82YqUAP1sfJV2Mes="; - types-aiobotocore-datasync = buildTypesAiobotocorePackage "datasync" "2.13.1" - "sha256-PBThgOkESfmfCgehLRboigoPNgB1ncQy+pTArVwyNNQ="; + types-aiobotocore-datasync = + buildTypesAiobotocorePackage "datasync" "2.15.0" + "sha256-E3SzICSZSRfKzcyUs1pXzg+jrAC6YX6S4FVUp6bqjqI="; - types-aiobotocore-dax = buildTypesAiobotocorePackage "dax" "2.13.1" - "sha256-XnENL/AXDPbiYHoP4q5dIPnZjntzEps4Z7+Zz0idGGc="; + types-aiobotocore-dax = + buildTypesAiobotocorePackage "dax" "2.15.0" + "sha256-CShLLvZXv9Wl2ipx7Yo/9EZgFd8xC51rTn+3s5IQtJs="; types-aiobotocore-detective = - buildTypesAiobotocorePackage "detective" "2.13.1" - "sha256-HPG0D8TOQDotnHwL6PsG4mpB2IgBA9mlC5sWQPwy9iQ="; + buildTypesAiobotocorePackage "detective" "2.15.0" + "sha256-1JpQFNtq/ER6zmTYo1glMgxKVz4ctYwQa3cm69otc14="; types-aiobotocore-devicefarm = - buildTypesAiobotocorePackage "devicefarm" "2.13.1" - "sha256-e2RQBZS4cXWEKtN6cQdUG/lSyP7J+alzfNlZ/8hYKUc="; + buildTypesAiobotocorePackage "devicefarm" "2.15.0" + "sha256-tRLyH18/lVx4skaoAk73cd2lE6sBJ+d8DMUaHxXIVkg="; types-aiobotocore-devops-guru = - buildTypesAiobotocorePackage "devops-guru" "2.13.1" - "sha256-zWl43w6QWSzXnBcoCuvQFv33TbgcQrPZ1A/YdturwVk="; + buildTypesAiobotocorePackage "devops-guru" "2.15.0" + "sha256-2Bv8N9q/i0WFB+F8Xu8BQZ7ws+7yJa7qgjaE7X1dQB0="; types-aiobotocore-directconnect = - buildTypesAiobotocorePackage "directconnect" "2.13.1" - "sha256-1pSPSX7Agzst4aTALLE0ZCyMZVrdnI43GQIjrO95b7E="; + buildTypesAiobotocorePackage "directconnect" "2.15.0" + "sha256-hY2hLmFtlsggdE6gyQ9lwjTjfkgfaGvWudSPcTy18NU="; types-aiobotocore-discovery = - buildTypesAiobotocorePackage "discovery" "2.13.1" - "sha256-8AL6/4Hc0e6Ew+IttkS+TH/elbNk7kAEVrlEykdiYZU="; + buildTypesAiobotocorePackage "discovery" "2.15.0" + "sha256-RnQoddR4qXiAItydDAFBTOkEsBg+DHolqqdHyfCTqXM="; - types-aiobotocore-dlm = buildTypesAiobotocorePackage "dlm" "2.13.1" - "sha256-2CyerhSqGOrXVvPVBe0f1Z/EzZVwWXHtskTAQHX9iDE="; + types-aiobotocore-dlm = + buildTypesAiobotocorePackage "dlm" "2.15.0" + "sha256-/lzVDT2qoK+6PrUozdrSyN7QTcygA7IyUGl7E1K0t4Y="; - types-aiobotocore-dms = buildTypesAiobotocorePackage "dms" "2.13.1" - "sha256-u2fQo8rxuAwME7tBm16HrSUy+WXS/Pd9HW/MEMZ+Tc4="; + types-aiobotocore-dms = + buildTypesAiobotocorePackage "dms" "2.15.0" + "sha256-9JKz+NHAudWbLGVL5L8fZwoTcom3o7JNFioRNYoVQ0Q="; - types-aiobotocore-docdb = buildTypesAiobotocorePackage "docdb" "2.13.1" - "sha256-tuBnHhnTRo/3qp8ZVSOsgZA8uY/9ZAKhu5GTcxGSbas="; + types-aiobotocore-docdb = + buildTypesAiobotocorePackage "docdb" "2.15.0" + "sha256-ZEdJM8Z7ngpa7LIMyL9+jRi0EL2IRcoG12O+cr2roYU="; types-aiobotocore-docdb-elastic = - buildTypesAiobotocorePackage "docdb-elastic" "2.13.1" - "sha256-DEFQP9zCXZaol/CIw1DYfFcIq2eia8dFxFA2wXdt3oI="; + buildTypesAiobotocorePackage "docdb-elastic" "2.15.0" + "sha256-kKf2pjIGoGuO/V/LjIDBPF+Kv0rhEO0kSCLsJe1npc8="; - types-aiobotocore-drs = buildTypesAiobotocorePackage "drs" "2.13.1" - "sha256-ZElJBbRMRxIbpEGGfukE3960MoeprT2Cutf72657KJ0="; + types-aiobotocore-drs = + buildTypesAiobotocorePackage "drs" "2.15.0" + "sha256-HxY54FJDM6VQuSAB7Qy1PNT9EhPF5z8NXn+m1ICe+aI="; - types-aiobotocore-ds = buildTypesAiobotocorePackage "ds" "2.13.1" - "sha256-0+zSG+xITYFMddqkeFLPTD3nKdZhJXRbIgqbWQ9COB0="; + types-aiobotocore-ds = + buildTypesAiobotocorePackage "ds" "2.15.0" + "sha256-iAq4ovzPUAjfH6DE94F5IJoOXMtLr3MF6b+ITByTE2c="; - types-aiobotocore-dynamodb = buildTypesAiobotocorePackage "dynamodb" "2.13.1" - "sha256-YJxyiLgbryyzCOpWUdpw28uSALB4+aNPX4kc7kq5LHA="; + types-aiobotocore-dynamodb = + buildTypesAiobotocorePackage "dynamodb" "2.15.0" + "sha256-TBiXxLLpyYHslMBCGjPVEOke+7/kj2YcBSMMNpe/d3s="; types-aiobotocore-dynamodbstreams = - buildTypesAiobotocorePackage "dynamodbstreams" "2.13.1" - "sha256-L2MY8Bg84pACtheQqvx5ifZE8Vk/BPP0WV9phEJkzYQ="; + buildTypesAiobotocorePackage "dynamodbstreams" "2.15.0" + "sha256-RRg/aabmM+Vl4b3HwafJVrIc/khRLhgVN9uflG8IGi4="; - types-aiobotocore-ebs = buildTypesAiobotocorePackage "ebs" "2.13.1" - "sha256-sFwvDd2fIsK/86xxpJ+V3WyIQQTpCLzJL5U01ecliSk="; + types-aiobotocore-ebs = + buildTypesAiobotocorePackage "ebs" "2.15.0" + "sha256-FGLzilsbA3iCnJLkdeBSYNUPsyzz4N6aNX26MUwGKLE="; - types-aiobotocore-ec2 = buildTypesAiobotocorePackage "ec2" "2.13.1" - "sha256-2UZIX3qB+1+zmI2MNNvWuW0W8J7ALTn6L2HulWJkNbE="; + types-aiobotocore-ec2 = + buildTypesAiobotocorePackage "ec2" "2.15.0" + "sha256-FnDRizmCPp39EhGU+c9UKJIFz2ZAMlTOaebcLhLBmlY="; types-aiobotocore-ec2-instance-connect = - buildTypesAiobotocorePackage "ec2-instance-connect" "2.13.1" - "sha256-1JfthjzoPg7AKiJ8+IDeub+z2h6jc8PSELzbSsZPJ+s="; + buildTypesAiobotocorePackage "ec2-instance-connect" "2.15.0" + "sha256-3KxMgKPAqCHVxv6a/70ykkJPAc/wFUIe+MxlOURCaHY="; - types-aiobotocore-ecr = buildTypesAiobotocorePackage "ecr" "2.13.1" - "sha256-M7SBFTH0R0pR/DNspYLVJT3ZjEIakkqcCVxt0by8GPI="; + types-aiobotocore-ecr = + buildTypesAiobotocorePackage "ecr" "2.15.0" + "sha256-+bAe56VT/aSJERPDE7/PuBelT5vJubs2j7mJB0pb5rA="; types-aiobotocore-ecr-public = - buildTypesAiobotocorePackage "ecr-public" "2.13.1" - "sha256-5xDlfYf5sVngVkz7cUlBVp3mZgyy7Ir9NTI9OABaAg4="; + buildTypesAiobotocorePackage "ecr-public" "2.15.0" + "sha256-5WJz1uIp+dbP3qqTCieXJBM9TCOWHPOfVQck1G8BkpY="; - types-aiobotocore-ecs = buildTypesAiobotocorePackage "ecs" "2.13.1" - "sha256-/Agvt1KPHs4tlvUPIsv3WkSISYzTf5MDF2W2p4K4ix0="; + types-aiobotocore-ecs = + buildTypesAiobotocorePackage "ecs" "2.15.0" + "sha256-KEE+rLoBBqNtP6AtFT33Xx4TzQydrvyUxKpamHe50jE="; - types-aiobotocore-efs = buildTypesAiobotocorePackage "efs" "2.13.1" - "sha256-lZip3L9g49AhZDfiLMI6Sub4tareaGK21M3x/8SL0Ds="; + types-aiobotocore-efs = + buildTypesAiobotocorePackage "efs" "2.15.0" + "sha256-3DZJT/rjzuxNi1oAc51AJguCXN9zI57cYp7Y3wTvtZs="; - types-aiobotocore-eks = buildTypesAiobotocorePackage "eks" "2.13.1" - "sha256-jcLVLCcwX2rZX6rkFXK/WnrFY24DP4cs1KOS4/SatdU="; + types-aiobotocore-eks = + buildTypesAiobotocorePackage "eks" "2.15.0" + "sha256-KEl1qvE3QAnhScIbH9/WkwRDyIHDGNsCnNBom1nkdRg="; types-aiobotocore-elastic-inference = - buildTypesAiobotocorePackage "elastic-inference" "2.13.1" - "sha256-fpf+83EIrfw0b8eRVPzv8Jso2rig/YwNvwnV1BXUTjU="; + buildTypesAiobotocorePackage "elastic-inference" "2.15.0" + "sha256-65/pni/wL4lR1hzu0C7xfVeiT4kzl980hGr/pWJAwvU="; types-aiobotocore-elasticache = - buildTypesAiobotocorePackage "elasticache" "2.13.1" - "sha256-YJDj31GBbfqvMzQieBbiqroi1c7XY+ls5WLioDopfxs="; + buildTypesAiobotocorePackage "elasticache" "2.15.0" + "sha256-GlAHYrfqx+VSBuXdwiRY4lUDqcfsmaxVXLwph6d6HCc="; types-aiobotocore-elasticbeanstalk = - buildTypesAiobotocorePackage "elasticbeanstalk" "2.13.1" - "sha256-QQftlSV3/ecfKJ+XLnh28dfQksqKSu6GL07YfnEeLjM="; + buildTypesAiobotocorePackage "elasticbeanstalk" "2.15.0" + "sha256-Cd16ST0rbvq+NOYAOQgwU2UZWDiKfUTQ4vdxQlP3+Bs="; types-aiobotocore-elastictranscoder = - buildTypesAiobotocorePackage "elastictranscoder" "2.13.1" - "sha256-L1Dvy5scS/PP3YWQ/Z8N/YjqeEennSbIGwxUNFwLYAM="; + buildTypesAiobotocorePackage "elastictranscoder" "2.15.0" + "sha256-3dGv1gPdU/0o0LBYMjzH+uoSMVzhd2dHwZNxt4jdE6U="; - types-aiobotocore-elb = buildTypesAiobotocorePackage "elb" "2.13.1" - "sha256-/vVRG4ss0RWlPk7fuSfITmFcXvRRGeRt4BDQlQudRgM="; + types-aiobotocore-elb = + buildTypesAiobotocorePackage "elb" "2.15.0" + "sha256-Y6J2/ChKP8JnrZEW8StlYONrAfRecKWJbf07I7zxIGI="; - types-aiobotocore-elbv2 = buildTypesAiobotocorePackage "elbv2" "2.13.1" - "sha256-YBnWgaK55Jo1IoQRziUoY7IIcVHjwXXlBQ5HmvEXwpw="; + types-aiobotocore-elbv2 = + buildTypesAiobotocorePackage "elbv2" "2.15.0" + "sha256-7m97yZfyrNFCI3zQYdHJ4SJ5oTACcJ+cfzMzX0MSdN8="; - types-aiobotocore-emr = buildTypesAiobotocorePackage "emr" "2.13.1" - "sha256-6vuMBCR5cd8H7VXvPZpTyxPex9/71PfE2aVmZSRPVxw="; + types-aiobotocore-emr = + buildTypesAiobotocorePackage "emr" "2.15.0" + "sha256-4GNDh92LYUWxXjvgiYrOsY2joFbHalolgAWtnd79AJQ="; types-aiobotocore-emr-containers = - buildTypesAiobotocorePackage "emr-containers" "2.13.1" - "sha256-oiAWpmJBs/kvNdKXnHqvWpY3DnX31r3QvW2JzOXXZVg="; + buildTypesAiobotocorePackage "emr-containers" "2.15.0" + "sha256-TnEfypfapADarPuVOfl0SzNnJSFJUQmxmeoDZ869fIk="; types-aiobotocore-emr-serverless = - buildTypesAiobotocorePackage "emr-serverless" "2.13.1" - "sha256-+nuAIs7l6xVSGcMg01AdohUqTkU4vSWbU+8hZ+jT5PI="; + buildTypesAiobotocorePackage "emr-serverless" "2.15.0" + "sha256-bjW88670lzwRWbIp5dHEJIf4EfJSOkQl7CIG2G/wpsQ="; types-aiobotocore-entityresolution = - buildTypesAiobotocorePackage "entityresolution" "2.13.1" - "sha256-zgMGXC6b2ooZhZFdaQDnf/Nx5IJAsqTW6egXMRtO4qg="; + buildTypesAiobotocorePackage "entityresolution" "2.15.0" + "sha256-9x6SSolu1CVMjQitu4/8QBxxhdk6G65onKE0EW4oGi0="; - types-aiobotocore-es = buildTypesAiobotocorePackage "es" "2.13.1" - "sha256-xjWWFmGM03NGlOKlOo0v7L8lVy03q3P8wBhLYEKa7xs="; + types-aiobotocore-es = + buildTypesAiobotocorePackage "es" "2.15.0" + "sha256-s8lgcAKVZH3rxzogSj74xJ98thChBIvePIvJmHKrApc="; - types-aiobotocore-events = buildTypesAiobotocorePackage "events" "2.13.1" - "sha256-Pvsd2abp28BF7V+2IOJgNlxHLiXy/3rDxNQ0S6aowCU="; + types-aiobotocore-events = + buildTypesAiobotocorePackage "events" "2.15.0" + "sha256-bgdyFuggcdUfDxEtDjgbmCIc88z4wGbdKQrYmIiZKjs="; types-aiobotocore-evidently = - buildTypesAiobotocorePackage "evidently" "2.13.1" - "sha256-6icdeO3oML5yEkfbA6Oaao+bX3scvXhTqefVO9SpBBo="; + buildTypesAiobotocorePackage "evidently" "2.15.0" + "sha256-ZNKyeP1THt85PeKqrof84e3glJ4x1TwT0ziqaCXKedk="; - types-aiobotocore-finspace = buildTypesAiobotocorePackage "finspace" "2.13.1" - "sha256-Ee30GzLvU5oERCCJEzzxNHim4Dy1kA0UZ1GJBvBWLZc="; + types-aiobotocore-finspace = + buildTypesAiobotocorePackage "finspace" "2.15.0" + "sha256-gvwDgITwyGZFVndTMKIkD0svxPF3Ur09De7rtP1N57A="; types-aiobotocore-finspace-data = - buildTypesAiobotocorePackage "finspace-data" "2.13.1" - "sha256-1e7WBzT7N9q0zq2xBihunaUUPgg5LE/krn3rRnB4gLw="; + buildTypesAiobotocorePackage "finspace-data" "2.15.0" + "sha256-+NpGar24GvTd3+3umx0axL2vNJQ0RtDKZzuKvNJu2RY="; - types-aiobotocore-firehose = buildTypesAiobotocorePackage "firehose" "2.13.1" - "sha256-Tso0OK3RVPr3MEalyLKZlnBPAA3W1dIE26ZOxSV4uRs="; + types-aiobotocore-firehose = + buildTypesAiobotocorePackage "firehose" "2.15.0" + "sha256-BD2gBxbEGlAolHT7xHBj58i4zVHXy3o0xGpIprcCA1I="; - types-aiobotocore-fis = buildTypesAiobotocorePackage "fis" "2.13.1" - "sha256-XL0LHEP21vqplbAe8YnakAFM47LCp8D+uXnlzUxG+DY="; + types-aiobotocore-fis = + buildTypesAiobotocorePackage "fis" "2.15.0" + "sha256-qRkkIDm1n3z41pVntjSLypDnM3UVQlXuh5A+sWipFGY="; - types-aiobotocore-fms = buildTypesAiobotocorePackage "fms" "2.13.1" - "sha256-VfwYpj2KVH6P1ELW1YTHlfms4pNdFsbJ/cPch5ygM7I="; + types-aiobotocore-fms = + buildTypesAiobotocorePackage "fms" "2.15.0" + "sha256-i2wfly+9R4KyK1rsRIwKbK3P6OnXpfCxWC8ZV1Fx1M4="; - types-aiobotocore-forecast = buildTypesAiobotocorePackage "forecast" "2.13.1" - "sha256-jn2O34ZHKZXzoTSreNfPUn8hdY4OR8JYmK3bbkh7Gjk="; + types-aiobotocore-forecast = + buildTypesAiobotocorePackage "forecast" "2.15.0" + "sha256-SC0rCCOVa47auM4pasWds3nOzO19anbT5jL1UVIUKXo="; types-aiobotocore-forecastquery = - buildTypesAiobotocorePackage "forecastquery" "2.13.1" - "sha256-ZBup38Uw4U9d7QbLgAfxortKEIUq3TJbevgJIya77fk="; + buildTypesAiobotocorePackage "forecastquery" "2.15.0" + "sha256-3+z4Ef85r9aOPdkLXV8L/+9MBvQpLNkFIElRBlQLsRo="; types-aiobotocore-frauddetector = - buildTypesAiobotocorePackage "frauddetector" "2.13.1" - "sha256-xSR3m24DmGDvaq7aCYcmM5ZYktoNDaTYIat0N1qICD4="; + buildTypesAiobotocorePackage "frauddetector" "2.15.0" + "sha256-UroaCR4B1cgLe4l2+RKdUa9/Q6LLpglmohhYDROSdnU="; - types-aiobotocore-fsx = buildTypesAiobotocorePackage "fsx" "2.13.1" - "sha256-YIZ3hBCtHtT0S9DUC0nMTUv6CIf+zeBhcCwaR1AOfvM="; + types-aiobotocore-fsx = + buildTypesAiobotocorePackage "fsx" "2.15.0" + "sha256-9iYbsEG4J4HeXBuCiQQtzOLVBzlkkcg404TbQGg+E7E="; - types-aiobotocore-gamelift = buildTypesAiobotocorePackage "gamelift" "2.13.1" - "sha256-V1G7mp/+nvF5bA/E6yGby1lykK/G7O9Q1cPbEuyJQ+8="; + types-aiobotocore-gamelift = + buildTypesAiobotocorePackage "gamelift" "2.15.0" + "sha256-x9KREjqQw/DMOD3cbdw19mH4zOxvqKcMIRe/doGGn0s="; types-aiobotocore-gamesparks = buildTypesAiobotocorePackage "gamesparks" "2.7.0" - "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; + "sha256-oVbKtuLMPpCQcZYx/cH1Dqjv/t6/uXsveflfFVqfN+8="; - types-aiobotocore-glacier = buildTypesAiobotocorePackage "glacier" "2.13.1" - "sha256-hEwuAdbhYop3DmUQQFSrFG1pgqGVqFWp+LGutURhPao="; + types-aiobotocore-glacier = + buildTypesAiobotocorePackage "glacier" "2.15.0" + "sha256-k/oPZr4TznL4ygQND0EuXCsSZNgVouBTm8Pih3m3j6k="; types-aiobotocore-globalaccelerator = - buildTypesAiobotocorePackage "globalaccelerator" "2.13.1" - "sha256-eId3UX9+TGCRGXfQKQl0nFdhtsKex6G4t8FWstwi+c0="; + buildTypesAiobotocorePackage "globalaccelerator" "2.15.0" + "sha256-e6bP28zUjuyGn9Y+IWJyYkcRNTQ8odpK6vlZUuxSIHg="; - types-aiobotocore-glue = buildTypesAiobotocorePackage "glue" "2.13.1" - "sha256-sCQiehUAJHXQ5gaSrR4Cly3X4xYelficyLvdudBFVmg="; + types-aiobotocore-glue = + buildTypesAiobotocorePackage "glue" "2.15.0" + "sha256-iEi6pPUnJ1VRFXpdFhNVDf8fQ94kByVZEUzLC4SPYIQ="; - types-aiobotocore-grafana = buildTypesAiobotocorePackage "grafana" "2.13.1" - "sha256-TAUw1rS+xXf6CDJ1tZBoBQ+0QF3va81ZKr9kAfZCi1g="; + types-aiobotocore-grafana = + buildTypesAiobotocorePackage "grafana" "2.15.0" + "sha256-vQJJB10LNbGNvQTj+xHVneRChhxaFZkHXel5DRg7RSs="; types-aiobotocore-greengrass = - buildTypesAiobotocorePackage "greengrass" "2.13.1" - "sha256-CNPpXxrRN83LzxrsGpzdevytWDR/fpCADkRo59SNMQ8="; + buildTypesAiobotocorePackage "greengrass" "2.15.0" + "sha256-RDhbq/ucOitxsOeElmNV5kXGlVTHv/g2d5sxAaBzLlI="; types-aiobotocore-greengrassv2 = - buildTypesAiobotocorePackage "greengrassv2" "2.13.1" - "sha256-WI+Jt+83JB3khjm1gix094Sapxbs+yNKIRhgRs6L+pk="; + buildTypesAiobotocorePackage "greengrassv2" "2.15.0" + "sha256-47eFTzMPom+q4Ha6HRjPOQCMbn9X5OtEbpScbH+JrpA="; types-aiobotocore-groundstation = - buildTypesAiobotocorePackage "groundstation" "2.13.1" - "sha256-7wDtgajzXuJx2Ydpfvi7SWyr3bR5jw20mnadkyienfA="; + buildTypesAiobotocorePackage "groundstation" "2.15.0" + "sha256-6+KjFU7B46BL2wsXpMawQT/3DTjdVfcir/XVq1mYS0c="; types-aiobotocore-guardduty = - buildTypesAiobotocorePackage "guardduty" "2.13.1" - "sha256-e35CQoyx1e5wSd5A5W4pAWK8WmbAftJqTpMcmijUShw="; + buildTypesAiobotocorePackage "guardduty" "2.15.0" + "sha256-IBiDqyfJYhKyqt3v3hd8y72UXawwUed3BILsswrWkmg="; - types-aiobotocore-health = buildTypesAiobotocorePackage "health" "2.13.1" - "sha256-DAMRdMfG+Ry8PkiECiJCwIXUbjTXWGZ6EfgxPI6BRfo="; + types-aiobotocore-health = + buildTypesAiobotocorePackage "health" "2.15.0" + "sha256-WMgJb50/QiojGKgh6s81aKjFrewlh3bx6YWroTIZabA="; types-aiobotocore-healthlake = - buildTypesAiobotocorePackage "healthlake" "2.13.1" - "sha256-m1LqsoGlWh7Hga+l/uZ3OZa6NK9yd00BviT0VDfuue4="; + buildTypesAiobotocorePackage "healthlake" "2.15.0" + "sha256-qy++uEn9Ph2Ek6Rzpth6j3x1NMK1AqoF50HFcVZBbIU="; types-aiobotocore-honeycode = buildTypesAiobotocorePackage "honeycode" "2.13.0" - "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; + "sha256-DeeheoQeFEcDH21DSNs2kSR1rjnPLtTgz0yNCFnE+Io="; - types-aiobotocore-iam = buildTypesAiobotocorePackage "iam" "2.13.1" - "sha256-g9Tkt2rOIg9Y9RwlTh80eiX2BEj4TqhGNWWMKomFEKU="; + types-aiobotocore-iam = + buildTypesAiobotocorePackage "iam" "2.15.0" + "sha256-HcCuedSOhN7B4xwCH2zQz7RxrVdz6y+L7ZfNoCWG8RE="; types-aiobotocore-identitystore = - buildTypesAiobotocorePackage "identitystore" "2.13.1" - "sha256-SslzL8/NmeF4nHNO/7BGHle/brlzc/V4D+ssqfcZNFo="; + buildTypesAiobotocorePackage "identitystore" "2.15.0" + "sha256-etmeEUkNyB/I760pSt3VEqbzqKnk44Evi1zqUc1SxFI="; types-aiobotocore-imagebuilder = - buildTypesAiobotocorePackage "imagebuilder" "2.13.1" - "sha256-GgkFg7I/a5wa03SlZtxYV2aGolNgzoB7TZrQkp7rjYI="; + buildTypesAiobotocorePackage "imagebuilder" "2.15.0" + "sha256-0jIUpv7Njy5h6vzRxnKqr0kIIiHBUkOZh+NEW1s6tLw="; types-aiobotocore-importexport = - buildTypesAiobotocorePackage "importexport" "2.13.1" - "sha256-ovXUrl03Mut4QJZeItbxbtiuTDt3beGv0SjUBxZLyrs="; + buildTypesAiobotocorePackage "importexport" "2.15.0" + "sha256-v0gErsdr3Ljiyil8Ct7iNGqf61VenoExZOUhH760SPA="; types-aiobotocore-inspector = - buildTypesAiobotocorePackage "inspector" "2.13.1" - "sha256-imFheQxmne5h9hN6yQOlSLWRDjdEYAW2enHhbTv+ei0="; + buildTypesAiobotocorePackage "inspector" "2.15.0" + "sha256-HInhkpxGJ886jRhspnQDWJkRF3jmo5J1PetVNrzuS7Q="; types-aiobotocore-inspector2 = - buildTypesAiobotocorePackage "inspector2" "2.13.1" - "sha256-N/xZO2FneEYp7Ux5OIM9XXHEyiZGfA5pDogPB7R8Les="; + buildTypesAiobotocorePackage "inspector2" "2.15.0" + "sha256-hvFzgJO69n+Jr5trZLv85PuActzWRXrLfRW0Iqdn9jk="; types-aiobotocore-internetmonitor = - buildTypesAiobotocorePackage "internetmonitor" "2.13.1" - "sha256-vEDQ6b8yf6yopj0cce1LIKR53ipmbAx5T/BI47shgEQ="; + buildTypesAiobotocorePackage "internetmonitor" "2.15.0" + "sha256-qgg/j2d763Q4e4axjkhXC3I+BnlJ24j4sZ4hxbvpgYA="; - types-aiobotocore-iot = buildTypesAiobotocorePackage "iot" "2.13.1" - "sha256-osgn2jHhrm9TiecS+jPV7VQW80ci8klwS85yFf4U6ik="; + types-aiobotocore-iot = + buildTypesAiobotocorePackage "iot" "2.15.0" + "sha256-/KgXN3dWVw/ITZ51SOtJRvlUqc1kPxalRa7l7Rb6gSk="; - types-aiobotocore-iot-data = buildTypesAiobotocorePackage "iot-data" "2.13.1" - "sha256-WLlWLxNPIOi+f2lsL/aM7TMfHsW+nCP+kDv8irqKlK0="; + types-aiobotocore-iot-data = + buildTypesAiobotocorePackage "iot-data" "2.15.0" + "sha256-7q+IBCltYgU5i8QuLlHm0ZFdZcDVDPLmw+tkrBSHeQQ="; types-aiobotocore-iot-jobs-data = - buildTypesAiobotocorePackage "iot-jobs-data" "2.13.1" - "sha256-O5Qi0KLLqwZhK45Uzt3ufoS2sIuNaB/0gKR9y+KjEEU="; + buildTypesAiobotocorePackage "iot-jobs-data" "2.15.0" + "sha256-aKQepzdWJBZQ+f633DVLErPldqrjyrkkAYMZt4Bi3gY="; types-aiobotocore-iot-roborunner = buildTypesAiobotocorePackage "iot-roborunner" "2.12.2" - "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; + "sha256-O/nGvYfUibI4EvHgONtkYHFv/dZSpHCehXjietPiMJo="; types-aiobotocore-iot1click-devices = - buildTypesAiobotocorePackage "iot1click-devices" "2.13.1" - "sha256-56U6mEIPQxNaBbml+3efOg0Bcoy0aTe6wlYGVg/Rkjk="; + buildTypesAiobotocorePackage "iot1click-devices" "2.15.0" + "sha256-c81lJVCAx4haFwRtRfzab8A6YKVspaUSwI9i/nd7jw8="; types-aiobotocore-iot1click-projects = - buildTypesAiobotocorePackage "iot1click-projects" "2.13.1" - "sha256-jkU6nulurbaTVshG1RCdvYFB23kQNn8VJhuuvLrpI8M="; + buildTypesAiobotocorePackage "iot1click-projects" "2.15.0" + "sha256-Bb9ze8VK6lRT0Ts1PhQ6jrOrjcMzYYrThqVCN4COdRw="; types-aiobotocore-iotanalytics = - buildTypesAiobotocorePackage "iotanalytics" "2.13.1" - "sha256-3m6Naodc/JUxmSIVO3St6DVvBGMNQmelz7UW7xw7g5w="; + buildTypesAiobotocorePackage "iotanalytics" "2.15.0" + "sha256-eOuQ4Bead3AQ4zD7Ibc/J7BO1bT3FxY0hlUB8qLz390="; types-aiobotocore-iotdeviceadvisor = - buildTypesAiobotocorePackage "iotdeviceadvisor" "2.13.1" - "sha256-HScTcygNmLUZIaj+jBp0gbPHEyhvpWC3l5KrON7+yNQ="; + buildTypesAiobotocorePackage "iotdeviceadvisor" "2.15.0" + "sha256-vrCjbqXz1DGStxCJXwQgrQHzI7BIxGee5zolY/pU6JI="; types-aiobotocore-iotevents = - buildTypesAiobotocorePackage "iotevents" "2.13.1" - "sha256-f3GMaGbe8iaz9oBX3A9GVCeyDztAl/Z8FFUqNlt60K8="; + buildTypesAiobotocorePackage "iotevents" "2.15.0" + "sha256-3YScaOGMmSYRY+ObPUMWMsCJuUy6dhOYP9LNzluZnhk="; types-aiobotocore-iotevents-data = - buildTypesAiobotocorePackage "iotevents-data" "2.13.1" - "sha256-5gf8jxI3g2aB6Nq+6qZELrFc3S0yyxswnAP7lDERSvs="; + buildTypesAiobotocorePackage "iotevents-data" "2.15.0" + "sha256-Q/i0S+Y/tbnM5buFT838rLwBKJenYcPmfwBq7pJ6pyQ="; types-aiobotocore-iotfleethub = - buildTypesAiobotocorePackage "iotfleethub" "2.13.1" - "sha256-ioxTcKwSmYOuLykUwiRwFkOUim5TWqL8aD4KCMONHkI="; + buildTypesAiobotocorePackage "iotfleethub" "2.15.0" + "sha256-EvUSF8PXk7Vb3+ic6ZtSdHJ63w2SmS0pp7QytP/tQss="; types-aiobotocore-iotfleetwise = - buildTypesAiobotocorePackage "iotfleetwise" "2.13.1" - "sha256-R04IXZingyp/1DDL30QOhNjnbfoLIj4+GLkzWoCquqQ="; + buildTypesAiobotocorePackage "iotfleetwise" "2.15.0" + "sha256-ZEWme0qNdJpQqTKit2wqMbsCa+1E+8+TaqVz/NwolSQ="; types-aiobotocore-iotsecuretunneling = - buildTypesAiobotocorePackage "iotsecuretunneling" "2.13.1" - "sha256-q2zWTqraceZkg8kPVptFBmK2xuVvhFbx6EEpqcuWi7I="; + buildTypesAiobotocorePackage "iotsecuretunneling" "2.15.0" + "sha256-O48C/03s2bPB8DhN00BuwoW4gIqUnQG6Dm2I+Vs3waU="; types-aiobotocore-iotsitewise = - buildTypesAiobotocorePackage "iotsitewise" "2.13.1" - "sha256-r8ye5bXfJjggdS2CSAzB1MTxUqW3WYnRhgyty1zUt8E="; + buildTypesAiobotocorePackage "iotsitewise" "2.15.0" + "sha256-smId9Cxm0QJ7YiORYp3FdzRNt96kFIlpnWBMbSldtYE="; types-aiobotocore-iotthingsgraph = - buildTypesAiobotocorePackage "iotthingsgraph" "2.13.1" - "sha256-DUyf0i1vj8/YKZEvpeI28Cxaa4m9jz9LNKIxM8mLFvQ="; + buildTypesAiobotocorePackage "iotthingsgraph" "2.15.0" + "sha256-cyjMATxGhhu4oYoa3l076VdgKJ2HHcrqrkGOYvAYMnE="; types-aiobotocore-iottwinmaker = - buildTypesAiobotocorePackage "iottwinmaker" "2.13.1" - "sha256-apD3UPBHiyMDEbf3y1L5tENdWEfum8LvCNc5dIq7tvc="; + buildTypesAiobotocorePackage "iottwinmaker" "2.15.0" + "sha256-xOmpDzfMY28x5eebi6P9pzPeM0bOdaj5yYeIaMnaI9E="; types-aiobotocore-iotwireless = - buildTypesAiobotocorePackage "iotwireless" "2.13.1" - "sha256-Z133nUtghZZJNhSJdn1kwCyoerN+sANlikrse2Up0Mo="; + buildTypesAiobotocorePackage "iotwireless" "2.15.0" + "sha256-d4Vxj2CQVXYTIPkPMF7hAi6TK3RTebuelZ+LfVCyIb8="; - types-aiobotocore-ivs = buildTypesAiobotocorePackage "ivs" "2.13.1" - "sha256-/xTDdUOgKRBROTAWa/Yo1to7fEDXDzeidbljgFe1QQo="; + types-aiobotocore-ivs = + buildTypesAiobotocorePackage "ivs" "2.15.0" + "sha256-EefoDS/gNX1VkN5/5lRf4lOTHTmU0h1uZWFPiQERzvE="; types-aiobotocore-ivs-realtime = - buildTypesAiobotocorePackage "ivs-realtime" "2.13.1" - "sha256-rnGISy6NHILsoihnWVOAt9ESTcOTeBHt2VD/mlgwWXc="; + buildTypesAiobotocorePackage "ivs-realtime" "2.15.0" + "sha256-GBan8Ln1n/ESWDNfbRlapLI5hgyamHTKQZdroasPpxo="; - types-aiobotocore-ivschat = buildTypesAiobotocorePackage "ivschat" "2.13.1" - "sha256-9xCBsQGk8LKSl3sbZ+wgbzWICNfZM6rPcTrVBZ6qEjM="; + types-aiobotocore-ivschat = + buildTypesAiobotocorePackage "ivschat" "2.15.0" + "sha256-SE0wPCcmri42ZHBqw1zA07JHA29Zq40QAfeuGKb5cis="; - types-aiobotocore-kafka = buildTypesAiobotocorePackage "kafka" "2.13.1" - "sha256-xksZ5c/RNGUQkaLjchkngrsNFrS4MPcLp6t6RUkyeTo="; + types-aiobotocore-kafka = + buildTypesAiobotocorePackage "kafka" "2.15.0" + "sha256-eCQIXF+idvdZZa29cdQQbNWqDCl7YRBiL6oYooS82Xw="; types-aiobotocore-kafkaconnect = - buildTypesAiobotocorePackage "kafkaconnect" "2.13.1" - "sha256-YXWl72Ai1/RMXtHIjyNgrq14Kar64OcZumCzotqI0Oo="; + buildTypesAiobotocorePackage "kafkaconnect" "2.15.0" + "sha256-a9/2yUk/rq0npsCyrgK/2dNWVE5qP8tqF7qpSsyT40I="; - types-aiobotocore-kendra = buildTypesAiobotocorePackage "kendra" "2.13.1" - "sha256-6SHFiSXNJGeq2FdvSW/G8adYO3CGw/IBH5Q0TLWCvfI="; + types-aiobotocore-kendra = + buildTypesAiobotocorePackage "kendra" "2.15.0" + "sha256-4xHwrD35jq9gbPR7X0TJx60GxystcHdMCuTxSZKckhw="; types-aiobotocore-kendra-ranking = - buildTypesAiobotocorePackage "kendra-ranking" "2.13.1" - "sha256-+OhqW5cU8bu5bYf6u4hcilZYfUrxaVwJCSY77MrkPXU="; + buildTypesAiobotocorePackage "kendra-ranking" "2.15.0" + "sha256-6MoK7C3eEhaty4jn6/Jc4o/WsZRTxDQ0FATrpSodTME="; types-aiobotocore-keyspaces = - buildTypesAiobotocorePackage "keyspaces" "2.13.1" - "sha256-OYXYg9JF3cwJFvWVkvrWNSJN1VYpqBAlzxCBvNW4Z1I="; + buildTypesAiobotocorePackage "keyspaces" "2.15.0" + "sha256-aIjdGRxpS6bbiarTM425jE8B2xbVYKaTaiJhVSQ/4JM="; - types-aiobotocore-kinesis = buildTypesAiobotocorePackage "kinesis" "2.13.1" - "sha256-JhGNdHtkiPvMht53v6n7wNR8/bry/zoDoqqzygMyo4g="; + types-aiobotocore-kinesis = + buildTypesAiobotocorePackage "kinesis" "2.15.0" + "sha256-hzKV9+gFBwkIbNhlUdDrRyVFU3/VasZfyTjaZNGA0MI="; types-aiobotocore-kinesis-video-archived-media = - buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.13.1" - "sha256-uE/3/iBMMIk2qSjLcZ9Jv26Tfpr83p12jNnZme7gWLU="; + buildTypesAiobotocorePackage "kinesis-video-archived-media" "2.15.0" + "sha256-w2b8fP8AEH3bh3iWPym7zAmX0eyXy4hobqYXwAOs3zg="; types-aiobotocore-kinesis-video-media = - buildTypesAiobotocorePackage "kinesis-video-media" "2.13.1" - "sha256-e1zl7BksbzYyhrNz3y+b+6g/iPmeUZkj4lgJjWFIyQY="; + buildTypesAiobotocorePackage "kinesis-video-media" "2.15.0" + "sha256-OkF8NwJTK9doelF0LCoKivpX8IQL0gJT+WgDEi1ZhkY="; types-aiobotocore-kinesis-video-signaling = - buildTypesAiobotocorePackage "kinesis-video-signaling" "2.13.1" - "sha256-2+B07qNWd1UXfVa7yeV31mBQ8d9L/5arYWTNjMaYfpQ="; + buildTypesAiobotocorePackage "kinesis-video-signaling" "2.15.0" + "sha256-/1eZFJLoCnBbvQlSSBgwbEZRCfFdZIUbNIimTVfnxAE="; types-aiobotocore-kinesis-video-webrtc-storage = - buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.13.1" - "sha256-f4ZEhcEKLz9tXnZ5jY2YlbBejX6H80be3GPIRbx4XxE="; + buildTypesAiobotocorePackage "kinesis-video-webrtc-storage" "2.15.0" + "sha256-++LfFLQ6NkCs6NwMkJzZYUFvEw1iJA24NV0nq+9eMnY="; types-aiobotocore-kinesisanalytics = - buildTypesAiobotocorePackage "kinesisanalytics" "2.13.1" - "sha256-hHR/i8xW0Qy+IG3grNl7cyzBJDfXCcAzUaOEP1wF3G0="; + buildTypesAiobotocorePackage "kinesisanalytics" "2.15.0" + "sha256-QaWFDq5DZiaqHZDOt9uat0d+YFsJymd+J+dJ8FBnsJ0="; types-aiobotocore-kinesisanalyticsv2 = - buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.13.1" - "sha256-csqNXzwvVd0nMKA+52gVLt/PGik94ObuCxUrCWUfAAQ="; + buildTypesAiobotocorePackage "kinesisanalyticsv2" "2.15.0" + "sha256-qoGXnmE2xrttERNdlD0vcgGvusymNo43Qmke53Cu9O0="; types-aiobotocore-kinesisvideo = - buildTypesAiobotocorePackage "kinesisvideo" "2.13.1" - "sha256-O129CbGxMDABLOQca2Xb4tK76+Xm/ZdfLASp42kT/JE="; + buildTypesAiobotocorePackage "kinesisvideo" "2.15.0" + "sha256-i5itjd7OC0MIzdV4cXYk/jKnL/fi7PqfcjBqEBxOGpU="; - types-aiobotocore-kms = buildTypesAiobotocorePackage "kms" "2.13.1" - "sha256-WXaLZBIbash+K+F1RaSUGU1WnEg58DON2dgzsgUpZ0Y="; + types-aiobotocore-kms = + buildTypesAiobotocorePackage "kms" "2.15.0" + "sha256-tNrJ8m8e1yvBxcnAFbwDPr6mLQSEYCuip/6cnIfnkYw="; types-aiobotocore-lakeformation = - buildTypesAiobotocorePackage "lakeformation" "2.13.1" - "sha256-0951Vo8Y8hRrgveEGigll6mfG7YYSpNSXBPfzgS/4o0="; + buildTypesAiobotocorePackage "lakeformation" "2.15.0" + "sha256-db+t78Wdjp9Q0Yelq00j4uGO3COAq9wAQMiS04OHCDM="; - types-aiobotocore-lambda = buildTypesAiobotocorePackage "lambda" "2.13.1" - "sha256-7B6cg/p00awvo8rN0NKh+A1vbBer6TTAYNjIFYQAW10="; + types-aiobotocore-lambda = + buildTypesAiobotocorePackage "lambda" "2.15.0" + "sha256-+zVb3jcfhxcwdZInmNgI5XD8kYg+cOztM5+vKw0NQig="; types-aiobotocore-lex-models = - buildTypesAiobotocorePackage "lex-models" "2.13.1" - "sha256-mcJOptD3eqAg+C2Ghgemd6juQCklxAmeiELstnubF4g="; + buildTypesAiobotocorePackage "lex-models" "2.15.0" + "sha256-CTBYSHSjk140r5/ntNrbhCW9qHyJkHKnuzDGy/VnvkA="; types-aiobotocore-lex-runtime = - buildTypesAiobotocorePackage "lex-runtime" "2.13.1" - "sha256-4j0rWpj8fE+MOZ0s6kB9KTQ2KIeWBXrxfmnY8qkKXtw="; + buildTypesAiobotocorePackage "lex-runtime" "2.15.0" + "sha256-HTMVi8/mDsMfLYxbOa1JoOqfFGyG87k5PDy6QBCWmFo="; types-aiobotocore-lexv2-models = - buildTypesAiobotocorePackage "lexv2-models" "2.13.1" - "sha256-mHRxhIYfxjSSEFc3AHF/wcJHt3CAEqlfH6dJC/NWLnA="; + buildTypesAiobotocorePackage "lexv2-models" "2.15.0" + "sha256-n+YKYwgx6LK4biiy7R0jroAniQH5eyJAZNCwt3bmd5U="; types-aiobotocore-lexv2-runtime = - buildTypesAiobotocorePackage "lexv2-runtime" "2.13.1" - "sha256-QfTy63MBeZpwVNOowmy9VmkMEkpy9ZVyIHyifyDTmiU="; + buildTypesAiobotocorePackage "lexv2-runtime" "2.15.0" + "sha256-dsNybSvDpCf8WcCyLmsoNmvGyAYjOPMpaZEuT1Uon6w="; types-aiobotocore-license-manager = - buildTypesAiobotocorePackage "license-manager" "2.13.1" - "sha256-S23klxiPDQkyCy4xMzxh0exywft91qwkAxDit/vUb2Y="; + buildTypesAiobotocorePackage "license-manager" "2.15.0" + "sha256-A/uBBx6+WR/QfyVSRoQ5QvxgJBoKYKomaV4Fy9bpdXs="; types-aiobotocore-license-manager-linux-subscriptions = - buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.13.1" - "sha256-u2O+8yfE8goI29SUJ1lKTJ8h5KNmVFAb0Iob9RF1ZmQ="; + buildTypesAiobotocorePackage "license-manager-linux-subscriptions" "2.15.0" + "sha256-Fsr3RTvMDVSagXHnZj2NMoqLjcVIYBGWKT5WsnIWebg="; types-aiobotocore-license-manager-user-subscriptions = - buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.13.1" - "sha256-Zet0z6TYa7VPEJd8f6fOkI44hC8Ia6h3gsQ/CLokBy4="; + buildTypesAiobotocorePackage "license-manager-user-subscriptions" "2.15.0" + "sha256-UDxwOQm+n6wABPchWLmTFE0K1CjPiQwISmLl+7Za9w4="; types-aiobotocore-lightsail = - buildTypesAiobotocorePackage "lightsail" "2.13.1" - "sha256-RozP6XcqZnOuSWlSK4C9tLm74OnzBe8n9f9mrXHQhX0="; + buildTypesAiobotocorePackage "lightsail" "2.15.0" + "sha256-iIDdWLBhFNNxtMSardWyzHL8JcvgHJIaudJ+05PXL7Q="; - types-aiobotocore-location = buildTypesAiobotocorePackage "location" "2.13.1" - "sha256-skC7EDojgvq38MIZLBwFnMCEPcnYs3bB8nEN2Ca0Toc="; + types-aiobotocore-location = + buildTypesAiobotocorePackage "location" "2.15.0" + "sha256-fodpQvoIPV1oTNgnSfW+3zM4AMLwe3pHVtYwZYB2kaA="; - types-aiobotocore-logs = buildTypesAiobotocorePackage "logs" "2.13.1" - "sha256-GRK5GRJBX9jn7hiXrBxTH3cyByDbfoW7Q+SxBi1tsPg="; + types-aiobotocore-logs = + buildTypesAiobotocorePackage "logs" "2.15.0" + "sha256-ZhbzssEml+X1laF9Cs2MegVLZ4EJCV3E4ZxLW12vEKU="; types-aiobotocore-lookoutequipment = - buildTypesAiobotocorePackage "lookoutequipment" "2.13.1" - "sha256-dokSUVIcQAXkiPjB8cL4/HNW0vwh6Qz+npRzvELA0fc="; + buildTypesAiobotocorePackage "lookoutequipment" "2.15.0" + "sha256-H2iedaGVN7uM7BLlzcnhdSbDQI96paStbohcijsRBUk="; types-aiobotocore-lookoutmetrics = - buildTypesAiobotocorePackage "lookoutmetrics" "2.13.1" - "sha256-/CWGYa+qwyI9ULV7uAM8FXJOnP/pdiHQK1A+C2se1gw="; + buildTypesAiobotocorePackage "lookoutmetrics" "2.15.0" + "sha256-VqVU6ziEvRtSQ60jPw2/XZo7dZTyAaLNUZ+6W9V8x+g="; types-aiobotocore-lookoutvision = - buildTypesAiobotocorePackage "lookoutvision" "2.13.1" - "sha256-r5VzRqV7QHygTvRNb3Hfucr1V97U6k77SWYpz4hbSaw="; + buildTypesAiobotocorePackage "lookoutvision" "2.15.0" + "sha256-7NoKEpbYPGMaaE2l8fzvE7wymcHOGy7La7sPzTWZzn8="; - types-aiobotocore-m2 = buildTypesAiobotocorePackage "m2" "2.13.1" - "sha256-rM8R5/foSrAn6tg/mKSI33fRuZHcvvZE4gReNgMUdxo="; + types-aiobotocore-m2 = + buildTypesAiobotocorePackage "m2" "2.15.0" + "sha256-oR4biBouqRzHpLi8t62eicIBAC6uDxKhHCFJXcw98VA="; types-aiobotocore-machinelearning = - buildTypesAiobotocorePackage "machinelearning" "2.13.1" - "sha256-DphFsB4gD/drCtzonYMi00Uf6xZDxnZMwrPe3NhghOQ="; + buildTypesAiobotocorePackage "machinelearning" "2.15.0" + "sha256-/7OUplbaSrqFCX6FM5It2M0einbHeKdPuhlPuW1oAf0="; - types-aiobotocore-macie = buildTypesAiobotocorePackage "macie" "2.7.0" - "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; + types-aiobotocore-macie = + buildTypesAiobotocorePackage "macie" "2.7.0" + "sha256-hJJtGsK2b56nKX1ZhiarC+ffyjHYWRiC8II4oyDZWWw="; - types-aiobotocore-macie2 = buildTypesAiobotocorePackage "macie2" "2.13.1" - "sha256-biycbIuk14p+Ith65PIqsYjjXsJJfKu3zpmSE+OzYWo="; + types-aiobotocore-macie2 = + buildTypesAiobotocorePackage "macie2" "2.15.0" + "sha256-sZbckbmw1LfBLDiRjtfk2ogZe45H35vViBvr/z/syY8="; types-aiobotocore-managedblockchain = - buildTypesAiobotocorePackage "managedblockchain" "2.13.1" - "sha256-Y0f3zLBsmV4q1CHr3EnFJEfonvl/rxlSiJv6KZRE5Io="; + buildTypesAiobotocorePackage "managedblockchain" "2.15.0" + "sha256-rCmVEy/oDykR2eiEZ8K1rP+M9hvie8Fr/aVXGX/mnng="; types-aiobotocore-managedblockchain-query = - buildTypesAiobotocorePackage "managedblockchain-query" "2.13.1" - "sha256-eafaAWDhDSUnw/JmvlHi0h8Ozm5ZHx23cKmwLQgbouU="; + buildTypesAiobotocorePackage "managedblockchain-query" "2.15.0" + "sha256-234BPfns0M64IQL6zLw2YXrEm6Gv9dr8jFZ6W9kiIFc="; types-aiobotocore-marketplace-catalog = - buildTypesAiobotocorePackage "marketplace-catalog" "2.13.1" - "sha256-11WiQ99Eel1MZtnjQgmifvsq7teJPqhyJxC979W+Ttg="; + buildTypesAiobotocorePackage "marketplace-catalog" "2.15.0" + "sha256-xt9u8d4mUUzkieGKwsh/682O1EFplNOCvf/5RuEL9iA="; types-aiobotocore-marketplace-entitlement = - buildTypesAiobotocorePackage "marketplace-entitlement" "2.13.1" - "sha256-LjDaNH9w+pyWsMPqa2GbRIs1kbAhNbNeFR6bOnFrSlw="; + buildTypesAiobotocorePackage "marketplace-entitlement" "2.15.0" + "sha256-ZQOMPaczJfEeHHPv4GWKKrQUOBDZLBIqol4fhriAhzA="; types-aiobotocore-marketplacecommerceanalytics = - buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.13.1" - "sha256-kIl2+04Iev+BLFrW0HsvQFac2qB6u/hTlkT+To65bl4="; + buildTypesAiobotocorePackage "marketplacecommerceanalytics" "2.15.0" + "sha256-ykZADFdCQ78IlBanzIQuWiHV5p7DuI4QPYwle1H63Bw="; types-aiobotocore-mediaconnect = - buildTypesAiobotocorePackage "mediaconnect" "2.13.1" - "sha256-Aou0aqeTNsykokkuUGn8KJ+5+pIqcTFHnCc4yNbLsiU="; + buildTypesAiobotocorePackage "mediaconnect" "2.15.0" + "sha256-Glz572WmmAhDL7s2sBNACPwSZhB3c0JzvycEZGLIMoc="; types-aiobotocore-mediaconvert = - buildTypesAiobotocorePackage "mediaconvert" "2.13.1" - "sha256-CGKpFDh5+MXhGF8yfZlsUDOW1bLnQ4E6W/PyAexYtF8="; + buildTypesAiobotocorePackage "mediaconvert" "2.15.0" + "sha256-T2S8GaUePcH/bnCOFbt1Tu9Fudhv+xoBEhJX6giF2a0="; types-aiobotocore-medialive = - buildTypesAiobotocorePackage "medialive" "2.13.1" - "sha256-dhicdKLUuAFUHNihBeyME4Im1rtaAn/jECoA0Vartj8="; + buildTypesAiobotocorePackage "medialive" "2.15.0" + "sha256-1pBMtaFdCzCWv2OXdP36NaeoLInFqlLTG46cSbWHihg="; types-aiobotocore-mediapackage = - buildTypesAiobotocorePackage "mediapackage" "2.13.1" - "sha256-7ho2qJjBNWqcJ2qdvTCFUbc2R8CZRuzjyH7tkHv8ZlI="; + buildTypesAiobotocorePackage "mediapackage" "2.15.0" + "sha256-3AQtWf67flmSz6pJ4HMzClD4qyuQUFafpGB74D8KJTA="; types-aiobotocore-mediapackage-vod = - buildTypesAiobotocorePackage "mediapackage-vod" "2.13.1" - "sha256-O5Gk5Ok0wWHYsP/6IrPL/8tkh1teCDmBoeph4eYOpnw="; + buildTypesAiobotocorePackage "mediapackage-vod" "2.15.0" + "sha256-BPQwsGw/xXEP5SeDhIQRu376UQ9AiP7M7hy+B5j56tw="; types-aiobotocore-mediapackagev2 = - buildTypesAiobotocorePackage "mediapackagev2" "2.13.1" - "sha256-ik87A7P4Oro/Fy/gz/KQJsPubsun9ZMlEP5Y/xHGM2w="; + buildTypesAiobotocorePackage "mediapackagev2" "2.15.0" + "sha256-Yjr+/QxMF6E7c5jsYzjptKMzMSezcSE/u5rVqBu2nGw="; types-aiobotocore-mediastore = - buildTypesAiobotocorePackage "mediastore" "2.13.1" - "sha256-v1JAKOy99C2H7k2vkE3SdM/BRjoBpEm0pHRSoxwyGKM="; + buildTypesAiobotocorePackage "mediastore" "2.15.0" + "sha256-YsgTZ0j3i3nlEERkF4fLqVn5M9pkzguFqthx5XSVn1E="; types-aiobotocore-mediastore-data = - buildTypesAiobotocorePackage "mediastore-data" "2.13.1" - "sha256-7HAibOEHV2DOsLNmd5sjXePOnGiX7sQClwiD1IMAS5Q="; + buildTypesAiobotocorePackage "mediastore-data" "2.15.0" + "sha256-ZnYZPMBhRC7e8kot/7RXCbXYGS5cU0NRfXiAdWgXVAA="; types-aiobotocore-mediatailor = - buildTypesAiobotocorePackage "mediatailor" "2.13.1" - "sha256-Ymg6jpoBQDcy/VEaLEluYII/817DcK69uii9EHmjX1A="; + buildTypesAiobotocorePackage "mediatailor" "2.15.0" + "sha256-FjHfv8tfQVFk0iBD8np1KCQFX+BuprkIiEAUJCEDPn0="; types-aiobotocore-medical-imaging = - buildTypesAiobotocorePackage "medical-imaging" "2.13.1" - "sha256-OzNc5eyipNPA0TFajfpXFa6kXj7tNupoe7p2EeDFygM="; + buildTypesAiobotocorePackage "medical-imaging" "2.15.0" + "sha256-sxbmmX7Y7NoyZzOPq3+vQFU57JrBStsWHMZig3E2ZUc="; - types-aiobotocore-memorydb = buildTypesAiobotocorePackage "memorydb" "2.13.1" - "sha256-GvcEWHpCR0J1ftCbH4rK3JJcG5KtRtvTm5YSEEn6gjg="; + types-aiobotocore-memorydb = + buildTypesAiobotocorePackage "memorydb" "2.15.0" + "sha256-C6dAMsCasQw2+bPFnBJVUZHdKUodT1zLKYVGizI0UiA="; types-aiobotocore-meteringmarketplace = - buildTypesAiobotocorePackage "meteringmarketplace" "2.13.1" - "sha256-TNg2yvdEcBSJ9U1nsc+ihWodc//IPdOJ9miMZDYC05U="; + buildTypesAiobotocorePackage "meteringmarketplace" "2.15.0" + "sha256-UG5Wy/1Fb3JwSL9cbzegHIj/UmVDyBIW0PhovEMMtZs="; - types-aiobotocore-mgh = buildTypesAiobotocorePackage "mgh" "2.13.1" - "sha256-t5owrAOVv4cMsUKbrT/QDd66pdz3LrWm0DcJ0g/fxVo="; + types-aiobotocore-mgh = + buildTypesAiobotocorePackage "mgh" "2.15.0" + "sha256-YGh12HkugOCGThtFOM/YGTGSsAqhkdyLXwe/DUo06JE="; - types-aiobotocore-mgn = buildTypesAiobotocorePackage "mgn" "2.13.1" - "sha256-xsAWfONvXq6x0BHSQkH+L2ikANbsq8+RNWV4iPhq94Y="; + types-aiobotocore-mgn = + buildTypesAiobotocorePackage "mgn" "2.15.0" + "sha256-pt+o3fHfEZ+i0nTtA3aL9N5835Z2fJPDTI27ct1Q6ts="; types-aiobotocore-migration-hub-refactor-spaces = - buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.13.1" - "sha256-PDpmWUxroS2y8Kh3aasITL4w+7XGcwEZ3nJL+ffCRKQ="; + buildTypesAiobotocorePackage "migration-hub-refactor-spaces" "2.15.0" + "sha256-UVbGGevpTSsk/5u4ZM4ssbupT4NNJOXRS1j6Ar6NTvg="; types-aiobotocore-migrationhub-config = - buildTypesAiobotocorePackage "migrationhub-config" "2.13.1" - "sha256-pdT8i6eGekkTPAa87cibkSyjw6KyI482jOhkfFqiyRs="; + buildTypesAiobotocorePackage "migrationhub-config" "2.15.0" + "sha256-isZ/J3BH52c3kADs3QV6NCaN4U1W0SLH+2vx5FBUfYM="; types-aiobotocore-migrationhuborchestrator = - buildTypesAiobotocorePackage "migrationhuborchestrator" "2.13.1" - "sha256-AA25qAEWLaQBQ+1hJKoRrGax4f23CGSGoMpvdaym2xo="; + buildTypesAiobotocorePackage "migrationhuborchestrator" "2.15.0" + "sha256-21q8uRwtbfsX03ayhHNFecq8ZC/VTYZENmpWauk1oL0="; types-aiobotocore-migrationhubstrategy = - buildTypesAiobotocorePackage "migrationhubstrategy" "2.13.1" - "sha256-CEqR0phDFZUtMH+JJqjbxLwHIC8ReiFTYG9MKFZajbE="; + buildTypesAiobotocorePackage "migrationhubstrategy" "2.15.0" + "sha256-xXmi5qhzx4ZNTwXxAwOkPHHuMVevdjgm6ER0V/zaDf4="; - types-aiobotocore-mobile = buildTypesAiobotocorePackage "mobile" "2.13.1" - "sha256-OBWSp6n3xpuAdWEP1DB+LoSd/Ds6tWSzMgC0fIYepPs="; + types-aiobotocore-mobile = + buildTypesAiobotocorePackage "mobile" "2.13.2" + "sha256-OxB91BCAmYnY72JBWZaBlEkpAxN2Q5aY4i1Pt3eD9hc="; - types-aiobotocore-mq = buildTypesAiobotocorePackage "mq" "2.13.1" - "sha256-xv2s3Ek2KvWUzDrOPWOpXC/kLC+VGhzQBihimhFZelY="; + types-aiobotocore-mq = + buildTypesAiobotocorePackage "mq" "2.15.0" + "sha256-c/m/RAQabQHFWArEYuvEWjekBSyh+gPTHYlwNnpQ7r0="; - types-aiobotocore-mturk = buildTypesAiobotocorePackage "mturk" "2.13.1" - "sha256-a1f/szq1zAskaf+28hpcxz9d5S5mYteZUo9TksnTAok="; + types-aiobotocore-mturk = + buildTypesAiobotocorePackage "mturk" "2.15.0" + "sha256-vtZK0eYARSRbn9RpRK4yrKz0erx75YoFCPjuGBV2ztM="; - types-aiobotocore-mwaa = buildTypesAiobotocorePackage "mwaa" "2.13.1" - "sha256-vUQSThUV6hGv4gsNMp+HC0thbxGf9j7XjWECUULJYT4="; + types-aiobotocore-mwaa = + buildTypesAiobotocorePackage "mwaa" "2.15.0" + "sha256-uI+uv/D25J/bkTAS3koq7rOgGimhDhHTW2ChCk9mTP0="; - types-aiobotocore-neptune = buildTypesAiobotocorePackage "neptune" "2.13.1" - "sha256-du5vrwZMa/1UkKImJ2AM1FYAsdZlvmHwB+jWvf9IPHA="; + types-aiobotocore-neptune = + buildTypesAiobotocorePackage "neptune" "2.15.0" + "sha256-MiH4jhgesSLxaeFzzEJfuorkAC60ncXGRfg1EFvT/Qg="; types-aiobotocore-network-firewall = - buildTypesAiobotocorePackage "network-firewall" "2.13.1" - "sha256-NZT7U3kF9He4+MhlKU/CDzt0Q6wW2dBIsGqXqQ1ne0o="; + buildTypesAiobotocorePackage "network-firewall" "2.15.0" + "sha256-NLBghjcr8XbHnSaZVGxUj3jCinFZkmxagLlDMjQFCbM="; types-aiobotocore-networkmanager = - buildTypesAiobotocorePackage "networkmanager" "2.13.1" - "sha256-xxcaP5s5vDReUEVQxis/4Kz+7e8UPXt0Mp4Uu9yLVXA="; + buildTypesAiobotocorePackage "networkmanager" "2.15.0" + "sha256-fA1CFdV5G+3BeJFqGb/61Mh4fDgUCIHZEHb3+Po1d70="; - types-aiobotocore-nimble = buildTypesAiobotocorePackage "nimble" "2.13.1" - "sha256-uLVJekBSmrJ1KjR1yXK4I97S1iAWiNobiShDBujRmmw="; + types-aiobotocore-nimble = + buildTypesAiobotocorePackage "nimble" "2.15.0" + "sha256-0Fp0TZK21QeaKPUQ9prOE7IaDirSGBVEgH8yv8KKy20="; - types-aiobotocore-oam = buildTypesAiobotocorePackage "oam" "2.13.1" - "sha256-thtnloGS4BEg5bdnEc4dIOZ/rAaojWQlQ+Nso5E1uks="; + types-aiobotocore-oam = + buildTypesAiobotocorePackage "oam" "2.15.0" + "sha256-1EU1ZCtMoCQaCWnSXlrayKKaC9l82y4Edc2kc2Rm/EQ="; - types-aiobotocore-omics = buildTypesAiobotocorePackage "omics" "2.13.1" - "sha256-Ak4nOBS8PlchtSZ7u2WdcvqcPS8CHx2gkb1IeE7CO78="; + types-aiobotocore-omics = + buildTypesAiobotocorePackage "omics" "2.15.0" + "sha256-cHrKEgGV79ea9FBdDV4fltKzEDPRsiavuSszM1z7Utw="; types-aiobotocore-opensearch = - buildTypesAiobotocorePackage "opensearch" "2.13.1" - "sha256-lrX9vNiaXekBoqBCUwiRcGrFOj98eAw+1VdtM/VrFvM="; + buildTypesAiobotocorePackage "opensearch" "2.15.0" + "sha256-6S42q0i4SULwjyUEx1YCg5i1kgwz0oXC4tTFdMiG+Po="; types-aiobotocore-opensearchserverless = - buildTypesAiobotocorePackage "opensearchserverless" "2.13.1" - "sha256-gYTMzWB1EpskiLA+CQvShpCnvJ7PM5x65NavdsksrJg="; + buildTypesAiobotocorePackage "opensearchserverless" "2.15.0" + "sha256-o6QHCkyNfjil/O28CCYgflU6E3pUkLZ/flGYcRoIWWE="; - types-aiobotocore-opsworks = buildTypesAiobotocorePackage "opsworks" "2.13.1" - "sha256-BqudWGmHb0LhamtuuKnKf7S7aXIrQQUo0jcdAch1Kl0="; + types-aiobotocore-opsworks = + buildTypesAiobotocorePackage "opsworks" "2.15.0" + "sha256-Jg9u7P2vapI3Pwx4DFeWMTy7HriNlro0UctPhSt9TgA="; types-aiobotocore-opsworkscm = - buildTypesAiobotocorePackage "opsworkscm" "2.13.1" - "sha256-e90/qTD/BfUnlJPwZS3VvUR5MA58qZ8Dz40emRzeqQ8="; + buildTypesAiobotocorePackage "opsworkscm" "2.15.0" + "sha256-34frDYBm3pH4/YYpKey/uG0Rv6DbNCXytSV3PnR3QHw="; types-aiobotocore-organizations = - buildTypesAiobotocorePackage "organizations" "2.13.1" - "sha256-rSxR2YdgwNIPAVreMalDA2CBwAjFqmjV9vpeuzexGKM="; + buildTypesAiobotocorePackage "organizations" "2.15.0" + "sha256-ZnjLqwh2+1N9Zb4nIkcysr+TGnUHBNxqy0vJABIQjuA="; - types-aiobotocore-osis = buildTypesAiobotocorePackage "osis" "2.13.1" - "sha256-pjnHLL/OY2Z30DbB/dG+EmQmw26mpMNLJRiVu75zhhE="; + types-aiobotocore-osis = + buildTypesAiobotocorePackage "osis" "2.15.0" + "sha256-HH7HaxV6bMywkwTsMXP3QZWc+lyWDzxtHmrZMIY/JOk="; - types-aiobotocore-outposts = buildTypesAiobotocorePackage "outposts" "2.13.1" - "sha256-+gsLaRbZBueYif1UC90Ig6gPYTR3OIn7SAoiROg+CQA="; + types-aiobotocore-outposts = + buildTypesAiobotocorePackage "outposts" "2.15.0" + "sha256-kGs9VO15CkvHdSZNA0d7OGUx5Mb/nzJK0kCna9qtRIA="; - types-aiobotocore-panorama = buildTypesAiobotocorePackage "panorama" "2.13.1" - "sha256-mCpsk5JMKBf44kTImSSK7tUd+VOXRDAwsT3DdOAoW2U="; + types-aiobotocore-panorama = + buildTypesAiobotocorePackage "panorama" "2.15.0" + "sha256-JtO0nR0IhaCN8HNFt7YObk0ytdeirfGyXG6EFDguOxk="; types-aiobotocore-payment-cryptography = - buildTypesAiobotocorePackage "payment-cryptography" "2.13.1" - "sha256-JnT1V2QCppuYsl8s2UHGHSowVWubTLj54sgV3/D3JkY="; + buildTypesAiobotocorePackage "payment-cryptography" "2.15.0" + "sha256-bqRMxwiGGbMqRFZqkQnsmNq4JWuXZOvLbX51IGeUz/Q="; types-aiobotocore-payment-cryptography-data = - buildTypesAiobotocorePackage "payment-cryptography-data" "2.13.1" - "sha256-tTib8+P2WYf02iYlek/yp0miVOa1aIhEG2+vHeB1gik="; + buildTypesAiobotocorePackage "payment-cryptography-data" "2.15.0" + "sha256-+o4Q5VmzkR9+eGUow5dlS+IyD0ukR//EQ+pbEL1v5QQ="; types-aiobotocore-personalize = - buildTypesAiobotocorePackage "personalize" "2.13.1" - "sha256-uNKKj6WvtZStJJhsetQhvPIMpLHrnlEyO+JYYIztNnc="; + buildTypesAiobotocorePackage "personalize" "2.15.0" + "sha256-jH5M7kLBNUQAsct741zqKB5OsZyIOMLbzKi96Wem4OY="; types-aiobotocore-personalize-events = - buildTypesAiobotocorePackage "personalize-events" "2.13.1" - "sha256-8M6LEacfNmx7o5wCInAKhwzABh8EJ0yQovDsE5cuJFo="; + buildTypesAiobotocorePackage "personalize-events" "2.15.0" + "sha256-KBsvNpf8J53cucgF/auehCMsMCnVxixaGMIiW9YeSvM="; types-aiobotocore-personalize-runtime = - buildTypesAiobotocorePackage "personalize-runtime" "2.13.1" - "sha256-AxfHzSWpYq0bz3VXJ+8z0b8K55dTGGzs09S83tPYLEw="; + buildTypesAiobotocorePackage "personalize-runtime" "2.15.0" + "sha256-Yf6yWHC2UqVHsxXc8ei6o6GPx8aAuhfMCkf7H/MoHzI="; - types-aiobotocore-pi = buildTypesAiobotocorePackage "pi" "2.13.1" - "sha256-N6aLsYFKnrACA/ia6EjiBxQXhp7Pi2TcUUfTaGukoOc="; + types-aiobotocore-pi = + buildTypesAiobotocorePackage "pi" "2.15.0" + "sha256-Bc0f8YGFQmCybeec+SnhpWYTbGQFyt7P4WtUMc4hIuY="; - types-aiobotocore-pinpoint = buildTypesAiobotocorePackage "pinpoint" "2.13.1" - "sha256-w3Z9eEu6Ty+yOxvKDyLfwqT7hZLEh7szwXX2ciHYYoY="; + types-aiobotocore-pinpoint = + buildTypesAiobotocorePackage "pinpoint" "2.15.0" + "sha256-dHJY2ErvI8iJOdoGV+7f8hlHFtcr756fNiX8MTsXhUE="; types-aiobotocore-pinpoint-email = - buildTypesAiobotocorePackage "pinpoint-email" "2.13.1" - "sha256-KnfpYd7H1e4ftRz8KubCVTqtjASurWkK2Qxfpq2z6hU="; + buildTypesAiobotocorePackage "pinpoint-email" "2.15.0" + "sha256-Dpdpfga05sbxoEiwmMwa9bYaclrrOK4HpOmqERoAYJw="; types-aiobotocore-pinpoint-sms-voice = - buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.13.1" - "sha256-yXiitAUhSJXi4sx/EgKfa3kZ/RWgVnAuA6ieZ2Z1w7Q="; + buildTypesAiobotocorePackage "pinpoint-sms-voice" "2.15.0" + "sha256-HAZyyUB+jpMcTwlUEJwmOxv6pTiyhWYdpbWnShVux2k="; types-aiobotocore-pinpoint-sms-voice-v2 = - buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.13.1" - "sha256-kaQJUyXlPVDTa7ay30X+MCCexF2ZHYodsgI5Bp1J16g="; + buildTypesAiobotocorePackage "pinpoint-sms-voice-v2" "2.15.0" + "sha256-pI+ICkq+DyuutwMHngQYxprvQqdExaL0Fx8pDHDQ4MU="; - types-aiobotocore-pipes = buildTypesAiobotocorePackage "pipes" "2.13.1" - "sha256-4BUUZPTbKpbWMCUNH3Mamg0rREiiHt2qic+XVHDKq+4="; + types-aiobotocore-pipes = + buildTypesAiobotocorePackage "pipes" "2.15.0" + "sha256-MIBeZQBCCfmi6iehHD29uWX2ArGlyWA3wlTgVhBie2s="; - types-aiobotocore-polly = buildTypesAiobotocorePackage "polly" "2.13.1" - "sha256-jve+PnNP4cmyBWeSxM6G349DbymY7kCE1sfbpDjDTGM="; + types-aiobotocore-polly = + buildTypesAiobotocorePackage "polly" "2.15.0" + "sha256-g/MJiOG6PulfS5KpWxZqRS7eGNr83O6Q1wyoZvidXrA="; - types-aiobotocore-pricing = buildTypesAiobotocorePackage "pricing" "2.13.1" - "sha256-gT+aYlKxQm0sXB1iPC59x7rzNmHk9V/CJokpKtmnHaE="; + types-aiobotocore-pricing = + buildTypesAiobotocorePackage "pricing" "2.15.0" + "sha256-egYnlcrzy8pZcIALNJSsW5AFfQ5O/2vQYTupGDBvNKE="; types-aiobotocore-privatenetworks = - buildTypesAiobotocorePackage "privatenetworks" "2.13.1" - "sha256-xvb+RgzOJFN35as+bWNFf5WvYRpbr+qmhLQHV15aUQI="; + buildTypesAiobotocorePackage "privatenetworks" "2.15.0" + "sha256-fPrRL1QyMOvF2sg5axx6Czoa1Ad5kNs/j8MLqEh6dDE="; - types-aiobotocore-proton = buildTypesAiobotocorePackage "proton" "2.13.1" - "sha256-zxAn9a/jagk+QDoAtTqw+0E/qGPAHSrWGJzDIwE4mz4="; + types-aiobotocore-proton = + buildTypesAiobotocorePackage "proton" "2.15.0" + "sha256-iJTcz8fTcBy3aw97Rn7J4m7Ha5kURK1EZvgiipqz64M="; - types-aiobotocore-qldb = buildTypesAiobotocorePackage "qldb" "2.13.1" - "sha256-NQcylhXkGqADCiagW4KNL5PEeGB0dT+ggRjPQSfpyQY="; + types-aiobotocore-qldb = + buildTypesAiobotocorePackage "qldb" "2.15.0" + "sha256-TZkL/IKBAUWR0meMUTkXqCa49ea8N32Ml67y4xjUA94="; types-aiobotocore-qldb-session = - buildTypesAiobotocorePackage "qldb-session" "2.13.1" - "sha256-SAkisanmZM1N2XnKE5quH6HkMugkggEjQbJ1+kq9MGQ="; + buildTypesAiobotocorePackage "qldb-session" "2.15.0" + "sha256-uLNMZgaWk9tUwYkG3vZogqyPiTbDmLcJm8GQqT3vqI4="; types-aiobotocore-quicksight = - buildTypesAiobotocorePackage "quicksight" "2.13.1" - "sha256-YOz+MKPoF+NoicK1bbVyNePbvuk4IsauXofTtA7jzhA="; + buildTypesAiobotocorePackage "quicksight" "2.15.0" + "sha256-QWXeYC6ZVd6tBDfOWtA1zUU7z2L0GOTeSuJiOvF2nZw="; - types-aiobotocore-ram = buildTypesAiobotocorePackage "ram" "2.13.1" - "sha256-TOxkThUwnulFpdyMFeZB2SjmY0fMDSLkVh15zDEhuLw="; + types-aiobotocore-ram = + buildTypesAiobotocorePackage "ram" "2.15.0" + "sha256-BwuU/43NqfuZt99u0BtLjOye61pyLyFm55SbGR+mcEM="; - types-aiobotocore-rbin = buildTypesAiobotocorePackage "rbin" "2.13.1" - "sha256-LVYmvDjYKBHumG3jjk1NrDSwhZXF/+9QCbKA62lAodU="; + types-aiobotocore-rbin = + buildTypesAiobotocorePackage "rbin" "2.15.0" + "sha256-0TrXf6db1xP42f9eJTBnzWr7w2su8Y0ExFTWmqV73fw="; - types-aiobotocore-rds = buildTypesAiobotocorePackage "rds" "2.13.1" - "sha256-RnEkNwOuI6m0ySLqL8pUzy2DeLsjYfN5EdtlPA7nQBw="; + types-aiobotocore-rds = + buildTypesAiobotocorePackage "rds" "2.15.0" + "sha256-X2fN3CYSDbqk6ImaaE4oVxOZbpN/UQzp1wMAFuOq7uY="; - types-aiobotocore-rds-data = buildTypesAiobotocorePackage "rds-data" "2.13.1" - "sha256-PU2usWylU13a3I/GBmymLqt2ViDvMacfS++cPnhwxKo="; + types-aiobotocore-rds-data = + buildTypesAiobotocorePackage "rds-data" "2.15.0" + "sha256-vyi+0YaxujcmWQfm/vQaWY/iozoFTNHRkJsCqBDSby4="; - types-aiobotocore-redshift = buildTypesAiobotocorePackage "redshift" "2.13.1" - "sha256-CXWyK8HJZx3YIBID2vy0xB8kjnOBONij8fWlCuYVZHg="; + types-aiobotocore-redshift = + buildTypesAiobotocorePackage "redshift" "2.15.0" + "sha256-wavvzMsczE/TJJEqcCLVm7t2QHscZuv8TS6Qsuuu990="; types-aiobotocore-redshift-data = - buildTypesAiobotocorePackage "redshift-data" "2.13.1" - "sha256-u3ghdTZxEWdjhQVmdv5a/7XUNQcG7NByxzllB4oD89U="; + buildTypesAiobotocorePackage "redshift-data" "2.15.0" + "sha256-JK3ZCluyF9pReeLHZy4AjgRIJTzmabb4vYakuHIracs="; types-aiobotocore-redshift-serverless = - buildTypesAiobotocorePackage "redshift-serverless" "2.13.1" - "sha256-jMnGJ2mri3hzQnOGigTejZVSuElPpacPiTJLp81M148="; + buildTypesAiobotocorePackage "redshift-serverless" "2.15.0" + "sha256-aw/ubbtRU1rGRnYr1j2a/WQTohYjJhBmNJ8nP9Kxk4Y="; types-aiobotocore-rekognition = - buildTypesAiobotocorePackage "rekognition" "2.13.1" - "sha256-eQJWy1kiCd6Ke/vKMVdNDvPitw4rqVtMvmhYPqcZXpA="; + buildTypesAiobotocorePackage "rekognition" "2.15.0" + "sha256-Ptv7sgRHVfbtRIEQM/M0Di0UPIVZC79Td15H2SHyTsE="; types-aiobotocore-resiliencehub = - buildTypesAiobotocorePackage "resiliencehub" "2.13.1" - "sha256-09BtkNGhgwjuMaIpc/O+oMQT23mJ+uXrYojcMTt8HYg="; + buildTypesAiobotocorePackage "resiliencehub" "2.15.0" + "sha256-/tJDFZQCnSvww/Mp8xL0AGhJxTmCCeI68fkvC4TSbjU="; types-aiobotocore-resource-explorer-2 = - buildTypesAiobotocorePackage "resource-explorer-2" "2.13.1" - "sha256-ujnFPsH+IR+XUr2LMRpGw+Ej9ASQjXDJH3nUYN31OHc="; + buildTypesAiobotocorePackage "resource-explorer-2" "2.15.0" + "sha256-yF8QaebGjKkuqZKU0kkgSjXBmVpVnGdhuGG8jYi8UP0="; types-aiobotocore-resource-groups = - buildTypesAiobotocorePackage "resource-groups" "2.13.1" - "sha256-IV05dhVccTKTINbgZevIWBX/4BSlTs6UoQaz/sNttCY="; + buildTypesAiobotocorePackage "resource-groups" "2.15.0" + "sha256-mxFaUb2cLNLaq9+pdUbfumO096kr2Ic2qGdKirR41LE="; types-aiobotocore-resourcegroupstaggingapi = - buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.13.1" - "sha256-j67iuVzyZq6Ps14uQV100KVuHgJ4bW6bE3pDVktDVUU="; + buildTypesAiobotocorePackage "resourcegroupstaggingapi" "2.15.0" + "sha256-4ISZza2xs+0qJ61oLDRI+a8PIS2Dw5ybWjmWpMzW4UQ="; types-aiobotocore-robomaker = - buildTypesAiobotocorePackage "robomaker" "2.13.1" - "sha256-zc1mEMFn0FcjxMjvRib8UrUMUX1Jp2bAN7+qeOsPe7o="; + buildTypesAiobotocorePackage "robomaker" "2.15.0" + "sha256-8R7Sy54+dC+PlgBmZ60vI0ZC31IqPbqv6x0kM4oomlE="; types-aiobotocore-rolesanywhere = - buildTypesAiobotocorePackage "rolesanywhere" "2.13.1" - "sha256-98F7KmVtYoS4LK7q8J29PYBAXTTz1Uaac4mBkqflYt0="; + buildTypesAiobotocorePackage "rolesanywhere" "2.15.0" + "sha256-8iyTLdJAWs9ptCUoeh9BkPQ50uCMRoT/NnKrQ8OajDc="; - types-aiobotocore-route53 = buildTypesAiobotocorePackage "route53" "2.13.1" - "sha256-s9UDZkNyY52aQZS0MNV9g1GMJBGaGNozRLx15Jmuhps="; + types-aiobotocore-route53 = + buildTypesAiobotocorePackage "route53" "2.15.0" + "sha256-UgH+fKQ+qsstCcPyvFUsG3ToMtJJCY4qlCkhMsfQfIM="; types-aiobotocore-route53-recovery-cluster = - buildTypesAiobotocorePackage "route53-recovery-cluster" "2.13.1" - "sha256-mFpBl/GVTFOkU7YkrfIVUfzWhhgetmI6UkRj66LeDzg="; + buildTypesAiobotocorePackage "route53-recovery-cluster" "2.15.0" + "sha256-4Zt9w4r3OxoXOQH0o8nmamEWWwA36yBaAFNeX0trDk0="; types-aiobotocore-route53-recovery-control-config = - buildTypesAiobotocorePackage "route53-recovery-control-config" "2.13.1" - "sha256-awmCwODj+26VDh05ObLDIsqWCARBMJxR9ug/GLBWnWA="; + buildTypesAiobotocorePackage "route53-recovery-control-config" "2.15.0" + "sha256-z5WITGBPD7P+k33UL9rD5VLavtyXV3LAZcv0FpgC6/w="; types-aiobotocore-route53-recovery-readiness = - buildTypesAiobotocorePackage "route53-recovery-readiness" "2.13.1" - "sha256-3lCdo3P9ma3lmJgHdhBE9M117NUjDecGCACj7hQB3e0="; + buildTypesAiobotocorePackage "route53-recovery-readiness" "2.15.0" + "sha256-Wc1AnMZa92WjRuc+rVePRadTSdcZfEAYOnmOyEpMaHs="; types-aiobotocore-route53domains = - buildTypesAiobotocorePackage "route53domains" "2.13.1" - "sha256-cgqvHKBkj/spPFVTL19oWRiYubLDmtspXBek8JN7Xig="; + buildTypesAiobotocorePackage "route53domains" "2.15.0" + "sha256-jUSEzlaMkj8Wj7VGXpIRwYHFl6n9Ei8dSgMIROtXsPo="; types-aiobotocore-route53resolver = - buildTypesAiobotocorePackage "route53resolver" "2.13.1" - "sha256-2zHZi66843jrAwXotc59HHbY160whGKMpiUCpo589Qg="; + buildTypesAiobotocorePackage "route53resolver" "2.15.0" + "sha256-CUJK2fsYrzHtm/XOXIFY2XYflI7XS7V9p2LyLxb6Cus="; - types-aiobotocore-rum = buildTypesAiobotocorePackage "rum" "2.13.1" - "sha256-rFmOs1OOYWF1+vUIsuaZ9VcqYVNVPFZgKKBwpkedi50="; + types-aiobotocore-rum = + buildTypesAiobotocorePackage "rum" "2.15.0" + "sha256-qke+xaXPd7UjBq0C1eEjw8zwjd2hpuQ/XP3FJNULKgY="; - types-aiobotocore-s3 = buildTypesAiobotocorePackage "s3" "2.13.1" - "sha256-YUnUEu+lR236JG98JscIVjdHEaSiIRkDpbiCbh/6XUY="; + types-aiobotocore-s3 = + buildTypesAiobotocorePackage "s3" "2.15.0" + "sha256-S3ZBfYlpZqBkUNgWNirNYkwlshwEDdEJVlJ+61Gdz/c="; types-aiobotocore-s3control = - buildTypesAiobotocorePackage "s3control" "2.13.1" - "sha256-Sqrr0hJgjPEUjkuatFhREo1u5Nm5dW9Qi+tZXKexvK4="; + buildTypesAiobotocorePackage "s3control" "2.15.0" + "sha256-L9YP3AIR4wn4m+eG8mHrK8M+IzrVlSC1j/NMeWTLXDU="; types-aiobotocore-s3outposts = - buildTypesAiobotocorePackage "s3outposts" "2.13.1" - "sha256-rTQbNJbMUyP06qm+LTTZ/ivPxnyEu84vNGNR3fo61u8="; + buildTypesAiobotocorePackage "s3outposts" "2.15.0" + "sha256-CFXrxd2HOtz0Z8sz9aIXLRKRYd9louiLBfixa68l5AU="; types-aiobotocore-sagemaker = - buildTypesAiobotocorePackage "sagemaker" "2.13.1" - "sha256-6jnWrBqSQdp/GaCxNh7FjIEJbcNiBNik8cxgVr9kPEA="; + buildTypesAiobotocorePackage "sagemaker" "2.15.0" + "sha256-hVy9kRYhnec8Q1wJDqZiSek5Ww5QmahwJRJX0V+PjmU="; types-aiobotocore-sagemaker-a2i-runtime = - buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.13.1" - "sha256-73hItZdNaqCpN6M6IOfN8YFVbPBGwv3D5VkmWxgr650="; + buildTypesAiobotocorePackage "sagemaker-a2i-runtime" "2.15.0" + "sha256-3jd5E8DSxushqXkIfkS9zm2s2p+iLlJfFBqCJz9STz0="; types-aiobotocore-sagemaker-edge = - buildTypesAiobotocorePackage "sagemaker-edge" "2.13.1" - "sha256-2GE6RCGoc1loaJ5rJfNCj+BRtZqLTLe9csSCA5jHIB4="; + buildTypesAiobotocorePackage "sagemaker-edge" "2.15.0" + "sha256-uydOAL5VEfRTL0QLl0aKIdCEjw2RYRp/RRSVMOKKsHs="; types-aiobotocore-sagemaker-featurestore-runtime = - buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.13.1" - "sha256-S/Hof7uG0BMFmPVVviUkMBEbpV8QjXbsbpfpIz7BSUw="; + buildTypesAiobotocorePackage "sagemaker-featurestore-runtime" "2.15.0" + "sha256-QiOGTUpL0R68Ns+Y3losMUVskv5YHf8/MnrmqeJqgmo="; types-aiobotocore-sagemaker-geospatial = - buildTypesAiobotocorePackage "sagemaker-geospatial" "2.13.1" - "sha256-2WWplzOpmcjwhOkmrjX1a80IlCwsA5tfla9jqS+9zPM="; + buildTypesAiobotocorePackage "sagemaker-geospatial" "2.15.0" + "sha256-oQRTnA2lbRkd1Tv7g44GdKuVuq9BZ2PXLTNWUyABKfg="; types-aiobotocore-sagemaker-metrics = - buildTypesAiobotocorePackage "sagemaker-metrics" "2.13.1" - "sha256-PHF1mdrFHGQTopPgPvEl+cekfs5eCuUbcPRHW5U2aCU="; + buildTypesAiobotocorePackage "sagemaker-metrics" "2.15.0" + "sha256-jzwn2HDRNL9QmSEy6V2tNTL6gcHyBXPEQnuBVISy8xY="; types-aiobotocore-sagemaker-runtime = - buildTypesAiobotocorePackage "sagemaker-runtime" "2.13.1" - "sha256-hPHBgjvUsCY+eSRkpGzEwLkJ+jrn+cen6r9b7PtNgBc="; + buildTypesAiobotocorePackage "sagemaker-runtime" "2.15.0" + "sha256-RtVl6fH1znkuNWPZ4Ndhb+qplLfDq1n1YzQ9p9Wk6G0="; types-aiobotocore-savingsplans = - buildTypesAiobotocorePackage "savingsplans" "2.13.1" - "sha256-3YmkCihwnizc15LPScXdvJ2aDQn10ZbQ7Fqvy4OMDlY="; + buildTypesAiobotocorePackage "savingsplans" "2.15.0" + "sha256-uLmimcAk1vZO+2QlWlpV5LxTSxooYdQNsYET8CJ+tg0="; types-aiobotocore-scheduler = - buildTypesAiobotocorePackage "scheduler" "2.13.1" - "sha256-qHeotLVmL5kJZXA+moqVgxbDg4WyF3MJ/bxX6l7ypcM="; + buildTypesAiobotocorePackage "scheduler" "2.15.0" + "sha256-0/WvqWSd8VGISlqrTx8ef6B839PkYzDte2JYRTXwUeM="; - types-aiobotocore-schemas = buildTypesAiobotocorePackage "schemas" "2.13.1" - "sha256-vJg4UFhLHg5464oB9cXl2Ls/rVDg5BQ82CYtTEzpcyA="; + types-aiobotocore-schemas = + buildTypesAiobotocorePackage "schemas" "2.15.0" + "sha256-+RA7DzmObfY/lbo1CCQUDMFacw/mwQGzXG8L44/y5z8="; - types-aiobotocore-sdb = buildTypesAiobotocorePackage "sdb" "2.13.1" - "sha256-eb/6qwofizpmfQdYDRdbu4MAMdsXJk+e8Aoo9zhWDFc="; + types-aiobotocore-sdb = + buildTypesAiobotocorePackage "sdb" "2.15.0" + "sha256-ImfIS00D5p0FYZW43C6ZMz8dvSowWDavlauuTYRIBZg="; types-aiobotocore-secretsmanager = - buildTypesAiobotocorePackage "secretsmanager" "2.13.1" - "sha256-ydSlw+KitEn8QaGz0NnYljZGX7uYspum136Qvu8PGVs="; + buildTypesAiobotocorePackage "secretsmanager" "2.15.0" + "sha256-w/ngCgJP9V1i11LDIVB1mqaDc3mKhALCpHHpMjoWnL4="; types-aiobotocore-securityhub = - buildTypesAiobotocorePackage "securityhub" "2.13.1" - "sha256-Pc8hF8ZDrVD2Wb/MMf99nRx5FpfzBHPyvIg2NaRAnH4="; + buildTypesAiobotocorePackage "securityhub" "2.15.0" + "sha256-EM+0L25N202Y3jLmcDz9EzfCr913N+ttbO36s0B2Cjg="; types-aiobotocore-securitylake = - buildTypesAiobotocorePackage "securitylake" "2.13.1" - "sha256-yM+H0NFlqfkTJAJfr+SZ5shdUMSCWubeg3dwmQjFNxQ="; + buildTypesAiobotocorePackage "securitylake" "2.15.0" + "sha256-grQYAC3rSiuW8JoqJr9ESuRx0OrwukhAHZuLBdTYMoc="; types-aiobotocore-serverlessrepo = - buildTypesAiobotocorePackage "serverlessrepo" "2.13.1" - "sha256-dXPQTeu3zEtimgdXFJ1KLQTvRxfCXiYabLhl0YpmJjk="; + buildTypesAiobotocorePackage "serverlessrepo" "2.15.0" + "sha256-Vvt7f6trMwQWDIC8jOs0HrkG5UB7OyDZB8QKztYPusM="; types-aiobotocore-service-quotas = - buildTypesAiobotocorePackage "service-quotas" "2.13.1" - "sha256-fVGD8IxKwrtxqBYz3yZjxgoy7NXcDYBpqP5Gp7+0rKg="; + buildTypesAiobotocorePackage "service-quotas" "2.15.0" + "sha256-NVUuGzwoRUyJu5rZVkJod0BIzIt6flp7egiuM9SzXIo="; types-aiobotocore-servicecatalog = - buildTypesAiobotocorePackage "servicecatalog" "2.13.1" - "sha256-d2PU9AWighlEsgWRzC3Jdzq9oL0GTTCfcRaqQZL85oQ="; + buildTypesAiobotocorePackage "servicecatalog" "2.15.0" + "sha256-pEUUNvG0GF73VL5o3djXl6bz5UsdUV6Jlz7itavgdqc="; types-aiobotocore-servicecatalog-appregistry = - buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.13.1" - "sha256-O2SbST9ZOtEc0eANm/D5PakAazJBAmBO8wPeCACRMQQ="; + buildTypesAiobotocorePackage "servicecatalog-appregistry" "2.15.0" + "sha256-/8dE7iiNcJ5ExvzorCG1rpbvOp6HNhw3hibymr+Y+z0="; types-aiobotocore-servicediscovery = - buildTypesAiobotocorePackage "servicediscovery" "2.13.1" - "sha256-cwkclyVKSsjJEUkW+qadtx/1P953xRntntpVhjGGW6U="; + buildTypesAiobotocorePackage "servicediscovery" "2.15.0" + "sha256-0GNZgK445MrP84a8ZlOyfhbx24EOVWcwJMlK8G0Rjqo="; - types-aiobotocore-ses = buildTypesAiobotocorePackage "ses" "2.13.1" - "sha256-/UJ3+qbExc59yTEfPl5hQl8ti5QDedOmZnZ5QD8+BI8="; + types-aiobotocore-ses = + buildTypesAiobotocorePackage "ses" "2.15.0" + "sha256-df/+KPwhP26hZIHj+kB8TT0SEmzvA1sSXEAyXOOu/oQ="; - types-aiobotocore-sesv2 = buildTypesAiobotocorePackage "sesv2" "2.13.1" - "sha256-GTHNhwOyBApeddCI4lqTHvPUzkzrnnydXudUrUww+GA="; + types-aiobotocore-sesv2 = + buildTypesAiobotocorePackage "sesv2" "2.15.0" + "sha256-17EmuWlNJZA+zIZChhHFkPRC+doE/n+ebPqVk73VtNs="; - types-aiobotocore-shield = buildTypesAiobotocorePackage "shield" "2.13.1" - "sha256-gOdnwTbWVK1KYshuFN+Cic4fqC4sdphYbKG+GTuSDw8="; + types-aiobotocore-shield = + buildTypesAiobotocorePackage "shield" "2.15.0" + "sha256-LVdaqwMmqHeBlU++Npje5zo/y9lHkyeNFNNGaETypNk="; - types-aiobotocore-signer = buildTypesAiobotocorePackage "signer" "2.13.1" - "sha256-q0PCBQsNMamebAlxydinILcH6xE4ZCSB37nItUoY5fY="; + types-aiobotocore-signer = + buildTypesAiobotocorePackage "signer" "2.15.0" + "sha256-K0R9aAS2jacez/U5l9QIiPsBUwMDlW/bb8blBVkoolY="; types-aiobotocore-simspaceweaver = - buildTypesAiobotocorePackage "simspaceweaver" "2.13.1" - "sha256-bwDH6nst28rVEYlMFs6UlcyhpAnZdsoZYzlSu6qulKA="; + buildTypesAiobotocorePackage "simspaceweaver" "2.15.0" + "sha256-Ilus9YxPmEpqLwuwh1GPZeDl/C7wVOUAaVi9xXRLT9E="; - types-aiobotocore-sms = buildTypesAiobotocorePackage "sms" "2.13.1" - "sha256-HqNKZ6DGH+Wdho2bTfNeq72OEs1UzylNPu+nbyf3jd0="; + types-aiobotocore-sms = + buildTypesAiobotocorePackage "sms" "2.15.0" + "sha256-BniFLeuZataAM/NYyOK6iB4b2a/sWtgNRpVfgHsqYiY="; types-aiobotocore-sms-voice = - buildTypesAiobotocorePackage "sms-voice" "2.13.1" - "sha256-lC4YEVdgp6ZLjVkwygsi7dUsX9vZ1L/fqbk1EpX/DmE="; + buildTypesAiobotocorePackage "sms-voice" "2.15.0" + "sha256-9MCKNyOtMOcEl/JpDNd4d9UmdJQFuxOSYVQFoRg3CL4="; types-aiobotocore-snow-device-management = - buildTypesAiobotocorePackage "snow-device-management" "2.13.1" - "sha256-yniuI6Hgp8XTmRjO74MZRxZYV0ohEE7CAtahIYQz6cg="; + buildTypesAiobotocorePackage "snow-device-management" "2.15.0" + "sha256-ZEz4+4y7ebhBOyeYxGUrwSDeqiU2/JDMJM/3i1jqJYU="; - types-aiobotocore-snowball = buildTypesAiobotocorePackage "snowball" "2.13.1" - "sha256-bKjZGXIWbCFIo7SyLueX8gj9WWjx7nh2P4DArfsMcFI="; + types-aiobotocore-snowball = + buildTypesAiobotocorePackage "snowball" "2.15.0" + "sha256-WL3OEnSX9SnfAZeNzknAwCiFTxnS49M8vg4Do+qa7Es="; - types-aiobotocore-sns = buildTypesAiobotocorePackage "sns" "2.13.1" - "sha256-VvbiWdwlApbJcRlAoFzZOG4SekaP7mJVbJCpoF+E6Tk="; + types-aiobotocore-sns = + buildTypesAiobotocorePackage "sns" "2.15.0" + "sha256-zoLt5UlcGqxQZY3LYzL3urQeryT/KQqmlMlMOx5UD9k="; - types-aiobotocore-sqs = buildTypesAiobotocorePackage "sqs" "2.13.1" - "sha256-pVRELwjlkLApPYUV+f6ax/ijc7N6C3nsqPBeGisB0HY="; + types-aiobotocore-sqs = + buildTypesAiobotocorePackage "sqs" "2.15.0" + "sha256-pYlp0b+AowToQQsrIcOS/dA/1a49WwNbojMsWXXroxs="; - types-aiobotocore-ssm = buildTypesAiobotocorePackage "ssm" "2.13.1" - "sha256-bdeTdx6+Pde+hFzqH5Bn4Jk/4fFe68ihYDCXmpbR44w="; + types-aiobotocore-ssm = + buildTypesAiobotocorePackage "ssm" "2.15.0" + "sha256-LGuL7mGhe7XVBetPFKrwqswpyMwLO3aXuWRwuWV1n4g="; types-aiobotocore-ssm-contacts = - buildTypesAiobotocorePackage "ssm-contacts" "2.13.1" - "sha256-lJvrcgICIvcGbwPuYlJ4oT3iceItzkOEnSqdJtJB86E="; + buildTypesAiobotocorePackage "ssm-contacts" "2.15.0" + "sha256-lycHVp5nrD6z0dXwqN5KTs7OGQwAZaAZCM5Gezqj+rQ="; types-aiobotocore-ssm-incidents = - buildTypesAiobotocorePackage "ssm-incidents" "2.13.1" - "sha256-mpDPfMZqKQV1PYrK5MqNZK/z9x0ObIiZbScpPSZFb1A="; + buildTypesAiobotocorePackage "ssm-incidents" "2.15.0" + "sha256-CeSG0L3z5T+tlgrAa/dKU6knE6qKsA6B6+nJXDcgXqg="; - types-aiobotocore-ssm-sap = buildTypesAiobotocorePackage "ssm-sap" "2.13.1" - "sha256-mFpwV41A5WDkzxSeKxGnw+NjByPH2M40ShgcNCDw+jM="; + types-aiobotocore-ssm-sap = + buildTypesAiobotocorePackage "ssm-sap" "2.15.0" + "sha256-0Dmwb0nOp3g3HY4gjxXKVRDFl/tjC1ppyzzrftgBkZU="; - types-aiobotocore-sso = buildTypesAiobotocorePackage "sso" "2.13.1" - "sha256-DIKi/0zz0O66P+CvgrLZRZ8NvqB0N4zlmIcF8DR5fvg="; + types-aiobotocore-sso = + buildTypesAiobotocorePackage "sso" "2.15.0" + "sha256-a9sxXz66olmSe2+PP27DFTcE9FK+ZFi7mNl3pdcOh8Q="; types-aiobotocore-sso-admin = - buildTypesAiobotocorePackage "sso-admin" "2.13.1" - "sha256-WO6KbaKvmijEaWCKPbEusudo4vHpJCcSX3aJ6zxWFG0="; + buildTypesAiobotocorePackage "sso-admin" "2.15.0" + "sha256-v+Co+P2VVLLF4HPES1x4gXFfq+m3EnreuD4iequsGis="; - types-aiobotocore-sso-oidc = buildTypesAiobotocorePackage "sso-oidc" "2.13.1" - "sha256-YriIVUyOpoC6Ry6F28yNRDuH3gwoYishq4TqUgW3CU4="; + types-aiobotocore-sso-oidc = + buildTypesAiobotocorePackage "sso-oidc" "2.15.0" + "sha256-qZ0w9T/NYTvLfOQ4CwZUoNtwVFmrAH6Ow6r5Lru1Vsk="; types-aiobotocore-stepfunctions = - buildTypesAiobotocorePackage "stepfunctions" "2.13.1" - "sha256-HijHsOB9bT5ESGdkwS8m3ulkPef8TLsJclAdum8aWCk="; + buildTypesAiobotocorePackage "stepfunctions" "2.15.0" + "sha256-bZPSrZ+hzxPrBYeE7PT8OGaM3V8T6950gxacsifLr0Y="; types-aiobotocore-storagegateway = - buildTypesAiobotocorePackage "storagegateway" "2.13.1" - "sha256-KETzBkIcOB8pWBYIzFzIYh2/Y7dc0TGBU6tRQFzGBhQ="; + buildTypesAiobotocorePackage "storagegateway" "2.15.0" + "sha256-THc96oaV0Bh7x9H+xSsV7LD1QwJKMT8t3z2H0Qzq3lw="; - types-aiobotocore-sts = buildTypesAiobotocorePackage "sts" "2.13.1" - "sha256-mUp9bdMDsAPqnFmDjfCusId6N2L/oqVgDK3jZjO29s8="; + types-aiobotocore-sts = + buildTypesAiobotocorePackage "sts" "2.15.0" + "sha256-ElXjKUWdOuR3xOBF59/FjWol+4v16Z5KzaGsuNL//Ng="; - types-aiobotocore-support = buildTypesAiobotocorePackage "support" "2.13.1" - "sha256-0qjcW4bo4LRYtsNde3ft34sjLEDZkvEOhWOQ9T283fM="; + types-aiobotocore-support = + buildTypesAiobotocorePackage "support" "2.15.0" + "sha256-263KZcvknzGUEJYl1FX2iwqz/3OWDnE3twBwZepzFaY="; types-aiobotocore-support-app = - buildTypesAiobotocorePackage "support-app" "2.13.1" - "sha256-OvZuJ4yU5el/xSLLJu2ZY94wiHXCtirBeykiHCVsb78="; + buildTypesAiobotocorePackage "support-app" "2.15.0" + "sha256-5YPHOgKZJADFOcefgIBg5NwolDQxDqruE3rtv3SaqJo="; - types-aiobotocore-swf = buildTypesAiobotocorePackage "swf" "2.13.1" - "sha256-sG4tBgtIZ5Gxhg9kWQ/p852XplThz6C46Ck1GsKWWnw="; + types-aiobotocore-swf = + buildTypesAiobotocorePackage "swf" "2.15.0" + "sha256-7HH2Pe87MmL1huAN2G9zNf7LfdWMWMgX6zIBAxap7NU="; types-aiobotocore-synthetics = - buildTypesAiobotocorePackage "synthetics" "2.13.1" - "sha256-ps6hwRhG5iofY95IV0oigJg32AxLJ4SVHN6vrJQ2x6s="; + buildTypesAiobotocorePackage "synthetics" "2.15.0" + "sha256-98S15J1C+jOv6eTO/EPEYN4qj8eWKLotMMjgpPUA5k0="; - types-aiobotocore-textract = buildTypesAiobotocorePackage "textract" "2.13.1" - "sha256-L2Cc0AT30rVvRFXg3ESH1g03Ay4lAlQHymG5S9Kr9fc="; + types-aiobotocore-textract = + buildTypesAiobotocorePackage "textract" "2.15.0" + "sha256-YwmAG8BMUrluE1oLDRVQ5CwfThaDnQahl2ENauOlhxw="; types-aiobotocore-timestream-query = - buildTypesAiobotocorePackage "timestream-query" "2.13.1" - "sha256-is97L08grAhe1l3SKOudv+X08Bn91j5XDc4MJDnM8iI="; + buildTypesAiobotocorePackage "timestream-query" "2.15.0" + "sha256-1RG3Y9yOkZh6/rySlvRzH32F5jDsw+o4UrCyiaRJZt0="; types-aiobotocore-timestream-write = - buildTypesAiobotocorePackage "timestream-write" "2.13.1" - "sha256-hA3oQKMzs4A6JOgZ0LJy1lBWLseeJh6Phh+T9sEaBss="; + buildTypesAiobotocorePackage "timestream-write" "2.15.0" + "sha256-94yxaeKblMoFpN9UgZqR3+x65my8UHg8002tVNnWB18="; - types-aiobotocore-tnb = buildTypesAiobotocorePackage "tnb" "2.13.1" - "sha256-bZy4/BTpRQ432zzSpJYpxva8204wVuCn2vKXNG8lXRg="; + types-aiobotocore-tnb = + buildTypesAiobotocorePackage "tnb" "2.15.0" + "sha256-+5m/DzJB5y1eucLfqj3j7FyVRW4vgGxIJOfqLCs24qM="; types-aiobotocore-transcribe = - buildTypesAiobotocorePackage "transcribe" "2.13.1" - "sha256-vjVVzDiImqPgP2HEsOQYzpU4LXNAzpIyO1qgAoit2tQ="; + buildTypesAiobotocorePackage "transcribe" "2.15.0" + "sha256-HIFmwpEuWcvQVKHvQ9pbqrLk76J7IpH7Hd8qbm/Aopc="; - types-aiobotocore-transfer = buildTypesAiobotocorePackage "transfer" "2.13.1" - "sha256-WB9TqJahHVmhrOUqJ/cj2zh/eqzVmqzXdX3+0V2PXqk="; + types-aiobotocore-transfer = + buildTypesAiobotocorePackage "transfer" "2.15.0" + "sha256-7Hz2zgr87h5xVhkf1+UzJN+O13rPqohVN4qZ2/E8ir4="; types-aiobotocore-translate = - buildTypesAiobotocorePackage "translate" "2.13.1" - "sha256-IAi/rWYer5DV2QJO4NeS6THQ+dAwR0+EvjsPeIlBgdQ="; + buildTypesAiobotocorePackage "translate" "2.15.0" + "sha256-eauTD0hzFk83sn41EnlJxrz3V1teKYQsD7ci9AhiFYc="; types-aiobotocore-verifiedpermissions = - buildTypesAiobotocorePackage "verifiedpermissions" "2.13.1" - "sha256-XUuwg1HtJ46K3AhRx4l74x6mVfJxyTv7R1gCgeapHOk="; + buildTypesAiobotocorePackage "verifiedpermissions" "2.15.0" + "sha256-0MmY0RefjXcu/2cZjhR+DoLSBETiqTHO4p+O7/CsQSY="; - types-aiobotocore-voice-id = buildTypesAiobotocorePackage "voice-id" "2.13.1" - "sha256-RKJA0GBvEQtZV1fx2W26fF2QCkh0BlEh1FNwuS6hxxo="; + types-aiobotocore-voice-id = + buildTypesAiobotocorePackage "voice-id" "2.15.0" + "sha256-5tsvPjGjtoXQZdYQ+NjoXcCU2F8IY/EQgEOUow+EIME="; types-aiobotocore-vpc-lattice = - buildTypesAiobotocorePackage "vpc-lattice" "2.13.1" - "sha256-bh1qQDmivNGTgQOBxJXlCK4Onmr13d7z9qpdIMjuaH4="; + buildTypesAiobotocorePackage "vpc-lattice" "2.15.0" + "sha256-Lw4kqT/JIrzK4cVsm6c1hUTTE1t6etVHfuzskO6kMyY="; - types-aiobotocore-waf = buildTypesAiobotocorePackage "waf" "2.13.1" - "sha256-xjqghC+Ul6XFeZSu+tOIe6UCJmAvh5iCZTV6pALk6ls="; + types-aiobotocore-waf = + buildTypesAiobotocorePackage "waf" "2.15.0" + "sha256-syx0otSKJ896wcitfxqsJafFxf/4nokZ7pUQGiEEYTg="; types-aiobotocore-waf-regional = - buildTypesAiobotocorePackage "waf-regional" "2.13.1" - "sha256-07Xbf+aRF1YNjK4MK/dNzmjbyFdTA/Aw/a/XxPLz1mA="; + buildTypesAiobotocorePackage "waf-regional" "2.15.0" + "sha256-9qIuIhKCDE6W09Ue2RFTrmKzFjK+73l6MA5X2zhoo3U="; - types-aiobotocore-wafv2 = buildTypesAiobotocorePackage "wafv2" "2.13.1" - "sha256-H/jRDzPfruygc278Rey4ZlpSqjJjPAxFfbB5Hwx5z34="; + types-aiobotocore-wafv2 = + buildTypesAiobotocorePackage "wafv2" "2.15.0" + "sha256-yeQPntqK7MRxLVqW54sihvcQ4t1MU3+sEz76N+wE0DI="; types-aiobotocore-wellarchitected = - buildTypesAiobotocorePackage "wellarchitected" "2.13.1" - "sha256-/x0aoRNtAdezLG3+8XISYaHhK6jEJDduIHThdbUxfBE="; + buildTypesAiobotocorePackage "wellarchitected" "2.15.0" + "sha256-ac5AzHfMlUq9x511Dfv4abQAjMc9LFvnmfSN7neAgdM="; - types-aiobotocore-wisdom = buildTypesAiobotocorePackage "wisdom" "2.13.1" - "sha256-N86oMUzLeyorE5kOKzdzNZ7xcPTj3RfMUi8Y/COUir8="; + types-aiobotocore-wisdom = + buildTypesAiobotocorePackage "wisdom" "2.15.0" + "sha256-HYeQ/YnZYWyIs12disXzm9LM2ZA8K1KSCGyI2oPwfjA="; - types-aiobotocore-workdocs = buildTypesAiobotocorePackage "workdocs" "2.13.1" - "sha256-vze4j28+URgY81Huiv9rLhga+3ZpmZbg9Kok7Kj9Hs0="; + types-aiobotocore-workdocs = + buildTypesAiobotocorePackage "workdocs" "2.15.0" + "sha256-hue/UsRvpngLHlgFFmTIPbCXzbtFB1vCkhEkiB7TNrA="; - types-aiobotocore-worklink = buildTypesAiobotocorePackage "worklink" "2.13.1" - "sha256-0GqKRn4wmfqWo2h4bVkBrU8l9rp2l4MEL+mNDzcNk6A="; + types-aiobotocore-worklink = + buildTypesAiobotocorePackage "worklink" "2.15.0" + "sha256-m4lbQZhG7UjtgSnsPyH37K51YxohcdfRwe0jPZGqQUs="; - types-aiobotocore-workmail = buildTypesAiobotocorePackage "workmail" "2.13.1" - "sha256-k0ZNjys7B3Kgh5k71tL8Pe9TfosuMXrjPB8EGk5sHSA="; + types-aiobotocore-workmail = + buildTypesAiobotocorePackage "workmail" "2.15.0" + "sha256-vQRAXpFV6RG4HWKRHLgLOQHr++Mqly20MsTlIn2M/yA="; types-aiobotocore-workmailmessageflow = - buildTypesAiobotocorePackage "workmailmessageflow" "2.13.1" - "sha256-Xs5k6yyCaSdHTCtWw6Xp7LDK5lpIS2oUv3xBavIw+yc="; + buildTypesAiobotocorePackage "workmailmessageflow" "2.15.0" + "sha256-7iMPW/8tdqfAmcCNCcTppvzaa4zo/8NCQMIuByJVB44="; types-aiobotocore-workspaces = - buildTypesAiobotocorePackage "workspaces" "2.13.1" - "sha256-DLDVHnrT7OEK3HBd5HOdTx+RQruFOowzVIpg8Sv/wzo="; + buildTypesAiobotocorePackage "workspaces" "2.15.0" + "sha256-wN9Jx2vAtKsDJ9YJBJOVguEJY0OLu8OUxY/K9bRqymM="; types-aiobotocore-workspaces-web = - buildTypesAiobotocorePackage "workspaces-web" "2.13.1" - "sha256-JOsQKGy81RNaOebeCph4PXrgngFIva4eHCXQlA8PIko="; + buildTypesAiobotocorePackage "workspaces-web" "2.15.0" + "sha256-ikKQGGpRu04WF1cix4RysjNSSl0sbA6QdPP2b2amz0E="; - types-aiobotocore-xray = buildTypesAiobotocorePackage "xray" "2.13.1" - "sha256-bxPi1ZV2DOv4Itv/DRoGvop2wHhloj49ovoXBdhWxZY="; + types-aiobotocore-xray = + buildTypesAiobotocorePackage "xray" "2.15.0" + "sha256-6axavJjQY10qnYlFnxXQvj44Dg9hmqYbpAHmTeOHoUU="; } From 1e32d7227a2b895c73a662103002270167a1e634 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:24:09 +0200 Subject: [PATCH 105/212] python312Packages.govee-local-api: 1.5.1 -> 1.5.2 Diff: https://github.com/Galorhallen/govee-local-api/compare/refs/tags/v1.5.1...v1.5.2 Changelog: https://github.com/Galorhallen/govee-local-api/releases/tag/v1.5.2 --- pkgs/development/python-modules/govee-local-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-local-api/default.nix b/pkgs/development/python-modules/govee-local-api/default.nix index f6eabfe721af..e2e6976b602e 100644 --- a/pkgs/development/python-modules/govee-local-api/default.nix +++ b/pkgs/development/python-modules/govee-local-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "govee-local-api"; - version = "1.5.1"; + version = "1.5.2"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Galorhallen"; repo = "govee-local-api"; rev = "refs/tags/v${version}"; - hash = "sha256-pmExXQmkkjeMHegXV/b94a95qkoOHA7SJOkR1NUV4lE="; + hash = "sha256-sxxw/XAPENtNeY/64+pxnPgMBBM7+lpF52ixRm18d48="; }; build-system = [ poetry-core ]; From a94bdd9131e6fdad1be1015db5e9572ab1a8a5d5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:24:54 +0200 Subject: [PATCH 106/212] python312Packages.karton-core: 5.4.0 -> 5.5.0 Diff: https://github.com/CERT-Polska/karton/compare/refs/tags/v5.4.0...v5.5.0 Changelog: https://github.com/CERT-Polska/karton/releases/tag/v5.5.0 --- pkgs/development/python-modules/karton-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 00796239d341..5dbd5f77fbbc 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "karton-core"; - version = "5.4.0"; + version = "5.5.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "CERT-Polska"; repo = "karton"; rev = "refs/tags/v${version}"; - hash = "sha256-4IU4ttJdh5BU79076kbQOtzqzeQ3/Xb9Qd6Bh9iNXrA="; + hash = "sha256-fjzZPq98AwNT+tiTvKZY2QsSD+FRUFx+oY84hPP7QdI="; }; build-system = [ setuptools ]; From fc8db9281287f3f6fe66c201984a97d363a2ce99 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:25:48 +0200 Subject: [PATCH 107/212] python312Packages.lingva: 5.0.3 -> 5.0.4 Diff: https://github.com/vacanza/lingva/compare/refs/tags/v5.0.3...v5.0.4 Changelog: https://github.com/vacanza/lingva/blob/5.0.4/changes.rst --- pkgs/development/python-modules/lingva/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lingva/default.nix b/pkgs/development/python-modules/lingva/default.nix index 153284d88125..3f6002284a5c 100644 --- a/pkgs/development/python-modules/lingva/default.nix +++ b/pkgs/development/python-modules/lingva/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "lingva"; - version = "5.0.3"; + version = "5.0.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "lingva"; rev = "refs/tags/v${version}"; - hash = "sha256-usJyEbHtwhsc0ulG9+7zJ/kDUFrxfqykZLOAWwzP+Dw="; + hash = "sha256-2h3J+pvXRmjD7noMA7Cyu5Tf/9R8Akv08A7xJMLVD08="; }; build-system = [ setuptools ]; From cd1ac62f13253ad8da5c5bf94fed802e50c60331 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:31:47 +0200 Subject: [PATCH 108/212] python312Packages.tencentcloud-sdk-python: 3.0.1230 -> 3.0.1231 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1230...3.0.1231 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1231/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a0a79b7083be..3de63ae5ecb4 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1230"; + version = "3.0.1231"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-wuEbocPbQL/oG6b78Q92+kfWP3ZkIIf8k97tSBZg9nc="; + hash = "sha256-XDFAUIP/oA71dK+QMUrh9ZmusJFzrpuI+0ExW+A6FIU="; }; build-system = [ setuptools ]; From 603b51508bdf5865909f5023c50b363948f81291 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:32:22 +0200 Subject: [PATCH 109/212] python312Packages.pypck: 0.7.22 -> 0.7.23 Diff: https://github.com/alengwenus/pypck/compare/refs/tags/0.7.22...0.7.23 Changelog: https://github.com/alengwenus/pypck/releases/tag/0.7.23 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 1dd639d8721b..d2ee3050522f 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.22"; + version = "0.7.23"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "alengwenus"; repo = "pypck"; rev = "refs/tags/${version}"; - hash = "sha256-rtlcsmjvhC232yjt258ne51tL//eKsCKYYc/yHG7HUU="; + hash = "sha256-CaDwmVx6otBRuPMVpQxaZH/wqkrLgMkq/OnbkkT+VcM="; }; postPatch = '' From 3a93975e33e275cbaabaab18421935b584431c8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 00:36:21 +0200 Subject: [PATCH 110/212] trivy: 0.55.0 -> 0.55.1 Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.55.0...v0.55.1 Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.55.1 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index cd0e01644f7f..b6f4faad4d81 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.55.0"; + version = "0.55.1"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-YbQdTtw2/cEuGspDQAEmPv//zQY+qbHt94yGs3/+6YU="; + hash = "sha256-NStDXhJ2nOaPxirD6qbLyqIZZFLp5vm5/u5tego7MyI="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-Q5XqnwMBVJoaA+TjqO4InLEjevBHIkwveJDFOoEtPmY="; + vendorHash = "sha256-h/hVzejcPvtGActgeVrmOmb2gn2mUdnzOvAWUrV5CvI="; subPackages = [ "cmd/trivy" ]; From c585a85e49e44f5d5d1dcb48752cc41916a36804 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:59:13 +0000 Subject: [PATCH 111/212] nsc: 2.8.7 -> 2.8.8 --- pkgs/tools/system/nsc/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix index 4930484accb5..e4775e7ebb84 100644 --- a/pkgs/tools/system/nsc/default.nix +++ b/pkgs/tools/system/nsc/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "nsc"; - version = "2.8.7"; + version = "2.8.8"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-uJR4AdXGSL3vKUABpBBteND7EUocKz+mLRqt5XPdREk="; + hash = "sha256-ZaizxiNGiyV3Z18U4W2LcqZXDLfUB7NhuURNVbx6M4s="; }; ldflags = [ @@ -27,24 +27,26 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd nsc \ --bash <($out/bin/nsc completion bash) \ --fish <($out/bin/nsc completion fish) \ --zsh <($out/bin/nsc completion zsh) ''; - preCheck = '' - # Tests attempt to write to the home directory. + preInstall = '' + # asc attempt to write to the home directory. export HOME=$(mktemp -d) ''; + preCheck = preInstall; + # Tests currently fail on darwin because of a test in nsc which # expects command output to contain a specific path. However # the test strips table formatting from the command output in a naive way # that removes all the table characters, including '-'. # The nix build directory looks something like: - # /private/tmp/nix-build-nsc-2.8.7.drv-0/nsc_test2000598938/keys + # /private/tmp/nix-build-nsc-2.8.8.drv-0/nsc_test2000598938/keys # Then the `-` are removed from the path unintentionally and the test fails. # This should be fixed upstream to avoid mangling the path when # removing the table decorations from the command output. From 3dbab8acbb9c5a94a722adefe0d6b910f2867949 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:21:37 -0500 Subject: [PATCH 112/212] netdata: format --- pkgs/tools/system/netdata/default.nix | 229 +++++++++++++++++--------- 1 file changed, 149 insertions(+), 80 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 84050ab400dc..c5dd4a9c016c 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,24 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, makeWrapper -, CoreFoundation, IOKit, libossp_uuid -, nixosTests -, bash, curl, jemalloc, json_c, libuv, zlib, libyaml, libelf, libbpf -, libcap, libuuid, lm_sensors, protobuf -, go, buildGoModule, ninja -, withCups ? false, cups -, withDBengine ? true, lz4 -, withIpmi ? (!stdenv.isDarwin), freeipmi -, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct -, withCloud ? false -, withCloudUi ? false -, withConnPubSub ? false, google-cloud-cpp, grpc -, withConnPrometheus ? false, snappy -, withSsl ? true, openssl -, withSystemdJournal ? (!stdenv.isDarwin), systemd -, withDebug ? false -, withEbpf ? false -, withNetworkViewer ? (!stdenv.isDarwin) +{ + lib, + stdenv, + fetchFromGitHub, + CoreFoundation, + IOKit, + bash, + buildGoModule, + cmake, + cups, + curl, + freeipmi, + go, + google-cloud-cpp, + grpc, + jemalloc, + json_c, + libbpf, + libcap, + libelf, + libmnl, + libnetfilter_acct, + libossp_uuid, + libuuid, + libuv, + libyaml, + lm_sensors, + lz4, + makeWrapper, + ninja, + nixosTests, + openssl, + pkg-config, + protobuf, + snappy, + systemd, + withCloud ? false, + withCloudUi ? false, + withConnPrometheus ? false, + withConnPubSub ? false, + withCups ? false, + withDBengine ? true, + withDebug ? false, + withEbpf ? false, + withIpmi ? (!stdenv.isDarwin), + withNetfilter ? (!stdenv.isDarwin), + withNetworkViewer ? (!stdenv.isDarwin), + withSsl ? true, + withSystemdJournal ? (!stdenv.isDarwin), + zlib, }: - stdenv.mkDerivation rec { version = "1.47.0"; pname = "netdata"; @@ -27,10 +57,12 @@ stdenv.mkDerivation rec { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - hash = if withCloudUi - then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" + hash = + if withCloudUi then + "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" # we delete the v2 GUI after fetching - else "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; + else + "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty @@ -43,19 +75,50 @@ stdenv.mkDerivation rec { strictDeps = true; - nativeBuildInputs = [ cmake pkg-config makeWrapper go ninja ] - ++ lib.optionals withCups [ cups.dev ]; + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + go + ninja + ] ++ lib.optionals withCups [ cups.dev ]; # bash is only used to rewrite shebangs - buildInputs = [ bash curl jemalloc json_c libuv zlib libyaml lm_sensors ] - ++ lib.optionals stdenv.isDarwin [ CoreFoundation IOKit libossp_uuid ] - ++ lib.optionals (!stdenv.isDarwin) [ libcap libuuid ] + buildInputs = + [ + bash + curl + jemalloc + json_c + libuv + zlib + libyaml + lm_sensors + ] + ++ lib.optionals stdenv.isDarwin [ + CoreFoundation + IOKit + libossp_uuid + ] + ++ lib.optionals (!stdenv.isDarwin) [ + libcap + libuuid + ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] ++ lib.optionals withIpmi [ freeipmi ] - ++ lib.optionals withNetfilter [ libmnl libnetfilter_acct ] - ++ lib.optionals withConnPubSub [ google-cloud-cpp grpc ] + ++ lib.optionals withNetfilter [ + libmnl + libnetfilter_acct + ] + ++ lib.optionals withConnPubSub [ + google-cloud-cpp + grpc + ] ++ lib.optionals withConnPrometheus [ snappy ] - ++ lib.optionals withEbpf [ libelf libbpf ] + ++ lib.optionals withEbpf [ + libelf + libbpf + ] ++ lib.optionals (withCloud || withConnPrometheus) [ protobuf ] ++ lib.optionals withSystemdJournal [ systemd ] ++ lib.optionals withSsl [ openssl ]; @@ -79,38 +142,40 @@ stdenv.mkDerivation rec { donStrip = withDebug; env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; - postInstall = '' - # Relocate one folder above. - mv $out/usr/* $out/ - '' + lib.optionalString (!stdenv.isDarwin) '' - # rename this plugin so netdata will look for setuid wrapper - mv $out/libexec/netdata/plugins.d/apps.plugin \ - $out/libexec/netdata/plugins.d/apps.plugin.org - mv $out/libexec/netdata/plugins.d/cgroup-network \ - $out/libexec/netdata/plugins.d/cgroup-network.org - mv $out/libexec/netdata/plugins.d/perf.plugin \ - $out/libexec/netdata/plugins.d/perf.plugin.org - mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ - $out/libexec/netdata/plugins.d/slabinfo.plugin.org - mv $out/libexec/netdata/plugins.d/debugfs.plugin \ - $out/libexec/netdata/plugins.d/debugfs.plugin.org - ${lib.optionalString withSystemdJournal '' - mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ - $out/libexec/netdata/plugins.d/systemd-journal.plugin.org - ''} - ${lib.optionalString withIpmi '' - mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ - $out/libexec/netdata/plugins.d/freeipmi.plugin.org - ''} - ${lib.optionalString withNetworkViewer '' - mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ - $out/libexec/netdata/plugins.d/network-viewer.plugin.org - ''} - ${lib.optionalString (!withCloudUi) '' - rm -rf $out/share/netdata/web/index.html - cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html - ''} - ''; + postInstall = + '' + # Relocate one folder above. + mv $out/usr/* $out/ + '' + + lib.optionalString (!stdenv.isDarwin) '' + # rename this plugin so netdata will look for setuid wrapper + mv $out/libexec/netdata/plugins.d/apps.plugin \ + $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org + mv $out/libexec/netdata/plugins.d/perf.plugin \ + $out/libexec/netdata/plugins.d/perf.plugin.org + mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ + $out/libexec/netdata/plugins.d/slabinfo.plugin.org + mv $out/libexec/netdata/plugins.d/debugfs.plugin \ + $out/libexec/netdata/plugins.d/debugfs.plugin.org + ${lib.optionalString withSystemdJournal '' + mv $out/libexec/netdata/plugins.d/systemd-journal.plugin \ + $out/libexec/netdata/plugins.d/systemd-journal.plugin.org + ''} + ${lib.optionalString withIpmi '' + mv $out/libexec/netdata/plugins.d/freeipmi.plugin \ + $out/libexec/netdata/plugins.d/freeipmi.plugin.org + ''} + ${lib.optionalString withNetworkViewer '' + mv $out/libexec/netdata/plugins.d/network-viewer.plugin \ + $out/libexec/netdata/plugins.d/network-viewer.plugin.org + ''} + ${lib.optionalString (!withCloudUi) '' + rm -rf $out/share/netdata/web/index.html + cp $out/share/netdata/web/v1/index.html $out/share/netdata/web/index.html + ''} + ''; preConfigure = lib.optionalString (!stdenv.isDarwin) '' export GOCACHE=$TMPDIR/go-cache @@ -174,25 +239,30 @@ stdenv.mkDerivation rec { enableParallelBuild = true; passthru = rec { - netdata-go-modules = (buildGoModule { - pname = "netdata-go-plugins"; - inherit version src; + netdata-go-modules = + (buildGoModule { + pname = "netdata-go-plugins"; + inherit version src; - sourceRoot = "${src.name}/src/go/plugin/go.d"; + sourceRoot = "${src.name}/src/go/plugin/go.d"; - vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; - doCheck = false; - proxyVendor = true; + vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; + doCheck = false; + proxyVendor = true; - ldflags = [ "-s" "-w" "-X main.version=${version}" ]; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + ]; - passthru.tests = tests; - meta = meta // { - description = "Netdata orchestrator for data collection modules written in Go"; - mainProgram = "godplugin"; - license = lib.licenses.gpl3Only; - }; - }).goModules; + passthru.tests = tests; + meta = meta // { + description = "Netdata orchestrator for data collection modules written in Go"; + mainProgram = "godplugin"; + license = lib.licenses.gpl3Only; + }; + }).goModules; inherit withIpmi withNetworkViewer; tests.netdata = nixosTests.netdata; }; @@ -202,8 +272,7 @@ stdenv.mkDerivation rec { description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; - license = [ licenses.gpl3Plus ] - ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; + license = [ licenses.gpl3Plus ] ++ lib.optionals (withCloudUi) [ licenses.ncul1 ]; platforms = platforms.unix; maintainers = [ ]; }; From 3b6197558a267cd6860c68db2e1742286cd2edb5 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:23:53 -0500 Subject: [PATCH 113/212] netdata: cleanup rec --- pkgs/tools/system/netdata/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c5dd4a9c016c..1af6c4d9cb8a 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -49,14 +49,14 @@ withSystemdJournal ? (!stdenv.isDarwin), zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { version = "1.47.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = if withCloudUi then "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" @@ -185,7 +185,7 @@ stdenv.mkDerivation rec { substituteInPlace packaging/cmake/Modules/NetdataGoTools.cmake \ --replace-fail \ 'GOPROXY=https://proxy.golang.org' \ - 'GOPROXY=file://${passthru.netdata-go-modules}' + 'GOPROXY=file://${finalAttrs.passthru.netdata-go-modules}' # Prevent the path to be caught into the Nix store path. substituteInPlace CMakeLists.txt \ @@ -242,9 +242,9 @@ stdenv.mkDerivation rec { netdata-go-modules = (buildGoModule { pname = "netdata-go-plugins"; - inherit version src; + inherit (finalAttrs) version src; - sourceRoot = "${src.name}/src/go/plugin/go.d"; + sourceRoot = "${finalAttrs.src.name}/src/go/plugin/go.d"; vendorHash = "sha256-NZ1tg+lvXNgypqmjjb5f7dHH6DIA9VOa4PMM4eq11n0="; doCheck = false; @@ -253,11 +253,11 @@ stdenv.mkDerivation rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; passthru.tests = tests; - meta = meta // { + meta = finalAttrs.meta // { description = "Netdata orchestrator for data collection modules written in Go"; mainProgram = "godplugin"; license = lib.licenses.gpl3Only; @@ -276,4 +276,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; maintainers = [ ]; }; -} +}) From da31ab50f3ad9ed653423890137a7b453aa2dd01 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 18:37:55 -0500 Subject: [PATCH 114/212] netdata: fix darwin --- pkgs/tools/system/netdata/default.nix | 40 +++++++++++++++------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 1af6c4d9cb8a..9db4e7756858 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -2,13 +2,12 @@ lib, stdenv, fetchFromGitHub, - CoreFoundation, - IOKit, bash, buildGoModule, cmake, cups, curl, + darwin, freeipmi, go, google-cloud-cpp, @@ -30,6 +29,7 @@ ninja, nixosTests, openssl, + overrideSDK, pkg-config, protobuf, snappy, @@ -42,14 +42,17 @@ withDBengine ? true, withDebug ? false, withEbpf ? false, - withIpmi ? (!stdenv.isDarwin), - withNetfilter ? (!stdenv.isDarwin), - withNetworkViewer ? (!stdenv.isDarwin), + withIpmi ? (stdenv.isLinux), + withNetfilter ? (stdenv.isLinux), + withNetworkViewer ? (stdenv.isLinux), withSsl ? true, - withSystemdJournal ? (!stdenv.isDarwin), + withSystemdJournal ? (stdenv.isLinux), zlib, }: -stdenv.mkDerivation (finalAttrs: { +let + stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; +in +stdenv'.mkDerivation (finalAttrs: { version = "1.47.0"; pname = "netdata"; @@ -92,16 +95,19 @@ stdenv.mkDerivation (finalAttrs: { libuv zlib libyaml - lm_sensors ] - ++ lib.optionals stdenv.isDarwin [ - CoreFoundation - IOKit - libossp_uuid - ] - ++ lib.optionals (!stdenv.isDarwin) [ + ++ lib.optionals stdenv.isDarwin ( + with darwin.apple_sdk.frameworks; + [ + CoreFoundation + IOKit + libossp_uuid + ] + ) + ++ lib.optionals (stdenv.isLinux) [ libcap libuuid + lm_sensors ] ++ lib.optionals withCups [ cups ] ++ lib.optionals withDBengine [ lz4 ] @@ -147,7 +153,7 @@ stdenv.mkDerivation (finalAttrs: { # Relocate one folder above. mv $out/usr/* $out/ '' - + lib.optionalString (!stdenv.isDarwin) '' + + lib.optionalString (stdenv.isLinux) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org @@ -177,7 +183,7 @@ stdenv.mkDerivation (finalAttrs: { ''} ''; - preConfigure = lib.optionalString (!stdenv.isDarwin) '' + preConfigure = '' export GOCACHE=$TMPDIR/go-cache export GOPATH=$TMPDIR/go export GOSUMDB=off @@ -268,7 +274,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = with lib; { - broken = stdenv.isDarwin || stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; + broken = stdenv.buildPlatform != stdenv.hostPlatform || withEbpf; description = "Real-time performance monitoring tool"; homepage = "https://www.netdata.cloud/"; changelog = "https://github.com/netdata/netdata/releases/tag/v${version}"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b931075d156..e662a84d170d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9664,7 +9664,6 @@ with pkgs; nerdctl = callPackage ../applications/networking/cluster/nerdctl { }; netdata = callPackage ../tools/system/netdata { - inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; protobuf = protobuf_21; }; netdataCloud = netdata.override { From f8726f98ae2d06b8b95705f447e30ce6d4819acd Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 12 Sep 2024 20:09:46 -0500 Subject: [PATCH 115/212] netdata: 1.47.0 -> 1.47.1 --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 9db4e7756858..c7c7554914c7 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -53,7 +53,7 @@ let stdenv' = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; in stdenv'.mkDerivation (finalAttrs: { - version = "1.47.0"; + version = "1.47.1"; pname = "netdata"; src = fetchFromGitHub { @@ -62,10 +62,10 @@ stdenv'.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = if withCloudUi then - "sha256-eMapy4HQaEblDfZt2uVSfBWRlkstX7TxZDBgSv5bW/I=" + "sha256-/iXmIjWpZ0s/LELZM7rYYQ9cjLNdfdisyOvDyLddSY4=" # we delete the v2 GUI after fetching else - "sha256-Gx7u3Owh/fVAnSw91xfdcmyx4m+bvQAvDaUxzXQ36/0="; + "sha256-pAqxxsWYgqbmF6wFBfTCYYc3x/Ufyz2Xs4bwB1ToHjo="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty From 6e8656a0f8202ed6c72a84cbf8c6c3c19b0732ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 14 Mar 2024 14:27:27 +0000 Subject: [PATCH 116/212] python312Packages.pyreadstat: 1.2.6 -> 1.2.7 --- pkgs/development/python-modules/pyreadstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index e2c39b05b020..b49de99c62b7 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pyreadstat"; - version = "1.2.6"; + version = "1.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Roche"; repo = "pyreadstat"; rev = "refs/tags/v${version}"; - hash = "sha256-VcPpGRrE/5udNijodO88Lw69JPOm6ZN7BZb4xD34srQ="; + hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA="; }; nativeBuildInputs = [ cython ]; From 3da9f7c1586c2bad7d1faa1923eae9bf2940eb5e Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Thu, 12 Sep 2024 17:36:45 -0400 Subject: [PATCH 117/212] raze: wrap vulkan-loader --- pkgs/by-name/ra/raze/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/raze/package.nix b/pkgs/by-name/ra/raze/package.nix index 8739aa1108a1..231f15bde4ce 100644 --- a/pkgs/by-name/ra/raze/package.nix +++ b/pkgs/by-name/ra/raze/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ZDoom"; repo = "Raze"; - rev = finalAttrs.version; + rev = "refs/tags/${finalAttrs.version}"; hash = "sha256-R3Sm/cibg+D2QPS4UisRp91xvz3Ine2BUR8jF5Rbj1g="; leaveDotGit = true; postFetch = '' @@ -68,7 +68,8 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' mv $out/bin/raze $out/share/raze - makeWrapper $out/share/raze/raze $out/bin/raze + makeWrapper $out/share/raze/raze $out/bin/raze \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ vulkan-loader ]} install -Dm644 ../source/platform/posix/org.zdoom.Raze.256.png $out/share/pixmaps/org.zdoom.Raze.png install -Dm644 ../source/platform/posix/org.zdoom.Raze.desktop $out/share/applications/org.zdoom.Raze.desktop install -Dm644 ../soundfont/raze.sf2 $out/share/raze/soundfonts/raze.sf2 From 382e693a3e3543ea6dea0da93c06c0895c024c0f Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 10:58:51 +0900 Subject: [PATCH 118/212] python312Packages.pyreadstat: switch to pypa build --- pkgs/development/python-modules/pyreadstat/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyreadstat/default.nix b/pkgs/development/python-modules/pyreadstat/default.nix index b49de99c62b7..12262cdff9cb 100644 --- a/pkgs/development/python-modules/pyreadstat/default.nix +++ b/pkgs/development/python-modules/pyreadstat/default.nix @@ -9,13 +9,14 @@ python, pythonOlder, readstat, + setuptools, zlib, }: buildPythonPackage rec { pname = "pyreadstat"; version = "1.2.7"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,11 +27,14 @@ buildPythonPackage rec { hash = "sha256-XuLFLpZbaCj/MHq0+l6GoNqR5nAldAlEJhoO5ioWYTA="; }; - nativeBuildInputs = [ cython ]; + build-system = [ + cython + setuptools + ]; buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - propagatedBuildInputs = [ + dependencies = [ readstat pandas ]; From 2ec6fe1a72eec77e108893febd1ac13685b750f9 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Thu, 12 Sep 2024 10:49:14 +0530 Subject: [PATCH 119/212] carapace: 1.0.5 -> 1.0.6 - depend on go 1.23 - update src to point to updated upstream Changes: https://github.com/carapace-sh/carapace-bin/releases/tag/v1.0.6 --- pkgs/shells/carapace/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 65df6529242b..ec0a79167662 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "1.0.5"; + version = "1.0.6"; src = fetchFromGitHub { - owner = "rsteube"; - repo = "${pname}-bin"; + owner = "carapace-sh"; + repo = "carapace-bin"; rev = "v${version}"; - hash = "sha256-PDxYRFf7nQfPb6uazwRmZOvCy3xMF5OqHDLy7hsFSBE="; + hash = "sha256-onkYihS4abrOfqOehlDy+ooL2d04w6DwOY3+B4+L3IQ="; }; - vendorHash = "sha256-GnwOyIKJ1K8+0a+VrXcohclgxnQTezu4S0C2cJO+ULU="; + vendorHash = "sha256-UFpQAlXFS1O/MqeGvUAWSQLhP03wf8JX8zz8cMyMmrc="; ldflags = [ "-s" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c12c64eac07b..58f25b6d245e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14528,7 +14528,9 @@ with pkgs; undistract-me = callPackage ../shells/bash/undistract-me { }; - carapace = callPackage ../shells/carapace { }; + carapace = callPackage ../shells/carapace { + buildGoModule = buildGo123Module; + }; dash = callPackage ../shells/dash { }; From f63ce293385cc9641977c2805814843724384128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 06:11:59 +0000 Subject: [PATCH 120/212] python311Packages.tcolorpy: 0.1.4 -> 0.1.6 --- pkgs/development/python-modules/tcolorpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index ab7b6bc198de..28b66c2dd51b 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "tcolorpy"; - version = "0.1.4"; + version = "0.1.6"; format = "setuptools"; src = fetchFromGitHub { owner = "thombashi"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cCdKeixRfXkvEGBqozMWw2RjliLdzhlMv8GE2Q40LZQ="; + hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; }; nativeCheckInputs = [ pytestCheckHook ]; From 591e7cca4fed5e44414e09d394027cd0a9256fa6 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 11:40:15 +0900 Subject: [PATCH 121/212] python312Packages.tcolorpy: refactor --- pkgs/development/python-modules/tcolorpy/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tcolorpy/default.nix b/pkgs/development/python-modules/tcolorpy/default.nix index 28b66c2dd51b..f807ca1bf08a 100644 --- a/pkgs/development/python-modules/tcolorpy/default.nix +++ b/pkgs/development/python-modules/tcolorpy/default.nix @@ -3,12 +3,14 @@ fetchFromGitHub, lib, pytestCheckHook, + setuptools, + setuptools-scm, }: buildPythonPackage rec { pname = "tcolorpy"; version = "0.1.6"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "thombashi"; @@ -17,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-esucU+So1YKzkuMt6ICCrQ5SzQVv24lh12SE1Jl5Y/w="; }; + build-system = [ + setuptools + setuptools-scm + ]; + + pythonImportsCheck = [ "tcolorpy" ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { From f5417608ad418e5fbbd8ee84c91e40d1abbe9ebf Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 11:52:58 +0900 Subject: [PATCH 122/212] python312Packages.pynetbox: refactor --- .../python-modules/pynetbox/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pynetbox/default.nix b/pkgs/development/python-modules/pynetbox/default.nix index e31759ec981c..14ce4a0de929 100644 --- a/pkgs/development/python-modules/pynetbox/default.nix +++ b/pkgs/development/python-modules/pynetbox/default.nix @@ -2,10 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, setuptools-scm, packaging, requests, - six, pytestCheckHook, pyyaml, }: @@ -13,23 +13,27 @@ buildPythonPackage rec { pname = "pynetbox"; version = "7.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "netbox-community"; - repo = pname; + repo = "pynetbox"; rev = "refs/tags/v${version}"; hash = "sha256-JOUgQvOtvXRDM79Sp472OHPh1YEoA82T3R9aZFes8SI="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ + setuptools + setuptools-scm + ]; - propagatedBuildInputs = [ + dependencies = [ packaging requests - six ]; + pythonImportsCheck = [ "pynetbox" ]; + nativeCheckInputs = [ pytestCheckHook pyyaml From ebf2798150b150b07787416d380b881ee501c107 Mon Sep 17 00:00:00 2001 From: Alistair Grant Date: Thu, 12 Sep 2024 08:32:08 +0200 Subject: [PATCH 123/212] glamoroustoolkit: 1.0.11 -> 1.1.0 --- .../tools/glamoroustoolkit/default.nix | 34 ++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/glamoroustoolkit/default.nix b/pkgs/development/tools/glamoroustoolkit/default.nix index 05b74f6339be..e2f5ed297fc2 100644 --- a/pkgs/development/tools/glamoroustoolkit/default.nix +++ b/pkgs/development/tools/glamoroustoolkit/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchzip +, fetchurl +, patchelf , wrapGAppsHook3 , cairo , dbus @@ -18,25 +20,39 @@ , libglvnd , libuuid , libxcb +, harfbuzz +, libsoup_3 +, webkitgtk_4_1 +, zenity }: stdenv.mkDerivation (finalAttrs: { pname = "glamoroustoolkit"; - version = "1.0.11"; + version = "1.1.0"; src = fetchzip { url = "https://github.com/feenkcom/gtoolkit-vm/releases/download/v${finalAttrs.version}/GlamorousToolkit-x86_64-unknown-linux-gnu.zip"; stripRoot = false; - hash = "sha256-GQeYR232zoHLIt1AzznD7rp6u4zMiAdj1+0OfXfT6AQ="; + hash = "sha256-863xmWC9AuNFTmmBTZVDSchgbqXuk14t1r6B6MeLU74="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; + nativeBuildInputs = [ + wrapGAppsHook3 + (patchelf.overrideAttrs (old: { + version = "0.11"; + src = fetchurl { + url = "https://nixos.org/releases/patchelf/patchelf-0.11/patchelf-0.11.tar.bz2"; + sha256 = "16ms3ijcihb88j3x6cl8cbvhia72afmfcphczb9cfwr0gbc22chx"; + }; + })) + ]; sourceRoot = "."; dontConfigure = true; dontBuild = true; dontPatchELF = true; + dontStrip = true; installPhase = '' runHook preInstall @@ -48,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; -preFixup = let + preFixup = let libPath = lib.makeLibraryPath [ cairo dbus @@ -65,8 +81,14 @@ preFixup = let libglvnd libuuid libxcb + harfbuzz # libWebView.so + libsoup_3 # libWebView.so + webkitgtk_4_1 # libWebView.so stdenv.cc.cc.lib ]; + binPath = lib.makeBinPath [ + zenity # File selection dialog + ]; in '' chmod +x $out/lib/*.so patchelf \ @@ -94,6 +116,10 @@ preFixup = let ln -s $out/lib/libcairo.so $out/lib/libcairo.so.2 rm $out/lib/libgit2.so ln -s "${libgit2}/lib/libgit2.so" $out/lib/libgit2.so.1.1 + + gappsWrapperArgs+=( + --prefix PATH : ${binPath} + ) ''; meta = { From 9a64284ea4a3aafd9231f435493f60a2aeb14ab4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Fri, 13 Sep 2024 07:27:22 +0200 Subject: [PATCH 124/212] nix-weather: 0.0.3 -> 0.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit changelog: https://git.fem.gg/cafkafk/nix-weather/releases/tag/v0.0.4 Signed-off-by: Christina Sørensen --- pkgs/by-name/ni/nix-weather/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-weather/package.nix b/pkgs/by-name/ni/nix-weather/package.nix index bd11ba3d624b..ea552ca9e4f4 100644 --- a/pkgs/by-name/ni/nix-weather/package.nix +++ b/pkgs/by-name/ni/nix-weather/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { pname = "nix-weather"; - version = "0.0.3"; + version = "0.0.4"; # fetch from GitHub and not upstream forgejo because cafkafk doesn't want to # pay for bandwidth @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage rec { owner = "cafkafk"; repo = "nix-weather"; rev = "v${version}"; - hash = "sha256-deVgDYYIv5SyKrkPAfPgbmQ/n4hYSrK2dohaiR5O0QE="; + hash = "sha256-15FUA4fszbAVXop3IyOHfxroyTt9/SkWZsSTUh9RtwY="; }; - cargoHash = "sha256-QJybGxqOJid1D6FTy7lvrakkB/Ss3P3JnXtU1UlGlW0="; + cargoHash = "sha256-vMeljXNWfFRyeQ4ZQ/Qe1vcW5bg5Y14aEH5HgEwOX3Q="; cargoExtraArgs = "-p nix-weather"; nativeBuildInputs = [ pkg-config ]; From 35671aabff6fcd9f6ea13741f51691b46712ab51 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 Sep 2024 07:12:08 +0100 Subject: [PATCH 125/212] dotnet/build-dotnet-module: fix eval of `fetch-deps` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. csharp-ls.fetch-deps --show-trace error: … while evaluating a path segment at pkgs/build-support/dotnet/build-dotnet-module/default.nix:258:36: 257| else 258| ''$(mktemp -t "${finalAttrs.pname ? finalAttrs.finalPackage.name}-deps-XXXXXX.nix")''; | ^ 259| nugetToNix = (nuget-to-nix.override { inherit dotnet-sdk; }); error: cannot coerce a Boolean to a string: false Switch from `?` operator (attribute presence predicate) to an `or` ("else" form). --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 412747733bd6..25dd4f777c77 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -255,7 +255,7 @@ let if lib.isPath nugetDeps && !lib.isStorePath nugetDepsFile then toString nugetDepsFile else - ''$(mktemp -t "${finalAttrs.pname ? finalAttrs.finalPackage.name}-deps-XXXXXX.nix")''; + ''$(mktemp -t "${finalAttrs.pname or finalAttrs.finalPackage.name}-deps-XXXXXX.nix")''; nugetToNix = (nuget-to-nix.override { inherit dotnet-sdk; }); }; From ce0617f20a2340cbdc3ebe5fafc2f92e4a1b1588 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 06:55:12 +0000 Subject: [PATCH 126/212] uni: 2.7.0 -> 2.8.0 --- pkgs/applications/misc/uni/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/uni/default.nix b/pkgs/applications/misc/uni/default.nix index 5773c13ae68e..04ffa390d4b3 100644 --- a/pkgs/applications/misc/uni/default.nix +++ b/pkgs/applications/misc/uni/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uni"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "arp242"; repo = "uni"; rev = "refs/tags/v${version}"; - hash = "sha256-ociPkuRtpBS+x1zSVNYk8oqAsJZGv31/TUUUlBOYhJA="; + hash = "sha256-LSmQtndWBc7wCYBnyaeDb4Le4PQPcSO8lTp+CSC2jbc="; }; - vendorHash = "sha256-/PvBn2RRYuVpjnrIL1xAcVqAKZuIV2KTSyVtBW1kqj4="; + vendorHash = "sha256-4w5L5Zg0LJX2v4mqLLjAvEdh3Ad69MLa97SR6RY3fT4="; ldflags = [ "-s" From f7966b3969a62476cbd7b45c555c55ef1c71e89c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 07:09:34 +0000 Subject: [PATCH 127/212] python312Packages.checkdmarc: 4.8.4 -> 5.5.0 --- pkgs/development/python-modules/checkdmarc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix index 4a17afb2f1b3..7a1e122b737d 100644 --- a/pkgs/development/python-modules/checkdmarc/default.nix +++ b/pkgs/development/python-modules/checkdmarc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "checkdmarc"; - version = "4.8.4"; + version = "5.5.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "domainaware"; repo = "checkdmarc"; rev = "refs/tags/${version}"; - hash = "sha256-NNB5dYQzzdNapjP4mtpCW08BzfZ+FFRESUtpxCOzrdk="; + hash = "sha256-skQqLWBEmfyiW2DsRRbj3Lfj52QZca0zKenFC7LltjM="; }; nativeBuildInputs = [ hatchling ]; From 45bbdb9f51461c5998fa4a418a211f0816075c5a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 13 Sep 2024 17:10:34 +1000 Subject: [PATCH 128/212] telegraf: move to pkgs/by-name --- .../telegraf/default.nix => by-name/te/telegraf/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/monitoring/telegraf/default.nix => by-name/te/telegraf/package.nix} (100%) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/by-name/te/telegraf/package.nix similarity index 100% rename from pkgs/servers/monitoring/telegraf/default.nix rename to pkgs/by-name/te/telegraf/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9736d1ec8d3..da604fd83ae5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13031,8 +13031,6 @@ with pkgs; teip = callPackage ../tools/text/teip { }; - telegraf = callPackage ../servers/monitoring/telegraf { }; - inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; }) teleport_14 teleport_15 teleport_16 teleport; From b09b1438b457427496fd10b934f30dc7db9aae23 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 13 Sep 2024 07:04:44 +0000 Subject: [PATCH 129/212] telegraf: 1.31.3 -> 1.32.0 Diff: https://github.com/influxdata/telegraf/compare/v1.31.3...v1.32.0 Changelog: https://github.com/influxdata/telegraf/blob/v1.32.0/CHANGELOG.md --- pkgs/by-name/te/telegraf/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix index d2291890d8b6..bda948d342aa 100644 --- a/pkgs/by-name/te/telegraf/package.nix +++ b/pkgs/by-name/te/telegraf/package.nix @@ -1,5 +1,5 @@ { lib -, buildGoModule +, buildGo123Module , fetchFromGitHub , nixosTests , stdenv @@ -7,9 +7,9 @@ , telegraf }: -buildGoModule rec { +buildGo123Module rec { pname = "telegraf"; - version = "1.31.3"; + version = "1.32.0"; subPackages = [ "cmd/telegraf" ]; @@ -17,10 +17,10 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - hash = "sha256-J5jIyrxG2cLEu909/fcPQCo+xUlW6VAoge5atCrW4HY="; + hash = "sha256-ITTlHsoWPXHbGtmNOE0x1sCbeADWi4liOEqXXKQUeGU="; }; - vendorHash = "sha256-lxLFUKOFg7HAjgZIVACW6VlWLgCeZX38SNRsjxc9D7g="; + vendorHash = "sha256-wKl6Rutt2QrF4nLxB5Ic6QlekrPUfHwdFZyTTdbK0HU="; proxyVendor = true; ldflags = [ From f5e36183740d3cf6cebba059e825e80d5b04c8dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 07:14:24 +0000 Subject: [PATCH 130/212] pulumi-esc: 0.9.1 -> 0.10.0 --- pkgs/by-name/pu/pulumi-esc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pu/pulumi-esc/package.nix b/pkgs/by-name/pu/pulumi-esc/package.nix index 1249b31e8a1c..b9fc15444e62 100644 --- a/pkgs/by-name/pu/pulumi-esc/package.nix +++ b/pkgs/by-name/pu/pulumi-esc/package.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "pulumi-esc"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "pulumi"; repo = "esc"; rev = "v${version}"; - hash = "sha256-9K7pP4MOShHPTxTuKaUMY87Z4rDkGHrV9Ds1guUpFqM="; + hash = "sha256-SeHO8N8NwAF4f6Eo46V2mBElVgJc5ijVrjsBHWtUMc0="; }; subPackages = "cmd/esc"; - vendorHash = "sha256-uVw8jc7dZOHdJt9uVDJGaJWkD7dz0rQ3W1pJXSrcW5w="; + vendorHash = "sha256-xJtlTyhGyoxefE2pFcLGHMapn9L2F/PKuNt49J41viE="; ldflags = [ "-s" From 1c001acbb99938be27b28688ffcac07f9a11b5e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 07:20:31 +0000 Subject: [PATCH 131/212] doppler: 3.69.0 -> 3.69.1 --- pkgs/by-name/do/doppler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index f3fbfe1caf20..64438e458000 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.69.0"; + version = "3.69.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY="; + sha256 = "sha256-KiSRMF4S+gz8cnRxkO2SVwO3Rl6ImflK/4MEgkQh2UE="; }; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; From 9913ebec357ab35a027f144756b8bcf5b347bd61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 07:26:18 +0000 Subject: [PATCH 132/212] wait4x: 2.14.1 -> 2.14.2 --- pkgs/by-name/wa/wait4x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix index a5b804e3c907..ab8176d6d42f 100644 --- a/pkgs/by-name/wa/wait4x/package.nix +++ b/pkgs/by-name/wa/wait4x/package.nix @@ -4,7 +4,7 @@ }: let pname = "wait4x"; - version = "2.14.1"; + version = "2.14.2"; in buildGoModule { inherit pname version; @@ -13,10 +13,10 @@ buildGoModule { owner = "atkrad"; repo = pname; rev = "v${version}"; - hash = "sha256-7dm1KERBYkASuRWlCbpbLuHVc4uCMPWbSwegjZ8LwVU="; + hash = "sha256-fNPZ/qgAn4odd5iWnDK1RWPxeBhS/l4ffHLFB27SAoM="; }; - vendorHash = "sha256-CYE5wvBgNLYzCiibd9SWubIQ+22nffr4jpwgwSxhtGo="; + vendorHash = "sha256-Eio6CoYaChG59rHL4tfl7dNWliD7ksRyhoCPxMvMmrQ="; # Tests make network access doCheck = false; From 49540b4fec5210cd13afa18ff9d25b3e7205dbdb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 07:30:44 +0000 Subject: [PATCH 133/212] k0sctl: 0.18.1 -> 0.19.0 --- pkgs/applications/networking/cluster/k0sctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix index 9215ea9845eb..94667e40d3a4 100644 --- a/pkgs/applications/networking/cluster/k0sctl/default.nix +++ b/pkgs/applications/networking/cluster/k0sctl/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.18.1"; + version = "0.19.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = pname; rev = "v${version}"; - hash = "sha256-lZCD8hBe6SKKjTvEKNg/lr7NXrAPqFQoh9iQg0O6jhc="; + hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc="; }; - vendorHash = "sha256-FobBn7rbRVfnW8Zd982vkSuKpPj4gGK4b41o9OK/CCY="; + vendorHash = "sha256-eKim5F8bKC1UOY+lOo0NSHOzXuMOcnBjkjm3/vDkGEM="; ldflags = [ "-s" From f0605d557b566e22076b39a7aa78b1d800148a1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:01:34 +0000 Subject: [PATCH 134/212] kubie: 0.23.1 -> 0.24.0 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 0fe6c0fb43df..42f19d97e4ff 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM="; + sha256 = "sha256-9tBPV0VR1bZUgYDD6T+hthPIzN9aGAyi1sUyeaynOQA="; }; - cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk="; + cargoHash = "sha256-Igq4vjIyixpAhFd1wZqrVXCUmJdetUn6uM1eIX/0CiM="; nativeBuildInputs = [ installShellFiles ]; From cf78535f9f85194807fff677b699e66ee7493104 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:01:46 +0000 Subject: [PATCH 135/212] python312Packages.ical: 8.1.1 -> 8.2.0 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index 53eaa42d30c0..e021c6574a85 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.1.1"; + version = "8.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; rev = "refs/tags/${version}"; - hash = "sha256-b0laQRDATmx4401bJKkdHsfT9gpMff8vGaZJ9l8O7w4="; + hash = "sha256-9mnyhDKcZTZAGRxojQN9I9ZAgBmsSSsBPzCMZO6Rl5k="; }; build-system = [ setuptools ]; From 0de7cb6bc4bdf2e9a1933a10c1e82c9176881e91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:02:01 +0000 Subject: [PATCH 136/212] python312Packages.djangorestframework-stubs: 3.15.0 -> 3.15.1 --- .../python-modules/djangorestframework-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/djangorestframework-stubs/default.nix b/pkgs/development/python-modules/djangorestframework-stubs/default.nix index 140168e8260c..19e771ebbeec 100644 --- a/pkgs/development/python-modules/djangorestframework-stubs/default.nix +++ b/pkgs/development/python-modules/djangorestframework-stubs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "djangorestframework-stubs"; - version = "3.15.0"; + version = "3.15.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "typeddjango"; repo = "djangorestframework-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-5fZzSRn59ii41QKOqkZUXTDnm70Um9SY445Vfoo8sgg="; + hash = "sha256-m9KxC3dGe+uRB3YIykV/SCOHeItRYNKopF9fqCd10Vk="; }; nativeBuildInputs = [ setuptools ]; From 429366032813c51829bd40c588a2eafa0dd3d2be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:18:35 +0000 Subject: [PATCH 137/212] myks: 4.2.2 -> 4.2.3 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 1d47d5da808e..a024ddd8f9c2 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-jI5u/xaAt7BOug/okrrRoZXZVJOr+ahGtFJE3PbPQ7k="; + hash = "sha256-sf+X+qafR0kpJTNIYoLr8q6stm+DgiD/yhVRyBRPA/s="; }; - vendorHash = "sha256-Ka+zVKQBAd6ChOYOw4FYzqJCfdzpN2OppDJsoT/5I0c="; + vendorHash = "sha256-aWXU2UG4/U8g4dgspjyIfTT2J++WoJlLHAo6K3CSLxc="; subPackages = "."; From 4a94f45bb4b6acee42893a06128fca97a5f29fec Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 10 Feb 2024 16:01:31 +0100 Subject: [PATCH 138/212] nixos/installer/cd-dvd: use `EFI/BOOT` and `EFI/BOOT/BOOT$ARCH.EFI` rather than lowercase Reported in https://discourse.nixos.org/t/nix-iso-unable-to-boot-in-uefi-mode-but-other-distros-can/16473/24 There seems to be weird situations with casing and FAT8.3 filenames, UEFI firmwares and what not. To increase our compatibility, let's ensure we have the critical stuff (the bootable) in uppercase. Signed-off-by: Raito Bezarius --- nixos/modules/installer/cd-dvd/iso-image.nix | 36 ++++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 6e9ab0079581..5c5f568db689 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -159,7 +159,7 @@ let if refindBinary != null then '' # Adds rEFInd to the ISO. - cp -v ${pkgs.refind}/share/refind/${refindBinary} $out/EFI/boot/ + cp -v ${pkgs.refind}/share/refind/${refindBinary} $out/EFI/BOOT/ '' else "# No refind for ${targetArch}" @@ -210,11 +210,11 @@ let ${ # When there is a theme configured, use it, otherwise use the background image. if config.isoImage.grubTheme != null then '' # Sets theme. - set theme=(\$root)/EFI/boot/grub-theme/theme.txt + set theme=(\$root)/EFI/BOOT/grub-theme/theme.txt # Load theme fonts - $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n") + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n") '' else '' - if background_image (\$root)/EFI/boot/efi-background.png; then + if background_image (\$root)/EFI/BOOT/efi-background.png; then # Black background means transparent background when there # is a background image set... This seems undocumented :( set color_normal=black/black @@ -235,7 +235,7 @@ let nativeBuildInputs = [ pkgs.buildPackages.grub2_efi ]; strictDeps = true; } '' - mkdir -p $out/EFI/boot/ + mkdir -p $out/EFI/BOOT # Add a marker so GRUB can find the filesystem. touch $out/EFI/nixos-installer-image @@ -309,13 +309,13 @@ let # probe for devices, even with --skip-fs-probe. grub-mkimage \ --directory=${grubPkgs.grub2_efi}/lib/grub/${grubPkgs.grub2_efi.grubTarget} \ - -o $out/EFI/boot/boot${targetArch}.efi \ - -p /EFI/boot \ + -o $out/EFI/BOOT/BOOT${lib.toUpper targetArch}.EFI \ + -p /EFI/BOOT \ -O ${grubPkgs.grub2_efi.grubTarget} \ ''${MODULES[@]} - cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/boot/ + cp ${grubPkgs.grub2_efi}/share/grub/unicode.pf2 $out/EFI/BOOT/ - cat < $out/EFI/boot/grub.cfg + cat < $out/EFI/BOOT/grub.cfg set textmode=${lib.boolToString (config.isoImage.forceTextMode)} set timeout=${toString grubEfiTimeout} @@ -331,12 +331,12 @@ let ${grubMenuCfg} hiddenentry 'Text mode' --hotkey 't' { - loadfont (\$root)/EFI/boot/unicode.pf2 + loadfont (\$root)/EFI/BOOT/unicode.pf2 set textmode=true terminal_output console } hiddenentry 'GUI mode' --hotkey 'g' { - $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n") + $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n") set textmode=false terminal_output gfxterm } @@ -411,7 +411,7 @@ let # Force root to be the FAT partition # Otherwise it breaks rEFInd's boot search --set=root --no-floppy --fs-uuid 1234-5678 - chainloader (\$root)/EFI/boot/${refindBinary} + chainloader (\$root)/EFI/BOOT/${refindBinary} } fi ''} @@ -427,7 +427,7 @@ let } EOF - grub-script-check $out/EFI/boot/grub.cfg + grub-script-check $out/EFI/BOOT/grub.cfg ${refind} ''; @@ -440,8 +440,8 @@ let # dates (cp -p, touch, mcopy -m, faketime for label), IDs (mkfs.vfat -i) '' mkdir ./contents && cd ./contents - mkdir -p ./EFI/boot - cp -rp "${efiDir}"/EFI/boot/{grub.cfg,*.efi} ./EFI/boot + mkdir -p ./EFI/BOOT + cp -rp "${efiDir}"/EFI/BOOT/{grub.cfg,*.EFI,*.efi} ./EFI/BOOT # Rewrite dates for everything in the FS find . -exec touch --date=2000-01-01 {} + @@ -836,11 +836,11 @@ in { source = "${efiDir}/EFI"; target = "/EFI"; } - { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/boot/grub.cfg") + "/grub"; + { source = (pkgs.writeTextDir "grub/loopback.cfg" "source /EFI/BOOT/grub.cfg") + "/grub"; target = "/boot/grub"; } { source = config.isoImage.efiSplashImage; - target = "/EFI/boot/efi-background.png"; + target = "/EFI/BOOT/efi-background.png"; } ] ++ lib.optionals (config.boot.loader.grub.memtest86.enable && config.isoImage.makeBiosBootable) [ { source = "${pkgs.memtest86plus}/memtest.bin"; @@ -848,7 +848,7 @@ in } ] ++ lib.optionals (config.isoImage.grubTheme != null) [ { source = config.isoImage.grubTheme; - target = "/EFI/boot/grub-theme"; + target = "/EFI/BOOT/grub-theme"; } ]; From 497e17bc23123f01a04e570c646431b3d1d10e16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:33:11 +0000 Subject: [PATCH 139/212] python312Packages.xmlschema: 3.3.2 -> 3.4.1 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index efb003146714..81bf772611f3 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.3.2"; + version = "3.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-cZVNgY0Y9tE+ud8596Ujidc7aq+Gon9x6q/XDCuJ9oI="; + hash = "sha256-ypyBBo00ZjYRvljn/eGaTxMViHzgoxq5IoNclWb7ghA="; }; build-system = [ setuptools ]; From 9905661267a6f65e148b72b9e6977df1535ef655 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:33:18 +0000 Subject: [PATCH 140/212] python312Packages.weaviate-client: 4.7.1 -> 4.8.0 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index c5af533ab504..506aa956bda6 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-JgnasbhAcdJwa3lpdID+B3Iwuc9peRQZBAC7tBBm54c="; + hash = "sha256-JVn9Xhq7MJD+o6DA/EaW1NNnvsjjqyW+pmFctuQStgo="; }; pythonRelaxDeps = [ From b09ba65a431da76eba35d5025331e50881242444 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Wed, 11 Sep 2024 20:16:18 -0500 Subject: [PATCH 141/212] idris2Packages: run nixfmt --- .../compilers/idris2/build-idris.nix | 70 ++++++---- pkgs/development/compilers/idris2/default.nix | 26 ++-- .../compilers/idris2/idris2-lsp.nix | 49 ++++--- pkgs/development/compilers/idris2/idris2.nix | 130 ++++++++++-------- pkgs/development/compilers/idris2/tests.nix | 23 +++- 5 files changed, 180 insertions(+), 118 deletions(-) diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 5b7c4a92a5ff..1efe6088f6d1 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -1,4 +1,8 @@ -{ stdenv, lib, idris2, makeWrapper +{ + stdenv, + lib, + idris2, + makeWrapper, }: # Usage: let # pkg = idris2Packages.buildIdris { @@ -11,47 +15,55 @@ # bin = pkg.executable; # } # -{ src -, ipkgName -, version ? "unversioned" -, idrisLibraries # Other libraries built with buildIdris -, ... }@attrs: +{ + src, + ipkgName, + version ? "unversioned", + idrisLibraries, # Other libraries built with buildIdris + ... +}@attrs: let # loop over idrisLibraries and normalize them by turning any that are # direct outputs of the buildIdris function into the `.library {}` # property. - idrisLibraryLibs = map (idrisLib: - if lib.isDerivation idrisLib - then idrisLib - else if builtins.isFunction idrisLib - then idrisLib {} - else if (builtins.isAttrs idrisLib && idrisLib ? "library") - then idrisLib.library {} - else throw "Found an Idris2 library dependency that was not the result of the buildIdris function" + idrisLibraryLibs = map ( + idrisLib: + if lib.isDerivation idrisLib then + idrisLib + else if builtins.isFunction idrisLib then + idrisLib { } + else if (builtins.isAttrs idrisLib && idrisLib ? "library") then + idrisLib.library { } + else + throw "Found an Idris2 library dependency that was not the result of the buildIdris function" ) idrisLibraries; - propagate = libs: lib.unique (lib.concatMap (nextLib: [nextLib] ++ nextLib.propagatedIdrisLibraries) libs); + propagate = + libs: lib.unique (lib.concatMap (nextLib: [ nextLib ] ++ nextLib.propagatedIdrisLibraries) libs); ipkgFileName = ipkgName + ".ipkg"; idrName = "idris2-${idris2.version}"; libSuffix = "lib/${idrName}"; propagatedIdrisLibraries = propagate idrisLibraryLibs; - libDirs = - (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + - ":${idris2}/${idrName}"; + libDirs = (lib.makeSearchPath libSuffix propagatedIdrisLibraries) + ":${idris2}/${idrName}"; supportDir = "${idris2}/${idrName}/lib"; drvAttrs = builtins.removeAttrs attrs [ "ipkgName" "idrisLibraries" ]; - derivation = stdenv.mkDerivation (finalAttrs: - drvAttrs // { + derivation = stdenv.mkDerivation ( + finalAttrs: + drvAttrs + // { pname = ipkgName; inherit version; src = src; - nativeBuildInputs = [ idris2 makeWrapper ] ++ attrs.nativeBuildInputs or []; - buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or []; + nativeBuildInputs = [ + idris2 + makeWrapper + ] ++ attrs.nativeBuildInputs or [ ]; + buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ]; IDRIS2_PACKAGE_PATH = libDirs; @@ -71,7 +83,8 @@ let } ); -in { +in +{ executable = derivation.overrideAttrs { installPhase = '' runHook preInstall @@ -97,9 +110,14 @@ in { ''; }; - library = { withSource ? false }: - let installCmd = if withSource then "--install-with-src" else "--install"; - in derivation.overrideAttrs { + library = + { + withSource ? false, + }: + let + installCmd = if withSource then "--install-with-src" else "--install"; + in + derivation.overrideAttrs { installPhase = '' runHook preInstall mkdir -p $out/${libSuffix} diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 79a90cbee0f3..ca82788fdec3 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,21 +1,21 @@ -{ callPackage -, idris2Packages -}: +{ callPackage, idris2Packages }: let -in { +in +{ idris2 = callPackage ./idris2.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; buildIdris = callPackage ./build-idris.nix { }; - idris2Api = (idris2Packages.buildIdris { - inherit (idris2Packages.idris2) src version; - ipkgName = "idris2api"; - idrisLibraries = [ ]; - preBuild = '' - export IDRIS2_PREFIX=$out/lib - make src/IdrisPaths.idr - ''; - }).library; + idris2Api = + (idris2Packages.buildIdris { + inherit (idris2Packages.idris2) src version; + ipkgName = "idris2api"; + idrisLibraries = [ ]; + preBuild = '' + export IDRIS2_PREFIX=$out/lib + make src/IdrisPaths.idr + ''; + }).library; } diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix index a01cd1667938..f5a3d93eab4a 100644 --- a/pkgs/development/compilers/idris2/idris2-lsp.nix +++ b/pkgs/development/compilers/idris2/idris2-lsp.nix @@ -1,14 +1,21 @@ -{ lib, fetchFromGitHub, idris2Packages, makeWrapper }: +{ + lib, + fetchFromGitHub, + idris2Packages, + makeWrapper, +}: let - globalLibraries = let - idrName = "idris2-${idris2Packages.idris2.version}"; - libSuffix = "lib/${idrName}"; - in [ - "\\$HOME/.nix-profile/lib/${idrName}" - "/run/current-system/sw/lib/${idrName}" - "${idris2Packages.idris2}/${idrName}" - ]; + globalLibraries = + let + idrName = "idris2-${idris2Packages.idris2.version}"; + libSuffix = "lib/${idrName}"; + in + [ + "\\$HOME/.nix-profile/lib/${idrName}" + "/run/current-system/sw/lib/${idrName}" + "${idris2Packages.idris2}/${idrName}" + ]; globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; inherit (idris2Packages) idris2Api; @@ -16,10 +23,10 @@ let ipkgName = "lsp-lib"; version = "2024-01-21"; src = fetchFromGitHub { - owner = "idris-community"; - repo = "LSP-lib"; - rev = "03851daae0c0274a02d94663d8f53143a94640da"; - hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; + owner = "idris-community"; + repo = "LSP-lib"; + rev = "03851daae0c0274a02d94663d8f53143a94640da"; + hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM="; }; idrisLibraries = [ ]; }; @@ -28,12 +35,15 @@ let ipkgName = "idris2-lsp"; version = "2024-01-21"; src = fetchFromGitHub { - owner = "idris-community"; - repo = "idris2-lsp"; - rev = "a77ef2d563418925aa274fa29f06880dde43f4ec"; - hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o="; + owner = "idris-community"; + repo = "idris2-lsp"; + rev = "a77ef2d563418925aa274fa29f06880dde43f4ec"; + hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o="; }; - idrisLibraries = [idris2Api lspLib]; + idrisLibraries = [ + idris2Api + lspLib + ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' @@ -49,4 +59,5 @@ let maintainers = with maintainers; [ mattpolzin ]; }; }; -in lspPkg.executable +in +lspPkg.executable diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix index 4d28b35bd4a9..2d5ec9a28368 100644 --- a/pkgs/development/compilers/idris2/idris2.nix +++ b/pkgs/development/compilers/idris2/idris2.nix @@ -1,29 +1,30 @@ # Almost 1:1 copy of idris2's nix/package.nix. Some work done in their flake.nix # we do here instead. -{ stdenv -, lib -, chez -, chez-racket -, clang -, gmp -, fetchFromGitHub -, makeWrapper -, gambit -, nodejs -, zsh -, callPackage +{ + stdenv, + lib, + chez, + chez-racket, + clang, + gmp, + fetchFromGitHub, + makeWrapper, + gambit, + nodejs, + zsh, + callPackage, }: # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs let platformChez = - if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") - then - chez - else - chez-racket; -in stdenv.mkDerivation rec { + if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then + chez + else + chez-racket; +in +stdenv.mkDerivation rec { pname = "idris2"; version = "0.7.0"; @@ -35,56 +36,69 @@ in stdenv.mkDerivation rec { }; strictDeps = true; - nativeBuildInputs = [ makeWrapper clang platformChez ] - ++ lib.optionals stdenv.isDarwin [ zsh ]; - buildInputs = [ platformChez gmp ]; + nativeBuildInputs = [ + makeWrapper + clang + platformChez + ] ++ lib.optionals stdenv.isDarwin [ zsh ]; + buildInputs = [ + platformChez + gmp + ]; prePatch = '' patchShebangs --build tests ''; - makeFlags = [ "PREFIX=$(out)" ] - ++ lib.optional stdenv.isDarwin "OS="; + makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.isDarwin "OS="; # The name of the main executable of pkgs.chez is `scheme` - buildFlags = [ "bootstrap" "SCHEME=scheme" ]; + buildFlags = [ + "bootstrap" + "SCHEME=scheme" + ]; checkTarget = "test"; - nativeCheckInputs = [ gambit nodejs ]; # racket ]; + nativeCheckInputs = [ + gambit + nodejs + ]; # racket ]; checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed # without having to recompile idris2 every time. - postInstall = let - name = "${pname}-${version}"; - globalLibraries = [ - "\\$HOME/.nix-profile/lib/${name}" - "/run/current-system/sw/lib/${name}" - "$out/${name}" - ]; - globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; - in '' - # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH - rm $out/bin/idris2 - # The only thing we need from idris2_app is the actual binary - mv $out/bin/idris2_app/idris2.so $out/bin/idris2 - rm $out/bin/idris2_app/* - rmdir $out/bin/idris2_app - # idris2 needs to find scheme at runtime to compile - # idris2 installs packages with --install into the path given by - # IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the - # behaviour of the standard Makefile install. - # TODO: Make support libraries their own derivation such that - # overriding LD_LIBRARY_PATH is unnecessary - wrapProgram "$out/bin/idris2" \ - --set-default CHEZ "${platformChez}/bin/scheme" \ - --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \ - --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ - --suffix IDRIS2_DATA ':' "$out/${name}/support" \ - --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \ - --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \ - --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" - ''; + postInstall = + let + name = "${pname}-${version}"; + globalLibraries = [ + "\\$HOME/.nix-profile/lib/${name}" + "/run/current-system/sw/lib/${name}" + "$out/${name}" + ]; + globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries; + in + '' + # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH + rm $out/bin/idris2 + # The only thing we need from idris2_app is the actual binary + mv $out/bin/idris2_app/idris2.so $out/bin/idris2 + rm $out/bin/idris2_app/* + rmdir $out/bin/idris2_app + # idris2 needs to find scheme at runtime to compile + # idris2 installs packages with --install into the path given by + # IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the + # behaviour of the standard Makefile install. + # TODO: Make support libraries their own derivation such that + # overriding LD_LIBRARY_PATH is unnecessary + wrapProgram "$out/bin/idris2" \ + --set-default CHEZ "${platformChez}/bin/scheme" \ + --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \ + --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \ + --suffix IDRIS2_DATA ':' "$out/${name}/support" \ + --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \ + --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \ + --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib" + ''; # Run package tests passthru.tests = callPackage ./tests.nix { inherit pname; }; @@ -94,7 +108,11 @@ in stdenv.mkDerivation rec { mainProgram = "idris2"; homepage = "https://github.com/idris-lang/Idris2"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fabianhjr wchresta mattpolzin ]; + maintainers = with lib.maintainers; [ + fabianhjr + wchresta + mattpolzin + ]; inherit (chez.meta) platforms; }; } diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index 54bb6d29eeef..9c367212021a 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -1,9 +1,23 @@ -{ stdenv, lib, pname, idris2, zsh }: +{ + stdenv, + lib, + pname, + idris2, + zsh, +}: let - testCompileAndRun = {testName, code, want, packages ? []}: let + testCompileAndRun = + { + testName, + code, + want, + packages ? [ ], + }: + let packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages); - in stdenv.mkDerivation { + in + stdenv.mkDerivation { name = "${pname}-${testName}"; meta.timeout = 60; @@ -34,7 +48,8 @@ let touch $out ''; }; -in { +in +{ # Simple hello world compiles, runs and outputs as expected hello-world = testCompileAndRun { testName = "hello-world"; From 43f5fc8e72489bfd229b318285caf6f05b4a70f9 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Wed, 11 Sep 2024 23:03:39 -0500 Subject: [PATCH 142/212] idris2: add buildIdris tests --- pkgs/development/compilers/idris2/tests.nix | 129 ++++++++++++++++++-- 1 file changed, 116 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/development/compilers/idris2/tests.nix index 9c367212021a..bb5cd140c90c 100644 --- a/pkgs/development/compilers/idris2/tests.nix +++ b/pkgs/development/compilers/idris2/tests.nix @@ -1,9 +1,12 @@ { stdenv, + runCommand, lib, pname, idris2, + idris2Packages, zsh, + tree, }: let @@ -17,17 +20,17 @@ let let packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages); in - stdenv.mkDerivation { - name = "${pname}-${testName}"; - meta.timeout = 60; + runCommand "${pname}-${testName}" + { + meta.timeout = 60; - # with idris2 compiled binaries assume zsh is available on darwin, but that - # is not the case with pure nix environments. Thus, we need to include zsh - # when we build for darwin in tests. While this is impure, this is also what - # we find in real darwin hosts. - nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; - - buildCommand = '' + # with idris2 compiled binaries assume zsh is available on darwin, but that + # is not the case with pure nix environments. Thus, we need to include zsh + # when we build for darwin in tests. While this is impure, this is also what + # we find in real darwin hosts. + nativeBuildInputs = lib.optionals stdenv.isDarwin [ zsh ]; + } + '' set -eo pipefail cat > packageTest.idr <&2 echo "Got: + $GOT" + >&2 echo 'want: + ${expectedTree}' + exit 1 + fi + + touch $out + ''; in { # Simple hello world compiles, runs and outputs as expected - hello-world = testCompileAndRun { + helloWorld = testCompileAndRun { testName = "hello-world"; code = '' module Main @@ -63,7 +98,7 @@ in }; # Data.Vect.Sort is available via --package contrib - use-contrib = testCompileAndRun { + useContrib = testCompileAndRun { testName = "use-contrib"; packages = [ "contrib" ]; code = '' @@ -80,4 +115,72 @@ in ''; want = "[1, 3, 5]"; }; + + buildLibrary = testBuildIdris { + testName = "library-package"; + buildIdrisArgs = { + ipkgName = "pkg"; + idrisLibraries = [ idris2Packages.idris2Api ]; + src = runCommand "library-package-src" { } '' + mkdir $out + + cat > $out/Main.idr < $out/pkg.ipkg < $out/Main.idr < $out/pkg.ipkg < Date: Wed, 11 Sep 2024 23:10:51 -0500 Subject: [PATCH 143/212] idris2Packages.buildIdris: QoL improvements - use binary wrapper - put environment variable into env attribute - support adding attributes to passthru --- pkgs/development/compilers/idris2/build-idris.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix index 1efe6088f6d1..bc3e0f551705 100644 --- a/pkgs/development/compilers/idris2/build-idris.nix +++ b/pkgs/development/compilers/idris2/build-idris.nix @@ -2,7 +2,7 @@ stdenv, lib, idris2, - makeWrapper, + makeBinaryWrapper, }: # Usage: let # pkg = idris2Packages.buildIdris { @@ -61,11 +61,11 @@ let src = src; nativeBuildInputs = [ idris2 - makeWrapper + makeBinaryWrapper ] ++ attrs.nativeBuildInputs or [ ]; buildInputs = propagatedIdrisLibraries ++ attrs.buildInputs or [ ]; - IDRIS2_PACKAGE_PATH = libDirs; + env.IDRIS2_PACKAGE_PATH = libDirs; buildPhase = '' runHook preBuild @@ -75,10 +75,10 @@ let passthru = { inherit propagatedIdrisLibraries; - }; + } // (attrs.passthru or { }); shellHook = '' - export IDRIS2_PACKAGE_PATH="${finalAttrs.IDRIS2_PACKAGE_PATH}" + export IDRIS2_PACKAGE_PATH="${finalAttrs.env.IDRIS2_PACKAGE_PATH}" ''; } ); From fffc206f46cf74a562b88c5d816f7a0586383e27 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Thu, 12 Sep 2024 00:05:43 -0500 Subject: [PATCH 144/212] idris2Packages: make idris2Api a more formal package --- pkgs/development/compilers/idris2/default.nix | 17 ++------------ .../compilers/idris2/idris2-api.nix | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/compilers/idris2/idris2-api.nix diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index ca82788fdec3..8f628246c649 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -1,21 +1,8 @@ -{ callPackage, idris2Packages }: - -let -in +{ callPackage }: { idris2 = callPackage ./idris2.nix { }; + idris2Api = callPackage ./idris2-api.nix { }; idris2Lsp = callPackage ./idris2-lsp.nix { }; buildIdris = callPackage ./build-idris.nix { }; - - idris2Api = - (idris2Packages.buildIdris { - inherit (idris2Packages.idris2) src version; - ipkgName = "idris2api"; - idrisLibraries = [ ]; - preBuild = '' - export IDRIS2_PREFIX=$out/lib - make src/IdrisPaths.idr - ''; - }).library; } diff --git a/pkgs/development/compilers/idris2/idris2-api.nix b/pkgs/development/compilers/idris2/idris2-api.nix new file mode 100644 index 000000000000..bd408a64dee1 --- /dev/null +++ b/pkgs/development/compilers/idris2/idris2-api.nix @@ -0,0 +1,22 @@ +{ lib, idris2Packages }: +let + inherit (idris2Packages) idris2 buildIdris; + apiPkg = buildIdris { + inherit (idris2) src version; + ipkgName = "idris2api"; + idrisLibraries = [ ]; + preBuild = '' + export IDRIS2_PREFIX=$out/lib + make src/IdrisPaths.idr + ''; + + meta = { + description = "Idris2 Compiler API Library"; + homepage = "https://github.com/idris-lang/Idris2"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mattpolzin ]; + inherit (idris2.meta) platforms; + }; + }; +in +apiPkg.library { } From fb6efe3dfb7ac8910aa8fb84c79d2d687fdc607b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:55:33 +0000 Subject: [PATCH 145/212] marwaita-teal: 20.3.1 -> 21 --- pkgs/by-name/ma/marwaita-teal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-teal/package.nix b/pkgs/by-name/ma/marwaita-teal/package.nix index 6e06211e2c03..0c5784c3f71a 100644 --- a/pkgs/by-name/ma/marwaita-teal/package.nix +++ b/pkgs/by-name/ma/marwaita-teal/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "marwaita-teal"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - hash = "sha256-0OKG7JOpPiYbofiHWtLfkqHsZZIeGJPhl/tW1CIO3co="; + hash = "sha256-9WH/mbnLLLAf8B5Fwd7PMRAX2psWVJn7gGO4C5KkLjM="; }; buildInputs = [ From 6c842b71af0b8477a862bdfe170edbc941a049b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 08:56:15 +0000 Subject: [PATCH 146/212] python312Packages.meraki: 1.49.0 -> 1.50.0 --- pkgs/development/python-modules/meraki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meraki/default.nix b/pkgs/development/python-modules/meraki/default.nix index b3ed0bc72832..7cd761f987aa 100644 --- a/pkgs/development/python-modules/meraki/default.nix +++ b/pkgs/development/python-modules/meraki/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "meraki"; - version = "1.49.0"; + version = "1.50.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-4/FiF8eEziaD3ka/XVdAxDI8WWuWlYoMoLupQXVCBA8="; + hash = "sha256-tKtfshAsKtXPkkDY13+QWRaWduQCBhor4+ReLjarwLA="; }; propagatedBuildInputs = [ From 7c59c4418c157c981cb361c7fc7877aeeefeafdd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 09:28:33 +0000 Subject: [PATCH 147/212] pokeget-rs: 1.5.1 -> 1.6.2 --- pkgs/tools/misc/pokeget-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pokeget-rs/default.nix b/pkgs/tools/misc/pokeget-rs/default.nix index a2ad6f0df19d..42e00b9e6117 100644 --- a/pkgs/tools/misc/pokeget-rs/default.nix +++ b/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.5.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-pP6iIgpY3wI2Yhtu9NXAyB5tQgKqC9yzbC0IwalzhiI="; + hash = "sha256-Epet0CG4p7ruKHYVx0rX7KeOAe9kCer6Y8bguOY9SUs="; fetchSubmodules = true; }; - cargoHash = "sha256-DBbcfq2ON05BXGRgtZ4Sze8rAz4Eu23pOk1AEYScVbg="; + cargoHash = "sha256-gakrHutB6KBYcSZce/MDDnHK6VRPHU2B2xwtmUi4ZWY="; meta = with lib; { description = "Better rust version of pokeget"; From 537289eed405d1f7653cf02bff9186dfa3f9b344 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 4 Sep 2024 17:22:48 +0200 Subject: [PATCH 148/212] intel-gpu-tools: 1.27.1 -> 1.29 --- .../tools/misc/intel-gpu-tools/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index dcafe4ceeff4..63cb5f676539 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch # build time , bison @@ -43,25 +42,16 @@ stdenv.mkDerivation rec { pname = "intel-gpu-tools"; - version = "1.27.1"; + version = "1.29"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "drm"; repo = "igt-gpu-tools"; rev = "refs/tags/v${version}"; - hash = "sha256-7Z9Y7uUjtjdQbB+xV/fvO18xB18VV7fBZqw1fI7U0jQ="; + hash = "sha256-t6DeFmIgTomMNwE53n5JicnvuCd/QfpNYWCdwPwc30E="; }; - patches = [ - # fixes pkgsMusl.intel-gpu-tools - # https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/138 - (fetchpatch { - url = "https://raw.githubusercontent.com/void-linux/void-packages/111918317d06598fe1459dbe139923404f3f4b9d/srcpkgs/igt-gpu-tools/patches/musl.patch"; - hash = "sha256-cvtwZg7js7O/Ww7puBTfVzLRji2bHTyV91+PvpH8qrg="; - }) - ]; - nativeBuildInputs = [ bison docbook_xsl @@ -102,7 +92,7 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - patchShebangs tests man + patchShebangs lib man scripts tests ''; hardeningDisable = [ "bindnow" ]; From 515f8b5e228948e7bf41a03160d86414014d705f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?= Date: Fri, 13 Sep 2024 10:20:07 +0700 Subject: [PATCH 149/212] dictdDBs.wiktionary: update to 20240901 --- pkgs/servers/dict/wiktionary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dict/wiktionary/default.nix b/pkgs/servers/dict/wiktionary/default.nix index 8ec15db4f319..bb3aac6f7531 100644 --- a/pkgs/servers/dict/wiktionary/default.nix +++ b/pkgs/servers/dict/wiktionary/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dict-db-wiktionary"; - version = "20220420"; + version = "20240901"; src = fetchurl { url = "https://dumps.wikimedia.org/enwiktionary/${version}/enwiktionary-${version}-pages-articles.xml.bz2"; - sha256 = "qsha26LL2513SDtriE/0zdPX1zlnpzk1KKk+R9dSdew="; + sha256 = "f37e899a9091a1b01137c7b0f3d58813edf3039e9e94ae656694c88859bbe756"; }; nativeBuildInputs = [ python3 dict glibcLocales libfaketime ]; From 553095afaa914f211fb29356d47c46135a56f8f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ng=C3=B4=20Ng=E1=BB=8Dc=20=C4=90=E1=BB=A9c=20Huy?= Date: Fri, 13 Sep 2024 10:21:37 +0700 Subject: [PATCH 150/212] Update deprecated UTF8 option for dictfmt --- pkgs/servers/dict/wiktionary/wiktionary2dict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/dict/wiktionary/wiktionary2dict.py b/pkgs/servers/dict/wiktionary/wiktionary2dict.py index a737079bf5c8..03cd8538c2fa 100644 --- a/pkgs/servers/dict/wiktionary/wiktionary2dict.py +++ b/pkgs/servers/dict/wiktionary/wiktionary2dict.py @@ -767,7 +767,7 @@ xml.sax.parse(f, TemplateHandler()) f.close() f = os.popen("bunzip2 -c %s" % fn, "r") -out = os.popen("dictfmt -p wiktionary-en --locale en_US.UTF-8 --columns 0 -u http://en.wiktionary.org", "w") +out = os.popen("dictfmt -p wiktionary-en --utf8 --columns 0 -u http://en.wiktionary.org", "w") out.write("%%h English Wiktionary\n%s" % info) xml.sax.parse(f, WordHandler()) From bc0673da3c2f2df9665da82c6fd6af54a4063408 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 13:01:44 +0200 Subject: [PATCH 151/212] localproxy: 3.1.1 -> 3.1.2 --- .../networking/localproxy/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/localproxy/default.nix b/pkgs/applications/networking/localproxy/default.nix index 3de21a4c7112..f693bcb12c04 100644 --- a/pkgs/applications/networking/localproxy/default.nix +++ b/pkgs/applications/networking/localproxy/default.nix @@ -15,25 +15,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "localproxy"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "aws-samples"; repo = "aws-iot-securetunneling-localproxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-voUKfXa43mOltePQEXgmJ2EBaN06E6R/2Zz6O09ogyY="; + hash = "sha256-bIJLGJhSzBVqJaTWJj4Pmw/shA4Y0CzX4HhHtQZjfj0="; }; patches = [ - # gcc-13 compatibility fix: - # https://github.com/aws-samples/aws-iot-securetunneling-localproxy/pull/136 (fetchpatch { - name = "gcc-13-part-1.patch"; - url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/f6ba73eaede61841534623cdb01b69d793124f4b.patch"; - hash = "sha256-sB9GuEuHLyj6DXNPuYAMibUJXdkThKbS/fxvnJU3rS4="; - }) - (fetchpatch { - name = "gcc-13-part-2.patch"; + name = "gcc-13.patch"; url = "https://github.com/aws-samples/aws-iot-securetunneling-localproxy/commit/de8779630d14e4f4969c9b171d826acfa847822b.patch"; hash = "sha256-11k6mRvCx72+5G/5LZZx2qnx10yfKpcAZofn8t8BD3E="; }) @@ -43,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl protobuf catch2 boost icu ]; + postPatch = '' + sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt + ''; + # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; From a8ab229198358f9f2d8e1d133c3b565f5fd9e827 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Thu, 12 Sep 2024 21:14:03 +0000 Subject: [PATCH 152/212] qemu_xen: drop qemu-system-x86_64 Xen is very tightly integrated with qemu-system-i386; even on ARM, it's the 32-bit x86 device model that's used. The actual architecture doesn't matter, but Xen only security-supports i386-softmmu, so let's avoid potentially unsupported configurations by skipping other architectures. Signed-off-by: Fernando Rodrigues --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78f0951a1df2..a90940e27094 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26905,9 +26905,9 @@ with pkgs; # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. - qemu_xen_4_19 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_19-slim; }); - qemu_xen_4_18 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_18-slim; }); - qemu_xen_4_17 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xenPackages.xen_4_17-slim; }); + qemu_xen_4_19 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_19-slim; }); + qemu_xen_4_18 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_18-slim; }); + qemu_xen_4_17 = lowPrio (qemu.override { hostCpuTargets = [ "i386-softmmu" ]; xenSupport = true; xen = xenPackages.xen_4_17-slim; }); qemu_xen = qemu_xen_4_19; qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); From 29ebb9171d3837946263cd164a3caa5763bfb0e4 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 13 Sep 2024 11:56:25 +0200 Subject: [PATCH 153/212] libuninameslist: 20240524 -> 20240910 Changelog: https://github.com/fontforge/libuninameslist/releases/tag/20240910 --- pkgs/development/libraries/libuninameslist/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index f0d153c70080..ff438f749fd8 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20240524"; + version = "20240910"; src = fetchFromGitHub { owner = "fontforge"; - repo = pname; + repo = "libuninameslist"; rev = version; - sha256 = "sha256-LANwM0fhCsscXAdI/qGOmUWDzAhe3g9w3J68g4szDZQ="; + hash = "sha256-Pi30c3To57AzY59i39JVG2IUkGnq7CEAQkqJ1f5AZhw="; }; nativeBuildInputs = [ @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/fontforge/libuninameslist/"; + changelog = "https://github.com/fontforge/libuninameslist/blob/${version}/ChangeLog"; description = "Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; From e46649169efe1e288808f35b8dfb05863429f7c3 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 13 Sep 2024 12:01:11 +0200 Subject: [PATCH 154/212] smuxi: ensure makeWrapper is restricted to nativeBuildInputs --- pkgs/by-name/sm/smuxi/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sm/smuxi/package.nix b/pkgs/by-name/sm/smuxi/package.nix index e8a743be45ad..40ae39deee0f 100644 --- a/pkgs/by-name/sm/smuxi/package.nix +++ b/pkgs/by-name/sm/smuxi/package.nix @@ -30,11 +30,10 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ autoconf automake itstool intltool gettext mono - stfl - makeWrapper ] ++ lib.optionals (guiSupport) [ + stfl ] ++ lib.optionals (guiSupport) [ gtk-sharp-2_0 # loaded at runtime by GTK# gdk-pixbuf pango From c425822e17ca7f599644fde133a629a24677f070 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 09:35:26 +0000 Subject: [PATCH 155/212] maintainers/scripts/sha-to-sri: format --- maintainers/scripts/sha-to-sri.py | 68 +++++++++++++++++-------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index 1af7ff215ad3..657d5ac5d87f 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -26,11 +26,12 @@ class Encoding(ABC): assert len(digest) == self.n from base64 import b64encode + return f"{self.hashName}-{b64encode(digest).decode()}" @classmethod - def all(cls, h) -> 'List[Encoding]': - return [ c(h) for c in cls.__subclasses__() ] + def all(cls, h) -> "List[Encoding]": + return [c(h) for c in cls.__subclasses__()] def __init__(self, h): self.n = h.digest_size @@ -38,54 +39,57 @@ class Encoding(ABC): @property @abstractmethod - def length(self) -> int: - ... + def length(self) -> int: ... @property def regex(self) -> str: return f"[{self.alphabet}]{{{self.length}}}" @abstractmethod - def decode(self, s: str) -> bytes: - ... + def decode(self, s: str) -> bytes: ... class Nix32(Encoding): alphabet = "0123456789abcdfghijklmnpqrsvwxyz" - inverted = { c: i for i, c in enumerate(alphabet) } + inverted = {c: i for i, c in enumerate(alphabet)} @property def length(self): return 1 + (8 * self.n) // 5 + def decode(self, s: str): assert len(s) == self.length - out = [ 0 for _ in range(self.n) ] + out = [0 for _ in range(self.n)] # TODO: Do better than a list of byte-sized ints for n, c in enumerate(reversed(s)): digit = self.inverted[c] i, j = divmod(5 * n, 8) - out[i] = out[i] | (digit << j) & 0xff + out[i] = out[i] | (digit << j) & 0xFF rem = digit >> (8 - j) if rem == 0: continue elif i < self.n: - out[i+1] = rem + out[i + 1] = rem else: raise ValueError(f"Invalid nix32 hash: '{s}'") return bytes(out) + class Hex(Encoding): alphabet = "0-9A-Fa-f" @property def length(self): return 2 * self.n + def decode(self, s: str): from binascii import unhexlify + return unhexlify(s) + class Base64(Encoding): alphabet = "A-Za-z0-9+/" @@ -94,36 +98,39 @@ class Base64(Encoding): """Number of characters in data and padding.""" i, k = divmod(self.n, 3) return 4 * i + (0 if k == 0 else k + 1), (3 - k) % 3 + @property def length(self): return sum(self.format) + @property def regex(self): data, padding = self.format return f"[{self.alphabet}]{{{data}}}={{{padding}}}" + def decode(self, s): from base64 import b64decode + return b64decode(s, validate = True) -_HASHES = (hashlib.new(n) for n in ('SHA-256', 'SHA-512')) -ENCODINGS = { - h.name: Encoding.all(h) - for h in _HASHES -} +_HASHES = (hashlib.new(n) for n in ("SHA-256", "SHA-512")) +ENCODINGS = {h.name: Encoding.all(h) for h in _HASHES} RE = { h: "|".join( - (f"({h}-)?" if e.name == 'base64' else '') + - f"(?P<{h}_{e.name}>{e.regex})" + (f"({h}-)?" if e.name == "base64" else "") + f"(?P<{h}_{e.name}>{e.regex})" for e in encodings - ) for h, encodings in ENCODINGS.items() + ) + for h, encodings in ENCODINGS.items() } -_DEF_RE = re.compile("|".join( - f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" - for h, re in RE.items() -)) +_DEF_RE = re.compile( + "|".join( + f"(?P<{h}>{h} = (?P<{h}_quote>['\"])({re})(?P={h}_quote);)" + for h, re in RE.items() + ) +) def defToSRI(s: str) -> str: @@ -153,7 +160,7 @@ def defToSRI(s: str) -> str: @contextmanager def atomicFileUpdate(target: Path): - '''Atomically replace the contents of a file. + """Atomically replace the contents of a file. Guarantees that no temporary files are left behind, and `target` is either left untouched, or overwritten with new content if no exception was raised. @@ -164,9 +171,10 @@ def atomicFileUpdate(target: Path): Upon exiting the context, the files are closed; if no exception was raised, `new` (atomically) replaces the `target`, otherwise it is deleted. - ''' + """ # That's mostly copied from noto-emoji.py, should DRY it out from tempfile import mkstemp + fd, _p = mkstemp( dir = target.parent, prefix = target.name, @@ -175,7 +183,7 @@ def atomicFileUpdate(target: Path): try: with target.open() as original: - with tmpPath.open('w') as new: + with tmpPath.open("w") as new: yield (original, new) tmpPath.replace(target) @@ -188,22 +196,20 @@ def atomicFileUpdate(target: Path): def fileToSRI(p: Path): with atomicFileUpdate(p) as (og, new): for i, line in enumerate(og): - with log_context(line=i): + with log_context(line = i): new.write(defToSRI(line)) -_SKIP_RE = re.compile( - "(generated by)|(do not edit)", - re.IGNORECASE -) +_SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE) if __name__ == "__main__": from sys import argv, stderr + logger.info("Starting!") for arg in argv[1:]: p = Path(arg) - with log_context(path=str(p)): + with log_context(path = str(p)): try: if p.name == "yarn.nix" or p.name.find("generated") != -1: logger.warning("File looks autogenerated, skipping!") From 915799a2b9e59a3b32d596a216893554f9c87f07 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 08:00:12 +0000 Subject: [PATCH 156/212] maintainers/scripts/sha-to-sri: fix file-descriptor leak --- maintainers/scripts/sha-to-sri.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index 657d5ac5d87f..881e03071913 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -173,17 +173,18 @@ def atomicFileUpdate(target: Path): raised, `new` (atomically) replaces the `target`, otherwise it is deleted. """ # That's mostly copied from noto-emoji.py, should DRY it out - from tempfile import mkstemp - - fd, _p = mkstemp( - dir = target.parent, - prefix = target.name, - ) - tmpPath = Path(_p) + from tempfile import NamedTemporaryFile try: with target.open() as original: - with tmpPath.open("w") as new: + with NamedTemporaryFile( + dir = target.parent, + prefix = target.stem, + suffix = target.suffix, + delete = False, + mode="w", # otherwise the file would be opened in binary mode by default + ) as new: + tmpPath = Path(new.name) yield (original, new) tmpPath.replace(target) From bf6b5f7f85e4d0b71392241f3824d880dd9414e5 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 08:00:53 +0000 Subject: [PATCH 157/212] maintainers/scripts/sha-to-sri: accept directories as input Doesn't skip files passed as CLI arguments based on their name anymore, since bulk changes can now be done without resorting to `xargs` or equivalent. --- maintainers/scripts/sha-to-sri.py | 32 +++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index 881e03071913..35ce2ca3389a 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -7,7 +7,7 @@ from pathlib import Path from structlog.contextvars import bound_contextvars as log_context from typing import ClassVar, List, Tuple -import hashlib, re, structlog +import hashlib, logging, re, structlog logger = structlog.getLogger("sha-to-SRI") @@ -208,24 +208,20 @@ if __name__ == "__main__": logger.info("Starting!") - for arg in argv[1:]: - p = Path(arg) - with log_context(path = str(p)): + def handleFile(p: Path, skipLevel = logging.INFO): + with log_context(file = str(p)): try: - if p.name == "yarn.nix" or p.name.find("generated") != -1: - logger.warning("File looks autogenerated, skipping!") - continue - with p.open() as f: for line in f: if line.strip(): break if _SKIP_RE.search(line): - logger.warning("File looks autogenerated, skipping!") - continue + logger.log(skipLevel, "File looks autogenerated, skipping!") + return fileToSRI(p) + except Exception as exn: logger.error( "Unhandled exception, skipping file!", @@ -233,3 +229,19 @@ if __name__ == "__main__": ) else: logger.info("Finished processing file") + + for arg in argv[1:]: + p = Path(arg) + with log_context(arg = arg): + if p.is_file(): + handleFile(p, skipLevel = logging.WARNING) + + elif p.is_dir(): + logger.info("Recursing into directory") + for q in p.glob("**/*.nix"): + if q.is_file(): + if q.name == "yarn.nix" or q.name.find("generated") != -1: + logger.info("File looks autogenerated, skipping!") + continue + + handleFile(q) From e079a279f4be68e45d47c2d424df6f314616ab5c Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 08:25:54 +0000 Subject: [PATCH 158/212] maintainers/scripts/sha-to-sri: drop unused imports --- maintainers/scripts/sha-to-sri.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index 35ce2ca3389a..e31091242341 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell #! nix-shell -i "python3 -I" -p "python3.withPackages(p: with p; [ rich structlog ])" -from abc import ABC, abstractclassmethod, abstractmethod +from abc import ABC, abstractmethod from contextlib import contextmanager from pathlib import Path from structlog.contextvars import bound_contextvars as log_context @@ -204,7 +204,7 @@ def fileToSRI(p: Path): _SKIP_RE = re.compile("(generated by)|(do not edit)", re.IGNORECASE) if __name__ == "__main__": - from sys import argv, stderr + from sys import argv logger.info("Starting!") From dc2f65a6813ba60e982e82ed98ae3203755dd481 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 10:15:19 +0000 Subject: [PATCH 159/212] python312Packages.elevenlabs: 1.7.0 -> 1.8.0 --- pkgs/development/python-modules/elevenlabs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index fd6f3b0d3802..d2d661cb3b0f 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "elevenlabs"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; rev = "refs/tags/v${version}"; - hash = "sha256-wRgDKaSNSdpOJLVeYx2gTbtQ8rcxEAjrxvCI9W1v5V4="; + hash = "sha256-puYRVPWMNV+nOHwa//hZQAq1pAkNeU5CFjlMls9C7MM="; }; build-system = [ poetry-core ]; From 011daf916106828a70a5adf3a55b393fffec4a11 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 10:15:19 +0000 Subject: [PATCH 160/212] maintainers/scripts: document sha-to-sri --- maintainers/scripts/README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md index 2b99a4e75114..44a5fc9bc590 100644 --- a/maintainers/scripts/README.md +++ b/maintainers/scripts/README.md @@ -56,3 +56,16 @@ The maintainer is designated by a `selector` which must be one of: see [`maintainer-list.nix`] for the fields' definition. [`maintainer-list.nix`]: ../maintainer-list.nix + + +## Conventions + +### `sha-to-sri.py` + +`sha-to-sri.py path ...` (atomically) rewrites hash attributes (named `hash` or `sha(1|256|512)`) +into the SRI format: `hash = "{hash name}-{base64 encoded value}"`. + +`path` must point to either a nix file, or a directory which will be automatically traversed. + +`sha-to-sri.py` automatically skips files whose first non-empty line contains `generated by` or `do not edit`. +Moreover, when walking a directory tree, the script will skip files whose name is `yarn.nix` or contains `generated`. From 10aa640bf1241d2ec82a25f2cc4e5ddd3e3426b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 10:15:24 +0000 Subject: [PATCH 161/212] python312Packages.pbs-installer: 2024.08.14 -> 2024.09.09 --- pkgs/development/python-modules/pbs-installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix index 8ab7896ea0d1..8404c8bc0b90 100644 --- a/pkgs/development/python-modules/pbs-installer/default.nix +++ b/pkgs/development/python-modules/pbs-installer/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pbs-installer"; - version = "2024.08.14"; + version = "2024.09.09"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "frostming"; repo = "pbs-installer"; rev = "refs/tags/${version}"; - hash = "sha256-Hitd7Ze8pujkRBoTapP5SekpdiDwJz/0UNe0wW7eaRA="; + hash = "sha256-c9jd85CLQPrwA1HmsedGhbBoQIuEWiPsZN0Srq+DyVE="; }; build-system = [ pdm-backend ]; From c39523c7ca87207741344980ec75e0e98e91d18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 10:15:30 +0000 Subject: [PATCH 162/212] roxctl: 4.5.1 -> 4.5.2 --- pkgs/applications/networking/cluster/roxctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/roxctl/default.nix b/pkgs/applications/networking/cluster/roxctl/default.nix index 53e18967700b..15ad3c94c755 100644 --- a/pkgs/applications/networking/cluster/roxctl/default.nix +++ b/pkgs/applications/networking/cluster/roxctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "roxctl"; - version = "4.5.1"; + version = "4.5.2"; src = fetchFromGitHub { owner = "stackrox"; repo = "stackrox"; rev = version; - sha256 = "sha256-EYhp07G4a3dhnNrWzz6BtFpcgoYHosGdY2sDUYcS9QA="; + sha256 = "sha256-dJtqUYH6TUEb3IMSzVg3NBi1UYGvUPDQUaQ9h19a3NY="; }; - vendorHash = "sha256-Z7EkKVrwTzoD1BwaPhLr6XVtq/dctPJwH+KgyN3ZbUU="; + vendorHash = "sha256-qDSi1Jk6erSCwPiLubdVlqOT6PQygMQghS8leieJ78s="; nativeBuildInputs = [ installShellFiles ]; From e38f0e2fa4c974571f7c1ea8188a7fad7ebda736 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 10:15:52 +0000 Subject: [PATCH 163/212] moar: 1.26.0 -> 1.27.0 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 1de0cf22d60f..b42a2eea71de 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-Gc2JhahxiaIpDRPpuUEjd+lOE6zk1RevhD4NechxXxA="; + hash = "sha256-nuBLO+7AUa2e9WC95kami77si+LrhigGu1ngAoFwjqY="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; From ef33eb3ee3befb3815a9eda632c00d667f191316 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:15:40 +0200 Subject: [PATCH 164/212] python312Packages.influxdb3-python: 0.8.0 -> 0.9.0 Diff: https://github.com/InfluxCommunity/influxdb3-python/compare/refs/tags/v0.8.0...v0.9.0 Changelog: https://github.com/InfluxCommunity/influxdb3-python/releases/tag/v0.9.0 --- pkgs/development/python-modules/influxdb3-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index e54b39c03846..8cd060128a4a 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Knub5rZ27OXsiJanA+sI85DaUIskiGcuedKk1wF5zss="; + hash = "sha256-4P+bQEldyBNh4qsIkoZLXnUOrQ5wVGbr55xbS0oQMMM="; }; build-system = [ setuptools ]; From 93aea44648a19869812c65aa28954756ba56a469 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:16:12 +0200 Subject: [PATCH 165/212] python312Packages.marshmallow-dataclass: 8.7.0 -> 8.7.1 Diff: https://github.com/lovasoa/marshmallow_dataclass/compare/refs/tags/v8.7.0...v8.7.1 Changelog: https://github.com/lovasoa/marshmallow_dataclass/blob/v8.7.1/CHANGELOG.md --- .../python-modules/marshmallow-dataclass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 163bc0516787..3f270d21bce4 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "marshmallow-dataclass"; - version = "8.7.0"; + version = "8.7.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "lovasoa"; repo = "marshmallow_dataclass"; rev = "refs/tags/v${version}"; - hash = "sha256-O96Xv732euS0X+1ilhLVMoazpC4kUSJvyVYwdj10e2E="; + hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; propagatedBuildInputs = [ From 9b882533cf6fc6a48ec19a96416a360fec4a3026 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:17:37 +0200 Subject: [PATCH 166/212] python312Packages.influxdb3-python: update disabled --- pkgs/development/python-modules/influxdb3-python/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 8cd060128a4a..6c96217d9efd 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "0.9.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "InfluxCommunity"; From 00653cc271b6b31adafef580f08d24e45e6421ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 13 Sep 2024 13:21:28 +0200 Subject: [PATCH 167/212] python312Packages.marshmallow-dataclass: refactor --- .../marshmallow-dataclass/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-dataclass/default.nix b/pkgs/development/python-modules/marshmallow-dataclass/default.nix index 3f270d21bce4..a06997a09e40 100644 --- a/pkgs/development/python-modules/marshmallow-dataclass/default.nix +++ b/pkgs/development/python-modules/marshmallow-dataclass/default.nix @@ -6,16 +6,18 @@ pytestCheckHook, pythonAtLeast, pythonOlder, + setuptools, typeguard, + typing-extensions, typing-inspect, }: buildPythonPackage rec { pname = "marshmallow-dataclass"; version = "8.7.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lovasoa"; @@ -24,10 +26,12 @@ buildPythonPackage rec { hash = "sha256-0OXP78oyNe/UcI05NHskPyXAuX3dwAW4Uz4dI4b8KV0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ marshmallow typing-inspect - ]; + ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; nativeCheckInputs = [ pytestCheckHook @@ -51,7 +55,7 @@ buildPythonPackage rec { description = "Automatic generation of marshmallow schemas from dataclasses"; homepage = "https://github.com/lovasoa/marshmallow_dataclass"; changelog = "https://github.com/lovasoa/marshmallow_dataclass/blob/v${version}/CHANGELOG.md"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 0754933d941096e4509c7e49ff330dd42f297572 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 11:31:14 +0000 Subject: [PATCH 168/212] credhub-cli: 2.9.36 -> 2.9.37 --- pkgs/tools/admin/credhub-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/credhub-cli/default.nix b/pkgs/tools/admin/credhub-cli/default.nix index 72a80938ca84..57164bd0dca6 100644 --- a/pkgs/tools/admin/credhub-cli/default.nix +++ b/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.36"; + version = "2.9.37"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-5jrVN0mFRLieKg92pWrBK89SiPr9A2Z8Rtzou4dRdOQ="; + sha256 = "sha256-BW6QMxBuiBmCE7ujpPc2sGEz0jkhEo0cPoa184Yx6/Q="; }; # these tests require network access that we're not going to give them From 87a7cb8feea7376543f8f7c9c817f581ff2a5486 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 11:31:35 +0000 Subject: [PATCH 169/212] opcr-policy: 0.2.17 -> 0.2.18 --- pkgs/development/tools/opcr-policy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/opcr-policy/default.nix b/pkgs/development/tools/opcr-policy/default.nix index f5b6148a028b..4c947f3e1aab 100644 --- a/pkgs/development/tools/opcr-policy/default.nix +++ b/pkgs/development/tools/opcr-policy/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "opcr-policy"; - version = "0.2.17"; + version = "0.2.18"; src = fetchFromGitHub { owner = "opcr-io"; repo = "policy"; rev = "v${version}"; - sha256 = "sha256-pZOCxOoGl/qq6nfklnwPtCy6pPXjIaY6qhH4TuL5kGg="; + sha256 = "sha256-Q/2r8mqz820mEQD7o9qzC1TPMrRH0f6nr1jgRQAEj/Y="; }; - vendorHash = "sha256-LTlBj+F+QdLpndLhtH/vW6oNrvh+yUqtYngWpFMfahA="; + vendorHash = "sha256-C6Y+R2q1ZRbeFN1qY109fikkzvcUsBfDn4CYCrKrLKI="; ldflags = [ "-s" "-w" "-X github.com/opcr-io/policy/pkg/version.ver=${version}" ]; From 5fc3cb3ca05bf4aedf51987cdc1817cca1794520 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Sep 2024 06:37:36 +0200 Subject: [PATCH 170/212] =?UTF-8?q?ocamlPackages.ocsigenserver:=205.1.2=20?= =?UTF-8?q?=E2=86=92=206.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.eliom: 10.4.1 → 11.0.0 --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- pkgs/development/ocaml-modules/ocsigen-server/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 30b955876ace..205fa78371fb 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -17,13 +17,13 @@ buildDunePackage rec { pname = "eliom"; - version = "10.4.1"; + version = "11.0.0"; src = fetchFromGitHub { owner = "ocsigen"; repo = "eliom"; rev = version; - hash = "sha256-j4t6GEd8hYyM87b9XvgcnaV9XMkouz6+v0SYW22/bqg="; + hash = "sha256-RgIK3xkKdX+zOurhML4370rsO4blJrWoEla09Nfe9Mw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index c475ebdecd26..0984416020e9 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -1,6 +1,6 @@ { lib, buildDunePackage, fetchFromGitHub, which, ocaml, lwt_react, ssl, lwt_ssl, findlib , bigstringaf, lwt, cstruct, mirage-crypto, zarith, mirage-crypto-ec, ptime, mirage-crypto-rng, mtime, ca-certs -, cohttp, cohttp-lwt-unix, hmap +, cohttp, cohttp-lwt-unix , lwt_log, re, cryptokit, xml-light, ipaddr , camlzip , makeWrapper @@ -17,7 +17,7 @@ let caml_ld_library_path = ; in buildDunePackage rec { - version = "5.1.2"; + version = "6.0.0"; pname = "ocsigenserver"; minimalOCamlVersion = "4.08"; @@ -26,13 +26,13 @@ buildDunePackage rec { owner = "ocsigen"; repo = "ocsigenserver"; rev = "refs/tags/${version}"; - hash = "sha256-piWHA4RMO370TETC9FtISyBvS1Uhk5CAGAtZleJTpjU="; + hash = "sha256-T3bgPZpDO6plgebLJDBtBuR2eR/bN3o24UAUv1VwgtI="; }; nativeBuildInputs = [ makeWrapper which ]; buildInputs = [ lwt_react camlzip findlib ]; - propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit hmap ipaddr lwt_log lwt_ssl + propagatedBuildInputs = [ cohttp cohttp-lwt-unix cryptokit ipaddr lwt_log lwt_ssl re xml-light ]; From d15cdb8d5108a531c8bc99b12a711f4346257397 Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 13 Sep 2024 13:21:29 +0100 Subject: [PATCH 171/212] biome: move to pkgs/by-name --- .../tools/biome/default.nix => by-name/bi/biome/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/biome/default.nix => by-name/bi/biome/package.nix} (100%) diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/by-name/bi/biome/package.nix similarity index 100% rename from pkgs/development/tools/biome/default.nix rename to pkgs/by-name/bi/biome/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fb98cb0f44..1e1d9dab165e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6692,8 +6692,6 @@ with pkgs; biodiff = callPackage ../development/tools/biodiff { }; - biome = callPackage ../development/tools/biome { }; - biosdevname = callPackage ../tools/networking/biosdevname { }; bluetooth_battery = python3Packages.callPackage ../applications/misc/bluetooth_battery { }; From b7e75d170edb23d0074fbb0eab1c3ebb4f602845 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:26:20 +0900 Subject: [PATCH 172/212] python312Packages.ipycanvas: 0.13.2 -> 0.13.3 Changelog: https://github.com/jupyter-widgets-contrib/ipycanvas/releases/tag/0.13.3 --- pkgs/development/python-modules/ipycanvas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipycanvas/default.nix b/pkgs/development/python-modules/ipycanvas/default.nix index 34bb4c7916ab..2a0e06c9ec02 100644 --- a/pkgs/development/python-modules/ipycanvas/default.nix +++ b/pkgs/development/python-modules/ipycanvas/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "ipycanvas"; - version = "0.13.2"; + version = "0.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Ujh9nYf2WVXzlVL7eSfEReXl5JN9hTgU2RDL6O+g+3k="; + hash = "sha256-ToZ8UJsB9cTPwAn32SHjLloSoCmshW54wE/xW2VpLEo="; }; # We relax dependencies here instead of pulling in a patch because upstream From 16d357361ba10907c60223c3d7bf9cbb59e8281a Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Fri, 13 Sep 2024 15:36:39 +0300 Subject: [PATCH 173/212] pulumi-bin: 3.131.0 -> 3.132.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 242 +++++++++++++-------------- 1 file changed, 121 insertions(+), 121 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 3f4a4dcd880c..a737d652bce4 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.131.0"; + version = "3.132.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-x64.tar.gz"; - sha256 = "06gzn2vbjmv4gljm7ar90hxm47ap2izhlr6whff7jrsrkvf71n54"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-x64.tar.gz"; + sha256 = "1ylraqx71fc28aij6hpmqgq83ccs1615222ccav3q2r3k72jjw8h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz"; @@ -17,20 +17,20 @@ sha256 = "1ckk20g77lwgg5v4baai0w6cvw9zapf31jy42lm9l3qnzx61fm6r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-linux-amd64.tar.gz"; - sha256 = "0f8xh0hqvfpqj9rzyj46kzk2ilna6r0s577bq03vd50p97slqs18"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-amd64.tar.gz"; + sha256 = "17mhp43q3igid15qavhib3ffcgz5ll64nxs9iv1gasmlm6v4gand"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-linux-amd64.tar.gz"; - sha256 = "1j87gqk46kdpbbzfjd7vfgq7f0yma1w66ygmh42f259hplaj0c33"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-amd64.tar.gz"; + sha256 = "0k520iz4rf26x09nhy3xzxky6ni6c6q26l4pks8zylm508g8kkaz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-linux-amd64.tar.gz"; - sha256 = "0ypabr7slayhy1kpiikx6pwfx89ibcvwz21kagf4zm3idrrv47kl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz"; + sha256 = "0qfkbwbkgh828hxgr64z8mkf6hbpqzwdfc2q6b1r718g647cm7nb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-linux-amd64.tar.gz"; - sha256 = "0grarc3ri7k9kvr8hb96id9r5sryyp0hymr2qv4ldm53wyzw3zxd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-amd64.tar.gz"; + sha256 = "1qvyh1d70lrgxbdkmcjcgl5pldc9a4bnzii9p3nnhgs37ks95w31"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz"; @@ -45,16 +45,16 @@ sha256 = "1l7qibcbak0zmrzfrldqrhkfdvmankb8yflv6ak17y8434dfcrfa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-amd64.tar.gz"; - sha256 = "1lc2p0x5ar0vhp0klmp6ilfl1aa8zilg4jgkiqsycsqqaj4f0hk7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-amd64.tar.gz"; + sha256 = "1gn7m1wyx7qlvv8q2i64cybpzms92dbydnv4dw3gvdxq4l217w94"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-amd64.tar.gz"; sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-linux-amd64.tar.gz"; - sha256 = "1r9flwh8sbnls78xsl64kfh7i29i2y3nm19jbhwjr8lmgnq5p2f4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-linux-amd64.tar.gz"; + sha256 = "06smn9a3lrmqz9k2akzg984345h22mnlv75x6y3yzgs7cihyq26m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-amd64.tar.gz"; @@ -89,12 +89,12 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-amd64.tar.gz"; - sha256 = "0biyj03nhbmq0fnlkx3v4w43cwk095sa80di1mhbszgz13zj4409"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-amd64.tar.gz"; + sha256 = "1cr2rwv1k4myd4gdyb88v4vyqrlxkl2br4jrvnari7sklpb4kjz9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-amd64.tar.gz"; - sha256 = "1zvspswy3lmjpwpw35xxpkssv28sapwcv52lxiam57vcr9rbyi5g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-amd64.tar.gz"; + sha256 = "0h0dmb5q2flkjgkv7ps9maildc9cfcd921n38wyccql9nscrdy94"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-amd64.tar.gz"; @@ -113,20 +113,20 @@ sha256 = "192m4j80xqhyn8ramp3sdczcagia6xvfv99wq5ffz6yh7vyv0l2g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; - sha256 = "13s88q8ibd2sb0ly4z4mbj785jv0hclvh0prccsvkq8zbyg91vv1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-amd64.tar.gz"; + sha256 = "1qrf7v0v2qzn3df1dh2v99kvszjj38c4ms8msv57pd0ksbkyy03x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-linux-amd64.tar.gz"; - sha256 = "0q2ajdbywq2s3ss7iqhv3iwjf0vqiw6ydyw059k606h0jr3x6dgr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-linux-amd64.tar.gz"; + sha256 = "1qp5ix0ybdjg9gzdlrlrkvvnqyc7sz9hwjkfmr944h6nc1smkghw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-amd64.tar.gz"; - sha256 = "1h2kql44fjq6vv2a3pvvnx78sil6jgwm792qmrvh7gqrad0dd050"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-amd64.tar.gz"; + sha256 = "0i9668mimdhm0aw0hjmg2ca2qycwilngz30mp2hjjlb2rv4mfgbk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-linux-amd64.tar.gz"; - sha256 = "1jp70a089k3kgyqqvywyy3x7iwwsnng4qb17m4p624y4xhfgy512"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-amd64.tar.gz"; + sha256 = "1974ysq788i3g4xzgx16azwn71flypbpb378j0dpaz7z2phwa021"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-amd64.tar.gz"; @@ -137,8 +137,8 @@ sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-linux-amd64.tar.gz"; - sha256 = "1931a27h7jbsiy5addq93j8rnsk9gys9jq76w04mwx1fmlzm78j9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-amd64.tar.gz"; + sha256 = "0ypnrzgfm5v3a4j28ydx9kbfliisvn5lc2i5kyzma86bvaizf8l8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-amd64.tar.gz"; @@ -149,8 +149,8 @@ sha256 = "11g44ngbz4yar22flz6l1qxsjrjh1ks0fihln0g2b2da9n24v251"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-linux-amd64.tar.gz"; - sha256 = "1i2r83yfzh7ivvd15198czr6g9ry28pvz49a0rz9fy29rkggxhqs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-amd64.tar.gz"; + sha256 = "05xc1bm0bzqfwpakw9yrlh6dwm0zy3sq0vdhp4bnwrl2cmkwxp26"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-x64.tar.gz"; - sha256 = "0pl3wd2y7mkap7jq29bmbw1ipc2qf149xixriad2wk87sr6swgak"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-x64.tar.gz"; + sha256 = "0xcrv8536h043s0sk3h5ja75xjvcpx4adqhdn799sjlbx449mv1i"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz"; @@ -175,20 +175,20 @@ sha256 = "0l34kaa1x2sbalx0dannmmysr1ai8bh2z6x0lzg1iwxhr6fdvl3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-darwin-amd64.tar.gz"; - sha256 = "1lhp3wsa47a9r1zh6p4173gzhs0z5yzbzlr8wiqgkpn5ifsnl44a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-amd64.tar.gz"; + sha256 = "0mzygnyznqjj7niz7dv4c936riqbqrw4291ws76f777awksyri2c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-darwin-amd64.tar.gz"; - sha256 = "1nmarzx8s506g9559wa1l8bmhaxhplh515r74jkibnfhgj79fckp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-amd64.tar.gz"; + sha256 = "06qg7jm9gr5s2nh1c44h94s17ai165c24j1lig01m27gwvdddl0z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "16v1mr4h5cd0yj1nbm56pajp7nh386y79jpi1j0vvclhv4g11gli"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz"; + sha256 = "1hqcr1yhlc8m99w8z0i3mr3wnvnldkbwni4v5s1r11blpzqrwa0p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-darwin-amd64.tar.gz"; - sha256 = "1x333757814q95ixbmkzk49lhkfvsw9xnjpgnnx8f6325x331hy1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-amd64.tar.gz"; + sha256 = "1cvf7y3xgplyd7j586fa10j9s9wm7h6nqdvhydkbqzlrbqs6ys6p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz"; @@ -203,16 +203,16 @@ sha256 = "02czk2wwf03sswlqj4hrj83i2i53h4nclqrb3nlgzjgaal82ijv9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-amd64.tar.gz"; - sha256 = "0iw3gf7kwpi5lckngns2ra1vyd4n05r756s18b01zbcppw8fq2mw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-amd64.tar.gz"; + sha256 = "0rnj0nvqazsmvb3wwkgiwnpcimzv86df6bw8ln5h7rjiqpb23mvk"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-amd64.tar.gz"; sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-darwin-amd64.tar.gz"; - sha256 = "0h0nng26467yq12w3jhkbbs0629d6a6mxigxmhfca9w3dzrmkw8h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-darwin-amd64.tar.gz"; + sha256 = "0hdnyy6fjnrz0shqf0jsyl80w5r3pmkbpgyv41s37n6yk04kmcgy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-amd64.tar.gz"; @@ -247,12 +247,12 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-amd64.tar.gz"; - sha256 = "0pw9qawf3wrndzrz0i93al09rygr23b6gg53njq3az74gw4vjaw3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-amd64.tar.gz"; + sha256 = "0lkbzgp8kycnd2285zb90w6l0q5iigmjamxh4zrak86vrk4lnyz7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-amd64.tar.gz"; - sha256 = "170fh5nyjxc3ayk0yfpv0ypck65rmdgy8p4p90v2i7mq7b6fs53z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-amd64.tar.gz"; + sha256 = "047y788pxxlls03j9anp9a7mngq9rkr1x5cyq0gjch11605p0fay"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-amd64.tar.gz"; @@ -271,20 +271,20 @@ sha256 = "1x5msm5ssslfpss1gvi56hmjc17hfnkvzmk5c1lhzzk1w94l30vj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; - sha256 = "09bdp7khxcmary0jiis921hdrakdz1ywzmz9byn4hfx0r6iajbpl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-amd64.tar.gz"; + sha256 = "0kv59rg37bvffgpc2mabi0p3rj6w7ihgzsxlplls1hx9x955kip8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-darwin-amd64.tar.gz"; - sha256 = "1gcl5pahm54rkfxny11wqc36kn848cgqzji6kn8iz82wwg2sq68v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-darwin-amd64.tar.gz"; + sha256 = "0qc451qq772vfa5cfi06r2vpcmi69hahj8m2040sbx363wpz8rm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-amd64.tar.gz"; - sha256 = "01g19rm8272n6yzm7a1dyj2xr6f6xvgi0d962aw66sjhq4jc0s1h"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-amd64.tar.gz"; + sha256 = "0jnbcq4649mn52qmq52h1sndad9jch07rh9b3ahjm8b6lakviq87"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-darwin-amd64.tar.gz"; - sha256 = "10x5j64dwvjvzmhv0991jsp8737v770hnyq9k99k3v0wi8fpsjfi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-amd64.tar.gz"; + sha256 = "0jbl5avzhqs4phnfrwp8n0lq1m4lmvlzvyhjpcsrx4nb33740rhz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-amd64.tar.gz"; @@ -295,8 +295,8 @@ sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-darwin-amd64.tar.gz"; - sha256 = "09454zh11wd9fra7x2dcyhy7ihs5chw5fy0ii376y4flj1gbx0j7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-amd64.tar.gz"; + sha256 = "1jbsh2ni7qrl2q4lm63pgb3rf00xg3j4070nw9v82xbl9fcfmrjg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-amd64.tar.gz"; @@ -307,8 +307,8 @@ sha256 = "1g164xrj9nkdjw9pw08y24vzhg25f8h5702rfjsk0s2z011g86p7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-darwin-amd64.tar.gz"; - sha256 = "12jsdnn5az8qhmak0i57k28w57nm0a0pmlpz81as47mffdkadjkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-amd64.tar.gz"; + sha256 = "1wj5zz7gc9c8f1yk1aycb55v6pdpdkm97x4yq7ig3gy1j0zx90pg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-arm64.tar.gz"; - sha256 = "1mvi1z851yzhdmxaxq03vg309x1hkniky3fkiz4k1qfwxrnqjpji"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-arm64.tar.gz"; + sha256 = "1ny1wsjw6zickc1lc8cm223zngdlag5zdrxm7q5vpqxmw6lxkvhy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz"; @@ -333,20 +333,20 @@ sha256 = "1ldlxsnpjkdqh2xdfl56wgq9y94vaigc5i3q6cz682094fwhmw42"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-linux-arm64.tar.gz"; - sha256 = "140rl0kxlk81xdn3k6alyyy5skkbdidfyr6522dl2yqj0bxgmkl0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-arm64.tar.gz"; + sha256 = "1l5947vz9k5p6n9ij072igb1ck52fm0rxim82aa0bhvbg794l08a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-linux-arm64.tar.gz"; - sha256 = "0w8c2vxfmwpcy1f6lbi8d7hahq3sbzpw1ivsb9n8864lin5iycry"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-arm64.tar.gz"; + sha256 = "0bcxkk2rl9bls4h7nn0s1hm4lnypz30w4vgkc5wphw6a8jr55pr5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-linux-arm64.tar.gz"; - sha256 = "157vh8jgkqyydpic63qpwsqp469rjxakld4sd671lr6lqz234pwm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz"; + sha256 = "0h7ngd0zblvgf22m563p7f2y3kpqlvn5kqvb6psz3ixa8k4klmz7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-linux-arm64.tar.gz"; - sha256 = "1jmqgajpi4771qp282p3rjaawnl5kcm4k63j41771nh69siyj0ib"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-arm64.tar.gz"; + sha256 = "0k5n9kcbs2h86d89lrcmcliihb0avxya765z8gzxj97mgyfz0x8j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz"; @@ -361,16 +361,16 @@ sha256 = "0ciadynvqc0pkmy9w7zj65zbc7w6rbsnz5b6iaszlyqp9rzwahg2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-linux-arm64.tar.gz"; - sha256 = "1wmi0zwrsvphk82h7wqn0jvlsk685nl3xf48crara716xkhlr6cp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-linux-arm64.tar.gz"; + sha256 = "0pv5av9471mlgv18k9pz977awnrc86zfm86bb1hkgbsgnpzxnxjd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-linux-arm64.tar.gz"; sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-linux-arm64.tar.gz"; - sha256 = "0kzsxb0kifxl8yvkssryic9jaqmyhxkxhvxna5d3zivawmy1hbil"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-linux-arm64.tar.gz"; + sha256 = "070jixfr3qqzk4ni24fzankqmvmvn27cixipa8xfmxg4wwci8kb3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-arm64.tar.gz"; @@ -405,12 +405,12 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-arm64.tar.gz"; - sha256 = "1m18aypypjsyr18igj2kmzh1dw86hxph32agk7k0zjfj921anqmx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-linux-arm64.tar.gz"; + sha256 = "00ip2mi0hizfcvrmhq609ppghxpw50nihq0gaxl6lw9a7983ai97"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-linux-arm64.tar.gz"; - sha256 = "07kv3nqbfdah4i82pb8q83swr726q0bkx8wr6wwy168nff6zs98l"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-arm64.tar.gz"; + sha256 = "04xvc3f94hybbdsln067qjw32876vak6msifqmh9vw3jkrzz60nx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-arm64.tar.gz"; @@ -429,20 +429,20 @@ sha256 = "0xyypg6rf1q9mb4brsplhaj4aj3fsrwsqli45662syhd7skmzwrm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; - sha256 = "1gmcqk0ddfa5zfmhqv32vl1x5shmr80pik8da2g96y3mvfjbicpp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-linux-arm64.tar.gz"; + sha256 = "1k8qylpilv579gdzv6m463v7i419npn2jca1w6lrjk234vlvz0c1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-linux-arm64.tar.gz"; - sha256 = "1d8qb9n96c536s3qbf82k9jjpvgi5lryywli7jlfjqz98bwwr8dm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-linux-arm64.tar.gz"; + sha256 = "0a1r87a9vp1sm4q7bxhgisrypyfi1p7hvh3c15yx22ylrmgwd83n"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-linux-arm64.tar.gz"; - sha256 = "0ainz86d5bcslk4yyyw6qsqnjhw2myirlkb22l0ldfpg85j4gbnm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-linux-arm64.tar.gz"; + sha256 = "11racnb583bfsi3id7mqf8bjnwxl83a252y1lxbz3wy4bpqdzz4b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-linux-arm64.tar.gz"; - sha256 = "0frpkch4nmkjcmkdp9iv35d6nj6n7188wqcnq4wi9hjchvz03ngx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-linux-arm64.tar.gz"; + sha256 = "11sf43q4djd1yk0cf7ypv5ypcjc62dibhb8g1p5dg2qcbdlkc551"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-arm64.tar.gz"; @@ -453,8 +453,8 @@ sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-linux-arm64.tar.gz"; - sha256 = "0d1hnhfk3mxsw57y8k4pbrsimdkd7pibc77gspmhz16r1mvwavmz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-arm64.tar.gz"; + sha256 = "01ihcjgg9cbvxf3f26p1jjpjdq3x9l4bklabhlhixp51jr4h7wyn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-arm64.tar.gz"; @@ -465,8 +465,8 @@ sha256 = "0jkjbsdmsc50jwv9rr40s0hlhwyhljwz95s5ll28xmmk413jkpfr"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-linux-arm64.tar.gz"; - sha256 = "0b42ym6ypaz1qrjgh1bpgadm1b2vjcj6wxqs1af81hjcwdmqnmn0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-arm64.tar.gz"; + sha256 = "11yb5bv4ra9a28g4ns4pmzmf0ax280j6hxwh2p2nrkxxd3p8a6ai"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-arm64.tar.gz"; - sha256 = "01ysc776ng4gdi9vaa7am0a9n49wakkbwq6r2bj5avn0v95njrqa"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-arm64.tar.gz"; + sha256 = "0wkmc2kajcd35js6ircf5an7h3hq7ra8z154v47dyid39m7c5bc5"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz"; @@ -491,20 +491,20 @@ sha256 = "0nwb4w5y5nyz8a9marqln338mhxgj49iw2br5p7rksfw0xcv3a4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.2-darwin-arm64.tar.gz"; - sha256 = "0yhy5ci5qxx4xnv16jav68b258ancjc8iqybk1xifhixf8vyxcr7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-arm64.tar.gz"; + sha256 = "125ck3a48ailqb7qwvfk7mx321k71xg3wby4fcvb2wjqgyl0x1kl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.8.0-darwin-arm64.tar.gz"; - sha256 = "1vz4qrf5nn17h9qlrnq1gb9q2km7zcl2bwa36bhfbm0h9rh2b52k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-arm64.tar.gz"; + sha256 = "174dzisax2mqjm6gwmq20va0yivz3jqkczq03ys8b4m7q4s9yl7w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.6.0-darwin-arm64.tar.gz"; - sha256 = "0rcxkkjxc7prywjj7hpsr4dvvxd70hvp2widqwfa1s4lg7gcbfi7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz"; + sha256 = "1d6gpymsa5qjn03510pz61g774qh53v914hg2dm5kqrjzgb1mnvh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.0-darwin-arm64.tar.gz"; - sha256 = "1qlhjwv6b1vad4i77i7xq6pp92v292i5aj4wjc1k0hsb2xsizs5v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-arm64.tar.gz"; + sha256 = "0321gnpljbzwyn1cdw5y3rhwi6kipavqnyamq6pa2s3725pplbys"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz"; @@ -519,16 +519,16 @@ sha256 = "1vs8xhy7iqfadfi2397jwfnz099pqyz5js4g4mx7kw1v47bsbvdq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.37.1-darwin-arm64.tar.gz"; - sha256 = "08hhsjw93g5fyivlykmrzg4sghrranprzl17p1wn8rfiwfvk3d1x"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.38.0-darwin-arm64.tar.gz"; + sha256 = "1b833d49z3h4cnf35qgill4rnixh6mfswk0g70qzv83jm9gvw9gz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.1-darwin-arm64.tar.gz"; sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.2-darwin-arm64.tar.gz"; - sha256 = "11afh8r6l0xjkfmqa8976h9i6xchn9fapsrfbpa8lvz3l4ch30md"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.33.1-darwin-arm64.tar.gz"; + sha256 = "0p2vciicmq7103cg205pqsxpjz0p0k1a1dbiakr2qjx56crraj4b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-arm64.tar.gz"; @@ -563,12 +563,12 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-arm64.tar.gz"; - sha256 = "19nr55glr64lvxf233c2z8j5g13b7r2zxqwsri9vgj3kg52rjsbi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.1-darwin-arm64.tar.gz"; + sha256 = "19shjz66ybjkcij72bhknsnxgpg8acnv6vp1lkmxd39s5g87ajv0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.17.1-darwin-arm64.tar.gz"; - sha256 = "1rh428pj6yzqy40l9gcjaacfcxy5snsy642gavwr9raw3yxdh4br"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-arm64.tar.gz"; + sha256 = "1vqyd9g11k64wqmp5c0si7xycl1wlfl694fg6l8jv6dhkmr44q5b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-arm64.tar.gz"; @@ -587,20 +587,20 @@ sha256 = "0l48njd1dw2fmr0sgpws5c6178wcv8h1rzvyj6x6djin3va8nwsg"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; - sha256 = "1p1r5mn75mgshs9k9yjnzxism4b4nlyp84vz2l48bdgcbqzn1jin"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1jmfrlilb4par17awwr4aklkr9dnckpr2c88p8x1i641zbfrniw7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.4-darwin-arm64.tar.gz"; - sha256 = "0w3y5phh1i6h2w77gg7p9rkrb9my11mx0bmsk29nlqpzrmfgwqbc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.5-darwin-arm64.tar.gz"; + sha256 = "0nsgv18wdkyjrr9wq6qdd07bcjy9jr5206ncz84xhar47iaw1m16"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.2-darwin-arm64.tar.gz"; - sha256 = "09z5hdwn282xcxi4a2xsigcscnxykidm3a57r1s92jyxcvp9y2k8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.58.0-darwin-arm64.tar.gz"; + sha256 = "0p9lcg7wjjsgj8slg5vxd6jdjdwk36pdfdk87w450zm7k0ymfzq1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.90.0-darwin-arm64.tar.gz"; - sha256 = "19n9pzm2nv8pwzvi9hvr7026zbywa2ravsplbbl35j1q15g46dcm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.91.0-darwin-arm64.tar.gz"; + sha256 = "02fqsg8vvfl1xcb7s5waa9ysfl57i6307wzgwsw2y156jdbl2xkn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-arm64.tar.gz"; @@ -611,8 +611,8 @@ sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.5-darwin-arm64.tar.gz"; - sha256 = "1dddpyrixmsgw2w8d30s18b49lc35xkkq8vjlhmwbpmcsp8kmfl7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-arm64.tar.gz"; + sha256 = "0kcycvq3yaary4197cdwj2ziryffwmry295ds2am91gbgd3wyzd1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-arm64.tar.gz"; @@ -623,8 +623,8 @@ sha256 = "114cbaxhr067nf6rhxqnxhqzfwbq6sak6wmxjq5d25xxx0k0392j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.0-darwin-arm64.tar.gz"; - sha256 = "1bgzdndiqkz45a8k3c82fr6br6sp02q06lv1bw5kybz9xn194jp8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-arm64.tar.gz"; + sha256 = "1329dc2jqwqdxlfrx214jmxji01kzny3rj5hh137yipkvfkrfzkf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.3-darwin-arm64.tar.gz"; From d88eafbacde75b2940e43671fb88e62ea9f14dc9 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 13 Sep 2024 18:09:10 +0530 Subject: [PATCH 174/212] pyenv: 2.4.11 -> 2.4.12 Diff: https://github.com/pyenv/pyenv/compare/refs/tags/v2.4.11...v2.4.12 Changelog: https://github.com/pyenv/pyenv/blob/refs/tags/v2.4.12/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/development/tools/pyenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 4809110d8c80..db91e04d6318 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-Si7fjcUsj5Q+SezBGzQtzvu6OK2ZFk6YruYabYpuyK4="; + hash = "sha256-ZvXtDD9HKwOJiUpR8ThqyCHWyMFs46dIrOgPMNpuHrY="; }; nativeBuildInputs = [ From 946f90c22777d255e6033903a5fa9dc8c15df37b Mon Sep 17 00:00:00 2001 From: isabel Date: Fri, 13 Sep 2024 13:22:00 +0100 Subject: [PATCH 175/212] biome: 1.8.3 -> 1.9.0 --- pkgs/by-name/bi/biome/package.nix | 57 +++++++++++++++++-------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index aa8a2855882f..c37b4f6f66e5 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -1,46 +1,50 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, rust-jemalloc-sys -, zlib -, stdenv -, darwin -, git +{ + lib, + rustPlatform, + fetchFromGitHub, + pkg-config, + libgit2, + rust-jemalloc-sys, + zlib, + stdenv, + darwin, + git, }: - rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-6/RYuaR4HBXLI7eKysyRcSOxONFlChpQuhzWHAlx2CM="; + hash = "sha256-AVw7yhC/f5JkFw2sQZ5YgzeXXjoJ8BfGgsS5sRVV/wE="; }; - cargoHash = "sha256-ytGbiDamxkTCPjNTBMsW1YjK+qMZfktGG5mVUVdKV5I="; + cargoHash = "sha256-Vz6GCDGdC2IUtBK5X/t/Q5LODFUSlUxPBTCIjgdw3XU="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libgit2 - rust-jemalloc-sys - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.Security - ]; + buildInputs = + [ + libgit2 + rust-jemalloc-sys + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; nativeCheckInputs = [ git ]; cargoBuildFlags = [ "-p=biome_cli" ]; - cargoTestFlags = cargoBuildFlags ++ + cargoTestFlags = + cargoBuildFlags + ++ # skip a broken test from v1.7.3 release # this will be removed on the next version [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; @@ -58,12 +62,15 @@ rustPlatform.buildRustPackage rec { unset BIOME_VERSION ''; - meta = with lib; { + meta = { description = "Toolchain of the web"; homepage = "https://biomejs.dev/"; changelog = "https://github.com/biomejs/biome/blob/${src.rev}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + isabelroses + ]; mainProgram = "biome"; }; } From 8f75dd40856dc79cd07f92270ae3f64a1f4b9de2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 12:45:10 +0000 Subject: [PATCH 176/212] python312Packages.llm: 0.15 -> 0.16 --- pkgs/development/python-modules/llm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix index 7c59d7c38911..bd5a3e34a4a4 100644 --- a/pkgs/development/python-modules/llm/default.nix +++ b/pkgs/development/python-modules/llm/default.nix @@ -25,7 +25,7 @@ let llm = buildPythonPackage rec { pname = "llm"; - version = "0.15"; + version = "0.16"; pyproject = true; build-system = [ setuptools ]; @@ -36,7 +36,7 @@ let owner = "simonw"; repo = "llm"; rev = "refs/tags/${version}"; - hash = "sha256-PPmbqY9+OYGs4U3z3LHs7a3BjQ0AlRY6J+SKmCY3bXk="; + hash = "sha256-ew8080Lv1ObjUaGicaGrj8IXXA7rtdgcWhp41O8gfVE="; }; patches = [ ./001-disable-install-uninstall-commands.patch ]; From 35eef7336d8e12b04d9a3dbec3fc978da6bddb99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 12:46:45 +0000 Subject: [PATCH 177/212] python312Packages.molecule: 24.8.0 -> 24.9.0 --- pkgs/development/python-modules/molecule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix index 834b336f48bc..5d935550d3c8 100644 --- a/pkgs/development/python-modules/molecule/default.nix +++ b/pkgs/development/python-modules/molecule/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "molecule"; - version = "24.8.0"; + version = "24.9.0"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-FAc4kE6fF4FXgFaKxAjJ9zu54qxyHjRoWjWebTUH5nc="; + hash = "sha256-hUjtoTwxoepBugeGsp3eRmz7gSYXwleSFRM1sXpBD2M="; }; nativeBuildInputs = [ From c960ba48d1b84714b29e8fa1157e4ef77d7e848f Mon Sep 17 00:00:00 2001 From: Parker Hoyes Date: Fri, 13 Sep 2024 13:08:29 +0000 Subject: [PATCH 178/212] nixos/nix-daemon: Enable cgroups delegation (#339310) When `use-cgroups` is enabled, the nix daemon creates sub-cgroups for the build processes (and itself if NixOS/nix#11412 is merged, see NixOS/nix#9675). `Delegate` should be set to prevent systemd from messing with the nix service's cgroups (https://github.com/systemd/systemd/blob/main/docs/CGROUP_DELEGATION.md) and ensure the OOM killer only targets the offending derivation and not the entire service (NixOS/nix#10374). --- nixos/modules/services/system/nix-daemon.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/system/nix-daemon.nix b/nixos/modules/services/system/nix-daemon.nix index 3d44bdac34bf..adadce4f88d6 100644 --- a/nixos/modules/services/system/nix-daemon.nix +++ b/nixos/modules/services/system/nix-daemon.nix @@ -198,6 +198,7 @@ in IOSchedulingClass = cfg.daemonIOSchedClass; IOSchedulingPriority = cfg.daemonIOSchedPriority; LimitNOFILE = 1048576; + Delegate = "yes"; }; restartTriggers = [ config.environment.etc."nix/nix.conf".source ]; From 2a3f63c41f8007dcda76ba8672c7fe3bc16f20af Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:27:20 +0900 Subject: [PATCH 179/212] python312Packages.jupyterlab-execute-time: 3.1.2 -> 3.2.0 --- .../python-modules/jupyterlab-execute-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix index f2efc2e7d5e8..3734c7d0bcd5 100644 --- a/pkgs/development/python-modules/jupyterlab-execute-time/default.nix +++ b/pkgs/development/python-modules/jupyterlab-execute-time/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "jupyterlab-execute-time"; - version = "3.1.2"; + version = "3.2.0"; pyproject = true; src = fetchPypi { pname = "jupyterlab_execute_time"; inherit version; - hash = "sha256-DiyGsoNXXh+ieMfpSrA6A/5c0ftNV9Ygs9Tl2/VEdbk="; + hash = "sha256-mxO2XCwTm/q7P2/xcGxNM+1aViA6idApdggzThW8nAs="; }; # jupyterlab is required to build from source but we use the pre-build package From 35a01c66451ce8c66ccfd7a6fd91a0751c177f38 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:27:31 +0900 Subject: [PATCH 180/212] python312Packages.marimo: 0.8.13 -> 0.8.15 Changelog: https://github.com/marimo-team/marimo/releases/tag/0.8.15 --- pkgs/development/python-modules/marimo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix index 2265b90abd25..5ed9926e1063 100644 --- a/pkgs/development/python-modules/marimo/default.nix +++ b/pkgs/development/python-modules/marimo/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "marimo"; - version = "0.8.13"; + version = "0.8.15"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-x1f71IaFO/LVNmgCS/eKa/Ia/KETToGexLK1FD3gWZM="; + hash = "sha256-S+lhoyM8s6wLFq1oGJMdzq+s+Uhn76qMgbkMUwpVr44="; }; build-system = [ setuptools ]; From 74aa49ee7ff4b0c026898a8059680318e5e616ee Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:27:39 +0900 Subject: [PATCH 181/212] python312Packages.mkdocs-jupyter: 0.24.8 -> 0.25.0 Changelog: https://github.com/danielfrg/mkdocs-jupyter/blob/0.25.0/CHANGELOG.md --- pkgs/development/python-modules/mkdocs-jupyter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index f50ed05a643f..dd0c300ab175 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -16,15 +16,15 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.24.8"; + version = "0.25.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-Cadi9ITVQNnA6UTTSyjLU2oyhp4iS0YOL8eRsUP3aUA="; + hash = "sha256-4mwdNBkWvFf5bqP5PY0KiPx3yH1M7iIvZtIAd5jZJPU="; }; pythonRelaxDeps = [ "nbconvert" ]; From 227b94720e2cac90a8debac01b9c5dc739b1c1d1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:27:51 +0900 Subject: [PATCH 182/212] python312Packages.nbdime: 4.0.1 -> 4.0.2 Changelog: https://github.com/jupyter/nbdime/blob/4.0.2/CHANGELOG.md --- pkgs/development/python-modules/nbdime/749.patch | 10 ---------- pkgs/development/python-modules/nbdime/default.nix | 14 ++++---------- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 pkgs/development/python-modules/nbdime/749.patch diff --git a/pkgs/development/python-modules/nbdime/749.patch b/pkgs/development/python-modules/nbdime/749.patch deleted file mode 100644 index b88aec0f67e3..000000000000 --- a/pkgs/development/python-modules/nbdime/749.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/nbdime/webapp/nbdimeserver.py -+++ b/nbdime/webapp/nbdimeserver.py -@@ -388,6 +388,7 @@ - 'jinja2_env': env, - 'local_hostnames': ['localhost', '127.0.0.1'], - 'cookie_secret': base64.encodebytes(os.urandom(32)), # Needed even for an unsecured server. -+ 'allow_unauthenticated_access': True, - } - - try: diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 7441a6123d23..7a873014640e 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -22,29 +22,23 @@ buildPythonPackage rec { pname = "nbdime"; - version = "4.0.1"; + version = "4.0.2"; pyproject = true; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-8adgwLAMG6m0lFwWzpJXfzk/tR0YTzUbdoW6boUCCY4="; + hash = "sha256-2Cefj0sjbAslOyDWDEgxu2eEPtjb1uCfI06wEdNvG/I="; }; - patches = [ - # this fixes the webserver (nbdiff-web) when jupyter-server >=2.13 is used - # see https://github.com/jupyter/nbdime/issues/749 - ./749.patch - ]; - - nativeBuildInputs = [ + build-system = [ hatch-jupyter-builder hatchling jupyterlab ]; - propagatedBuildInputs = [ + dependencies = [ nbformat colorama pygments From 39167ccfeebde12ae472b6de5847e4f388155580 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 13 Sep 2024 21:28:05 +0900 Subject: [PATCH 183/212] python312Packages.oauthenticator: 16.3.1 -> 17.0.0 Changelog: https://github.com/jupyterhub/oauthenticator/blob/17.0.0/docs/source/reference/changelog.md --- pkgs/development/python-modules/oauthenticator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 0c438815d843..e87edd391028 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "16.3.1"; + version = "17.0.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gFhhOCcmorkrLxrup9fICh5ueCrc64fxfuZXTQG1tMk="; + hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0="; }; build-system = [ setuptools ]; From 10227864638765e3dc839f133b75314cbf91e8ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 14:03:53 +0000 Subject: [PATCH 184/212] fulcrum: 1.11.0 -> 1.11.1 --- pkgs/applications/blockchains/fulcrum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/applications/blockchains/fulcrum/default.nix index 189af6c02869..8c45ab485702 100644 --- a/pkgs/applications/blockchains/fulcrum/default.nix +++ b/pkgs/applications/blockchains/fulcrum/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "fulcrum"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "cculianu"; repo = "Fulcrum"; rev = "v${version}"; - sha256 = "sha256-VY6yUdmU8MLwSH3VeAWCGbdouOxGrhDc1usYj70jrd8="; + sha256 = "sha256-+hBc7jW1MVLVjYXNOV7QvFJJpZ5RzW5/c9NdqOXrsj0="; }; nativeBuildInputs = [ pkg-config qmake ]; From 2bc0ee9cd180b001a68a3cf09842756e7a3fb2b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 14:05:24 +0000 Subject: [PATCH 185/212] gqlgenc: 0.24.0 -> 0.25.0 --- pkgs/development/tools/gqlgenc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index ae8359101b2b..34a279ec108a 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-tKEHqo7drOwHIRCgKEXbELi0u9uRpXSwB9R1fPhv/PE="; + sha256 = "sha256-4d2IFJIoIX0IlS/v/EJkn1cK8hJl9808PE8ZnwqYzu8="; }; excludedPackages = [ "example" ]; - vendorHash = "sha256-lQ2KQF+55qvscnYfm1jLK/4DdwFBaRZmv9oa/BUSoXI="; + vendorHash = "sha256-GcqLW/Ooy2h5spYA94/HmaG0yYiqA4g5DyKlg9EORCQ="; meta = with lib; { description = "Go tool for building GraphQL client with gqlgen"; From 9259479c421ede2348d756f739b5690578ad4a38 Mon Sep 17 00:00:00 2001 From: nicoo Date: Fri, 13 Sep 2024 14:11:34 +0000 Subject: [PATCH 186/212] maintainers/scripts/sha-to-sri: minor efficiency improvement of the `Nix32` decoder --- maintainers/scripts/sha-to-sri.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/maintainers/scripts/sha-to-sri.py b/maintainers/scripts/sha-to-sri.py index e31091242341..971c24fe1fff 100755 --- a/maintainers/scripts/sha-to-sri.py +++ b/maintainers/scripts/sha-to-sri.py @@ -59,8 +59,7 @@ class Nix32(Encoding): def decode(self, s: str): assert len(s) == self.length - out = [0 for _ in range(self.n)] - # TODO: Do better than a list of byte-sized ints + out = bytearray(self.n) for n, c in enumerate(reversed(s)): digit = self.inverted[c] From bc12c1fdff8a90cad8e127ce37ca2e0e63ca39ee Mon Sep 17 00:00:00 2001 From: d73027e7 <166523163+d73027e7@users.noreply.github.com> Date: Fri, 13 Sep 2024 14:13:49 +0000 Subject: [PATCH 187/212] nusmv: fix homepage URL The previous homepage URL contained a typo in the domain name and the path pointed to a location no longer available. --- pkgs/applications/science/logic/nusmv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/logic/nusmv/default.nix b/pkgs/applications/science/logic/nusmv/default.nix index d7ecbc7cd887..058949083caf 100644 --- a/pkgs/applications/science/logic/nusmv/default.nix +++ b/pkgs/applications/science/logic/nusmv/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "New symbolic model checker for the analysis of synchronous finite-state and infinite-state systems"; - homepage = "https://nuxmv.fbk.eu/pmwiki.php"; + homepage = "https://nusmv.fbk.eu/"; maintainers = with maintainers; [ mgttlinger ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = platforms.linux; From 16b85ae6ad5f75b64c8a41f7d8cf4f40748cfe96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 15:07:00 +0000 Subject: [PATCH 188/212] gowall: 0.1.7 -> 0.1.8 --- pkgs/by-name/go/gowall/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix index 7ec23d59c96b..cd79fa1c3770 100644 --- a/pkgs/by-name/go/gowall/package.nix +++ b/pkgs/by-name/go/gowall/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "gowall"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "Achno"; repo = "gowall"; rev = "v${version}"; - hash = "sha256-R7dOONfyzj6V3101Rp/WhUcFpqrSKWEkVm4a2riXZAI="; + hash = "sha256-r2IvwpvtWMlIKG0TNM4cLUPKFRgUV8E06VzkPSVCorI="; }; vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4="; From 7ab47cceba63337e76739ab8a4b967f6f9172b04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 15:07:16 +0000 Subject: [PATCH 189/212] python312Packages.plantuml-markdown: 3.10.3 -> 3.10.4 --- pkgs/development/python-modules/plantuml-markdown/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix index 9fd818691610..c24cd66e2fac 100644 --- a/pkgs/development/python-modules/plantuml-markdown/default.nix +++ b/pkgs/development/python-modules/plantuml-markdown/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "plantuml-markdown"; - version = "3.10.3"; + version = "3.10.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "mikitex70"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9G+llIojgNyxupvKLfJC4igjtNK1YjbEMxcape9xqmk="; + hash = "sha256-5K8NSxMCdAsOtV0egY8gMbHnHifvYNRHzafR0LAcm+Q="; }; propagatedBuildInputs = [ From a4e4fc5d3565488b8720878dad19784d724a329f Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Sep 2024 20:18:12 +0300 Subject: [PATCH 190/212] dotnetenv.{buildSolution,buildWrapper}: follow `editorconfig` & follow common bash style There seems to be duplication and also improvements to one between these, so someone should rework these. Add missing `pre` and `post` hook runs. --- .../dotnet/dotnetenv/build-solution.nix | 55 +++++++++---------- .../dotnet/dotnetenv/wrapper.nix | 30 +++++----- 2 files changed, 39 insertions(+), 46 deletions(-) diff --git a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix index b3372b942177..9984db1cb2d3 100644 --- a/pkgs/build-support/dotnet/dotnetenv/build-solution.nix +++ b/pkgs/build-support/dotnet/dotnetenv/build-solution.nix @@ -31,41 +31,37 @@ stdenv.mkDerivation { ''; installPhase = '' - addDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i) - assemblySearchPaths="$assemblySearchPaths;$windowsPath" + runHook preInstall - addDeps $i - done - fi + addDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i) + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + + addDeps $i + done + fi } - for i in ${toString assemblyInputs} - do - windowsPath=$(cygpath --windows $i) - echo "Using assembly path: $windowsPath" + for i in ${toString assemblyInputs}; do + windowsPath=$(cygpath --windows $i) + echo "Using assembly path: $windowsPath" - if [ "$assemblySearchPaths" = "" ] - then - assemblySearchPaths="$windowsPath" - else - assemblySearchPaths="$assemblySearchPaths;$windowsPath" - fi + if [ "$assemblySearchPaths" = "" ]; then + assemblySearchPaths="$windowsPath" + else + assemblySearchPaths="$assemblySearchPaths;$windowsPath" + fi - addDeps $i + addDeps $i done echo "Assembly search paths are: $assemblySearchPaths" - if [ "$assemblySearchPaths" != "" ] - then - echo "Using assembly search paths args: $assemblySearchPathsArg" - export AssemblySearchPaths=$assemblySearchPaths + if [ "$assemblySearchPaths" != "" ]; then + echo "Using assembly search paths args: $assemblySearchPathsArg" + export AssemblySearchPaths=$assemblySearchPaths fi mkdir -p $out @@ -77,9 +73,10 @@ stdenv.mkDerivation { mkdir -p $out/nix-support - for i in ${toString assemblyInputs} - do - echo $i >> $out/nix-support/dotnet-assemblies + for i in ${toString assemblyInputs}; do + echo $i >> $out/nix-support/dotnet-assemblies done + + runHook postInstall ''; } diff --git a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix index 423303c3084a..549abd07e2b9 100644 --- a/pkgs/build-support/dotnet/dotnetenv/wrapper.nix +++ b/pkgs/build-support/dotnet/dotnetenv/wrapper.nix @@ -28,27 +28,23 @@ dotnetenv.buildSolution { slnFile = "Wrapper.sln"; assemblyInputs = [ application ]; preBuild = '' - addRuntimeDeps() - { - if [ -f $1/nix-support/dotnet-assemblies ] - then - for i in $(cat $1/nix-support/dotnet-assemblies) - do - windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') - assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" + addRuntimeDeps() { + if [ -f $1/nix-support/dotnet-assemblies ]; then + for i in $(cat $1/nix-support/dotnet-assemblies); do + windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g') + assemblySearchArray="$assemblySearchArray @\"$windowsPath\"" - addRuntimeDeps $i - done - fi + addRuntimeDeps $i + done + fi } export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g') # Generate assemblySearchPaths string array contents - for path in ${toString assemblyInputs} - do - assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " - addRuntimeDeps $path + for path in ${toString assemblyInputs}; do + assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", " + addRuntimeDeps $path done sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \ @@ -57,8 +53,8 @@ dotnetenv.buildSolution { sed -e "s|@NAMESPACE@|${namespace}|g" \ -e "s|@MAINCLASSNAME@|${mainClassName}|g" \ - -e "s|@EXEPATH@|$exePath|g" \ - -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ + -e "s|@EXEPATH@|$exePath|g" \ + -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \ Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs ''; } From a0c06061b4674b04e3e5dc22bbd438caa7d9611e Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 12 Sep 2024 20:26:39 +0300 Subject: [PATCH 191/212] treewide: follow editorconfig --- pkgs/applications/science/math/sage/dist-tests.nix | 8 ++++---- pkgs/build-support/rust/build-rust-crate/log.nix | 6 +++--- pkgs/by-name/lz/lzlib/package.nix | 2 +- pkgs/data/icons/apple-cursor/default.nix | 1 - 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix index 24a86a8f37a4..45376b832b9f 100644 --- a/pkgs/applications/science/math/sage/dist-tests.nix +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -7,10 +7,10 @@ # subset of files responsible for the vast majority of packaging tests, we can # think about moving this upstream. [ - "src/sage/env.py" # [1] - "src/sage/misc/persist.pyx" # [1] - "src/sage/misc/inline_fortran.py" # [1] - "src/sage/repl/ipython_extension.py" # [1] + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] ] # Numbered list of past failures to annotate files with diff --git a/pkgs/build-support/rust/build-rust-crate/log.nix b/pkgs/build-support/rust/build-rust-crate/log.nix index 9054815f4a1b..cb0846190eac 100644 --- a/pkgs/build-support/rust/build-rust-crate/log.nix +++ b/pkgs/build-support/rust/build-rust-crate/log.nix @@ -49,11 +49,11 @@ in { noisily = colors: verbose: '' noisily() { - ${lib.optionalString verbose '' + ${lib.optionalString verbose '' echo_colored -n "Running " echo $@ - ''} - $@ + ''} + $@ } ''; } diff --git a/pkgs/by-name/lz/lzlib/package.nix b/pkgs/by-name/lz/lzlib/package.nix index db517669c5e8..6e9510215abe 100644 --- a/pkgs/by-name/lz/lzlib/package.nix +++ b/pkgs/by-name/lz/lzlib/package.nix @@ -30,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ehmry ]; }; -}) \ No newline at end of file +}) diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix index 6f33219ed6c5..e2f059ecb1fb 100644 --- a/pkgs/data/icons/apple-cursor/default.nix +++ b/pkgs/data/icons/apple-cursor/default.nix @@ -31,7 +31,6 @@ in stdenv.mkDerivation rec { homepage = "https://github.com/ful1e5/apple_cursor"; license = [ licenses.gpl3Only - # Potentially a derivative work of copyrighted Apple designs licenses.unfree ]; From 98fe3e841bf2fadf8822fb98fa16aa0c264cb42f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 15:39:38 +0000 Subject: [PATCH 192/212] dezoomify-rs: 2.12.4 -> 2.12.5 --- pkgs/by-name/de/dezoomify-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index e35c607c55a0..c639c99b1b64 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "dezoomify-rs"; - version = "2.12.4"; + version = "2.12.5"; src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; rev = "refs/tags/v${version}"; - hash = "sha256-7CRwlnIItJ89qqemkJbx5QjcLrwYrvpcjVYX5ZWP0W4="; + hash = "sha256-PbtsrvNHo/SvToQJTTAPLoNDFotDPmSjr6C3IJZUjqU="; }; - cargoHash = "sha256-v48eM43+/dt2M1J9yfjfTpBetv6AA2Hhzu8rrL3gojg="; + cargoHash = "sha256-K9LNommagWjVxOXq6YUE4eg/3zpj3+MR5BugGCcVUlA="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From 135b49bb5cf2f3c459f9734190b6d49708e11da0 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Thu, 12 Sep 2024 10:37:18 -0400 Subject: [PATCH 193/212] fastfetch: update description to match the project --- pkgs/by-name/fa/fastfetch/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index dadcf2def1ac..d240ac5abd92 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -167,7 +167,7 @@ stdenv'.mkDerivation (finalAttrs: { }; meta = { - description = "Like neofetch, but much faster because written in C"; + description = "An actively maintained, feature-rich and performance oriented, neofetch like system information tool"; homepage = "https://github.com/fastfetch-cli/fastfetch"; changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; From 345c263f2f53a3710abe117f28a5cb86d0ba4059 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Sun, 8 Sep 2024 18:19:32 -0500 Subject: [PATCH 194/212] zoekt: unstable-2022-11-09 -> 0-unstable-2024-09-05 Also incorporate `nix-update-script`, so the update robot can prevent future bitrotting (there are no stable release tags at all.) Signed-off-by: Austin Seipp --- .../default.nix => by-name/zo/zoekt/package.nix} | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/{tools/text/zoekt/default.nix => by-name/zo/zoekt/package.nix} (62%) diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/by-name/zo/zoekt/package.nix similarity index 62% rename from pkgs/tools/text/zoekt/default.nix rename to pkgs/by-name/zo/zoekt/package.nix index 293ad7a0954c..afc6e099c0ad 100644 --- a/pkgs/tools/text/zoekt/default.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -2,19 +2,21 @@ , buildGoModule , fetchFromGitHub , git +, nix-update-script }: + buildGoModule { pname = "zoekt"; - version = "unstable-2022-11-09"; + version = "0-unstable-2024-09-05"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "c4b18d3b44da94b3e7c9c94467d68c029666bb86"; - hash = "sha256-QtwOiBxBeFkhRfH3R2fP72b05Hc4+zt9njqCNVcprZ4="; + rev = "35dda3e212b7d7fb0df43dcbd88eb7a7b49ad9d8"; + hash = "sha256-YdInCAq7h7iC1sfMekLgxqu3plUHr5Ku6FxyPKluQzw="; }; - vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k="; + vendorHash = "sha256-GPeMRL5zWVjJVYpFPnB211Gfm/IaqisP1s6RNaLvN6M="; nativeCheckInputs = [ git @@ -25,6 +27,10 @@ buildGoModule { git config --global --replace-all protocol.file.allow always ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version" "branch" ]; + }; + meta = { description = "Fast trigram based code search"; homepage = "https://github.com/sourcegraph/zoekt"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fb98cb0f44..a5f76ffe5856 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7438,10 +7438,6 @@ with pkgs; zeekscript = callPackage ../tools/security/zeekscript { }; - zoekt = callPackage ../tools/text/zoekt { - buildGoModule = buildGo121Module; - }; - zonemaster-cli = perlPackages.ZonemasterCLI; zotero-translation-server = callPackage ../tools/misc/zotero-translation-server { }; From c0cb370ed58958ba2c96226b5150b8b3036376b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 16:15:23 +0000 Subject: [PATCH 195/212] gatekeeper: 3.17.0 -> 3.17.1 --- pkgs/applications/networking/cluster/gatekeeper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/gatekeeper/default.nix b/pkgs/applications/networking/cluster/gatekeeper/default.nix index 559be08a5e89..2b8ef8c1f176 100644 --- a/pkgs/applications/networking/cluster/gatekeeper/default.nix +++ b/pkgs/applications/networking/cluster/gatekeeper/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gatekeeper"; - version = "3.17.0"; + version = "3.17.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "gatekeeper"; rev = "v${version}"; - hash = "sha256-33imFUFIonE5DTNwAKgJQd4jQ/lLap3LmVTqn9nxj98="; + hash = "sha256-Tu4p0kY0UdU0++zLpj+6A5ky5OXEEN5iivHbiyvghw4="; }; vendorHash = null; From a0c69fdacbbaca6e5cc98a96d12d0097111783fd Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 13 Sep 2024 12:22:27 -0400 Subject: [PATCH 196/212] blender: mark as broken on Darwin See comment, tried using apple_sdk_12_3. --- pkgs/applications/misc/blender/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 09762d8eddac..5c05ac521718 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -434,8 +434,7 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-darwin" ]; - # the current apple sdk is too old (currently 11_0) and fails to build "metal" on x86_64-darwin - broken = stdenv.hostPlatform.system == "x86_64-darwin"; + broken = stdenv.isDarwin; # fails due to too-old SDK, using newer SDK fails to compile maintainers = with lib.maintainers; [ amarshall veprbl From 12e084743a09350e634ef7b047472ded3fd41a3c Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 13 Sep 2024 12:23:37 -0400 Subject: [PATCH 197/212] blender: extract conditionals to variables for reuse This gives them some greater semantic meaning, easing understanding (and we will reuse them more soon). In some places, remove duplicate inclusion of the deps in different conditionals to unify them (i.e., include them once based on one conditional, instead of under multiple separate conditionals). --- pkgs/applications/misc/blender/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 5c05ac521718..8ad88b906262 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -84,6 +84,10 @@ }: let + embreeSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; + openImageDenoiseSupport = (!stdenv.isAarch64 && stdenv.isLinux) || stdenv.isDarwin; + openUsdSupport = !stdenv.isDarwin; + python3 = python3Packages.python; pyPkgsOpenusd = python3Packages.openusd.override { withOsl = false; }; @@ -193,7 +197,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [ + ++ lib.optionals (!embreeSupport) [ "-DWITH_CYCLES_EMBREE=OFF" ] ++ lib.optionals stdenv.isDarwin [ @@ -269,10 +273,8 @@ stdenv.mkDerivation (finalAttrs: { zlib zstd ] - ++ lib.optionals (!stdenv.isAarch64 && stdenv.isLinux) [ - embree - (openimagedenoise.override { inherit cudaSupport; }) - ] + ++ lib.optional embreeSupport embree + ++ lib.optional openImageDenoiseSupport (openimagedenoise.override { inherit cudaSupport; }) ++ ( if (!stdenv.isDarwin) then [ @@ -296,9 +298,7 @@ stdenv.mkDerivation (finalAttrs: { OpenGL SDL brotli - embree llvmPackages.openmp - (openimagedenoise.override { inherit cudaSupport; }) sse2neon ] ) @@ -325,7 +325,7 @@ stdenv.mkDerivation (finalAttrs: { ps.requests ps.zstandard ] - ++ lib.optionals (!stdenv.isDarwin) [ pyPkgsOpenusd ]; + ++ lib.optional openUsdSupport [ pyPkgsOpenusd ]; blenderExecutable = placeholder "out" From 7252a3c5528ba58256618d2f864752607d2e8507 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 13 Sep 2024 12:29:14 -0400 Subject: [PATCH 198/212] blender: cleanup conditional config Rather than specify things just OFF or ON based on something, always set them to either OFF or ON based on that. --- pkgs/applications/misc/blender/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 8ad88b906262..b87457314403 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_CODEC_SNDFILE=ON" "-DWITH_CPU_CHECK=OFF" "-DWITH_CYCLES_DEVICE_OPTIX=${if cudaSupport then "ON" else "OFF"}" + "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" "-DWITH_CYCLES_OSL=OFF" "-DWITH_FFTW3=ON" "-DWITH_IMAGE_OPENJPEG=ON" @@ -185,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_SDL=OFF" "-DWITH_STRICT_BUILD_OPTIONS=ON" "-DWITH_TBB=ON" - "-DWITH_USD=ON" + "-DWITH_USD=${if openUsdSupport then "ON" else "OFF"}" # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" @@ -197,13 +198,9 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals (!embreeSupport) [ - "-DWITH_CYCLES_EMBREE=OFF" - ] ++ lib.optionals stdenv.isDarwin [ "-DLIBDIR=/does-not-exist" "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib" - "-DWITH_USD=OFF" # currently fails on darwin ] ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optionals cudaSupport [ From 952b83be9973c8b9d4294d647d22b4cb10940495 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 16:51:29 +0000 Subject: [PATCH 199/212] clever-tools: 3.8.2 -> 3.8.3 --- pkgs/by-name/cl/clever-tools/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 01832874d51f..ddea9886a888 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -10,7 +10,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.8.2"; + version = "3.8.3"; nodejs = nodejs_18; @@ -18,10 +18,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-cBFdxJrH/1l6YpvdJTeLQf1zl6pm3IbPryimtewh9fc="; + hash = "sha256-70wyu8+Jb9kR5lIucBZG9UWIufMhsgMBMkT2ohGvE50="; }; - npmDepsHash = "sha256-cY7wB0IQPLHOOuOLunjeJASp1Ba7ri8cj05/2HveJ7A="; + npmDepsHash = "sha256-LljwS6Rd/8WnGpxSHwCr87KWLaRR2i7sMdUuuprYiOE="; dontNpmBuild = true; From 88bad969ac63e220055eea815ab35fdf248f9d30 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 13 Sep 2024 12:29:24 -0400 Subject: [PATCH 200/212] blender: fix build on aarch64-linux --- pkgs/applications/misc/blender/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b87457314403..503e739a74bd 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -170,6 +170,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_CYCLES_EMBREE=${if embreeSupport then "ON" else "OFF"}" "-DWITH_CYCLES_OSL=OFF" "-DWITH_FFTW3=ON" + "-DWITH_HYDRA=${if openUsdSupport then "ON" else "OFF"}" "-DWITH_IMAGE_OPENJPEG=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_JACK=${if jackaudioSupport then "ON" else "OFF"}" @@ -177,6 +178,7 @@ stdenv.mkDerivation (finalAttrs: { "-DWITH_MOD_OCEANSIM=ON" "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" "-DWITH_OPENCOLORIO=ON" + "-DWITH_OPENIMAGEDENOISE=${if openImageDenoiseSupport then "ON" else "OFF"}" "-DWITH_OPENSUBDIV=ON" "-DWITH_OPENVDB=ON" "-DWITH_PULSEAUDIO=OFF" @@ -284,7 +286,6 @@ stdenv.mkDerivation (finalAttrs: { libXxf86vm openal openxr-loader - pyPkgsOpenusd ] else [ @@ -300,6 +301,7 @@ stdenv.mkDerivation (finalAttrs: { ] ) ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] + ++ lib.optionals openUsdSupport [ pyPkgsOpenusd ] ++ lib.optionals waylandSupport [ dbus libdecor' From bd384e382f0b511eab8f5dd166805a771ad85de3 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Thu, 12 Sep 2024 15:21:02 +0200 Subject: [PATCH 201/212] go-ios: 1.0.121 -> 1.0.143 --- pkgs/tools/misc/go-ios/default.nix | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/go-ios/default.nix b/pkgs/tools/misc/go-ios/default.nix index 0cf946ae43e5..f26665835bce 100644 --- a/pkgs/tools/misc/go-ios/default.nix +++ b/pkgs/tools/misc/go-ios/default.nix @@ -2,27 +2,34 @@ , buildGoModule , fetchFromGitHub , nix-update-script +, pkg-config +, libusb1 }: buildGoModule rec { pname = "go-ios"; - version = "1.0.121"; + version = "1.0.143"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${version}"; - sha256 = "sha256-zWaEtfxrJYaROQ05nBQvM5fiIRSG+hCecU+BVnpIuck="; + sha256 = "sha256-6RiKyhV5y6lOrhfZezSB2m/l17T3bHYaYRhsMf04wT8="; }; - vendorHash = "sha256-0Wi9FCTaOD+kzO5cRjpqbXHqx5UAKSGu+hc9bpj+PWo="; + proxyVendor = true; + vendorHash = "sha256-GfVHAOlN2tL21ILQYPw/IaYQZccxitjHGQ09unfHcKg="; excludedPackages = [ "restapi" ]; - checkFlags = [ - "-tags=fast" + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libusb1 ]; postInstall = '' @@ -30,6 +37,16 @@ buildGoModule rec { mv $out/bin/go-ios $out/bin/ios ''; + # skips all the integration tests (requires iOS device) (`-tags=fast`) + # as well as tests that requires networking + checkFlags = let + skippedTests = [ + "TestWorksWithoutProxy" + "TestUsesProxy" + ]; + in [ "-tags=fast" ] + ++ [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + passthru.updateScript = nix-update-script { }; meta = with lib; { From 143437a4659850bdd875629c8f26c9acf6296322 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Fri, 13 Sep 2024 19:59:52 +0200 Subject: [PATCH 202/212] soulseekqt: fixed desktop file --- pkgs/applications/networking/p2p/soulseekqt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index 9587bd0a9304..014dd89d7499 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -33,7 +33,8 @@ mkDerivation rec { # fixup and install desktop file desktop-file-install --dir $out/share/applications \ - --set-key Exec --set-value $binary \ + --set-key Exec --set-value SoulseekQt \ + --set-key Terminal --set-value false \ --set-key Comment --set-value "${meta.description}" \ --set-key Categories --set-value Network ${appextracted}/default.desktop mv $out/share/applications/default.desktop $out/share/applications/SoulseekQt.desktop From 6dc0d924ff2209e8a5ac6f42b4b4da29e70d00b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 18:32:09 +0000 Subject: [PATCH 203/212] python312Packages.python-arango: 8.1.0 -> 8.1.1 --- pkgs/development/python-modules/python-arango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix index 944c2f1c7959..95e73ca2bb52 100644 --- a/pkgs/development/python-modules/python-arango/default.nix +++ b/pkgs/development/python-modules/python-arango/default.nix @@ -33,7 +33,7 @@ in buildPythonPackage rec { pname = "python-arango"; - version = "8.1.0"; + version = "8.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -42,7 +42,7 @@ buildPythonPackage rec { owner = "arangodb"; repo = "python-arango"; rev = "refs/tags/${version}"; - hash = "sha256-bMCzuqKLOQYmBGhdfHaff+0ZIVmZ4iy5jFtmV7X0pIM="; + hash = "sha256-C2qFC0KOPO8I2CIDgFl0L7LyPgvqfqEeYdPAvwIJ+PY="; }; nativeBuildInputs = [ From ebad66d7e5a605b72febaf73e6d896c02d20ec26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 18:32:18 +0000 Subject: [PATCH 204/212] python312Packages.influxdb-client: 1.45.0 -> 1.46.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 21792943efac..0bf65299a561 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.45.0"; + version = "1.46.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Mhbje/wRltU04jrDQBZVG4OuGdBn20gmBRnnPqyzjcU="; + hash = "sha256-oq6VXsCizqs7ZGocFWvD6SK1HRgQerlAEDW6+SBoM+A="; }; build-system = [ setuptools ]; From b0aee01d8a7b05e8a20933888a757544d79864d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 18:32:51 +0000 Subject: [PATCH 205/212] python312Packages.weconnect: 0.60.4 -> 0.60.5 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index bd168ccb8f59..171622cf10b2 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.60.4"; + version = "0.60.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Ht+TSjI1FZ+y/lt5IlepxpT5uOBYeJaNmF7aBw2YUPA="; + hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg="; }; postPatch = '' From 8420ab868cced8323436c5719287b37816e965f2 Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Fri, 13 Sep 2024 17:59:54 +0200 Subject: [PATCH 206/212] luaPackages.lua-resty-openidc: 1.7.6 -> 1.8.0 --- .../lua-modules/generated-packages.nix | 10 +++++----- pkgs/development/lua-modules/overrides.nix | 15 +++++++-------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index aec5d2b0b896..d92aa05f4b7c 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1348,16 +1348,16 @@ buildLuarocksPackage { lua-resty-openidc = callPackage({ buildLuarocksPackage, fetchFromGitHub, fetchurl, lua-resty-http, lua-resty-jwt, lua-resty-session, luaOlder }: buildLuarocksPackage { pname = "lua-resty-openidc"; - version = "1.7.6-3"; + version = "1.8.0-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/lua-resty-openidc-1.7.6-3.rockspec"; - sha256 = "08nq24kxw51xiyyp5jailyqjfsgz4m4fzy4hb7g3fv76vcsf8msp"; + url = "mirror://luarocks/lua-resty-openidc-1.8.0-1.rockspec"; + sha256 = "0jgajhn45nybhi7z15bg957kznzqcjzxc8nrzmgyignkwp4yi1qk"; }).outPath; src = fetchFromGitHub { owner = "zmartzone"; repo = "lua-resty-openidc"; - rev = "v1.7.6"; - hash = "sha256-1yBmYuFlF/RdOz9csteaqsEEUxVWdwE6IMgS5M9PsJU="; + rev = "v1.8.0"; + hash = "sha256-LSkNWebMF1L1a66QszugAxcHsW5o9uxQZHWituFFgJs="; }; disabled = luaOlder "5.1"; diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 91859ea2aab8..fb8a483495ed 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -323,7 +323,13 @@ in }); lua-resty-jwt = prev.lua-resty-jwt.overrideAttrs(oa: { - meta = oa.meta // { broken = true; }; + src = fetchFromGitHub { + owner = "cdbattags"; + repo = "lua-resty-jwt"; + rev = "v0.2.3"; + hash = "sha256-5lnr0ka6ijfujiRjqwCPb6jzItXx45FIN8CvhR/KiB8="; + fetchSubmodules = true; + }; }); lua-zlib = prev.lua-zlib.overrideAttrs (oa: { @@ -470,13 +476,6 @@ in # meta.broken = true; # }); - lua-resty-openidc = prev.lua-resty-openidc.overrideAttrs (_: { - postConfigure = '' - substituteInPlace ''${rockspecFilename} \ - --replace '"lua-resty-session >= 2.8, <= 3.10",' '"lua-resty-session >= 2.8",' - ''; - }); - lua-yajl = prev.lua-yajl.overrideAttrs (oa: { buildInputs = oa.buildInputs ++ [ yajl From 3f2471a5ada145bda89d71325203a8949f6462e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 14 Sep 2024 05:37:23 +1000 Subject: [PATCH 207/212] python312Packages.pyngo: 2.2.0 -> 2.2.1 (#341636) https://github.com/yezz123/pyngo/releases/tag/2.2.1 --- pkgs/development/python-modules/pyngo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngo/default.nix b/pkgs/development/python-modules/pyngo/default.nix index 23f0a904d4ac..ee1d1d227665 100644 --- a/pkgs/development/python-modules/pyngo/default.nix +++ b/pkgs/development/python-modules/pyngo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "pyngo"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "yezz123"; repo = "pyngo"; rev = "refs/tags/${version}"; - hash = "sha256-vzqm+g/jYkxue5DiUe+iYA5x0zMKLKQtAatOSKCUWzs="; + hash = "sha256-E3UNgn/L1bbfYljufPp+bGAvSsADpPAvv/eJimD8v50="; }; nativeBuildInputs = [ From e9499b657c5eea6db591968cdeee3ef39d6c99ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 19:51:02 +0000 Subject: [PATCH 208/212] python312Packages.python-linkplay: 0.0.9 -> 0.0.10 --- pkgs/development/python-modules/python-linkplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index b8240e0c23f6..0b66eb44f892 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; rev = "refs/tags/v${version}"; - hash = "sha256-SA+FKssA9ucbEWCAYfjFgZUt0RIIWBSAWQGZ7SCIyYE="; + hash = "sha256-uenFr86WXSFzo3PlDz/KyMgG06QDzm69z0TM59UP6pg="; }; build-system = [ setuptools ]; From 7123d83118acdd046afa31a6c5e7d3fcd6c5e349 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 13 Sep 2024 22:03:02 +0200 Subject: [PATCH 209/212] python312Packages.torchmetrics: 1.4.1 -> 1.4.2 Diff: https://github.com/Lightning-AI/torchmetrics/compare/refs/tags/v1.4.1...v1.4.2 Changelog: https://github.com/Lightning-AI/torchmetrics/releases/tag/v1.4.2 --- pkgs/development/python-modules/torchmetrics/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/torchmetrics/default.nix b/pkgs/development/python-modules/torchmetrics/default.nix index a98c7178fe71..cf08a09e552a 100644 --- a/pkgs/development/python-modules/torchmetrics/default.nix +++ b/pkgs/development/python-modules/torchmetrics/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # dependencies @@ -29,19 +28,17 @@ let pname = "torchmetrics"; - version = "1.4.1"; + version = "1.4.2"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Lightning-AI"; repo = "torchmetrics"; rev = "refs/tags/v${version}"; - hash = "sha256-NOxj1vVY9ynCS/Pf6V+ONNx50jjKqfkhzYbc60Sf4Qw="; + hash = "sha256-YieIz99QFnuW3hTtNFgxhkNnSXGsTG2qqYhRCyvZo7Q="; }; dependencies = [ From 29589c387651a9b19a578234060e8b4ece3db9d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 13 Sep 2024 21:34:56 +0100 Subject: [PATCH 210/212] libgda, libgda6: fix the eval MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Without the change the eval fails as: $ nix build --no-link -f. libgda error: … while calling the 'derivationStrict' builtin at :34:12: 33| 34| strict = derivationStrict drvAttrs; | ^ 35| … while evaluating derivation 'libgda-5.2.10' whose name attribute is located at kgs/stdenv/generic/make-derivation.nix:336:7 … while evaluating attribute 'NIX_CFLAGS_COMPILE' of derivation 'libgda-5.2.10' (stack trace truncated; use '--show-trace' to show the full, detailed trace) error: The `env` attribute set can only contain derivation, string, boolean or integer attributes. The `NIX_CFLAGS_COMPILE` attribute is of type list. --- pkgs/development/libraries/libgda/6.x.nix | 2 +- pkgs/development/libraries/libgda/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index af05b23080eb..72f4741fd2e7 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { postgresql ]; - env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; postPatch = '' patchShebangs \ diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index aa136ed0adbd..a8af4d9b4874 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { "--enable-system-sqlite=${if stdenv.isDarwin then "no" else "yes"}" ]; - env.NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=incompatible-function-pointer-types"; enableParallelBuilding = true; From b3460f4b103bd96c9b2e0569c3d00ffedfb94417 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Sep 2024 21:05:37 +0000 Subject: [PATCH 211/212] python312Packages.pyblu: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/pyblu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 7aa6faf27c3d..fdabb3f9ef67 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; rev = "refs/tags/v${version}"; - hash = "sha256-Qe6GNzF8ffNSwqRL5QlN9x3dqwaX/YCfY/keEDwWW/8="; + hash = "sha256-olQZ7e4RmjL1KVtJvPsXICgL2VCOIFnZCW8WjKO3X+Q="; }; build-system = [ poetry-core ]; From b44fdbfc11b98987d816fb5970e424cafbf739b8 Mon Sep 17 00:00:00 2001 From: tmarkov Date: Sat, 14 Sep 2024 00:36:55 +0300 Subject: [PATCH 212/212] nixos/windmill: add database.url option and defaults --- nixos/modules/services/web-apps/windmill.nix | 33 +++++++++++++++----- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/web-apps/windmill.nix b/nixos/modules/services/web-apps/windmill.nix index f5ec7f70e877..2571740ebbf1 100644 --- a/nixos/modules/services/web-apps/windmill.nix +++ b/nixos/modules/services/web-apps/windmill.nix @@ -34,13 +34,24 @@ in description = "Database user."; }; + url = lib.mkOption { + type = lib.types.str; + default = "postgres://${config.services.windmill.database.name}?host=/var/run/postgresql"; + defaultText = lib.literalExpression '' + "postgres://\$\{config.services.windmill.database.name}?host=/var/run/postgresql"; + ''; + description = "Database url. Note that any secret here would be world-readable. Use `services.windmill.database.urlPath` unstead to include secrets in the url."; + }; + urlPath = lib.mkOption { - type = lib.types.path; + type = lib.types.nullOr lib.types.path; description = '' Path to the file containing the database url windmill should connect to. This is not deducted from database user and name as it might contain a secret ''; + default = null; example = "config.age.secrets.DATABASE_URL_FILE.path"; }; + createLocally = lib.mkOption { type = lib.types.bool; default = true; @@ -50,6 +61,10 @@ in baseUrl = lib.mkOption { type = lib.types.str; + default = "https://localhost:${toString config.services.windmill.serverPort}"; + defaultText = lib.literalExpression '' + "https://localhost:\$\{toString config.services.windmill.serverPort}"; + ''; description = '' The base url that windmill will be served on. ''; @@ -79,6 +94,7 @@ in systemd.services = let + useUrlPath = (cfg.database.urlPath != null); serviceConfig = { DynamicUser = true; # using the same user to simplify db connection @@ -86,10 +102,16 @@ in ExecStart = "${pkgs.windmill}/bin/windmill"; Restart = "always"; + } // lib.optionalAttrs useUrlPath { LoadCredential = [ "DATABASE_URL_FILE:${cfg.database.urlPath}" ]; }; + db_url_envs = lib.optionalAttrs useUrlPath { + DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; + } // lib.optionalAttrs (!useUrlPath) { + DATABASE_URL = cfg.database.url; + }; in { @@ -132,12 +154,11 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; PORT = builtins.toString cfg.serverPort; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "server"; - }; + } // db_url_envs; }; windmill-worker = { @@ -148,13 +169,12 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill-worker";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "worker"; WORKER_GROUP = "default"; KEEP_JOB_DIR = "false"; - }; + } // db_url_envs; }; windmill-worker-native = { @@ -165,12 +185,11 @@ EOF serviceConfig = serviceConfig // { StateDirectory = "windmill-worker-native";}; environment = { - DATABASE_URL_FILE = "%d/DATABASE_URL_FILE"; WM_BASE_URL = cfg.baseUrl; RUST_LOG = cfg.logLevel; MODE = "worker"; WORKER_GROUP = "native"; - }; + } // db_url_envs; }; }; };