From 89aaab565e830235f2026763cc13f1f33df27820 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 16 Jun 2024 20:21:39 +0200 Subject: [PATCH 001/481] nixos/doc: add documentation for formats.hocon --- .../development/settings-options.section.md | 153 ++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index cedc82d32f89..ae15113567f6 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -46,6 +46,159 @@ have a predefined type and string generator already declared under `generate` to build a Java `.properties` file, taking care of the correct escaping, etc. +`pkgs.formats.hocon` { *`generator`* ? ``, *`validator`* ? ``, *`doCheck`* ? true } + +: A function taking an attribute set with values + + `generator` + + : A derivation used for converting the JSON output + from the nix settings into HOCON. This might be + useful if your HOCON variant is slightly different + from the java-based one, or for testing purposes. + + `validator` + + : A derivation used for verifying that the HOCON + output is correct and parsable. This might be + useful if your HOCON variant is slightly different + from the java-based one, or for testing purposes. + + `doCheck` + + : Whether to enable/disable the validator check. + + It returns an attrset with a `type`, `generate` function, + and a `lib` attset, as specified [below](#pkgs-formats-result). + Some of the lib functions will be best understood if you have + read the reference specification. You can find this + specification here: + + + + Inside of `lib`, you will find these functions + + `mkInclude` + + : This is used together with a specially named + attribute `includes`, to include other HOCON + sources into the document. + + The function has a shorthand variant where it + is up to the HOCON parser to figure out what type + of include is being used. The include will default + to being non-required. If you want to be more + explicit about the details of the include, you can + provide an attrset with following arguments + + `required` + + : Whether the parser should fail upon failure + to include the document + + `type` + + : Type of the source of the included document. + Valid values are `file`, `url` and `classpath`. + See upstream documentation for the semantics + behind each value + + `value` + + : The URI/path/classpath pointing to the source of + the document to be included. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + hocon_file = pkgs.writeText "to_include.hocon" '' + a = 1; + ''; + in { + some.nested.hocon.attrset = { + _includes = [ + (format.lib.mkInclude hocon_file) + (format.lib.mkInclude "https://example.com/to_include.hocon") + (format.lib.mkInclude { + required = true; + type = "file"; + value = include_file; + }) + ]; + ... + }; + } + ``` + + `mkAppend` + + : This is used to invoke the `+=` operator. + This can be useful if you need to add something + to a list that is included from outside of nix. + See upstream documentation for the semantics + behind the `+=` operation. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + hocon_file = pkgs.writeText "to_include.hocon" '' + a = [ 1 ]; + b = [ 2 ]; + ''; + in { + _includes = [ + (format.lib.mkInclude hocon_file) + ]; + + c = 3; + a = format.lib.mkAppend 3; + b = format.lib.mkAppend (format.lib.mkSubstitution "c"); + } + ``` + + `mkSubstitution` + + : This is used to make HOCON substitutions. + Similarly to `mkInclude`, this function has + a shorthand variant where you just give it + the string with the substitution value. + The substitution is not optional by default. + Alternatively, you can provide an attrset + with more options + + `optional` + + : Whether the parser should fail upon + failure to fetch the substitution value. + + `value` + + : The name of the variable to use for + substitution. + + See upstream documentation for semantics + behind the substitution functionality. + + `Example usage:` + + ```nix + let + format = pkgs.formats.hocon { }; + in { + a = 1; + b = format.lib.mkSubstitution "a"; + c = format.lib.mkSubstition "SOME_ENVVAR"; + d = format.lib.mkSubstition { + value = "SOME_OPTIONAL_ENVVAR"; + optional = true; + }; + } + ``` + `pkgs.formats.json` { } : A function taking an empty attribute set (for future extensibility) From 141a8a6c86a4b14554add0457c864182c6fb6332 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 16 Jun 2024 20:44:48 +0200 Subject: [PATCH 002/481] nixos/doc: move implementation notes for formats.hocon to docs --- nixos/doc/manual/development/settings-options.section.md | 8 ++++++++ pkgs/pkgs-lib/formats/hocon/default.nix | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index ae15113567f6..030d5ae3dce0 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -199,6 +199,14 @@ have a predefined type and string generator already declared under } ``` + `Implementation notes:` + + - classpath includes are not implemented in pyhocon, + which is used for validating the HOCON output. This + means that if you are using classpath includes, + you will want to either use an alternative validator + or set `doCheck = false` in the format options. + `pkgs.formats.json` { } : A function taking an empty attribute set (for future extensibility) diff --git a/pkgs/pkgs-lib/formats/hocon/default.nix b/pkgs/pkgs-lib/formats/hocon/default.nix index d7ff1e85bda6..a5e081875b89 100644 --- a/pkgs/pkgs-lib/formats/hocon/default.nix +++ b/pkgs/pkgs-lib/formats/hocon/default.nix @@ -27,13 +27,9 @@ let ''; in { - # https://github.com/lightbend/config/blob/main/HOCON.md format = { generator ? hocon-generator , validator ? hocon-validator - # `include classpath("")` is not implemented in pyhocon. - # In the case that you need this functionality, - # you will have to disable pyhocon validation. , doCheck ? true }: let hoconLib = { From a891526b22a9cc741dcf5a070925c8a5ab7b452a Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 16 Jun 2024 20:39:59 +0200 Subject: [PATCH 003/481] nixos/doc: add documentation for formats.libconfig --- .../development/settings-options.section.md | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 030d5ae3dce0..19984a7e345c 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -207,6 +207,68 @@ have a predefined type and string generator already declared under you will want to either use an alternative validator or set `doCheck = false` in the format options. +`pkgs.formats.libconfig` { *`generator`* ? ``, *`validator`* ? `` } + +: A function taking an attribute set with values + + `generator` + + : A derivation used for converting the JSON output + from the nix settings into libconfig. This might be + useful if your libconfig variant is slightly different + from the original one, or for testing purposes. + + `validator` + + : A derivation used for verifying that the libconfig + output is correct and parsable. This might be + useful if your libconfig variant is slightly different + from the original one, or for testing purposes. + + It returns an attrset with a `type`, `generate` function, + and a `lib` attset, as specified [below](#pkgs-formats-result). + Some of the lib functions will be best understood if you have + read the reference specification. You can find this + specification here: + + + + Inside of `lib`, you will find these functions + + `mkHex`, `mkOctal`, `mkFloat` + + : Use these to specify numbers in other formats. + + `Example usage:` + + ```nix + let + format = pkgs.formats.libconfig { }; + in { + myHexValue = format.lib.mkHex "0x1FC3"; + myOctalValue = format.lib.mkOctal "0027"; + myFloatValue = format.lib.mkFloat "1.2E-3"; + } + ``` + + `mkArray`, `mkList` + + : Use these to differentiate between whether + a nix list should be considered as a libconfig + array or a libconfig list. See the upstream + documentation for the semantics behind these types. + + `Example usage:` + + ```nix + let + format = pkgs.formats.libconfig { }; + in { + myList = format.lib.mkList [ "foo" 1 true ]; + myArray = format.lib.mkArray [ 1 2 3 ]; + } + ``` + `pkgs.formats.json` { } : A function taking an empty attribute set (for future extensibility) From bf2adb82b7f1fd702ffd8a16b1c3f14b068874c6 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sun, 16 Jun 2024 20:40:28 +0200 Subject: [PATCH 004/481] nixos/doc: move implementation notes for formats.libconfig to docs --- nixos/doc/manual/development/settings-options.section.md | 8 ++++++++ pkgs/pkgs-lib/formats/libconfig/default.nix | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index 19984a7e345c..48cc62bb424c 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -269,6 +269,14 @@ have a predefined type and string generator already declared under } ``` + `Implementation notes:` + + - Since libconfig does not allow setting names to start with an underscore, + this is used as a prefix for both special types and include directives. + + - The difference between 32bit and 64bit values became optional in libconfig + 1.5, so we assume 64bit values for all numbers. + `pkgs.formats.json` { } : A function taking an empty attribute set (for future extensibility) diff --git a/pkgs/pkgs-lib/formats/libconfig/default.nix b/pkgs/pkgs-lib/formats/libconfig/default.nix index 5687ab8c0057..e30c6c3c9300 100644 --- a/pkgs/pkgs-lib/formats/libconfig/default.nix +++ b/pkgs/pkgs-lib/formats/libconfig/default.nix @@ -3,14 +3,6 @@ }: let inherit (pkgs) buildPackages callPackage; - # Implementation notes: - # Libconfig spec: https://hyperrealm.github.io/libconfig/libconfig_manual.html - # - # Since libconfig does not allow setting names to start with an underscore, - # this is used as a prefix for both special types and include directives. - # - # The difference between 32bit and 64bit values became optional in libconfig - # 1.5, so we assume 64bit values for all numbers. libconfig-generator = buildPackages.rustPlatform.buildRustPackage { name = "libconfig-generator"; From 0c4ceee4e4ac4e28c6a4fdce2bdd770806d44b51 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:14:04 -0700 Subject: [PATCH 005/481] build2: 0.16.0 -> 0.17.0 --- pkgs/development/tools/build-managers/build2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/default.nix b/pkgs/development/tools/build-managers/build2/default.nix index bbe1739392fe..c420bd8c7320 100644 --- a/pkgs/development/tools/build-managers/build2/default.nix +++ b/pkgs/development/tools/build-managers/build2/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation rec { pname = "build2"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" "man" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/build2-${version}.tar.gz"; - hash = "sha256-ZK4+UACsAs51bC1dE0sIxmCiHlH3pYGPWJNsl61oSOY="; + hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA="; }; patches = [ From 07524c2f27f8f3f13b42dc9b4e27e17fda447b5f Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:14:56 -0700 Subject: [PATCH 006/481] libbutl: 0.16.0 -> 0.17.0 Changelog: https://git.build2.org/cgit/libbutl/log --- pkgs/development/libraries/libbutl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbutl/default.nix b/pkgs/development/libraries/libbutl/default.nix index aee951a51d6c..65fe845ff25a 100644 --- a/pkgs/development/libraries/libbutl/default.nix +++ b/pkgs/development/libraries/libbutl/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libbutl"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${version}.tar.gz"; - hash = "sha256-MGL6P/lG2sJdJXZiTcDvdy4jmU+2jYHsvaX4eEO9J2g="; + hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs="; }; nativeBuildInputs = [ From 4fa15953375ca4dcafe76b4447ae50abfeec42d8 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:15:18 -0700 Subject: [PATCH 007/481] bpkg: 0.16.0 -> 0.17.0 Changelog: https://git.build2.org/cgit/bpkg/tree/NEWS --- pkgs/development/tools/build-managers/build2/bpkg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index e395322df420..e4d212858690 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "bpkg"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${version}.tar.gz"; - hash = "sha256-sxzVidVL8dpoH82IevcwjcIWj4LQzliGv9zasTYqeok="; + hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs="; }; strictDeps = true; From 692a94157c825ba69518aea04a972811664bf84c Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:15:29 -0700 Subject: [PATCH 008/481] bdep: 0.16.0 -> 0.17.0 Changelog: https://git.build2.org/cgit/bdep/tree/NEWS --- pkgs/development/tools/build-managers/build2/bdep.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bdep.nix b/pkgs/development/tools/build-managers/build2/bdep.nix index 90a58e4f1b51..a1a77db45e1b 100644 --- a/pkgs/development/tools/build-managers/build2/bdep.nix +++ b/pkgs/development/tools/build-managers/build2/bdep.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "bdep"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bdep-${version}.tar.gz"; - hash = "sha256-5w8Ng8TS8g+Nkbixn5txg4FGi57TSfc6ii+2wh8apCo="; + hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ="; }; strictDeps = true; From 46d4396c678cb66e7f5bf1afa18b99a76045fd83 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:15:50 -0700 Subject: [PATCH 009/481] libodb: 2.5.0-b.25 -> 2.5.0-b.27 Changelog: https://git.codesynthesis.com/cgit/odb/libodb/tree/NEWS --- pkgs/development/libraries/libodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libodb/default.nix b/pkgs/development/libraries/libodb/default.nix index c016fc657d6f..b83e4d5c6816 100644 --- a/pkgs/development/libraries/libodb/default.nix +++ b/pkgs/development/libraries/libodb/default.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation rec { pname = "libodb"; - version = "2.5.0-b.25"; + version = "2.5.0-b.27"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-${version}.tar.gz"; - hash = "sha256-G634kVRbgwfBmIh8QqUclr/xvY3o0ouVmp/jxJrHzcs="; + hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q="; }; nativeBuildInputs = [ build2 ]; From 428fd4f85bd3e64b2f829b912517ceb2db544f58 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:15:57 -0700 Subject: [PATCH 010/481] libodb-sqlite: 2.5.0-b.25 -> 2.5.0-b.27 Changelog: https://git.codesynthesis.com/cgit/odb/libodb-sqlite/tree/NEWS --- pkgs/development/libraries/libodb-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libodb-sqlite/default.nix b/pkgs/development/libraries/libodb-sqlite/default.nix index 9ac1153deee2..547ff807d441 100644 --- a/pkgs/development/libraries/libodb-sqlite/default.nix +++ b/pkgs/development/libraries/libodb-sqlite/default.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation rec { pname = "libodb-sqlite"; - version = "2.5.0-b.25"; + version = "2.5.0-b.27"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${version}.tar.gz"; - hash = "sha256-Ko40WZErbL77B4eoJ5FFko/gTFYhADGlBzxPLuy8Wqc="; + hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w="; }; nativeBuildInputs = [ From f01d2608de02fb7d1213d386259b0e3332248c1a Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:16:17 -0700 Subject: [PATCH 011/481] libbpkg: 0.16.0 -> 0.17.0 Changelog: https://git.build2.org/cgit/libbpkg/log --- pkgs/development/libraries/libbpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbpkg/default.nix b/pkgs/development/libraries/libbpkg/default.nix index 6315b5df0f05..969654b675a2 100644 --- a/pkgs/development/libraries/libbpkg/default.nix +++ b/pkgs/development/libraries/libbpkg/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "libbpkg"; - version = "0.16.0"; + version = "0.17.0"; outputs = [ "out" "dev" "doc" ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${version}.tar.gz"; - hash = "sha256-h3Stt1n1057ASf3n16plr5cNGIKOjHiiuOfqrcCJ5tA="; + hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY="; }; nativeBuildInputs = [ From feb1211f0a3a68ef8254f064033417a9d6d11318 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sat, 13 Jul 2024 16:22:38 -0700 Subject: [PATCH 012/481] build2.bootstrap: 0.16.0 -> 0.17.0 --- pkgs/development/tools/build-managers/build2/bootstrap.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/bootstrap.nix b/pkgs/development/tools/build-managers/build2/bootstrap.nix index 0e1297506d4a..c06be28e462a 100644 --- a/pkgs/development/tools/build-managers/build2/bootstrap.nix +++ b/pkgs/development/tools/build-managers/build2/bootstrap.nix @@ -6,10 +6,10 @@ }: stdenv.mkDerivation rec { pname = "build2-bootstrap"; - version = "0.16.0"; + version = "0.17.0"; src = fetchurl { url = "https://download.build2.org/${version}/build2-toolchain-${version}.tar.xz"; - hash = "sha256-I3k/aCoXsdlcgLvYSSRHNe1Zo+JzYVKapIZdJ3b/itw="; + hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10="; }; patches = [ # Pick up sysdirs from NIX_LDFLAGS From 19e84ecb3e0330c163871936014db8fcb4cda080 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 00:33:02 +0000 Subject: [PATCH 013/481] dk: 2.2 -> 2.3 --- pkgs/applications/window-managers/dk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index a0efe1ad768f..27d0e15492a7 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dk"; - version = "2.2"; + version = "2.3"; src = fetchFromBitbucket { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-u1fZTcfGLwKFeRADU55MFYDvtSOaOg5qtWB90xYpVuY="; + hash = "sha256-VkNF3F/NRQadBkbnbVmMZliIXRxFU0qqxOeQDX4UrJg="; }; buildInputs = [ From 3cefe1ebcccb2e6d6cf73e0ec884a19595dc0bcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Jul 2024 02:24:22 +0000 Subject: [PATCH 014/481] coq2html: 1.3 -> 1.4 --- pkgs/tools/typesetting/coq2html/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/coq2html/default.nix b/pkgs/tools/typesetting/coq2html/default.nix index 69b3bc0ff239..049a48089aea 100644 --- a/pkgs/tools/typesetting/coq2html/default.nix +++ b/pkgs/tools/typesetting/coq2html/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "coq2html"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "xavierleroy"; repo = "coq2html"; rev = "v${version}"; - hash = "sha256-2J9uETDt+P+t4E9KhTIypA4MQpTCCxYmR6FYF30RqKk="; + hash = "sha256-dBXYeRwBhBWXJfdULLzfgZU+WD6WC6R8wV2eS1zAkq8="; }; nativeBuildInputs = [ ocaml ]; From 66d41e75e89aa7cf3484c97b5c006c36da5fc56f Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Sat, 20 Jul 2024 23:56:40 -0700 Subject: [PATCH 015/481] python{39,310,311,312,313}: Allow using cc to resolve dynamic libraries This patch hasn't been complete since an alternate case was added to cpython which allows using ld(1) to resolve libraries. In addition to this, the stated reason for the patch, to improve startup times by preventing cpython from invoking gcc to resolve libuuid, has not been an issue since that logic was removed in cpython 3.9. Finally, this patch creates a disparity between Linux and other operating systems (I am working on FreeBSD right now) since the ld(1) case is system gated. Since it no longer accomplishes its stated purpose, is no longer needed, and creates platform disparities, we should remove it. I've left the half of this patch which prevents /sbin/ldconfig from being invoked, since no nix-compiled program should ever be invoking absolute paths like this. --- .../python/cpython/3.10/no-ldconfig.patch | 55 ------------------- .../python/cpython/3.11/no-ldconfig.patch | 55 ------------------- .../python/cpython/3.12/no-ldconfig.patch | 55 ------------------- .../python/cpython/3.13/no-ldconfig.patch | 55 ------------------- .../python/cpython/3.9/no-ldconfig.patch | 55 ------------------- 5 files changed, 275 deletions(-) diff --git a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch index c259aed72b99..e65883ab895a 100644 --- a/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.10/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e..7fb98af 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ elif os.name == "posix": else: diff --git a/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch index ca6a76d0ffd9..bafcaee7c980 100644 --- a/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.11/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch index ca6a76d0ffd9..bafcaee7c980 100644 --- a/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.12/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch index ca6a76d0ffd9..bafcaee7c980 100644 --- a/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.13/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ def _is_elf(filename): - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ def find_library(name, is64 = False): else: diff --git a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch index 41d3ab52345b..1a5eccb9eca8 100644 --- a/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch +++ b/pkgs/development/interpreters/python/cpython/3.9/no-ldconfig.patch @@ -11,61 +11,6 @@ diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py index 0c2510e161..7fb98af308 100644 --- a/Lib/ctypes/util.py +++ b/Lib/ctypes/util.py -@@ -100,53 +100,7 @@ elif os.name == "posix": - return thefile.read(4) == elf_header - - def _findLib_gcc(name): -- # Run GCC's linker with the -t (aka --trace) option and examine the -- # library name it prints out. The GCC command will fail because we -- # haven't supplied a proper program with main(), but that does not -- # matter. -- expr = os.fsencode(r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)) -- -- c_compiler = shutil.which('gcc') -- if not c_compiler: -- c_compiler = shutil.which('cc') -- if not c_compiler: -- # No C compiler available, give up -- return None -- -- temp = tempfile.NamedTemporaryFile() -- try: -- args = [c_compiler, '-Wl,-t', '-o', temp.name, '-l' + name] -- -- env = dict(os.environ) -- env['LC_ALL'] = 'C' -- env['LANG'] = 'C' -- try: -- proc = subprocess.Popen(args, -- stdout=subprocess.PIPE, -- stderr=subprocess.STDOUT, -- env=env) -- except OSError: # E.g. bad executable -- return None -- with proc: -- trace = proc.stdout.read() -- finally: -- try: -- temp.close() -- except FileNotFoundError: -- # Raised if the file was already removed, which is the normal -- # behaviour of GCC if linking fails -- pass -- res = re.findall(expr, trace) -- if not res: -- return None -- -- for file in res: -- # Check if the given file is an elf file: gcc can report -- # some files that are linker scripts and not actual -- # shared objects. See bpo-41976 for more details -- if not _is_elf(file): -- continue -- return os.fsdecode(file) -+ return None - - - if sys.platform == "sunos5": @@ -268,34 +222,7 @@ elif os.name == "posix": else: From e7e1dea32df4c65009943523821e6ce36f0bca5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 22 Jul 2024 03:48:50 +0000 Subject: [PATCH 016/481] domoticz: 2024.4 -> 2024.7 --- pkgs/servers/domoticz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/domoticz/default.nix b/pkgs/servers/domoticz/default.nix index 61fcc8762441..72b4d71a62af 100644 --- a/pkgs/servers/domoticz/default.nix +++ b/pkgs/servers/domoticz/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "domoticz"; - version = "2024.4"; + version = "2024.7"; src = fetchFromGitHub { owner = "domoticz"; repo = pname; rev = version; - hash = "sha256-bIA7Dx8XV2zT2Cdm4CwKX6xfedBREhevE/bN76o4r78="; + hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; fetchSubmodules = true; }; From 64c6d5f183c59122c2ef53ccc81f24f9cc657163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:20:05 -0400 Subject: [PATCH 017/481] usbutils: build and install usbreset --- pkgs/os-specific/linux/usbutils/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 4e64f394d82f..c0b713ca9047 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -20,8 +20,14 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 python3 ]; outputs = [ "out" "man" "python" ]; + + postBuild = '' + $CC $NIX_CFLAGS -o usbreset usbreset.c + ''; + postInstall = '' moveToOutput "bin/lsusb.py" "$python" + install -Dm555 usbreset -t $out/bin ''; meta = with lib; { From 3150b3bd7551d8604cbff05bab981cf11f3c025b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Wed, 24 Jul 2024 09:20:27 -0400 Subject: [PATCH 018/481] usbutils: fix meta --- pkgs/os-specific/linux/usbutils/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index c0b713ca9047..f55c4e983367 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -30,12 +30,15 @@ stdenv.mkDerivation rec { install -Dm555 usbreset -t $out/bin ''; - meta = with lib; { + meta = { homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; - maintainers = with maintainers; [ cafkafk ]; - license = licenses.gpl2Plus; - platforms = platforms.linux; + maintainers = with lib.maintainers; [ cafkafk ]; + license = with lib.licenses; [ + gpl2Only # manpages, usbreset + gpl2Plus # most of the code + ]; + platforms = lib.platforms.linux; mainProgram = "lsusb"; }; } From 4945979ed624e49d5cede0c7cb1161dba200900b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Jul 2024 12:21:47 +0000 Subject: [PATCH 019/481] notmuch-bower: 1.0 -> 1.1 --- .../networking/mailreaders/notmuch-bower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 29aa21bca0f2..7073c7b91113 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "sha256-BNuJEVuzreI2AK/fqVMRHq8ZhPQjO33Y2FzkrWlfmm0="; + sha256 = "sha256-CqA9JU/ujqIn/NvtbPtSWxKDYCv4oDdLCgbf2jj9Av4="; }; nativeBuildInputs = [ mercury pandoc ]; From ad5c6904973dbee6e0add6c896f711783ddf81cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jul 2024 22:47:47 +0000 Subject: [PATCH 020/481] questdb: 8.0.1 -> 8.1.0 --- pkgs/servers/nosql/questdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index f201e34e85c7..81973bba64c8 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-S6i6XLxFpIxYAlxCu+MAznMLkBWvp8QVxged+rYCWT0="; + hash = "sha256-mqfL+boSCxktYT8pTq15i8bJL48ZxKmm1ygtBIhs0wg="; }; nativeBuildInputs = [ From fc48ee3027cf06f0d7b2152f93bafce3f61a5b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 00:23:37 +0000 Subject: [PATCH 021/481] freenect: 0.7.0 -> 0.7.5 --- pkgs/development/libraries/freenect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index b537bea33777..4be38fbef062 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "freenect"; - version = "0.7.0"; + version = "0.7.5"; src = fetchFromGitHub { owner = "OpenKinect"; repo = "libfreenect"; rev = "v${version}"; - sha256 = "sha256-Lb5mrl9jiI1Z9UOAlP+bBPNoKNxm5VSrFZRvifEfhoU="; + sha256 = "sha256-PpJGFWrlQ5sK7TJxQNoPujw1MxWRjphvblwOqnF+mSg="; }; buildInputs = [ libusb1 libglut libGLU libGL libXi libXmu ] From 0af83e770a3985067f105dc1294443e08fe0be53 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 28 Jul 2024 19:54:22 +0100 Subject: [PATCH 022/481] meson: 1.5.0 -> 1.5.1 --- pkgs/by-name/me/meson/package.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 79ffae36a98f..5e7f9368d66b 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -21,13 +21,13 @@ let in python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "mesonbuild"; repo = "meson"; rev = "refs/tags/${version}"; - hash = "sha256-Y//8fXBNdx+ikpvg+S5Bk2rN3UVS5qo2bnbTSVBb8b8="; + hash = "sha256-BqsEO1a93a8d7/UH232buSPBt+WSNJbw1DGYA2nm9rs="; }; patches = [ @@ -81,12 +81,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-XkwNQ5eg/fVekhsFg/V2/S2LbIVGz3H0wsSFlUT3ZZE="; }) - (fetchpatch { - name = "cross.patch"; - url = "https://github.com/mesonbuild/meson/pull/13411.patch"; - hash = "sha256-IHSV0Dfse0lzDtxh/+APc/dzGr/BUbR/WIOqDsm7/8Y="; - }) - # Fix extraframework lookup on case-sensitive APFS. # https://github.com/mesonbuild/meson/pull/13038 ./007-case-sensitive-fs.patch From 24655f78040b420c6af6103c714f2c052a533592 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 26 Jul 2024 16:20:14 +0200 Subject: [PATCH 023/481] patch-shebangs: don't patch shebangs with bash builtins 'command -v builtin' returns 'builtin', which doesn't suit us since we're looking for program in the given PATH. This could give us shebangs like this: #!builtin which is surprising. Switch to 'type -P command' which always returns a path, even if command is both a builtin and an executable (for example 'test'), or fail is 'command' is just a builtin. --- pkgs/build-support/setup-hooks/patch-shebangs.sh | 8 ++++---- pkgs/test/stdenv/patch-shebangs.nix | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 80a29d727c85..0553eb04b111 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -90,8 +90,8 @@ patchShebangs() { if [[ $arg0 == "-S" ]]; then arg0=${args%% *} args=${args#* } - newPath="$(PATH="${!pathName}" command -v "env" || true)" - args="-S $(PATH="${!pathName}" command -v "$arg0" || true) $args" + newPath="$(PATH="${!pathName}" type -P "env" || true)" + args="-S $(PATH="${!pathName}" type -P "$arg0" || true) $args" # Check for unsupported 'env' functionality: # - options: something starting with a '-' besides '-S' @@ -100,7 +100,7 @@ patchShebangs() { echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 else - newPath="$(PATH="${!pathName}" command -v "$arg0" || true)" + newPath="$(PATH="${!pathName}" type -P "$arg0" || true)" fi else if [[ -z $oldPath ]]; then @@ -109,7 +109,7 @@ patchShebangs() { oldPath="/bin/sh" fi - newPath="$(PATH="${!pathName}" command -v "$(basename "$oldPath")" || true)" + newPath="$(PATH="${!pathName}" type -P "$(basename "$oldPath")" || true)" args="$arg0 $args" fi diff --git a/pkgs/test/stdenv/patch-shebangs.nix b/pkgs/test/stdenv/patch-shebangs.nix index db9ca2fcaafe..51edf128f7d5 100644 --- a/pkgs/test/stdenv/patch-shebangs.nix +++ b/pkgs/test/stdenv/patch-shebangs.nix @@ -87,6 +87,20 @@ let }; }; + dont-patch-builtins = stdenv.mkDerivation { + name = "dont-patch-builtins"; + strictDeps = false; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + echo "#!/usr/bin/builtin" > $out/bin/test + chmod +x $out/bin/test + dontPatchShebangs= + ''; + passthru = { + assertion = "grep '^#!/usr/bin/builtin' $out/bin/test > /dev/null"; + }; + }; }; in stdenv.mkDerivation { From 4c6e132c7ed1928d347e48dc1f2ea6013f48cd6d Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Sat, 4 May 2024 08:23:44 +0300 Subject: [PATCH 024/481] =?UTF-8?q?lib/systems:=20use=20execline=E2=80=99s?= =?UTF-8?q?=20exec=20instead=20of=20runtimeShell?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/systems/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0b8aeda208e3..6c5cdb853348 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -282,8 +282,11 @@ let }; wine = (pkgs.winePackagesFor "wine${toString final.parsed.cpu.bits}").minimal; in + # Note: we guarantee that the return value is either `null` or a path + # to an emulator program. That is, if an emulator requires additional + # arguments, a wrapper should be used. if pkgs.stdenv.hostPlatform.canExecute final - then "${pkgs.runtimeShell} -c '\"$@\"' --" + then "${pkgs.execline}/bin/exec" else if final.isWindows then "${wine}/bin/wine${optionalString (final.parsed.cpu.bits == 64) "64"}" else if final.isLinux && pkgs.stdenv.hostPlatform.isLinux && final.qemuArch != null From 99ae138ab7ee9230999c4e515b663d445f2b69a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 1 Aug 2024 14:13:22 +0000 Subject: [PATCH 025/481] kubecm: 0.30.0 -> 0.31.0 --- pkgs/applications/networking/cluster/kubecm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubecm/default.nix b/pkgs/applications/networking/cluster/kubecm/default.nix index a369bf0d7cbe..494d5e5e1b2e 100644 --- a/pkgs/applications/networking/cluster/kubecm/default.nix +++ b/pkgs/applications/networking/cluster/kubecm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubecm"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "sunny0826"; repo = "kubecm"; rev = "v${version}"; - hash = "sha256-zyXxMp+59buSwm4fZY62b2xqAmq7XAzhET0qez8oWPs="; + hash = "sha256-Go2lroa8lq1XjIzvdA5ZL/lOjTAyDKopBepqgWzsUII="; }; - vendorHash = "sha256-6RrnsRbQ1+Cx7vnqauisBICgwmvTpJQT32DnIDVc6ts="; + vendorHash = "sha256-BrSYfxftrnNOcPgG/rsTF3OukDd+VlOvE7OJcos7vW4="; ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; doCheck = false; From 93ff87e4ffa2178066dc11699b5d9f450ea0ec9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 5 Aug 2024 01:48:05 -0700 Subject: [PATCH 026/481] python312Packages.flake8: 7.1.0 -> 7.1.1 Diff: https://github.com/PyCQA/flake8/compare/7.1.0...7.1.1 Changelog: https://github.com/PyCQA/flake8/blob/7.1.1/docs/source/release-notes/7.1.1.rst --- pkgs/development/python-modules/flake8/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 8fa7a8fa99a9..624f36a7447a 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "flake8"; - version = "7.1.0"; + version = "7.1.1"; disabled = pythonOlder "3.8"; @@ -22,12 +22,12 @@ buildPythonPackage rec { owner = "PyCQA"; repo = "flake8"; rev = version; - hash = "sha256-jkRr/k/XjiKOkcd4jlOQTnnFun7/hMHdVUWBlS1QZ1E="; + hash = "sha256-6iCZEapftHqd9okJS1wMzIjjmWahrmmZtXd7SUMVcmE="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ mccabe pycodestyle pyflakes @@ -36,6 +36,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/PyCQA/flake8/blob/${src.rev}/docs/source/release-notes/${version}.rst"; description = "Modular source code checker: pep8, pyflakes and co"; homepage = "https://github.com/PyCQA/flake8"; license = licenses.mit; From 388bcf6e3e56c4a376dfeecdec482fae2809930e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Aug 2024 13:05:06 -0700 Subject: [PATCH 027/481] python312Packages.pyyaml: 6.0.1 -> 6.0.2 Diff: https://github.com/yaml/pyyaml/compare/6.0.1...6.0.2 Changelog: https://github.com/yaml/pyyaml/blob/6.0.2/CHANGES --- .../python-modules/pyyaml/default.nix | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 7e81354ceae0..f9aafffd0905 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -3,43 +3,39 @@ buildPythonPackage, pythonOlder, fetchFromGitHub, - cython_0, + cython, setuptools, libyaml, - python, + pytestCheckHook, }: buildPythonPackage rec { pname = "pyyaml"; - version = "6.0.1"; + version = "6.0.2"; + pyproject = true; - disabled = pythonOlder "3.6"; - - format = "pyproject"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "yaml"; repo = "pyyaml"; - rev = version; - hash = "sha256-YjWMyMVDByLsN5vEecaYjHpR1sbBey1L/khn4oH9SPA="; + rev = "refs/tags/${version}"; + hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA="; }; - nativeBuildInputs = [ - cython_0 + build-system = [ + cython setuptools ]; buildInputs = [ libyaml ]; - checkPhase = '' - runHook preCheck - PYTHONPATH="tests/lib:$PYTHONPATH" ${python.interpreter} -m test_all - runHook postCheck - ''; - pythonImportsCheck = [ "yaml" ]; + nativeCheckInputs = [ pytestCheckHook ]; + meta = with lib; { + changelog = "https://github.com/yaml/pyyaml/blob/${src.rev}/CHANGES"; description = "Next generation YAML parser and emitter for Python"; homepage = "https://github.com/yaml/pyyaml"; license = licenses.mit; From 11026bcc424175bbdfaca6fbe1c687b1902ea340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Aug 2024 04:22:28 +0000 Subject: [PATCH 028/481] polychromatic: 0.9.1 -> 0.9.2 --- pkgs/applications/misc/polychromatic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/polychromatic/default.nix b/pkgs/applications/misc/polychromatic/default.nix index 24ff669e4f22..ad0736c8bc4b 100644 --- a/pkgs/applications/misc/polychromatic/default.nix +++ b/pkgs/applications/misc/polychromatic/default.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "polychromatic"; - version = "0.9.1"; + version = "0.9.2"; format = "other"; src = fetchFromGitHub { owner = "polychromatic"; repo = "polychromatic"; - rev = "v${version}"; - hash = "sha256-3Pt1Z8G0xDWlFD7LxJILPUifMBTN4OvPNHZv80umO1s="; + rev = "refs/tags/v${version}"; + hash = "sha256-eSfyoEu4qQv+R17wgTfATOE1uHkksNxo17btR6swuZo="; }; postPatch = '' From 5f26c661bd2716e29f9f5164eecd02ae6ea61e9b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 03:15:12 +0000 Subject: [PATCH 029/481] xmrig-proxy: 6.21.1 -> 6.22.0 --- pkgs/applications/misc/xmrig/proxy.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index 20d79d6c4ac0..fb69b92e8fe1 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig-proxy"; - version = "6.21.1"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - hash = "sha256-70SYdO3uyPINanAoARd2lDwyiuc2f/gg4QuoDgoXjjs="; + hash = "sha256-qRn/FiYvogGFUIUj3CojtfO6fXRZghH+bgRP+ysI6mc="; }; postPatch = '' From c19c741a98da62349ee05ad868d8489bfe9d2e2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 03:28:58 +0000 Subject: [PATCH 030/481] xmrig: 6.21.3 -> 6.22.0 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index ff9965c3403d..2cea4d2dd45c 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation rec { pname = "xmrig"; - version = "6.21.3"; + version = "6.22.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - hash = "sha256-1lIrxJ1Y5YRoXbZn77Msah5lSVW71gDczYUlXQjf01s="; + hash = "sha256-kFjUAOs92xExCV/ph81TFvgRXC6ZRi1m0G51c4JmeMA="; }; patches = [ From 90eda56fc83d3264418a506e285c8b03a2c28bae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 08:07:53 +0000 Subject: [PATCH 031/481] vips: 8.15.2 -> 8.15.3 --- pkgs/tools/graphics/vips/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index fde14fe0c53d..129b33427bc3 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.15.2"; + version = "8.15.3"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-jp6RPceFzzWgFBzcfvggniAkhXaAGszT/sy4H6aCtGc="; + hash = "sha256-VQtHHitEpxv63wC41TtRWLLCKHDAK7fbrS+cByeWxT0="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' From 982a4342778517c7edc76d759240ffc63d7d66b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Aug 2024 14:58:09 +0000 Subject: [PATCH 032/481] elasticmq-server-bin: 1.6.5 -> 1.6.7 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index debb1d8a57bc..f1e8da820509 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.6.5"; + version = "1.6.7"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar"; - sha256 = "sha256-7VpalDKa2Qr3HaIO5LcORvm5rAhgYQzStQkp7rs3pMQ="; + sha256 = "sha256-JSMxJBdYpYcBo/9wLY7QuQMEGlRF3hdVzVH2VMNT5b4="; }; # don't do anything? From 117e468da4642bf43cffe0336bb9f8a22921645b Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 10:08:05 +0200 Subject: [PATCH 033/481] graphene: tighten withDocumentation default The underlying reason documentation can't be built for pkgsStatic is that gobject-introspection is unavailable, so branching based on that fixes the same problem for all situations where that's true, not just pkgsStatic. --- pkgs/development/libraries/graphene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 7b64aa2bc586..11b0f43fec24 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -11,7 +11,7 @@ , mutest , nixosTests , glib -, withDocumentation ? !stdenv.hostPlatform.isStatic +, withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform || stdenv.hostPlatform.emulatorAvailable buildPackages , gtk-doc , docbook_xsl , docbook_xml_dtd_43 @@ -65,10 +65,10 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_43 docbook_xsl gtk-doc + ] ++ lib.optionals (withDocumentation && !stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + mesonEmulatorHook ] ++ lib.optionals withIntrospection [ gobject-introspection - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook ]; buildInputs = [ From 4249fa33f622eaf9ffebc3d7a01cb74d6bbf6704 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 2 Jan 2024 11:28:30 +0300 Subject: [PATCH 034/481] gnutls: enable ktls support --- pkgs/development/libraries/gnutls/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 33b35446d725..f1ecc1e9939f 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -92,6 +92,7 @@ stdenv.mkDerivation rec { # - fastopen: no idea; it broke between 3.6.2 and 3.6.3 (3437fdde6 in particular) # - trust-store: default trust store path (/etc/ssl/...) is missing in sandbox (3.5.11) # - psk-file: no idea; it broke between 3.6.3 and 3.6.4 + # - ktls: requires tls module loaded into kernel # Change p11-kit test to use pkg-config to find p11-kit postPatch = '' sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh @@ -99,6 +100,8 @@ stdenv.mkDerivation rec { sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool.sh + '' + lib.optionalString stdenv.isLinux '' + sed '2iexit 77' -i tests/{ktls,ktls_keyupdate}.sh ''; preConfigure = "patchShebangs ."; @@ -112,6 +115,8 @@ stdenv.mkDerivation rec { "--with-unbound-root-key-file=${dns-root-data}/root.key" (lib.withFeature withP11-kit "p11-kit") (lib.enableFeature cxxBindings "cxx") + ] ++ lib.optionals stdenv.isLinux [ + "--enable-ktls" ] ++ lib.optionals (stdenv.hostPlatform.isMinGW) [ "--disable-doc" ]; From 5be4ecc1c44eb566cd6a2dd537325cd891e9d2a9 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 16 Aug 2024 04:39:35 +0800 Subject: [PATCH 035/481] emacs: make melpaBuild accept recipe content as a string This is the first part of https://github.com/NixOS/nixpkgs/issues/334888. --- .../editors/emacs/build-support/melpa.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index aeaf1d3882ab..bda412a0957f 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -63,11 +63,10 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: /* recipe: Optional MELPA recipe. Default: a minimally functional recipe + This can be a path of a recipe file, a string of the recipe content or an empty string. + The default value is used if it is an empty string. */ -, recipe ? (writeText "${finalAttrs.pname}-recipe" '' - (${finalAttrs.ename} :fetcher git :url "" - ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"}) - '') +, recipe ? "" , preUnpack ? "" , postUnpack ? "" , meta ? {} @@ -98,9 +97,21 @@ libBuildHelper.extendMkDerivation' genericBuild (finalAttrs: preUnpack = '' mkdir -p "$NIX_BUILD_TOP/recipes" - if [ -n "$recipe" ]; then - cp "$recipe" "$NIX_BUILD_TOP/recipes/$ename" + recipeFile="$NIX_BUILD_TOP/recipes/$ename" + if [ -r "$recipe" ]; then + ln -s "$recipe" "$recipeFile" + nixInfoLog "link recipe" + elif [ -n "$recipe" ]; then + printf "%s" "$recipe" > "$recipeFile" + nixInfoLog "write recipe" + else + cat > "$recipeFile" <<'EOF' +(${finalAttrs.ename} :fetcher git :url "" ${lib.optionalString (finalAttrs.files != null) ":files ${finalAttrs.files}"}) +EOF + nixInfoLog "use default recipe" fi + nixInfoLog "recipe content:" "$(< $recipeFile)" + unset -v recipeFile ln -s "$packageBuild" "$NIX_BUILD_TOP/package-build" From 9717a2f8fa7c355c8cebc40c9a95103cda7938b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Aug 2024 13:32:21 +0000 Subject: [PATCH 036/481] llvmPackages_14.lldbPlugins.llef: 1.1.0 -> 1.2.0 --- pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix index c06aeb187105..97b80ade42e1 100644 --- a/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix +++ b/pkgs/development/compilers/llvm/common/lldb-plugins/llef.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llef"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "foundryzero"; repo = "llef"; rev = "v${finalAttrs.version}"; - hash = "sha256-tta99ncWJdnnSkVdnOwx36utEcefMy7fb5NDN2aZ5F0="; + hash = "sha256-cpBQuRWpov4q3lEtZPA7ZWqQ8Aa/KKQbhtVStSfNa+Q="; }; dontBuild = true; From 023967169b3524a16a9e967b9dbe7880bd335570 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Wed, 10 Jul 2024 16:58:09 -0400 Subject: [PATCH 037/481] python3Packages.k5test: fix krb5-config paths --- pkgs/development/python-modules/k5test/fix-paths.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/k5test/fix-paths.patch b/pkgs/development/python-modules/k5test/fix-paths.patch index 04103df36d53..feb24226dc2f 100644 --- a/pkgs/development/python-modules/k5test/fix-paths.patch +++ b/pkgs/development/python-modules/k5test/fix-paths.patch @@ -49,7 +49,7 @@ if provider_cls == K5Realm: - krb5_config = _discover_path("krb5-config", "/usr/bin/krb5-config", kwargs) -+ krb5_config = _discover_path("krb5-config", "@krb5@/bin/krb5-config", kwargs) ++ krb5_config = _discover_path("krb5-config", "@krb5Dev@/bin/krb5-config", kwargs) try: krb5_version = subprocess.check_output( @@ -58,7 +58,7 @@ # macOS output doesn't contain Heimdal if "heimdal" in krb5_version.lower() or ( - sys.platform == "darwin" and krb5_config == "/usr/bin/krb5-config" -+ sys.platform == "darwin" and krb5_config == "@krb5@/bin/krb5-config" ++ sys.platform == "darwin" and krb5_config == "@krb5Dev@/bin/krb5-config" ): provider_cls = HeimdalRealm else: From cf2eaa548152f7d5a0fffdc2aecec821c67a4a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 18 Aug 2024 14:28:57 -0700 Subject: [PATCH 038/481] python312Packages.pyjwt: 2.8.0 -> 2.9.0 Diff: https://github.com/jpadilla/pyjwt/compare/refs/tags/2.8.0...2.9.0 Changelog: https://github.com/jpadilla/pyjwt/blob/2.9.0/CHANGELOG.rst --- .../python-modules/pyjwt/default.nix | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 62c9c8c859db..2dee3c550a12 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, cryptography, pytestCheckHook, @@ -13,38 +13,34 @@ buildPythonPackage rec { pname = "pyjwt"; - version = "2.8.0"; - format = "pyproject"; + version = "2.9.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; - src = fetchPypi { - pname = "PyJWT"; - inherit version; - hash = "sha256-V+KNFW49XBAIjgxoq7kL+sPfgrQKcb0NqiDGXM1cI94="; + src = fetchFromGitHub { + owner = "jpadilla"; + repo = "pyjwt"; + rev = "refs/tags/${version}"; + hash = "sha256-z1sqaSeign0ZDFcg94cli0fIVBxcK14VUlgP+mSaxRA="; }; - postPatch = '' - sed -i '/types-cryptography/d' setup.cfg - ''; - outputs = [ "out" "doc" ]; + build-system = [ setuptools ]; + nativeBuildInputs = [ - setuptools sphinxHook sphinx-rtd-theme zope-interface ]; - passthru.optional-dependencies.crypto = [ cryptography ]; + optional-dependencies.crypto = [ cryptography ]; - nativeCheckInputs = [ - pytestCheckHook - ] ++ (lib.flatten (lib.attrValues passthru.optional-dependencies)); + nativeCheckInputs = [ pytestCheckHook ] ++ (lib.flatten (lib.attrValues optional-dependencies)); disabledTests = [ # requires internet connection From 84762ac4d0bd7a0da97aa8945020c39268d6155c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 19 Aug 2024 21:40:33 +0100 Subject: [PATCH 039/481] libinput: 1.26.1 -> 1.26.2 Changes: https://lists.freedesktop.org/archives/wayland-devel/2024-August/043706.html --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 1628cb679d22..0021f08aa5e2 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "libinput"; - version = "1.26.1"; + version = "1.26.2"; outputs = [ "bin" "out" "dev" ]; @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { owner = "libinput"; repo = "libinput"; rev = version; - hash = "sha256-3iWKqg9HSicocDAyp1Lk87nBbj+Slg1/e1VKEOIQkyQ="; + hash = "sha256-Ly832W2U38JuXiqvt6e7u3APynrmwi4Ns98bBdTBnP8="; }; patches = [ From 4c2e720a58bc4c6903147a34d9fd9699276d5986 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Tue, 30 Jul 2024 17:33:07 +0300 Subject: [PATCH 040/481] pbzx: fix build with musl libc --- pkgs/tools/compression/pbzx/default.nix | 1 + pkgs/tools/compression/pbzx/stdin.patch | 53 +++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/compression/pbzx/stdin.patch diff --git a/pkgs/tools/compression/pbzx/default.nix b/pkgs/tools/compression/pbzx/default.nix index 44555cd6ddbc..aa5692d14c51 100644 --- a/pkgs/tools/compression/pbzx/default.nix +++ b/pkgs/tools/compression/pbzx/default.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; sha256 = "0bwd7wmnhpz1n5p39mh6asfyccj4cm06hwigslcwbb3pdwmvxc90"; }; + patches = [ ./stdin.patch ]; buildInputs = [ xz xar ]; buildPhase = '' ${stdenv.cc.targetPrefix}cc pbzx.c -llzma -lxar -o pbzx diff --git a/pkgs/tools/compression/pbzx/stdin.patch b/pkgs/tools/compression/pbzx/stdin.patch new file mode 100644 index 000000000000..f4fa23474387 --- /dev/null +++ b/pkgs/tools/compression/pbzx/stdin.patch @@ -0,0 +1,53 @@ +C standard defines `stdin` as a macro so we can’t use it as an +identifier. See also +https://lists.llvm.org/pipermail/llvm-commits/Week-of-Mon-20130506/173524.html + +--- a/pbzx.c ++++ b/pbzx.c +@@ -34,7 +34,7 @@ + + /* Structure to hold the command-line options. */ + struct options { +- bool stdin; /* True if data should be read from stdin. */ ++ bool usestdin; /* True if data should be read from stdin. */ + bool noxar; /* The input data is not a XAR archive but the pbzx Payload. */ + bool help; /* Print usage with details and exit. */ + bool version; /* Print version and exit. */ +@@ -74,7 +74,7 @@ + /* Skip arguments that are not flags. */ + if (argv[i][0] != '-') continue; + /* Match available arguments. */ +- if (strcmp(argv[i], "-") == 0) opts->stdin = true; ++ if (strcmp(argv[i], "-") == 0) opts->usestdin = true; + else if (strcmp(argv[i], "-n") == 0) opts->noxar = true; + else if (strcmp(argv[i], "-h") == 0) opts->help = true; + else if (strcmp(argv[i], "-v") == 0) opts->version = true; +@@ -204,9 +204,9 @@ + parse_args(&argc, argv, &opts); + if (opts.version) version(); + if (opts.help) usage(NULL); +- if (!opts.stdin && argc < 2) ++ if (!opts.usestdin && argc < 2) + usage("missing filename argument"); +- else if ((!opts.stdin && argc > 2) || (opts.stdin && argc > 1)) ++ else if ((!opts.usestdin && argc > 2) || (opts.usestdin && argc > 1)) + usage("unhandled positional argument(s)"); + + char const* filename = NULL; +@@ -216,7 +216,7 @@ + struct stream stream; + stream_init(&stream); + bool success = false; +- if (opts.stdin) { ++ if (opts.usestdin) { + stream.type = STREAM_FP; + stream.fp = stdin; + success = true; +@@ -291,6 +291,6 @@ + } + free(zbuf); + lzma_end(&zs); +- if (!opts.stdin) stream_close(&stream); ++ if (!opts.usestdin) stream_close(&stream); + return 0; + } From 0c2e6f18fdfcda215322f81f0dcbab7dd82803ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 16:38:02 +0000 Subject: [PATCH 041/481] python312Packages.pytest-textual-snapshot: 0.4.0 -> 1.0.0 --- .../python-modules/pytest-textual-snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix index 6661b9397ac9..911cdd5d0def 100644 --- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pytest-textual-snapshot"; - version = "0.4.0"; + version = "1.0.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Textualize"; repo = "pytest-textual-snapshot"; rev = "refs/tags/v${version}"; - hash = "sha256-XkXeyodRdwWqCP63Onx82Z3IbNLDDR/Lvaw8xUY7fAg="; + hash = "sha256-C8vL2kLOvVcDlTtNiG/pf7PwHzb/F0sWdkEcLvdGrd8="; }; nativeBuildInputs = [ poetry-core ]; From f000781fce5d50469f514191931569464d9a383d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Aug 2024 16:38:07 +0000 Subject: [PATCH 042/481] sqlcipher: 4.6.0 -> 4.6.1 --- pkgs/development/libraries/sqlcipher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index c5dc183dd143..dff4e09fa7a7 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "sqlcipher"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "sqlcipher"; repo = "sqlcipher"; rev = "v${version}"; - hash = "sha256-ds+0ckQiHikNMr4Xf/wCWwQySpadGgnccENd6u6gIzQ="; + hash = "sha256-VcD3NwVrC75kLOJiIgrnzVpkBPhjxTmEFyKg/87wHGc="; }; nativeBuildInputs = [ From 6c166ced421740ee6c108d546e350aa8899a623a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 05:33:20 +0000 Subject: [PATCH 043/481] publicsuffix-list: 0-unstable-2024-06-19 -> 0-unstable-2024-08-21 --- pkgs/data/misc/publicsuffix-list/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/publicsuffix-list/default.nix b/pkgs/data/misc/publicsuffix-list/default.nix index 95cab65aa61b..3a46cc980bc3 100644 --- a/pkgs/data/misc/publicsuffix-list/default.nix +++ b/pkgs/data/misc/publicsuffix-list/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation { pname = "publicsuffix-list"; - version = "0-unstable-2024-06-19"; + version = "0-unstable-2024-08-21"; src = fetchFromGitHub { owner = "publicsuffix"; repo = "list"; - rev = "92c74a6cde6092a5e80531c0662e1055abeb975e"; - hash = "sha256-fkfjR2A2nf3/F16Pn0hCwXtAd26TbUVA5gIv+J4DOjc="; + rev = "30c3fc2db5ec0ecbc2efbb798b12459e9a22fffd"; + hash = "sha256-RmSlBl6lHFFvEEG2rsnwMpF9X8tv0VhPwhnke4UxUmA="; }; dontBuild = true; From fd0cd7c98f3a4beed3176df11a0aa462f263c349 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 06:58:36 +0000 Subject: [PATCH 044/481] librepo: 1.18.0 -> 1.18.1 --- pkgs/tools/package-management/librepo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 4d263e3e1d89..3e5a34404ec7 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -18,7 +18,7 @@ }: stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.18.1"; pname = "librepo"; outputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "sha256-u9dE1TqqZp/cHIgqnRDgOT4gU7XNLnSnmAFJxLKnDSQ="; + sha256 = "sha256-b5f6zfQu5GQ9bZPnWgmLZLH0YFFLQu7bHwMQUt4Q4Q8="; }; nativeBuildInputs = [ From 1890efc3bf9d02a1bd6a3a6a02d6c0f2a3a3b7ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 13:15:59 +0000 Subject: [PATCH 045/481] gtk-pipe-viewer: 0.5.2 -> 0.5.3 --- pkgs/applications/video/pipe-viewer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/pipe-viewer/default.nix b/pkgs/applications/video/pipe-viewer/default.nix index e95e1a1346a2..a1c7de85ebc4 100644 --- a/pkgs/applications/video/pipe-viewer/default.nix +++ b/pkgs/applications/video/pipe-viewer/default.nix @@ -37,13 +37,13 @@ let in buildPerlModule rec { pname = "pipe-viewer"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "trizen"; repo = "pipe-viewer"; rev = version; - hash = "sha256-TCcAQjz0B3eWILMAoqHCnMLvu8zD0W5wOFg+UaMPmXg="; + hash = "sha256-crYdbHIDcecfq1FKoRWX3u9x9wqdlaYrBgr7mGdEHeU="; }; nativeBuildInputs = [ makeWrapper ] From ed67b10a8ccf169289548f4b70c8639226265a54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 14:23:47 +0000 Subject: [PATCH 046/481] ocamlPackages.lambdasoup: 1.0.0 -> 1.1.0 --- pkgs/development/ocaml-modules/lambdasoup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index a5b61880da7d..8af5c5f43dc8 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "lambdasoup"; - version = "1.0.0"; + version = "1.1.0"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "aantron"; repo = pname; rev = version; - hash = "sha256-PZkhN5vkkLu8A3gYrh5O+nq9wFtig0Q4qD8zLGUGTRI="; + hash = "sha256-HUYE29nhoBjG5OZSV4n0C5yLq8yDtP+wsmxYyWsF3lc="; }; propagatedBuildInputs = [ camlp-streams markup ]; From 5bc31cf591df699233e3f41c51e4a7f20ef65cbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Aug 2024 19:19:05 +0000 Subject: [PATCH 047/481] tidb: 8.1.0 -> 8.3.0 --- pkgs/servers/tidb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tidb/default.nix b/pkgs/servers/tidb/default.nix index c5da10baaa3c..3c251dacb7d2 100644 --- a/pkgs/servers/tidb/default.nix +++ b/pkgs/servers/tidb/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tidb"; - version = "8.1.0"; + version = "8.3.0"; src = fetchFromGitHub { owner = "pingcap"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i8soETbTWmFZQqKYcRoLXVIgFCQxHDvXZbJNjDmS8Jo="; + sha256 = "sha256-dlLT1vwRZ6vbfCRcMxevJQ99T2Aq4qaAVwitmcd9yJ4="; }; - vendorHash = "sha256-RNYL5tb6d8NhNiOm3x8sgo1SEc8+uMdWgYor/VL3C6s="; + vendorHash = "sha256-NZv4DrPygSNCcK0A7VTGz0wIuHSR+Tf5Dhf5JuqiQ5A="; ldflags = [ "-X github.com/pingcap/tidb/pkg/parser/mysql.TiDBReleaseVersion=${version}" From 6b2530d2416b7611a0200bc61ff7b499eb8369b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 23 Aug 2024 03:39:26 +0200 Subject: [PATCH 048/481] python312Packages.aiohttp: 3.10.3 -> 3.10.5 https://github.com/aio-libs/aiohttp/blob/v3.10.5/CHANGES.rst --- .../python-modules/aiohttp/default.nix | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index c96f0b1384e7..75db6b645291 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -5,12 +5,16 @@ pythonOlder, fetchFromGitHub, substituteAll, - llhttp, python, - # build_requires + + # build-system cython, setuptools, - # install_requires + + # native dependencies + llhttp, + + # dependencies aiohappyeyeballs, attrs, multidict, @@ -20,12 +24,14 @@ aiosignal, aiodns, brotli, - # tests_require + + # tests freezegun, gunicorn, proxy-py, + pytest-cov-stub, pytest-mock, - pytest7CheckHook, + pytestCheckHook, python-on-whales, re-assert, trustme, @@ -33,7 +39,7 @@ buildPythonPackage rec { pname = "aiohttp"; - version = "3.10.3"; + version = "3.10.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -42,7 +48,7 @@ buildPythonPackage rec { owner = "aio-libs"; repo = "aiohttp"; rev = "refs/tags/v${version}"; - hash = "sha256-3dWd/IcCiPI3Ral6ULEUzOEOLkcdWVreDn7EI6eEy2k="; + hash = "sha256-HN2TJ8hVbClakV3ldTOn3wbrhCuf2Qn9EjWCSlSyJpw="; }; patches = [ @@ -54,8 +60,6 @@ buildPythonPackage rec { ]; postPatch = '' - sed -i '/--cov/d' setup.cfg - rm -r vendor patchShebangs tools touch .git # tools/gen.py uses .git to find the project root @@ -92,8 +96,9 @@ buildPythonPackage rec { freezegun gunicorn proxy-py + pytest-cov-stub pytest-mock - pytest7CheckHook + pytestCheckHook python-on-whales re-assert trustme From caef6dd355ad6cc584a5e316c545808e7636b185 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 23 Aug 2024 09:04:05 +0200 Subject: [PATCH 049/481] curl: enable configure flag `--enable-versioned-symbols` This flag enable versioned symbols in CURL shared library. --- pkgs/tools/networking/curl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 1ac724a08bc3..cc850b0d7b0c 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -120,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { ''; configureFlags = [ + "--enable-versioned-symbols" # Build without manual "--disable-manual" (lib.enableFeature c-aresSupport "ares") From 45db1ff7c1aa8219a83e3fd48034fdf58706fd00 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 23 Aug 2024 11:41:20 +0200 Subject: [PATCH 050/481] nodejs_20: 20.16.0 -> 20.17.0 (#336388) --- pkgs/development/web/nodejs/v20.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/web/nodejs/v20.nix b/pkgs/development/web/nodejs/v20.nix index 1aa0fbf72e8d..bb2a446d6eef 100644 --- a/pkgs/development/web/nodejs/v20.nix +++ b/pkgs/development/web/nodejs/v20.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }: +{ callPackage, openssl, python3, enableNpm ? true }: let buildNodejs = callPackage ./nodejs.nix { @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "20.16.0"; - sha256 = "cd6c8fc3ff2606aadbc7155db6f7e77247d2d0065ac18e2f7f049095584b8b46"; + version = "20.17.0"; + sha256 = "9abf03ac23362c60387ebb633a516303637145cb3c177be3348b16880fd8b28c"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch @@ -21,13 +21,5 @@ buildNodejs { ./bypass-darwin-xcrun-node16.patch ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/87598d4b63ef2c827a2bebdfa0f1540c35718519.patch"; - hash = "sha256-efRJ2nN9QXaT91SQTB+ESkHvXtBq30Cb9BEDEZU9M/8="; - }) - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/d0a6b605fba6cd69a82e6f12ff0363eef8fe1ee9.patch"; - hash = "sha256-TfYal/PikRZHL6zpAlC3SmkYXCe+/8Gs83dLX/X/P/k="; - }) ] ++ gypPatches; } From c455cc3170d68f05b4614c41883a7d417d1c16e0 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Fri, 23 Aug 2024 11:41:36 +0200 Subject: [PATCH 051/481] nodejs_22: 22.6.0 -> 22.7.0 (#336556) --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 9724d70c2b51..3c6508fc5c5d 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.6.0"; - sha256 = "37259d618d5565ca55acc2585045c7e1c5b9965a3d4eb44c0a237fdae84b9d44"; + version = "22.7.0"; + sha256 = "1e0b6f2f2ca4fb0b4644a11363169daf4b7c42f00e5a53d2c65a9fdc463e7d88"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch From 911aa1440f40405f13f9252e2eb8ffc12f269090 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Tue, 28 Nov 2023 22:15:40 +1100 Subject: [PATCH 052/481] treewide: support NIX_SSL_CERT_FILE as an impureEnvVar This envvar is also added to lib.proxyImpureEnvVars since it's typically required for https proxies. This change also updates fetchgit and go module fetching to use this envvar. NIX_GIT_SSL_CAINFO is still supported for backwards compatibility in fetchgit. --- lib/fetchers.nix | 3 +++ pkgs/build-support/fetchgit/default.nix | 4 +--- pkgs/build-support/fetchgit/nix-prefetch-git | 6 +++--- pkgs/build-support/go/module.nix | 1 + pkgs/data/misc/cacert/setup-hook.sh | 6 +++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/fetchers.nix b/lib/fetchers.nix index e94c611299be..b2fe7872a12b 100644 --- a/lib/fetchers.nix +++ b/lib/fetchers.nix @@ -9,6 +9,9 @@ # by definition pure. "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "HTTP_PROXY" "HTTPS_PROXY" "FTP_PROXY" "ALL_PROXY" "NO_PROXY" + + # https proxies typically need to inject custom root CAs too + "NIX_SSL_CERT_FILE" ]; } diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 66bb3b7c09ff..92c7468753e8 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -67,7 +67,7 @@ stdenvNoCC.mkDerivation { builder = ./builder.sh; fetcher = ./nix-prefetch-git; - nativeBuildInputs = [ git ] + nativeBuildInputs = [ git cacert ] ++ lib.optionals fetchLFS [ git-lfs ]; outputHashAlgo = if hash != "" then null else "sha256"; @@ -94,8 +94,6 @@ stdenvNoCC.mkDerivation { export HOME=$PWD ''; - GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt"; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ netrcImpureEnvVars ++ [ "GIT_PROXY_COMMAND" "NIX_GIT_SSL_CAINFO" "SOCKS_SERVER" ]; diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 0f41cbd6a265..b921f161f012 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -17,9 +17,9 @@ branchName=$NIX_PREFETCH_GIT_BRANCH_NAME out=${out:-} http_proxy=${http_proxy:-} -# allow overwriting cacert's ca-bundle.crt with a custom one -# this can be done by setting NIX_GIT_SSL_CAINFO and NIX_SSL_CERT_FILE environment variables for the nix-daemon -GIT_SSL_CAINFO=${NIX_GIT_SSL_CAINFO:-$GIT_SSL_CAINFO} +# NOTE: use of NIX_GIT_SSL_CAINFO is for backwards compatibility; NIX_SSL_CERT_FILE is preferred +# as of PR#303307 +GIT_SSL_CAINFO=${NIX_GIT_SSL_CAINFO:-$NIX_SSL_CERT_FILE} # populated by clone_user_rev() fullRev= diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix index 214b2603ff7f..bda01fc6f9b2 100644 --- a/pkgs/build-support/go/module.nix +++ b/pkgs/build-support/go/module.nix @@ -136,6 +136,7 @@ in exit 10 fi + export GIT_SSL_CAINFO=$NIX_SSL_CERT_FILE ${if finalAttrs.proxyVendor then '' mkdir -p "''${GOPATH}/pkg/mod/cache/download" go mod download diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh index 93b682fbbd12..62361102648d 100644 --- a/pkgs/data/misc/cacert/setup-hook.sh +++ b/pkgs/data/misc/cacert/setup-hook.sh @@ -1,7 +1,7 @@ -export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +export NIX_SSL_CERT_FILE="${NIX_SSL_CERT_FILE:-@out@/etc/ssl/certs/ca-bundle.crt}" # compatibility # - openssl -export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt +export SSL_CERT_FILE=$NIX_SSL_CERT_FILE # - Haskell x509-system -export SYSTEM_CERTIFICATE_PATH=@out@/etc/ssl/certs/ca-bundle.crt +export SYSTEM_CERTIFICATE_PATH=$NIX_SSL_CERT_FILE From 7eb5c0991cc5e6ad7fcef92848157e83e23f5fe8 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Fri, 9 Feb 2024 14:20:32 +1100 Subject: [PATCH 053/481] doc: add proxy usage to fetchers chapter --- doc/build-helpers/fetchers.chapter.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/build-helpers/fetchers.chapter.md b/doc/build-helpers/fetchers.chapter.md index 2167df3f1748..21cadfaa21fa 100644 --- a/doc/build-helpers/fetchers.chapter.md +++ b/doc/build-helpers/fetchers.chapter.md @@ -157,6 +157,12 @@ Here are security considerations for this scenario: In more concrete terms, if you use any other hash, the [`--insecure` flag](https://curl.se/docs/manpage.html#-k) will be passed to the underlying call to `curl` when downloading content. +## Proxy usage {#sec-pkgs-fetchers-proxy} + +Nixpkgs fetchers can make use of a http(s) proxy. Each fetcher will automatically inherit proxy-related environment variables (`http_proxy`, `https_proxy`, etc) via [impureEnvVars](https://nixos.org/manual/nix/stable/language/advanced-attributes#adv-attr-impureEnvVars). + +The environment variable `NIX_SSL_CERT_FILE` is also inherited in fetchers, and can be used to provide a custom certificate bundle to fetchers. This is usually required for a https proxy to work without certificate validation errors. + []{#fetchurl} ## `fetchurl` {#sec-pkgs-fetchers-fetchurl} From 0a4fb986558dd24ffa46088bbb991dc8c3198f49 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 16 May 2024 23:24:04 +0200 Subject: [PATCH 054/481] lvm2: 2.03.23 -> 2.03.24 https://gitlab.com/lvmteam/lvm2/-/blob/v2_03_24/WHATS_NEW --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 +- pkgs/os-specific/linux/lvm2/common.nix | 3 - pkgs/os-specific/linux/lvm2/fix-static.patch | 28 --------- .../linux/lvm2/fix-stdio-usage.patch | 58 ++++++++++--------- 4 files changed, 32 insertions(+), 61 deletions(-) delete mode 100644 pkgs/os-specific/linux/lvm2/fix-static.patch diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index fa0a2cc8a600..c4f27ef96ae8 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.23"; - hash = "sha256-dOeUqene4bz4ogZfZbkZbET98yHiLWO5jtfejJqhel0="; + version = "2.03.24"; + hash = "sha256-WTxVA7oA+qscbgtKWXuWBex7WIGEXAS/QS6/nRu/oTw="; } diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix index 9cba67ee2b39..6f7c3cb77f23 100644 --- a/pkgs/os-specific/linux/lvm2/common.nix +++ b/pkgs/os-specific/linux/lvm2/common.nix @@ -101,10 +101,7 @@ stdenv.mkDerivation rec { multipath_tools = optionalTool enableMultipath multipath-tools; vdo = optionalTool enableVDO vdo; })) - # Musl fix from Alpine ./fix-stdio-usage.patch - # https://gitlab.com/lvmteam/lvm2/-/merge_requests/8 - ./fix-static.patch ]; doCheck = false; # requires root diff --git a/pkgs/os-specific/linux/lvm2/fix-static.patch b/pkgs/os-specific/linux/lvm2/fix-static.patch deleted file mode 100644 index 89192744adec..000000000000 --- a/pkgs/os-specific/linux/lvm2/fix-static.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0cbe7f0adc86c92c61156c417b27b063f156b31b Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Tue, 2 Jan 2024 18:15:20 +0100 -Subject: [PATCH] makefiles: fix disabling shared link - -LIB_SHARED still gets set when shared linking has been disabled, so -the previous version of this check still attempted to build the -shared library. ---- - libdm/make.tmpl.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in -index 2dd9625d4d..69ba2c35ab 100644 ---- a/libdm/make.tmpl.in -+++ b/libdm/make.tmpl.in -@@ -436,7 +436,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64 - @echo " [CC] $( -Date: Wed, 16 Nov 2022 10:42:39 +0100 -Subject: [PATCH] fix stdio usage - ---- - lib/commands/toolcontext.c | 4 ++-- - tools/lvmcmdline.c | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c -index b630554a9..f20080d18 100644 +index 56dc1f856..011ec2700 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c -@@ -1667,7 +1667,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, +@@ -1660,6 +1660,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, /* FIXME Make this configurable? */ reset_lvm_errno(1); --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) ++#ifdef __GLIBC__ /* Set in/out stream buffering before glibc */ if (set_buffering - #ifdef SYS_gettid -@@ -2045,7 +2045,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + && !cmd->running_on_valgrind /* Skipping within valgrind execution. */ +@@ -1704,7 +1705,7 @@ struct cmd_context *create_toolcontext(unsigned is_clvmd, + } else if (!set_buffering) + /* Without buffering, must not use stdin/stdout */ + init_silent(1); +- ++#endif + /* + * Environment variable LVM_SYSTEM_DIR overrides this below. + */ +@@ -2038,6 +2039,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + if (cmd->cft_def_hash) dm_hash_destroy(cmd->cft_def_hash); - dm_device_list_destroy(&cmd->cache_dm_devs); --#ifndef VALGRIND_POOL -+#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - if (cmd->linebuffer) { ++#ifdef __GLIBC__ + if (!cmd->running_on_valgrind && cmd->linebuffer) { + int flags; /* Reset stream buffering to defaults */ - if (is_valid_fd(STDIN_FILENO) && +@@ -2061,6 +2063,7 @@ void destroy_toolcontext(struct cmd_context *cmd) + + free(cmd->linebuffer); + } ++#endif + + destroy_config_context(cmd); + diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index a5bb6a5c5..0ebfa375c 100644 +index 1b2f7f47c..e0674d42d 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3422,7 +3422,7 @@ static int _check_standard_fds(void) +@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -43,7 +48,7 @@ index a5bb6a5c5..0ebfa375c 100644 if (err) perror("stdin stream open"); else -@@ -3432,7 +3432,7 @@ static int _check_standard_fds(void) +@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -52,7 +57,7 @@ index a5bb6a5c5..0ebfa375c 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3440,7 +3440,7 @@ static int _check_standard_fds(void) +@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && @@ -61,6 +66,3 @@ index a5bb6a5c5..0ebfa375c 100644 printf("stderr stream open: %s\n", strerror(errno)); return 0; --- -2.38.1 - From ee6a0e376d4e6cb4d8c980eedff78cceeef18a1e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 8 Jul 2024 18:55:38 +0200 Subject: [PATCH 055/481] kvdo: drop --- .../manual/release-notes/rl-2411.section.md | 2 ++ nixos/modules/tasks/lvm.nix | 3 +- pkgs/os-specific/linux/kvdo/default.nix | 35 ------------------- pkgs/os-specific/linux/vdo/default.nix | 2 +- pkgs/top-level/linux-kernels.nix | 3 +- 5 files changed, 5 insertions(+), 40 deletions(-) delete mode 100644 pkgs/os-specific/linux/kvdo/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 6b380c5023d4..bff4f1eac74f 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -262,6 +262,8 @@ - PPD files for Utax printers got renamed (spaces replaced by underscores) in newest `foomatic-db` package; users of Utax printers might need to adapt their `hardware.printers.ensurePrinters.*.model` value. +- The `kvdo` kernel module package was removed, because it was upstreamed in kernel version 6.9, where it is called `dm-vdo`. + - `libe57format` has been updated to `>= 3.0.0`, which contains some backward-incompatible API changes. See the [release note](https://github.com/asmaloney/libE57Format/releases/tag/v3.0.0) for more details. - `gitlab` deprecated support for *runner registration tokens* in GitLab 16.0, disabled their support in GitLab 17.0 and will diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 9607218ec069..438b46f8f9b0 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -89,7 +89,7 @@ in { (mkIf cfg.boot.vdo.enable { boot = { initrd = { - kernelModules = [ "kvdo" ]; + kernelModules = [ "dm-vdo" ]; systemd.initrdBin = lib.mkIf config.boot.initrd.services.lvm.enable [ pkgs.vdo ]; @@ -107,7 +107,6 @@ in { done ''; }; - extraModulePackages = [ config.boot.kernelPackages.kvdo ]; }; services.lvm.package = mkOverride 999 pkgs.lvm2_vdo; # this overrides mkDefault diff --git a/pkgs/os-specific/linux/kvdo/default.nix b/pkgs/os-specific/linux/kvdo/default.nix deleted file mode 100644 index cc5ace339b42..000000000000 --- a/pkgs/os-specific/linux/kvdo/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, vdo, kernel }: - -stdenv.mkDerivation rec { - inherit (vdo); - pname = "kvdo"; - version = "8.2.3.3"; # bump this version with vdo - - src = fetchFromGitHub { - owner = "dm-vdo"; - repo = "kvdo"; - rev = version; - hash = "sha256-y7uVgWFV6uWRoRqfiu0arG9731mgWijXjcp9KSaZ5X0="; - }; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - dontConfigure = true; - enableParallelBuilding = true; - - KSRC = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = placeholder "out"; - - preBuild = '' - makeFlags="$makeFlags -C ${KSRC} M=$(pwd)" - ''; - installTargets = [ "modules_install" ]; - - meta = with lib; { - inherit (vdo.meta) license maintainers; - homepage = "https://github.com/dm-vdo/kvdo"; - description = "Pair of kernel modules which provide pools of deduplicated and/or compressed block storage"; - platforms = platforms.linux; - broken = kernel.kernelOlder "5.17"; - }; -} diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index e709b26ad93d..548caf7a5b6e 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.2.2.2"; # bump this version with kvdo + version = "8.2.2.2"; src = fetchFromGitHub { owner = "dm-vdo"; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index d5bd0f19bac2..027374fd490e 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -389,8 +389,6 @@ in { ena = callPackage ../os-specific/linux/ena {}; - kvdo = callPackage ../os-specific/linux/kvdo {}; - lenovo-legion-module = callPackage ../os-specific/linux/lenovo-legion { }; linux-gpib = callPackage ../applications/science/electronics/linux-gpib/kernel.nix { }; @@ -613,6 +611,7 @@ in { vm-tools = self.mm-tools; xmm7360-pci = throw "Support for the XMM7360 WWAN card was added to the iosm kmod in mainline kernel version 5.18"; amdgpu-pro = throw "amdgpu-pro was removed due to lack of maintenance"; # Added 2024-06-16 + kvdo = throw "kvdo was removed, because it was added to mainline in kernel version 6.9"; # Added 2024-07-08 }); hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides); From f5fa4e0cc890b1a6ccf8cce32944a7e7a49cae85 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 8 Jul 2024 18:59:09 +0200 Subject: [PATCH 056/481] nixos/tests/lvm2/vdo: only build latest kernel --- nixos/tests/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/lvm2/default.nix b/nixos/tests/lvm2/default.nix index ba1bdb5de545..346ec6739501 100644 --- a/nixos/tests/lvm2/default.nix +++ b/nixos/tests/lvm2/default.nix @@ -10,7 +10,7 @@ let tests = let callTest = p: lib.flip (import p) { inherit system pkgs; }; in { thinpool = { test = callTest ./thinpool.nix; kernelFilter = lib.id; }; # we would like to test all versions, but the kernel module currently does not compile against the other versions - vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "6.1"); }; + vdo = { test = callTest ./vdo.nix; kernelFilter = lib.filter (v: v == "latest"); }; # systemd in stage 1 @@ -26,7 +26,7 @@ let }; vdo-sd-stage-1 = { test = callTest ./systemd-stage-1.nix; - kernelFilter = lib.filter (v: v == "6.1"); + kernelFilter = lib.filter (v: v == "latest"); flavour = "vdo"; }; }; From 9366ef0fbd3e5ddb495b2c38ab861d66f569fdd7 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Mon, 8 Jul 2024 19:03:43 +0200 Subject: [PATCH 057/481] vdo: 8.2.2.2 -> 8.3.0.71 --- nixos/modules/tasks/lvm.nix | 4 ++-- pkgs/os-specific/linux/vdo/default.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 438b46f8f9b0..6748f023ec4c 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -98,11 +98,11 @@ in { copy_bin_and_libs ${pkgs.vdo}/bin/$BIN done substituteInPlace $out/bin/vdorecover --replace "${pkgs.bash}/bin/bash" "/bin/sh" - substituteInPlace $out/bin/adaptLVMVDO.sh --replace "${pkgs.bash}/bin/bash" "/bin/sh" + substituteInPlace $out/bin/adaptlvm --replace "${pkgs.bash}/bin/bash" "/bin/sh" ''; extraUtilsCommandsTest = mkIf (!config.boot.initrd.systemd.enable)'' - ls ${pkgs.vdo}/bin/ | grep -vE '(adaptLVMVDO|vdorecover)' | while read BIN; do + ls ${pkgs.vdo}/bin/ | grep -vE '(adaptlvm|vdorecover)' | while read BIN; do $out/bin/$(basename $BIN) --help > /dev/null done ''; diff --git a/pkgs/os-specific/linux/vdo/default.nix b/pkgs/os-specific/linux/vdo/default.nix index 548caf7a5b6e..dc0a30732ed0 100644 --- a/pkgs/os-specific/linux/vdo/default.nix +++ b/pkgs/os-specific/linux/vdo/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "vdo"; - version = "8.2.2.2"; + version = "8.3.0.71"; src = fetchFromGitHub { owner = "dm-vdo"; repo = pname; rev = version; - hash = "sha256-+2w9jzJemI2xr+i/Jd5TIBZ/o8Zv+Ett0fbJbkOD7KI="; + hash = "sha256-FZerMUzth43p5jvKQalyYcW+mrl6SLjS8GrivY2qWkI="; }; nativeBuildInputs = [ @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; postInstall = '' - installShellCompletion --bash $out/bash_completion.d/* - rm -r $out/bash_completion.d + installShellCompletion --bash $out/usr/share/bash-completion/completions/* + rm -rv $out/usr wrapPythonPrograms ''; From 31f61f5254bf27f5e2a73dc058757c40ecf8aeed Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 12 Jul 2024 18:52:28 +0200 Subject: [PATCH 058/481] lvm2: 2.03.24 -> 2.03.25 https://gitlab.com/lvmteam/lvm2/-/blob/v2_03_25/WHATS_NEW --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index c4f27ef96ae8..fcd141e3e5fa 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.24"; - hash = "sha256-WTxVA7oA+qscbgtKWXuWBex7WIGEXAS/QS6/nRu/oTw="; + version = "2.03.25"; + hash = "sha256-S+pv0uWvnNs+J7SLTvqNiSENm/oT35AOCS5ARyClmx0="; } From bd0539cb2086b948cb57cb2e9876efff3e47bfb8 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 18 Jul 2024 09:14:21 +0200 Subject: [PATCH 059/481] nixos/tasks/lvm: assert kernel version for vdo --- nixos/modules/tasks/lvm.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index 6748f023ec4c..0b628725969a 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -87,6 +87,11 @@ in { environment.systemPackages = [ pkgs.thin-provisioning-tools ]; }) (mkIf cfg.boot.vdo.enable { + assertions = [{ + assertion = lib.versionAtLeast config.boot.kernelPackages.kernel.version "6.9"; + message = "boot.vdo.enable requires at least kernel version 6.9"; + }]; + boot = { initrd = { kernelModules = [ "dm-vdo" ]; From eec2ebe81aae6523512ad5d78bcafcf8c5f58da5 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 23 Aug 2024 20:01:58 +0200 Subject: [PATCH 060/481] lvm2: 2.03.25 -> 2.03.26 https://gitlab.com/lvmteam/lvm2/-/blob/v2_03_26/WHATS_NEW --- pkgs/os-specific/linux/lvm2/2_03.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix index fcd141e3e5fa..ad559a6c2bb6 100644 --- a/pkgs/os-specific/linux/lvm2/2_03.nix +++ b/pkgs/os-specific/linux/lvm2/2_03.nix @@ -1,4 +1,4 @@ import ./common.nix { - version = "2.03.25"; - hash = "sha256-S+pv0uWvnNs+J7SLTvqNiSENm/oT35AOCS5ARyClmx0="; + version = "2.03.26"; + hash = "sha256-cuqLTw4WEN5dEZKWsV7yoiA0MQiVQdy+vGY2H2X7NfU="; } From 5547322a0c01dd30a7e0111adc1f02bafbbd6ebc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Mar 2024 17:35:58 +0100 Subject: [PATCH 061/481] postgresql: move dynamic modules to default output Dynamic modules are technically libraries, but are not used by other packages. Instead they are loaded by PostgreSQL itself, e.g. as extensions. Those just increased the size of the lib output without benefit. This removes the NIX_PGLIBDIR hack introduced in #17838 and instead makes sure that pg_config always returns the correct PGLIBDIR. The test for postgis introduced in the same PR is still passing with the change. --- .../rust/cargo-pgrx/buildPgrxExtension.nix | 1 - pkgs/servers/sql/postgresql/generic.nix | 35 +++---------------- .../patches/paths-for-split-outputs.patch | 11 ++++++ .../specify_pkglibdir_at_runtime.patch | 28 --------------- 4 files changed, 15 insertions(+), 60 deletions(-) delete mode 100644 pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index 7138ae8ecfef..ab4343462f26 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -117,7 +117,6 @@ let ${preBuildAndTest} ${maybeEnterBuildAndTestSubdir} - NIX_PGLIBDIR="${postgresql}/lib" \ PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ ${lib.optionalString stdenv.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ cargo pgrx package \ diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 08b32befb672..a8610c8e487b 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -112,7 +112,6 @@ let (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) ./patches/less-is-more.patch ./patches/paths-for-split-outputs.patch - ./patches/specify_pkglibdir_at_runtime.patch ./patches/paths-with-postgresql-suffix.patch (substituteAll { @@ -129,18 +128,13 @@ let installTargets = [ "install-world" ]; postPatch = '' + substituteInPlace "src/Makefile.global.in" --subst-var out # Hardcode the path to pgxs so pg_config returns the path in $out substituteInPlace "src/common/config_info.c" --subst-var out - '' + lib.optionalString jitSupport '' - # Force lookup of jit stuff in $out instead of $lib - substituteInPlace src/backend/jit/jit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit.c --replace pkglib_path \"$out/lib\" - substituteInPlace src/backend/jit/llvm/llvmjit_inline.cpp --replace pkglib_path \"$out/lib\" ''; postInstall = '' - moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it moveToOutput "lib/libpgcommon*.a" "$out" moveToOutput "lib/libpgport*.a" "$out" moveToOutput "lib/libecpg*" "$out" @@ -159,11 +153,6 @@ let done fi '' + lib.optionalString jitSupport '' - # Move the bitcode and libllvmjit.so library out of $lib; otherwise, every client that - # depends on libpq.so will also have libLLVM.so in its closure too, bloating it - moveToOutput "lib/bitcode" "$out" - moveToOutput "lib/llvmjit*" "$out" - # In the case of JIT support, prevent a retained dependency on clang-wrapper substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) @@ -225,7 +214,7 @@ let in import ./ext newSelf newSuper; withPackages = postgresqlWithPackages { - inherit makeWrapper buildEnv; + inherit buildEnv; postgresql = this; } this.pkgs; @@ -271,30 +260,14 @@ let }; }); - postgresqlWithPackages = { postgresql, makeWrapper, buildEnv }: pkgs: f: buildEnv { + postgresqlWithPackages = { postgresql, buildEnv }: pkgs: f: buildEnv { name = "postgresql-and-plugins-${postgresql.version}"; paths = f pkgs ++ [ postgresql - postgresql.lib postgresql.man # in case user installs this into environment ]; - nativeBuildInputs = [ makeWrapper ]; - - # We include /bin to ensure the $out/bin directory is created, which is - # needed because we'll be removing the files from that directory in postBuild - # below. See #22653 - pathsToLink = ["/" "/bin"]; - - # Note: the duplication of executables is about 4MB size. - # So a nicer solution was patching postgresql to allow setting the - # libdir explicitly. - postBuild = '' - mkdir -p $out/bin - rm $out/bin/{pg_config,postgres,pg_ctl} - cp --target-directory=$out/bin ${postgresql}/bin/{postgres,pg_config,pg_ctl} - wrapProgram $out/bin/postgres --set NIX_PGLIBDIR $out/lib - ''; + pathsToLink = ["/"]; passthru.version = postgresql.version; passthru.psqlSchema = postgresql.psqlSchema; diff --git a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch index 2134f7e81a87..fca7aa10fc83 100644 --- a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch +++ b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch @@ -9,3 +9,14 @@ strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); cleanup_path(path); configdata[i].setting = pstrdup(path); +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -116,7 +116,7 @@ endif + + libdir := @libdir@ + +-pkglibdir = $(libdir) ++pkglibdir = @out@/lib + ifeq "$(findstring pgsql, $(pkglibdir))" "" + ifeq "$(findstring postgres, $(pkglibdir))" "" + override pkglibdir := $(pkglibdir)/postgresql diff --git a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch b/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch deleted file mode 100644 index b94fc9efcbff..000000000000 --- a/pkgs/servers/sql/postgresql/patches/specify_pkglibdir_at_runtime.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/src/port/path.c -+++ b/src/port/path.c -@@ -714,7 +714,11 @@ - void - get_lib_path(const char *my_exec_path, char *ret_path) - { -- make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); -+ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); -+ if(nix_pglibdir == NULL) -+ make_relative_path(ret_path, LIBDIR, PGBINDIR, my_exec_path); -+ else -+ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); - } - - /* -@@ -723,7 +727,11 @@ - void - get_pkglib_path(const char *my_exec_path, char *ret_path) - { -- make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); -+ char const * const nix_pglibdir = getenv("NIX_PGLIBDIR"); -+ if(nix_pglibdir == NULL) -+ make_relative_path(ret_path, PKGLIBDIR, PGBINDIR, my_exec_path); -+ else -+ make_relative_path(ret_path, nix_pglibdir, PGBINDIR, my_exec_path); - } - - /* From 77977286d80c9bfb77cbf80989d41c59d66dccf8 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 3 Mar 2024 17:50:31 +0100 Subject: [PATCH 062/481] postgresql: move libecpq to lib output This library is used by other packages, so should be in the lib output. By removing unused sections, libecpg will not contain any references to other outputs and thus does not increase the closure for the lib output anymore. This will also help massively when splitting a dev output later. As a side-effect, this also unbreaks pkgsMusl.postgresql_12_jit and pkgsMusl.postgresql_13_jit. For, at least to me, unknown reasons, those build fine now. --- pkgs/servers/sql/postgresql/generic.nix | 42 ++++++++++++++----- .../patches/export-dynamic-darwin-15-.patch | 13 ++++++ 2 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index a8610c8e487b..fc6087cde870 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -23,7 +23,7 @@ let # JIT , jitSupport - , nukeReferences, patchelf, llvmPackages + , nukeReferences, patchelf, llvmPackages, overrideCC # PL/Python , pythonSupport ? false @@ -43,7 +43,14 @@ let pname = "postgresql"; - stdenv' = if jitSupport then llvmPackages.stdenv else stdenv; + stdenv' = + if jitSupport then + overrideCC llvmPackages.stdenv (llvmPackages.stdenv.cc.override { + # LLVM bintools are not used by default, but are needed to make -flto work below. + bintools = llvmPackages.bintools; + }) + else + stdenv; in stdenv'.mkDerivation (finalAttrs: { inherit version; pname = pname + lib.optionalString jitSupport "-jit"; @@ -53,10 +60,15 @@ let inherit hash; }; + __structuredAttrs = true; + hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; outputs = [ "out" "lib" "doc" "man" ]; setOutputFlags = false; # $out retains configureFlags :-/ + outputChecks.lib = { + disallowedReferences = [ "out" "doc" "man" ]; + }; buildInputs = [ zlib @@ -87,9 +99,17 @@ let buildFlags = [ "world" ]; - # Makes cross-compiling work when xml2-config can't be executed on the host. - # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6 - env.NIX_CFLAGS_COMPILE = lib.optionalString (olderThan "13") "-I${libxml2.dev}/include/libxml2"; + # libpgcommon.a and libpgport.a contain all paths returned by pg_config and are linked + # into all binaries. However, almost no binaries actually use those paths. The following + # flags will remove unused sections from all shared libraries and binaries - including + # those paths. This avoids a lot of circular dependency problems with different outputs, + # and allows splitting them cleanly. + env.CFLAGS = "-fdata-sections -ffunction-sections" + + (if stdenv'.cc.isClang then " -flto" else " -fmerge-constants -Wl,--gc-sections") + + lib.optionalString (stdenv'.isDarwin && jitSupport) " -fuse-ld=lld" + # Makes cross-compiling work when xml2-config can't be executed on the host. + # Fixed upstream in https://github.com/postgres/postgres/commit/0bc8cebdb889368abdf224aeac8bc197fe4c9ae6 + + lib.optionalString (olderThan "13") " -I${libxml2.dev}/include/libxml2"; configureFlags = [ "--with-openssl" @@ -106,7 +126,10 @@ let ++ lib.optionals gssSupport [ "--with-gssapi" ] ++ lib.optionals pythonSupport [ "--with-python" ] ++ lib.optionals jitSupport [ "--with-llvm" ] - ++ lib.optionals stdenv'.isLinux [ "--with-pam" ]; + ++ lib.optionals stdenv'.isLinux [ "--with-pam" ] + # This could be removed once the upstream issue is resolved: + # https://postgr.es/m/flat/427c7c25-e8e1-4fc5-a1fb-01ceff185e5b%40technowledgy.de + ++ lib.optionals (stdenv'.isDarwin && atLeast "16") [ "LDFLAGS_EX_BE=-Wl,-export_dynamic" ]; patches = [ (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) @@ -123,6 +146,8 @@ let map fetchurl (lib.attrValues muslPatches) ) ++ lib.optionals stdenv'.isLinux [ (if atLeast "13" then ./patches/socketdir-in-run-13+.patch else ./patches/socketdir-in-run.patch) + ] ++ lib.optionals (stdenv'.isDarwin && olderThan "16") [ + ./patches/export-dynamic-darwin-15-.patch ]; installTargets = [ "install-world" ]; @@ -137,7 +162,6 @@ let '' moveToOutput "lib/libpgcommon*.a" "$out" moveToOutput "lib/libpgport*.a" "$out" - moveToOutput "lib/libecpg*" "$out" # Prevent a retained dependency on gcc-wrapper. substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld @@ -254,9 +278,7 @@ let # resulting LLVM IR isn't platform-independent this doesn't give you much. # In fact, I tried to test the result in a VM-test, but as soon as JIT was used to optimize # a query, postgres would coredump with `Illegal instruction`. - broken = (jitSupport && stdenv.hostPlatform != stdenv.buildPlatform) - # Allmost all tests fail FATAL errors for v12 and v13 - || (jitSupport && stdenv.hostPlatform.isMusl && olderThan "14"); + broken = jitSupport && !stdenv.hostPlatform.canExecute stdenv.buildPlatform; }; }); diff --git a/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch b/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch new file mode 100644 index 000000000000..fa0f4be4de7f --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/export-dynamic-darwin-15-.patch @@ -0,0 +1,13 @@ +See https://postgr.es/m/eb249761-56e2-4e42-a2c5-b9ae18c1ca1f%40technowledgy.de +--- +--- a/src/makefiles/Makefile.darwin ++++ b/src/makefiles/Makefile.darwin +@@ -5,6 +5,8 @@ DLSUFFIX = .so + # env var name to use in place of LD_LIBRARY_PATH + ld_library_path_var = DYLD_LIBRARY_PATH + ++export_dynamic = -Wl,-export_dynamic ++ + ifdef PGXS + BE_DLLLIBS = -bundle_loader $(bindir)/postgres + else From 435f51c37faf74375134dfbd7c5a4560da2a9ea7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 4 Mar 2024 21:26:50 +0100 Subject: [PATCH 063/481] postgresql: split dev output This splits a dev output to make the default output not depend on any build dependencies anymore. This also avoids removing references from pgxs' Makefile this way, which should, at least theoretically, be good to build extensions via pgxs, making sure they use the same tooling. ecpg is the "embedded SQL C preprocessor", which is certainly a dev tool. Most important, for closure size anyway, is to move pg_config to the dev output, since it retains paths to all the other outputs. The only thing with references to the dev output remaining is then the postgres binary itself. It contains all the output paths, because it shows those in the pg_config system view. There is no other way than to nuke those references to avoid circular dependencies between outputs - and blowing up closure size again. --- .../manual/release-notes/rl-2411.section.md | 2 + .../modules/services/databases/postgresql.md | 4 + pkgs/servers/sql/postgresql/generic.nix | 73 +++++++++++++------ .../patches/empty-pg-config-view-15+.patch | 54 ++++++++++++++ .../patches/empty-pg-config-view.patch | 50 +++++++++++++ .../patches/paths-for-split-outputs.patch | 2 +- 6 files changed, 160 insertions(+), 25 deletions(-) create mode 100644 pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch create mode 100644 pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 98e5f961624f..9feef0c04fc5 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -298,6 +298,8 @@ - Docker now defaults to 27.x, because version 24.x stopped receiving security updates and bug fixes after [February 1, 2024](https://github.com/moby/moby/pull/46772#discussion_r1686464084). +- `postgresql` was split into default and -dev outputs. To make this work without circular dependencies, the output of the `pg_config` system view has been removed. The `pg_config` binary is provided in the -dev output and still works as expected. + - `keycloak` was updated to version 25, which introduces new hostname related options. See [Upgrading Guide](https://www.keycloak.org/docs/25.0.1/upgrading/#migrating-to-25-0-0) for instructions. diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index e76f127335c7..4de0ca9d2e90 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -362,3 +362,7 @@ postgresql.withJIT.pname ``` evaluates to `"foobar"`. + +## Notable differences to upstream + +- To avoid circular dependencies between default and -dev outputs, the output of the `pg_config` system view has been removed. diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index fc6087cde870..0ba6a7085ecb 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -6,6 +6,7 @@ let , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , linux-pam + , removeReferencesTo # This is important to obtain a version of `libpq` that does not depend on systemd. , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic @@ -64,10 +65,26 @@ let hardeningEnable = lib.optionals (!stdenv'.cc.isClang) [ "pie" ]; - outputs = [ "out" "lib" "doc" "man" ]; - setOutputFlags = false; # $out retains configureFlags :-/ + outputs = [ "out" "dev" "doc" "lib" "man" ]; + outputChecks.out = { + disallowedReferences = [ "dev" "doc" "man" ]; + disallowedRequisites = [ + stdenv'.cc + ] ++ ( + map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs) + ) ++ lib.optionals jitSupport [ + llvmPackages.llvm.out + ]; + }; outputChecks.lib = { - disallowedReferences = [ "out" "doc" "man" ]; + disallowedReferences = [ "out" "dev" "doc" "man" ]; + disallowedRequisites = [ + stdenv'.cc + ] ++ ( + map lib.getDev (builtins.filter (drv: drv ? "dev") finalAttrs.buildInputs) + ) ++ lib.optionals jitSupport [ + llvmPackages.llvm.out + ]; }; buildInputs = [ @@ -90,6 +107,7 @@ let nativeBuildInputs = [ makeWrapper pkg-config + removeReferencesTo ] ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; @@ -116,7 +134,6 @@ let "--with-libxml" "--with-icu" "--sysconfdir=/etc" - "--libdir=$(lib)/lib" "--with-system-tzdata=${tzdata}/share/zoneinfo" "--enable-debug" (lib.optionalString systemdSupport' "--with-systemd") @@ -133,6 +150,7 @@ let patches = [ (if atLeast "16" then ./patches/relative-to-symlinks-16+.patch else ./patches/relative-to-symlinks.patch) + (if atLeast "15" then ./patches/empty-pg-config-view-15+.patch else ./patches/empty-pg-config-view.patch) ./patches/less-is-more.patch ./patches/paths-for-split-outputs.patch ./patches/paths-with-postgresql-suffix.patch @@ -154,21 +172,38 @@ let postPatch = '' substituteInPlace "src/Makefile.global.in" --subst-var out - # Hardcode the path to pgxs so pg_config returns the path in $out - substituteInPlace "src/common/config_info.c" --subst-var out + # Hardcode the path to pgxs so pg_config returns the path in $dev + substituteInPlace "src/common/config_info.c" --subst-var dev ''; postInstall = '' - moveToOutput "lib/libpgcommon*.a" "$out" - moveToOutput "lib/libpgport*.a" "$out" + moveToOutput "bin/ecpg" "$dev" + moveToOutput "lib/pgxs" "$dev" - # Prevent a retained dependency on gcc-wrapper. - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/ld ld + # Pretend pg_config is located in $out/bin to return correct paths, but + # actually have it in -dev to avoid pulling in all other outputs. + moveToOutput "bin/pg_config" "$dev" + # To prevent a "pg_config: could not find own program executable" error, we fake + # pg_config in the default output. + cat << EOF > "$out/bin/pg_config" && chmod +x "$out/bin/pg_config" + #!${stdenv'.shell} + echo The real pg_config can be found in the -dev output. + exit 1 + EOF + wrapProgram "$dev/bin/pg_config" --argv0 "$out/bin/pg_config" + + # postgres exposes external symbols get_pkginclude_path and similar. Those + # can't be stripped away by --gc-sections/LTO, because they could theoretically + # be used by dynamically loaded modules / extensions. To avoid circular dependencies, + # references to -dev, -doc and -man are removed here. References to -lib must be kept, + # because there is a realistic use-case for extensions to locate the /lib directory to + # load other shared modules. + remove-references-to -t "$dev" -t "$doc" -t "$man" "$out/bin/postgres" if [ -z "''${dontDisableStatic:-}" ]; then # Remove static libraries in case dynamic are available. - for i in $out/lib/*.a $lib/lib/*.a; do + for i in $lib/lib/*.a; do name="$(basename "$i")" ext="${stdenv'.hostPlatform.extensions.sharedLibrary}" if [ -e "$lib/lib/''${name%.a}$ext" ] || [ -e "''${i%.a}$ext" ]; then @@ -176,21 +211,13 @@ let fi done fi + # The remaining static libraries are libpgcommon.a, libpgport.a and related. + # Those are only used when building e.g. extensions, so go to $dev. + moveToOutput "lib/*.a" "$dev" '' + lib.optionalString jitSupport '' # In the case of JIT support, prevent a retained dependency on clang-wrapper - substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv'.cc}/bin/clang clang nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) - # Stop out depending on the default output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${llvmPackages.llvm.out}/bin "" \ - --replace '$(LLVM_BINPATH)/' "" - - # Stop out depending on the -dev output of llvm - substituteInPlace $out/lib/pgxs/src/Makefile.global \ - --replace ${llvmPackages.llvm.dev}/bin/llvm-config llvm-config \ - --replace -I${llvmPackages.llvm.dev}/include "" - ${lib.optionalString (!stdenv'.isDarwin) '' # Stop lib depending on the -dev output of llvm rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) @@ -210,8 +237,6 @@ let # autodetection doesn't seem to able to find this, but it's there. checkTarget = "check"; - disallowedReferences = [ stdenv'.cc ]; - passthru = let this = self.callPackage generic args; jitToggle = this.override { diff --git a/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch new file mode 100644 index 000000000000..c83e6964cf45 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view-15+.patch @@ -0,0 +1,54 @@ +Empty the pg_config system information view. This view keeps references to +several -dev outputs, which we want to avoid to keep closure size down. + +The alternative to this patch would be to nuke references across the board, +but this will also affect the output of the pg_config utility. By emptying +the view only, we keep the pg_config binary intact. It resides in the -dev +output, so it's fine to have all those references there. + +--- +--- a/src/backend/utils/misc/pg_config.c ++++ b/src/backend/utils/misc/pg_config.c +@@ -32,20 +32,5 @@ pg_config(PG_FUNCTION_ARGS) + /* initialize our tuplestore */ + InitMaterializedSRF(fcinfo, 0); + +- configdata = get_configdata(my_exec_path, &configdata_len); +- for (i = 0; i < configdata_len; i++) +- { +- Datum values[2]; +- bool nulls[2]; +- +- memset(values, 0, sizeof(values)); +- memset(nulls, 0, sizeof(nulls)); +- +- values[0] = CStringGetTextDatum(configdata[i].name); +- values[1] = CStringGetTextDatum(configdata[i].setting); +- +- tuplestore_putvalues(rsinfo->setResult, rsinfo->setDesc, values, nulls); +- } +- + return (Datum) 0; + } +--- a/src/test/regress/expected/sysviews.out ++++ b/src/test/regress/expected/sysviews.out +@@ -29,7 +29,7 @@ select name, ident, parent, level, total_bytes >= free_bytes + (1 row) + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + ok + ---- + t +--- a/src/test/regress/sql/sysviews.sql ++++ b/src/test/regress/sql/sysviews.sql +@@ -18,7 +18,7 @@ select name, ident, parent, level, total_bytes >= free_bytes + from pg_backend_memory_contexts where level = 0; + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + + -- We expect no cursors in this test; see also portals.sql + select count(*) = 0 as ok from pg_cursors; diff --git a/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch new file mode 100644 index 000000000000..98e4b8151431 --- /dev/null +++ b/pkgs/servers/sql/postgresql/patches/empty-pg-config-view.patch @@ -0,0 +1,50 @@ +Empty the pg_config system information view. This view keeps references to +several -dev outputs, which we want to avoid to keep closure size down. + +The alternative to this patch would be to nuke references across the board, +but this will also affect the output of the pg_config utility. By emptying +the view only, we keep the pg_config binary intact. It resides in the -dev +output, so it's fine to have all those references there. + +--- +--- a/src/backend/utils/misc/pg_config.c ++++ b/src/backend/utils/misc/pg_config.c +@@ -69,16 +69,6 @@ pg_config(PG_FUNCTION_ARGS) + /* initialize our tuplestore */ + tupstore = tuplestore_begin_heap(true, false, work_mem); + +- configdata = get_configdata(my_exec_path, &configdata_len); +- for (i = 0; i < configdata_len; i++) +- { +- values[0] = configdata[i].name; +- values[1] = configdata[i].setting; +- +- tuple = BuildTupleFromCStrings(attinmeta, values); +- tuplestore_puttuple(tupstore, tuple); +- } +- + /* + * no longer need the tuple descriptor reference created by + * TupleDescGetAttInMetadata() +--- a/src/test/regress/expected/sysviews.out ++++ b/src/test/regress/expected/sysviews.out +@@ -20,7 +20,7 @@ select count(*) >= 0 as ok from pg_available_extensions; + (1 row) + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + ok + ---- + t +--- a/src/test/regress/sql/sysviews.sql ++++ b/src/test/regress/sql/sysviews.sql +@@ -13,7 +13,7 @@ select count(*) >= 0 as ok from pg_available_extension_versions; + select count(*) >= 0 as ok from pg_available_extensions; + + -- At introduction, pg_config had 23 entries; it may grow +-select count(*) > 20 as ok from pg_config; ++select count(*) = 0 as ok from pg_config; + + -- We expect no cursors in this test; see also portals.sql + select count(*) = 0 as ok from pg_cursors; diff --git a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch index fca7aa10fc83..46164bba2555 100644 --- a/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch +++ b/pkgs/servers/sql/postgresql/patches/paths-for-split-outputs.patch @@ -4,7 +4,7 @@ i++; configdata[i].name = pstrdup("PGXS"); -+ strlcpy(path, "@out@/lib", sizeof(path)); ++ strlcpy(path, "@dev@/lib", sizeof(path)); - get_pkglib_path(my_exec_path, path); strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path)); cleanup_path(path); From 94d432ce88b6dff272a17b4ed15dbefca14097fc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 8 Mar 2024 09:52:58 +0100 Subject: [PATCH 064/481] postgresql: remove references to llvm-dev on darwin as well The !isDarwin condition seems to have been put in place only because of the use of patchelf, which in turn seemed to be necessary because of nuke-refs. Replacing the big nuke with the more granular remove-references-to allows enabling this for darwin, too. --- pkgs/servers/sql/postgresql/generic.nix | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 0ba6a7085ecb..fcd8e335aac5 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -24,7 +24,7 @@ let # JIT , jitSupport - , nukeReferences, patchelf, llvmPackages, overrideCC + , nukeReferences, llvmPackages, overrideCC # PL/Python , pythonSupport ? false @@ -40,6 +40,8 @@ let lz4Enabled = atLeast "14"; zstdEnabled = atLeast "15"; + dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; + systemdSupport' = if enableSystemd == null then systemdSupport else (lib.warn "postgresql: argument enableSystemd is deprecated, please use systemdSupport instead." enableSystemd); pname = "postgresql"; @@ -109,7 +111,7 @@ let pkg-config removeReferencesTo ] - ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences patchelf ]; + ++ lib.optionals jitSupport [ llvmPackages.llvm.dev nukeReferences ]; enableParallelBuilding = true; @@ -218,13 +220,8 @@ let # In the case of JIT support, prevent a retained dependency on clang-wrapper nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) - ${lib.optionalString (!stdenv'.isDarwin) '' - # Stop lib depending on the -dev output of llvm - rpath=$(patchelf --print-rpath $out/lib/llvmjit.so) - nuke-refs -e $out $out/lib/llvmjit.so - # Restore the correct rpath - patchelf $out/lib/llvmjit.so --set-rpath "$rpath" - ''} + # Stop lib depending on the -dev output of llvm + remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}" ''; postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") @@ -244,13 +241,13 @@ let }; in { + inherit dlSuffix; + psqlSchema = lib.versions.major version; withJIT = if jitSupport then this else jitToggle; withoutJIT = if jitSupport then jitToggle else this; - dlSuffix = if olderThan "16" then ".so" else stdenv.hostPlatform.extensions.sharedLibrary; - pkgs = let scope = { inherit jitSupport; From dfde86f73857f575ae79785c1da9496599b38b2c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Tue, 30 Jul 2024 20:36:59 +0200 Subject: [PATCH 065/481] postgresql: refactor removal of references in bitcode files This prevents silently ignoring errors from "find". --- pkgs/servers/sql/postgresql/generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index fcd8e335aac5..4d9b1ac95ee1 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -217,8 +217,8 @@ let # Those are only used when building e.g. extensions, so go to $dev. moveToOutput "lib/*.a" "$dev" '' + lib.optionalString jitSupport '' - # In the case of JIT support, prevent a retained dependency on clang-wrapper - nuke-refs $out/lib/llvmjit_types.bc $(find $out/lib/bitcode -type f) + # In the case of JIT support, prevent useless dependencies on header files + find "$out/lib" -iname '*.bc' -type f -exec nuke-refs '{}' + # Stop lib depending on the -dev output of llvm remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}" From 73cb40366df17b3224970ae80e64527687bd5023 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 1 Jun 2024 17:32:35 +0200 Subject: [PATCH 066/481] postgresql: refactor to simplify condition glibc is not available on darwin anyway and isGnu is just shorter. --- pkgs/servers/sql/postgresql/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 4d9b1ac95ee1..bd9199c93026 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -224,7 +224,7 @@ let remove-references-to -t ${llvmPackages.llvm.dev} "$out/lib/llvmjit${dlSuffix}" ''; - postFixup = lib.optionalString (!stdenv'.isDarwin && stdenv'.hostPlatform.libc == "glibc") + postFixup = lib.optionalString stdenv'.hostPlatform.isGnu '' # initdb needs access to "locale" command from glibc. wrapProgram $out/bin/initdb --prefix PATH ":" ${glibc.bin}/bin From 19770f0097f4436c2b3147ad0f489ce08e84463a Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 23 Aug 2024 21:41:14 +0100 Subject: [PATCH 067/481] maturin: 1.7.0 -> 1.7.1 Changes: https://github.com/PyO3/maturin/releases/tag/v1.7.1 --- pkgs/by-name/ma/maturin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index d075c1882bb9..91ed83ea9715 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-SjINeNtCbyMp3U+Op7ey+8lV7FYxLVpmO5g1a01ouBs="; + hash = "sha256-kFhY2ixZZrSA/YxLCQDLPjLqNWQI3zl5V1MLTPqQH60="; }; - cargoHash = "sha256-xJafCgpCeihyORj3gIVUus74vu9h3N1xuyKvkxSqYK4="; + cargoHash = "sha256-ik6kFS66umiHf0M1fE+6++zpZF4gJrN9LQ2l+vi9SSY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From ee075da75169ba8067d161dd31e180060fa82cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 14 Aug 2024 08:24:29 -0700 Subject: [PATCH 068/481] python312Packages.pybind11: 2.13.1 -> 2.13.5 Diff: https://github.com/pybind/pybind11/compare/v2.13.1...v2.13.5 Changelog: https://github.com/pybind/pybind11/blob/v2.13.5/docs/changelog.rst --- pkgs/development/python-modules/pybind11/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index 9ca1e3769566..6dab8d700d1e 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -50,14 +50,14 @@ let in buildPythonPackage rec { pname = "pybind11"; - version = "2.13.1"; + version = "2.13.5"; pyproject = true; src = fetchFromGitHub { owner = "pybind"; repo = "pybind11"; rev = "v${version}"; - hash = "sha256-sQUq39CmgsDEMfluKMrrnC5fio//pgExcyqJAE00UjU="; + hash = "sha256-cpxhrTFihA+gWmX62a+EQF3lccUyvu+d1MU2IC/CN6Q="; }; build-system = [ From 6e725d468c2bf2efcd732e2c1880bc32c4c3ee8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 24 Aug 2024 00:39:58 +0200 Subject: [PATCH 069/481] libpsl: don't make first output conditional if build statically This can cause surprises if no output is chosen. --- pkgs/development/libraries/libpsl/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index f1b2fbbab4fb..1659a55cb4ef 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -23,8 +23,9 @@ stdenv.mkDerivation rec { hash = "sha256-mp9qjG7bplDPnqVUdc0XLdKEhzFoBOnHMgLZdXLNOi0="; }; - # bin/psl-make-dafsa brings a large runtime closure through python3 - outputs = lib.optional (!stdenv.hostPlatform.isStatic) "bin" ++ [ "out" "dev" ]; + outputs = [ "out" "dev" ] + # bin/psl-make-dafsa brings a large runtime closure through python3 + ++ lib.optional (!stdenv.hostPlatform.isStatic) "bin"; nativeBuildInputs = [ autoreconfHook @@ -77,7 +78,7 @@ stdenv.mkDerivation rec { the domain in a user interface or sorting domain lists by site. ''; homepage = "https://rockdaboot.github.io/libpsl/"; - changelog = "https://raw.githubusercontent.com/rockdaboot/${pname}/${pname}-${version}/NEWS"; + changelog = "https://raw.githubusercontent.com/rockdaboot/libpsl/libpsl-${version}/NEWS"; license = licenses.mit; maintainers = [ maintainers.c0bw3b ]; mainProgram = "psl"; From 17c9dc89607b35948c2aa611ef5b638e543c6d5e Mon Sep 17 00:00:00 2001 From: hexacera Date: Thu, 22 Aug 2024 23:27:30 +0800 Subject: [PATCH 070/481] svt-av1: 2.1.2 -> 2.2.0 Release notes: https://gitlab.com/AOMediaCodec/SVT-AV1/-/tags/v2.2.0 --- pkgs/tools/video/svt-av1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 4ffa2892195c..e9d2c4b571fe 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - hash = "sha256-jrfnUcDTbrf3wWs0D57ueeLmndhpOQChM7gBB14MzcQ="; + hash = "sha256-LkTcy+CiuhlRnQsjNMA0hTVRVx7pbYs1ujMWjLrhvEU="; }; nativeBuildInputs = [ From 2e73274b605341828eb1aae87087c694eb29ad18 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 24 Aug 2024 02:11:20 -0400 Subject: [PATCH 071/481] veilid: add updateScript --- pkgs/tools/networking/veilid/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix index ad78af648d21..c41f4b414af0 100644 --- a/pkgs/tools/networking/veilid/default.nix +++ b/pkgs/tools/networking/veilid/default.nix @@ -9,6 +9,7 @@ , cmake , testers , veilid +, gitUpdater }: rustPlatform.buildRustPackage rec { @@ -54,9 +55,12 @@ rustPlatform.buildRustPackage rec { moveToOutput "lib" "$lib" ''; - passthru.tests = { - veilid-version = testers.testVersion { - package = veilid; + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests = { + veilid-version = testers.testVersion { + package = veilid; + }; }; }; From 1efcffa700a0650bfab2beb40b6e538d2bfb4bfc Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 23 Aug 2024 21:34:11 +0200 Subject: [PATCH 072/481] stdenv: support default values in concatTo The previously used pattern was introduced in #318614, but technically leaked the default flags into the global scope. While this would probably not make much of a practical difference, making concatTo support default values is a much cleaner approach. --- pkgs/build-support/setup-hooks/autoreconf.sh | 7 +++-- pkgs/by-name/ni/ninja/setup-hook.sh | 3 +-- pkgs/stdenv/generic/setup.sh | 27 ++++++++++---------- pkgs/test/stdenv/default.nix | 13 ++++++++-- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index 763ea649c1c4..bb168aad4c51 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -4,8 +4,11 @@ autoreconfPhase() { runHook preAutoreconf local flagsArray=() - : "${autoreconfFlags:=--install --force --verbose}" - concatTo flagsArray autoreconfFlags + if [[ -v autoreconfFlags ]]; then + concatTo flagsArray autoreconfFlags + else + flagsArray+=(--install --force --verbose) + fi autoreconf "${flagsArray[@]}" runHook postAutoreconf diff --git a/pkgs/by-name/ni/ninja/setup-hook.sh b/pkgs/by-name/ni/ninja/setup-hook.sh index 4f3bc5b5acfa..4573aceea3c6 100644 --- a/pkgs/by-name/ni/ninja/setup-hook.sh +++ b/pkgs/by-name/ni/ninja/setup-hook.sh @@ -65,8 +65,7 @@ ninjaInstallPhase() { local flagsArray=( "-j$buildCores" ) - : "${installTargets:=install}" - concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets + concatTo flagsArray ninjaFlags ninjaFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" TERM=dumb ninja "${flagsArray[@]}" diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 1b4f7a89d358..3c197171e801 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -387,12 +387,16 @@ appendToVar() { # Accumulate flags from the named variables $2+ into the indexed array $1. # # Arrays are simply concatenated, strings are split on whitespace. +# Default values can be passed via name=default. concatTo() { local -n targetref="$1"; shift - local name type - for name in "$@"; do - if type=$(declare -p "$name" 2> /dev/null); then - local -n nameref="$name" + local arg default name type + for arg in "$@"; do + IFS="=" read -r name default <<< "$arg" + local -n nameref="$name" + if [[ ! -n "${nameref[@]}" && -n "$default" ]]; then + targetref+=( "$default" ) + elif type=$(declare -p "$name" 2> /dev/null); then case "${type#* }" in -A*) echo "concatTo(): ERROR: trying to use concatTo on an associative array." >&2 @@ -1340,8 +1344,7 @@ patchPhase() { esac local -a flagsArray - : "${patchFlags:=-p1}" - concatTo flagsArray patchFlags + concatTo flagsArray patchFlags=-p1 # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.) # shellcheck disable=SC2086 $uncompress < "$i" 2>&1 | patch "${flagsArray[@]}" @@ -1493,8 +1496,7 @@ checkPhase() { SHELL="$SHELL" ) - : "${checkFlags:=VERBOSE=y}" - concatTo flagsArray makeFlags makeFlagsArray checkFlags checkFlagsArray checkTarget + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1528,8 +1530,7 @@ installPhase() { SHELL="$SHELL" ) - : "${installTargets:=install}" - concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1612,9 +1613,8 @@ installCheckPhase() { SHELL="$SHELL" ) - : "${installCheckTarget:=installcheck}" concatTo flagsArray makeFlags makeFlagsArray \ - installCheckFlags installCheckFlagsArray installCheckTarget + installCheckFlags installCheckFlagsArray installCheckTarget=installcheck echoCmd 'installcheck flags' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -1629,8 +1629,7 @@ distPhase() { runHook preDist local flagsArray=() - : "${distTarget:=dist}" - concatTo flagsArray distFlags distFlagsArray distTarget + concatTo flagsArray distFlags distFlagsArray distTarget=dist echo 'dist flags: %q' "${flagsArray[@]}" make ${makefile:+-f $makefile} "${flagsArray[@]}" diff --git a/pkgs/test/stdenv/default.nix b/pkgs/test/stdenv/default.nix index a5b571b5a9f4..6ed430f5da3f 100644 --- a/pkgs/test/stdenv/default.nix +++ b/pkgs/test/stdenv/default.nix @@ -109,21 +109,30 @@ let declare -A associativeArray=(["X"]="Y") [[ $(concatTo nowhere associativeArray 2>&1) =~ "trying to use" ]] || (echo "concatTo did not throw concatenating associativeArray" && false) + empty_array=() + empty_string="" + declare -a flagsArray - concatTo flagsArray string list + concatTo flagsArray string list notset=e=f empty_array=g empty_string=h declare -p flagsArray [[ "''${flagsArray[0]}" == "a" ]] || (echo "'\$flagsArray[0]' was not 'a'" && false) [[ "''${flagsArray[1]}" == "b" ]] || (echo "'\$flagsArray[1]' was not 'b'" && false) [[ "''${flagsArray[2]}" == "c" ]] || (echo "'\$flagsArray[2]' was not 'c'" && false) [[ "''${flagsArray[3]}" == "d" ]] || (echo "'\$flagsArray[3]' was not 'd'" && false) + [[ "''${flagsArray[4]}" == "e=f" ]] || (echo "'\$flagsArray[4]' was not 'e=f'" && false) + [[ "''${flagsArray[5]}" == "g" ]] || (echo "'\$flagsArray[5]' was not 'g'" && false) + [[ "''${flagsArray[6]}" == "h" ]] || (echo "'\$flagsArray[6]' was not 'h'" && false) # test concatenating to unset variable - concatTo nonExistant string list + concatTo nonExistant string list notset=e=f empty_array=g empty_string=h declare -p nonExistant [[ "''${nonExistant[0]}" == "a" ]] || (echo "'\$nonExistant[0]' was not 'a'" && false) [[ "''${nonExistant[1]}" == "b" ]] || (echo "'\$nonExistant[1]' was not 'b'" && false) [[ "''${nonExistant[2]}" == "c" ]] || (echo "'\$nonExistant[2]' was not 'c'" && false) [[ "''${nonExistant[3]}" == "d" ]] || (echo "'\$nonExistant[3]' was not 'd'" && false) + [[ "''${nonExistant[4]}" == "e=f" ]] || (echo "'\$nonExistant[4]' was not 'e=f'" && false) + [[ "''${nonExistant[5]}" == "g" ]] || (echo "'\$nonExistant[5]' was not 'g'" && false) + [[ "''${nonExistant[6]}" == "h" ]] || (echo "'\$nonExistant[6]' was not 'h'" && false) eval "$extraTest" From f96e20895fbbde870aec134d04352b55f6344865 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 16:22:35 +0200 Subject: [PATCH 073/481] bmake: support structuredAttrs in setup hook Tested libfsm with and without __structuredAttrs. --- pkgs/by-name/bm/bmake/setup-hook.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/bm/bmake/setup-hook.sh b/pkgs/by-name/bm/bmake/setup-hook.sh index a36d024b111e..d6a7c4aafa0f 100644 --- a/pkgs/by-name/bm/bmake/setup-hook.sh +++ b/pkgs/by-name/bm/bmake/setup-hook.sh @@ -14,9 +14,8 @@ bmakeBuildPhase() { local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"} ) + concatTo flagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray echoCmd 'build flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -42,11 +41,8 @@ bmakeCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"} - ${checkTarget} ) + concatTo flagsArray makeFlags makeFlagsArray checkFlags=VERBOSE=y checkFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -65,11 +61,8 @@ bmakeInstallPhase() { local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} SHELL="$SHELL" - # Old bash empty array hack - $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"} - $installFlags ${installFlagsArray+"${installFlagsArray[@]}"} - ${installTargets:-install} ) + concatTo flagsArray makeFlags makeFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" @@ -84,10 +77,8 @@ bmakeDistPhase() { mkdir -p "$prefix" fi - # Old bash empty array hack - local flagsArray=( - $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist} - ) + local flagsArray=() + concatTo flagsArray distFlags distFlagsArray distTarget=dist echo 'dist flags: %q' "${flagsArray[@]}" bmake ${makefile:+-f $makefile} "${flagsArray[@]}" From c3900d12c9805df2ad26b24c0475de4f951f25d2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 16:24:40 +0200 Subject: [PATCH 074/481] just: support structuredAttrs in setup hook Tested cosmic-applibrary with and without __structuredAttrs. --- pkgs/by-name/ju/just/setup-hook.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ju/just/setup-hook.sh b/pkgs/by-name/ju/just/setup-hook.sh index 0ffcfc187ebf..4f260714483f 100644 --- a/pkgs/by-name/ju/just/setup-hook.sh +++ b/pkgs/by-name/ju/just/setup-hook.sh @@ -1,7 +1,8 @@ justBuildPhase() { runHook preBuild - local flagsArray=($justFlags "${justFlagsArray[@]}") + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray echoCmd 'build flags' "${flagsArray[@]}" just "${flagsArray[@]}" @@ -21,10 +22,8 @@ justCheckPhase() { if [ -z "${checkTarget:-}" ]; then echo "no test target found in just, doing nothing" else - local flagsArray=( - $justFlags "${justFlagsArray[@]}" - $checkTarget - ) + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray checkTarget echoCmd 'check flags' "${flagsArray[@]}" just "${flagsArray[@]}" @@ -36,8 +35,8 @@ justCheckPhase() { justInstallPhase() { runHook preInstall - # shellcheck disable=SC2086 - local flagsArray=($justFlags "${justFlagsArray[@]}" ${installTargets:-install}) + local flagsArray=() + concatTo flagsArray justFlags justFlagsArray installTargets=install echoCmd 'install flags' "${flagsArray[@]}" just "${flagsArray[@]}" From 8affc6a06fc1a21c8dd6007b24e35a1cdff23e56 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 20:46:31 +0200 Subject: [PATCH 075/481] just: shellcheck setup hook --- pkgs/by-name/ju/just/setup-hook.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ju/just/setup-hook.sh b/pkgs/by-name/ju/just/setup-hook.sh index 4f260714483f..d171ac7610bb 100644 --- a/pkgs/by-name/ju/just/setup-hook.sh +++ b/pkgs/by-name/ju/just/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + justBuildPhase() { runHook preBuild @@ -15,7 +17,7 @@ justCheckPhase() { if [ -z "${checkTarget:-}" ]; then if just -n test >/dev/null 2>&1; then - checkTarget=test + checkTarget="test" fi fi @@ -44,14 +46,14 @@ justInstallPhase() { runHook postInstall } -if [ -z "${dontUseJustBuild-}" -a -z "${buildPhase-}" ]; then +if [ -z "${dontUseJustBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=justBuildPhase fi -if [ -z "${dontUseJustCheck-}" -a -z "${checkPhase-}" ]; then +if [ -z "${dontUseJustCheck-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=justCheckPhase fi -if [ -z "${dontUseJustInstall-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseJustInstall-}" ] && [ -z "${installPhase-}" ]; then installPhase=justInstallPhase fi From add9bca495a7f0679156e8b8869f96b433778a28 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 16:15:49 +0200 Subject: [PATCH 076/481] waf: support structuredAttrs in setup hook Tested samba4 with and without __structuredAttrs. --- pkgs/by-name/wa/waf/setup-hook.sh | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/wa/waf/setup-hook.sh b/pkgs/by-name/wa/waf/setup-hook.sh index a154ae378a07..692341fb5a04 100644 --- a/pkgs/by-name/wa/waf/setup-hook.sh +++ b/pkgs/by-name/wa/waf/setup-hook.sh @@ -16,11 +16,8 @@ wafConfigurePhase() { export PKGCONFIG="${PKG_CONFIG}" fi - local flagsArray=( - $prefixFlag - $wafConfigureFlags "${wafConfigureFlagsArray[@]}" - ${wafConfigureTargets:-configure} - ) + local flagsArray=( $prefixFlag ) + concatTo flagsArray wafConfigureFlags wafConfigureFlagsArray wafConfigureTargets=configure echoCmd 'waf configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -41,15 +38,8 @@ wafConfigurePhase() { wafBuildPhase () { runHook preBuild - # set to empty if unset - : "${wafFlags=}" - - local flagsArray=( - ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafBuildFlags ${wafBuildFlagsArray[@]} - ${wafBuildTargets:-build} - ) + local flagsArray=( ${enableParallelBuilding:+-j ${NIX_BUILD_CORES}} ) + concatTo flagsArray wafFlags wafFlagsArray wafBuildFlags wafBuildFlagsArray wafBuildTargets=build echoCmd 'waf build flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" @@ -64,12 +54,8 @@ wafInstallPhase() { mkdir -p "$prefix" fi - local flagsArray=( - ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} - $wafFlags ${wafFlagsArray[@]} - $wafInstallFlags ${wafInstallFlagsArray[@]} - ${wafInstallTargets:-install} - ) + local flagsArray=( ${enableParallelInstalling:+-j ${NIX_BUILD_CORES}} ) + concatTo flagsArray wafFlags wafFlagsArray wafInstallFlags wafInstallFlagsArray wafInstallTargets=install echoCmd 'waf install flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" From 55640420313c92c988c543ae3022009f9bfb20d7 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 18:49:39 +0200 Subject: [PATCH 077/481] zig: support structuredAttrs in setup hook Tested waylock with and without __structuredAttrs. --- .../compilers/zig/0.10/setup-hook.sh | 24 +++++++++---------- .../compilers/zig/0.11/setup-hook.sh | 24 +++++++++---------- .../compilers/zig/0.12/setup-hook.sh | 24 +++++++++---------- .../compilers/zig/0.13/setup-hook.sh | 24 +++++++++---------- .../compilers/zig/0.9/setup-hook.sh | 24 +++++++++---------- pkgs/development/compilers/zig/setup-hook.sh | 24 +++++++++---------- 6 files changed, 66 insertions(+), 78 deletions(-) diff --git a/pkgs/development/compilers/zig/0.10/setup-hook.sh b/pkgs/development/compilers/zig/0.10/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/0.10/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.10/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` diff --git a/pkgs/development/compilers/zig/0.11/setup-hook.sh b/pkgs/development/compilers/zig/0.11/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/0.11/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.11/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` diff --git a/pkgs/development/compilers/zig/0.12/setup-hook.sh b/pkgs/development/compilers/zig/0.12/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/0.12/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.12/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` diff --git a/pkgs/development/compilers/zig/0.13/setup-hook.sh b/pkgs/development/compilers/zig/0.13/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/0.13/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.13/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` diff --git a/pkgs/development/compilers/zig/0.9/setup-hook.sh b/pkgs/development/compilers/zig/0.9/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/0.9/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.9/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index 689ebec8a307..f9df7e6b558a 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -1,5 +1,6 @@ # shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { @@ -10,10 +11,9 @@ function zigSetGlobalCacheDir { function zigBuildPhase { runHook preBuild - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray echoCmd 'zig build flags' "${flagsArray[@]}" zig build "${flagsArray[@]}" @@ -24,10 +24,9 @@ function zigBuildPhase { function zigCheckPhase { runHook preCheck - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigCheckFlags "${zigCheckFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigCheckFlags zigCheckFlagsArray echoCmd 'zig check flags' "${flagsArray[@]}" zig build test "${flagsArray[@]}" @@ -38,11 +37,10 @@ function zigCheckPhase { function zigInstallPhase { runHook preInstall - local flagsArray=( - "${zigDefaultFlagsArray[@]}" - $zigBuildFlags "${zigBuildFlagsArray[@]}" - $zigInstallFlags "${zigInstallFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray zigDefaultFlagsArray \ + zigBuildFlags zigBuildFlagsArray \ + zigInstallFlags zigInstallFlagsArray if [ -z "${dontAddPrefix-}" ]; then # Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/` From e3191276d9e36fbffafa2c969b36c1569245510c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 19 Aug 2024 09:42:05 +0200 Subject: [PATCH 078/481] zig: improve shellcheck disable comments --- pkgs/development/compilers/zig/0.10/setup-hook.sh | 3 ++- pkgs/development/compilers/zig/0.11/setup-hook.sh | 3 ++- pkgs/development/compilers/zig/0.12/setup-hook.sh | 3 ++- pkgs/development/compilers/zig/0.13/setup-hook.sh | 3 ++- pkgs/development/compilers/zig/0.9/setup-hook.sh | 3 ++- pkgs/development/compilers/zig/setup-hook.sh | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/zig/0.10/setup-hook.sh b/pkgs/development/compilers/zig/0.10/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/0.10/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.10/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.11/setup-hook.sh b/pkgs/development/compilers/zig/0.11/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/0.11/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.11/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.12/setup-hook.sh b/pkgs/development/compilers/zig/0.12/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/0.12/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.12/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.13/setup-hook.sh b/pkgs/development/compilers/zig/0.13/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/0.13/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.13/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/0.9/setup-hook.sh b/pkgs/development/compilers/zig/0.9/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/0.9/setup-hook.sh +++ b/pkgs/development/compilers/zig/0.9/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index f9df7e6b558a..0053c5997da6 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -1,4 +1,4 @@ -# shellcheck shell=bash disable=SC2154,SC2086 +# shellcheck shell=bash # shellcheck disable=SC2034 readonly zigDefaultFlagsArray=(@zig_default_flags@) @@ -53,6 +53,7 @@ function zigInstallPhase { runHook postInstall } +# shellcheck disable=SC2154 addEnvHooks "$targetOffset" zigSetGlobalCacheDir if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then From 5d3e7203cea89b8db01dc18e7b2447cc6c1f4c92 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 18:58:17 +0200 Subject: [PATCH 079/481] build2: support structuredAttrs in setup hook Tested build2 itself with and without __structuredAttrs. --- .../tools/build-managers/build2/setup-hook.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/setup-hook.sh b/pkgs/development/tools/build-managers/build2/setup-hook.sh index 1259fabc0548..d5dadfe73253 100644 --- a/pkgs/development/tools/build-managers/build2/setup-hook.sh +++ b/pkgs/development/tools/build-managers/build2/setup-hook.sh @@ -16,8 +16,8 @@ build2ConfigurePhase() { "config.install.man=${!outputDoc}/share/man" "config.install.sbin=${!outputBin}/sbin" "config.install.bin.mode=755" - $build2ConfigureFlags "${build2ConfigureFlagsArray[@]}" ) + concatTo flagsArray build2ConfigureFlags build2ConfigureFlagsArray if [ -n "@isTargetDarwin@" ]; then flagsArray+=("config.bin.ld=ld64-lld") @@ -35,9 +35,8 @@ build2ConfigurePhase() { build2BuildPhase() { runHook preBuild - local flagsArray=( - $build2BuildFlags "${build2BuildFlagsArray[@]}" - ) + local flagsArray=() + concatTo flagsArray build2BuildFlags build2BuildFlagsArray echo 'build flags' "${flagsArray[@]}" b "${flagsArray[@]}" @@ -48,9 +47,8 @@ build2BuildPhase() { build2CheckPhase() { runHook preCheck - local flagsArray=( - $build2CheckFlags "${build2CheckFlags[@]}" - ) + local flagsArray=() + concatTo flagsArray build2CheckFlags build2CheckFlags echo 'check flags' "${flagsArray[@]}" @@ -62,10 +60,8 @@ build2CheckPhase() { build2InstallPhase() { runHook preInstall - local flagsArray=( - $build2InstallFlags "${build2InstallFlagsArray[@]}" - ${installTargets:-} - ) + local flagsArray=() + concatTo flagsArray build2InstallFlags build2InstallFlagsArray installTargets echo 'install flags' "${flagsArray[@]}" b install "${flagsArray[@]}" From b42b649581b9f845173bc7c6727aa2536c30f350 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 20:57:04 +0200 Subject: [PATCH 080/481] build2: shellcheck setup hook --- .../tools/build-managers/build2/setup-hook.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/build2/setup-hook.sh b/pkgs/development/tools/build-managers/build2/setup-hook.sh index d5dadfe73253..ba6b616cf417 100644 --- a/pkgs/development/tools/build-managers/build2/setup-hook.sh +++ b/pkgs/development/tools/build-managers/build2/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + build2ConfigurePhase() { runHook preConfigure @@ -19,6 +21,7 @@ build2ConfigurePhase() { ) concatTo flagsArray build2ConfigureFlags build2ConfigureFlagsArray + # shellcheck disable=SC2157 if [ -n "@isTargetDarwin@" ]; then flagsArray+=("config.bin.ld=ld64-lld") flagsArray+=("config.cc.loptions+=-fuse-ld=lld") @@ -52,7 +55,7 @@ build2CheckPhase() { echo 'check flags' "${flagsArray[@]}" - b test ${build2Dir:-.} "${flagsArray[@]}" + b test "${build2Dir:-.}" "${flagsArray[@]}" runHook postCheck } @@ -69,19 +72,20 @@ build2InstallPhase() { runHook postInstall } -if [ -z "${dontUseBuild2Configure-}" -a -z "${configurePhase-}" ]; then +if [ -z "${dontUseBuild2Configure-}" ] && [ -z "${configurePhase-}" ]; then + # shellcheck disable=SC2034 setOutputFlags= configurePhase=build2ConfigurePhase fi -if [ -z "${dontUseBuild2Build-}" -a -z "${buildPhase-}" ]; then +if [ -z "${dontUseBuild2Build-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=build2BuildPhase fi -if [ -z "${dontUseBuild2Check-}" -a -z "${checkPhase-}" ]; then +if [ -z "${dontUseBuild2Check-}" ] && [ -z "${checkPhase-}" ]; then checkPhase=build2CheckPhase fi -if [ -z "${dontUseBuild2Install-}" -a -z "${installPhase-}" ]; then +if [ -z "${dontUseBuild2Install-}" ] && [ -z "${installPhase-}" ]; then installPhase=build2InstallPhase fi From 4a48b9242cbe9bd8aaf3d630d78784c62ec461ce Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 19:06:44 +0200 Subject: [PATCH 081/481] scons: support structuredAttrs in setup hook Tested swiften with and without __structuredAttrs. --- pkgs/by-name/sc/scons/setup-hook.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sc/scons/setup-hook.sh b/pkgs/by-name/sc/scons/setup-hook.sh index bfd8f3cc07b9..ea9b919fce21 100644 --- a/pkgs/by-name/sc/scons/setup-hook.sh +++ b/pkgs/by-name/sc/scons/setup-hook.sh @@ -8,14 +8,13 @@ sconsBuildPhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - buildFlags="${prefixKey:-prefix=}$prefix $buildFlags" + prependToVar buildFlags "${prefixKey:-prefix=}$prefix" fi local flagsArray=( ${enableParallelBuilding:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $buildFlags ${buildFlagsArray[@]} ) + concatTo flagsArray sconsFlags sconsFlagsArray buildFlags buildFlagsArray echoCmd 'scons build flags' "${flagsArray[@]}" scons "${flagsArray[@]}" @@ -31,15 +30,13 @@ sconsInstallPhase() { fi if [ -z "${dontAddPrefix:-}" ] && [ -n "$prefix" ]; then - installFlags="${prefixKey:-prefix=}$prefix $installFlags" + prependToVar installFlags "${prefixKey:-prefix=}$prefix" fi local flagsArray=( ${enableParallelInstalling:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - $installFlags ${installFlagsArray[@]} - ${installTargets:-install} ) + concatTo flagsArray sconsFlags sconsFlagsArray installFlags installFlagsArray installTargets=install echoCmd 'scons install flags' "${flagsArray[@]}" scons "${flagsArray[@]}" @@ -63,9 +60,8 @@ sconsCheckPhase() { else local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} - $sconsFlags ${sconsFlagsArray[@]} - ${checkFlagsArray[@]} ) + concatTo flagsArray sconsFlags sconsFlagsArray checkFlagsArray echoCmd 'scons check flags' "${flagsArray[@]}" scons "${flagsArray[@]}" From 5c740315edaca42781cb0cf5a3b924d7cb61e965 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 19:11:33 +0200 Subject: [PATCH 082/481] scons: add missing checkTarget in setup hook The checkTarget variable is explicitly tested before, but not passed to scons. This was apparently missed in the initial commit for that setupHook in #50293. --- pkgs/by-name/sc/scons/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/sc/scons/setup-hook.sh b/pkgs/by-name/sc/scons/setup-hook.sh index ea9b919fce21..3cdb7da42453 100644 --- a/pkgs/by-name/sc/scons/setup-hook.sh +++ b/pkgs/by-name/sc/scons/setup-hook.sh @@ -61,7 +61,7 @@ sconsCheckPhase() { local flagsArray=( ${enableParallelChecking:+-j${NIX_BUILD_CORES}} ) - concatTo flagsArray sconsFlags sconsFlagsArray checkFlagsArray + concatTo flagsArray sconsFlags sconsFlagsArray checkFlagsArray checkTarget echoCmd 'scons check flags' "${flagsArray[@]}" scons "${flagsArray[@]}" From bc0468d6edfc769aefca04f0dd0ec953619ae2d9 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 19:14:23 +0200 Subject: [PATCH 083/481] premake: support structuredAttrs in setup hook Tested gmad with and without __structuredAttrs. Building it succeeded on master with structuredAttrs, but the log output showed that the configure flags were not passed correctly previously. --- pkgs/development/tools/misc/premake/setup-hook.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh index 6e65e9e8c73f..d89229f8a786 100644 --- a/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/pkgs/development/tools/misc/premake/setup-hook.sh @@ -3,9 +3,8 @@ premakeConfigurePhase() { local flagsArray=( ${premakefile:+--file=$premakefile} - $premakeFlags ${premakeFlagsArray[@]} - ${premakeBackend:-gmake} ) + concatTo flagsArray premakeFlags premakeFlagsArray premakeBackend=gmake echoCmd 'configure flags' "${flagsArray[@]}" From b072c1f723747ab7d98f344430e293cd17872449 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 21:01:20 +0200 Subject: [PATCH 084/481] premake: shellcheck setup hook --- pkgs/development/tools/misc/premake/setup-hook.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/premake/setup-hook.sh b/pkgs/development/tools/misc/premake/setup-hook.sh index d89229f8a786..c99fae4d14f8 100644 --- a/pkgs/development/tools/misc/premake/setup-hook.sh +++ b/pkgs/development/tools/misc/premake/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + premakeConfigurePhase() { runHook preConfigure From 544b981c3eb5f65ed8d56e98ee7d526a1322c4ae Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 21:25:34 +0200 Subject: [PATCH 085/481] gn: support structuredAttrs in setup hook Tested v8 with and without __structuredAttrs. --- pkgs/development/tools/build-managers/gn/setup-hook.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh index 850f18948cad..9f52f7778b9b 100644 --- a/pkgs/development/tools/build-managers/gn/setup-hook.sh +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -1,9 +1,12 @@ gnConfigurePhase() { runHook preConfigure - echo "gn flags: $gnFlags ${gnFlagsArray[@]}" + local flagsArray=() + concatTo flagsArray gnFlags gnFlagsArray - gn gen out/Release --args="$gnFlags ${gnFlagsArray[@]}" + echoCmd 'gn flags' "${flagsArray[@]}" + + gn gen out/Release --args="${flagsArray[*]}" cd out/Release/ runHook postConfigure From 5b370227d11ee87fc308fb9165813acb5626f9f2 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sun, 9 Jun 2024 21:28:37 +0200 Subject: [PATCH 086/481] gn: shellcheck setup hook --- pkgs/development/tools/build-managers/gn/setup-hook.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gn/setup-hook.sh b/pkgs/development/tools/build-managers/gn/setup-hook.sh index 9f52f7778b9b..f459e979aa0f 100644 --- a/pkgs/development/tools/build-managers/gn/setup-hook.sh +++ b/pkgs/development/tools/build-managers/gn/setup-hook.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + gnConfigurePhase() { runHook preConfigure @@ -7,11 +9,12 @@ gnConfigurePhase() { echoCmd 'gn flags' "${flagsArray[@]}" gn gen out/Release --args="${flagsArray[*]}" + # shellcheck disable=SC2164 cd out/Release/ runHook postConfigure } -if [ -z "${dontUseGnConfigure-}" -a -z "${configurePhase-}" ]; then +if [ -z "${dontUseGnConfigure-}" ] && [ -z "${configurePhase-}" ]; then configurePhase=gnConfigurePhase fi From 1bcca7d66b0a052b703d029c4593434b84136455 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 12 Jun 2024 18:31:45 +0200 Subject: [PATCH 087/481] qt: support structuredAttrs in qmake hook Tested qbs with and without __structuredAttrs. --- .../libraries/qt-5/hooks/qmake-hook.sh | 36 +++++++++---------- .../qt-5/hooks/qttools-setup-hook.sh | 2 +- .../libraries/qt-6/hooks/qmake-hook.sh | 28 +++++++-------- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh index 56607df6b4b9..f52de4e51df2 100644 --- a/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qmake-hook.sh @@ -1,40 +1,36 @@ . @fix_qmake_libtool@ -qmakeFlags=( ${qmakeFlags-} ) - qmakePrePhase() { - qmakeFlags_orig=( "${qmakeFlags[@]}" ) - # These flags must be added _before_ the flags specified in the derivation. - qmakeFlags=( \ - "PREFIX=$out" \ - "NIX_OUTPUT_OUT=$out" \ - "NIX_OUTPUT_DEV=${!outputDev}" \ - "NIX_OUTPUT_BIN=${!outputBin}" \ - "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ - "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ - "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" \ - ) + prependToVar qmakeFlags \ + "PREFIX=$out" \ + "NIX_OUTPUT_OUT=$out" \ + "NIX_OUTPUT_DEV=${!outputDev}" \ + "NIX_OUTPUT_BIN=${!outputBin}" \ + "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ + "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ + "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" if [ -n "@debug@" ]; then - qmakeFlags+=( "CONFIG+=debug" ) + prependToVar qmakeFlags "CONFIG+=debug" else - qmakeFlags+=( "CONFIG+=release" ) + prependToVar qmakeFlags "CONFIG+=release" fi # do the stripping ourselves (needed for separateDebugInfo) - qmakeFlags+=( "CONFIG+=nostrip" ) - - qmakeFlags+=( "${qmakeFlags_orig[@]}" ) + prependToVar qmakeFlags "CONFIG+=nostrip" } prePhases+=" qmakePrePhase" qmakeConfigurePhase() { runHook preConfigure + local flagsArray=() + concatTo flagsArray qmakeFlags + echo "QMAKEPATH=$QMAKEPATH" - echo qmake "${qmakeFlags[@]}" - qmake "${qmakeFlags[@]}" + echo qmake "${flagsArray[@]}" + qmake "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 diff --git a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh index c320a7974471..099c0879ed39 100644 --- a/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh +++ b/pkgs/development/libraries/qt-5/hooks/qttools-setup-hook.sh @@ -1 +1 @@ -qmakeFlags+=( "QMAKE_LRELEASE=@dev@/bin/lrelease" ) +appendToVar qmakeFlags "QMAKE_LRELEASE=@dev@/bin/lrelease" diff --git a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh index 130e8290a3fe..84b2fb153d9f 100644 --- a/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh +++ b/pkgs/development/libraries/qt-6/hooks/qmake-hook.sh @@ -1,33 +1,29 @@ . @fix_qmake_libtool@ -qmakeFlags=(${qmakeFlags-}) - qmakePrePhase() { - qmakeFlags_orig=("${qmakeFlags[@]}") - # These flags must be added _before_ the flags specified in the derivation. # TODO: these flags also need a patch which isn't applied # can we either remove these flags or update the qt5 patch? # "NIX_OUTPUT_DOC=${!outputDev}/${qtDocPrefix:?}" \ - qmakeFlags=( - "PREFIX=$out" - "NIX_OUTPUT_OUT=$out" - "NIX_OUTPUT_DEV=${!outputDev}" - "NIX_OUTPUT_BIN=${!outputBin}" - "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" - "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" - ) - - qmakeFlags+=("${qmakeFlags_orig[@]}") + prependToVar qmakeFlags \ + "PREFIX=$out" \ + "NIX_OUTPUT_OUT=$out" \ + "NIX_OUTPUT_DEV=${!outputDev}" \ + "NIX_OUTPUT_BIN=${!outputBin}" \ + "NIX_OUTPUT_QML=${!outputBin}/${qtQmlPrefix:?}" \ + "NIX_OUTPUT_PLUGIN=${!outputBin}/${qtPluginPrefix:?}" } prePhases+=" qmakePrePhase" qmakeConfigurePhase() { runHook preConfigure + local flagsArray=() + concatTo flagsArray qmakeFlags + echo "QMAKEPATH=$QMAKEPATH" - echo qmake "${qmakeFlags[@]}" - qmake "${qmakeFlags[@]}" + echo qmake "${flagsArray[@]}" + qmake "${flagsArray[@]}" if ! [[ -v enableParallelBuilding ]]; then enableParallelBuilding=1 From 581aebcdad092b228b02ac068bb28d6b2a22b909 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Wed, 12 Jun 2024 18:35:54 +0200 Subject: [PATCH 088/481] perl: support structuredAttrs in generic builder Tested perlPackages.GSSAPI with and without __structuredAttrs. --- pkgs/development/perl-modules/generic/builder.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh index 4da9f7a98212..f87bb2b9e177 100644 --- a/pkgs/development/perl-modules/generic/builder.sh +++ b/pkgs/development/perl-modules/generic/builder.sh @@ -23,7 +23,10 @@ preConfigure() { fi done - perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" + local flagsArray=() + concatTo flagsArray makeMakerFlags + + perl Makefile.PL PREFIX=$out INSTALLDIRS=site "${flagsArray[@]}" PERL=$(type -P perl) FULLPERL=\"$fullperl/bin/perl\" } if test -n "$perlPreHook"; then From 050689db307b54c180afd5a4320f57db947e0a7d Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 9 Dec 2023 20:00:23 +0100 Subject: [PATCH 089/481] treewide: fix pg_config / postgresql headers moved to dev output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was supposed to happen in #294504, but the commit was accidentally left out when splitting off some libpq-related changes. Originated in #179962, by Sandro. Co-authored-by: Sandro Jäckel Co-authored-by: Wolfgang Walther --- doc/languages-frameworks/ruby.section.md | 8 +++----- pkgs/applications/misc/pgmodeler/default.nix | 4 ++-- pkgs/applications/networking/misc/zammad/default.nix | 2 +- pkgs/development/compilers/urweb/default.nix | 1 - pkgs/development/libraries/libdbi-drivers/default.nix | 2 -- pkgs/development/libraries/opendbx/default.nix | 2 +- pkgs/development/python-modules/psycopg/default.nix | 5 +++++ pkgs/development/python-modules/psycopg2/default.nix | 2 +- pkgs/development/ruby-modules/gem-config/default.nix | 2 +- .../tools/rust/cargo-pgrx/buildPgrxExtension.nix | 4 ++-- pkgs/servers/mail/exim/default.nix | 1 - pkgs/servers/sql/postgresql/ext/age.nix | 2 +- pkgs/servers/sql/postgresql/ext/plv8/default.nix | 2 +- pkgs/servers/sql/postgresql/ext/tsja.nix | 8 ++++---- pkgs/tools/backup/bacula/default.nix | 2 +- pkgs/tools/networking/kea/default.nix | 2 +- pkgs/top-level/php-packages.nix | 4 ++-- 17 files changed, 26 insertions(+), 27 deletions(-) diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md index c5cc122394f5..31f696bd6427 100644 --- a/doc/languages-frameworks/ruby.section.md +++ b/doc/languages-frameworks/ruby.section.md @@ -154,7 +154,7 @@ let defaultGemConfig = pkgs.defaultGemConfig // { pg = attrs: { buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; }; @@ -172,7 +172,7 @@ let gemConfig = pkgs.defaultGemConfig // { pg = attrs: { buildFlags = - [ "--with-pg-config=${pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; + [ "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; }; @@ -190,9 +190,7 @@ let defaultGemConfig = super.defaultGemConfig // { pg = attrs: { buildFlags = [ - "--with-pg-config=${ - pkgs."postgresql_${pg_version}" - }/bin/pg_config" + "--with-pg-config=${lib.getDev pkgs."postgresql_${pg_version}"}/bin/pg_config" ]; }; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index c3b5491387cd..f97827eccafa 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ]; qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.isDarwin [ - "PGSQL_INC=${postgresql}/include" - "PGSQL_LIB=${postgresql.lib}/lib/libpq.dylib" + "PGSQL_INC=${lib.getDev postgresql}/include" + "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib" "XML_INC=${libxml2.dev}/include/libxml2" "XML_LIB=${libxml2.out}/lib/libxml2.dylib" "PREFIX=${placeholder "out"}/Applications/pgModeler.app/Contents" diff --git a/pkgs/applications/networking/misc/zammad/default.nix b/pkgs/applications/networking/misc/zammad/default.nix index 065749554ea1..4a37b4737c61 100644 --- a/pkgs/applications/networking/misc/zammad/default.nix +++ b/pkgs/applications/networking/misc/zammad/default.nix @@ -74,7 +74,7 @@ let ]; gemConfig = defaultGemConfig // { pg = attrs: { - buildFlags = [ "--with-pg-config=${postgresql}/bin/pg_config" ]; + buildFlags = [ "--with-pg-config=${lib.getDev postgresql}/bin/pg_config" ]; }; rszr = attrs: { buildInputs = [ imlib2 imlib2.dev ]; diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 2621f4bc8050..f96cce8c53f1 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-openssl=${openssl.dev}" ]; preConfigure = '' - export PGHEADER="${postgresql}/include/libpq-fe.h"; export MSHEADER="${libmysqlclient}/include/mysql/mysql.h"; export SQHEADER="${sqlite.dev}/include/sqlite3.h"; export ICU_INCLUDES="-I${icu.dev}/include"; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index bbd9e3898d91..6537e3ae2a3e 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -42,8 +42,6 @@ stdenv.mkDerivation rec { "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite" ] ++ lib.optionals (postgresql != null) [ "--with-pgsql" - "--with-pgsql_incdir=${postgresql}/include" - "--with-pgsql_libdir=${postgresql.lib}/lib" ]; env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/development/libraries/opendbx/default.nix b/pkgs/development/libraries/opendbx/default.nix index 04ffde29daa0..9fbb8356679c 100644 --- a/pkgs/development/libraries/opendbx/default.nix +++ b/pkgs/development/libraries/opendbx/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = '' export CPPFLAGS="-I${getDev libmysqlclient}/include/mysql" - export LDFLAGS="-L${libmysqlclient}/lib/mysql -L${postgresql}/lib" + export LDFLAGS="-L${libmysqlclient}/lib/mysql" configureFlagsArray=(--with-backends="mysql pgsql sqlite3") ''; diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix index 7d1f8c54f3d0..b1b69bc3526a 100644 --- a/pkgs/development/python-modules/psycopg/default.nix +++ b/pkgs/development/python-modules/psycopg/default.nix @@ -74,11 +74,16 @@ let nativeBuildInputs = [ cython + # needed to find pg_config with strictDeps postgresql setuptools tomli ]; + buildInputs = [ + postgresql + ]; + # tested in psycopg doCheck = false; diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix index ec958d7525c9..c8959b948fd7 100644 --- a/pkgs/development/python-modules/psycopg2/default.nix +++ b/pkgs/development/python-modules/psycopg2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { # some linker flags are added but the linker ignores them because they're incompatible # https://github.com/psycopg/psycopg2/blob/89005ac5b849c6428c05660b23c5a266c96e677d/setup.py substituteInPlace setup.py \ - --replace "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getExe' buildPackages.postgresql "pg_config"}"' + --replace-fail "self.pg_config_exe = self.build_ext.pg_config" 'self.pg_config_exe = "${lib.getDev buildPackages.postgresql}/bin/pg_config"' ''; nativeBuildInputs = [ diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index a541a8ee34bd..eb55255191cf 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -671,7 +671,7 @@ in # Force pkg-config lookup for libpq. # See https://github.com/ged/ruby-pg/blob/6629dec6656f7ca27619e4675b45225d9e422112/ext/extconf.rb#L34-L55 # - # Note that setting --with-pg-config=${postgresql}/bin/pg_config would add + # Note that setting --with-pg-config=${lib.getDev postgresql}/bin/pg_config would add # an unnecessary reference to the entire postgresql package. buildFlags = [ "--with-pg-config=ignore" ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix index ab4343462f26..3d41c35ffd36 100644 --- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix +++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix @@ -86,7 +86,7 @@ let preBuildAndTest = '' export PGRX_HOME=$(mktemp -d) export PGDATA="$PGRX_HOME/data-${pgrxPostgresMajor}/" - cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${postgresql}/bin/pg_config + cargo-pgrx pgrx init "--pg${pgrxPostgresMajor}" ${lib.getDev postgresql}/bin/pg_config echo "unix_socket_directories = '$(mktemp -d)'" > "$PGDATA/postgresql.conf" # This is primarily for Mac or other Nix systems that don't use the nixbld user. @@ -120,7 +120,7 @@ let PGRX_BUILD_FLAGS="--frozen -j $NIX_BUILD_CORES ${builtins.concatStringsSep " " cargoBuildFlags}" \ ${lib.optionalString stdenv.isDarwin ''RUSTFLAGS="''${RUSTFLAGS:+''${RUSTFLAGS} }-Clink-args=-Wl,-undefined,dynamic_lookup"''} \ cargo pgrx package \ - --pg-config ${postgresql}/bin/pg_config \ + --pg-config ${lib.getDev postgresql}/bin/pg_config \ ${maybeDebugFlag} \ --features "${builtins.concatStringsSep " " buildFeatures}" \ --out-dir "$out" diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index 26967b333eb9..bf593354da92 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -82,7 +82,6 @@ in stdenv.mkDerivation rec { s:^# \(LOOKUP_PGSQL=yes\)$:\1: s:^\(LOOKUP_LIBS\)=\(.*\):\1=\2 -lpq -L${postgresql.lib}/lib: s:^# \(LOOKUP_LIBS\)=.*:\1=-lpq -L${postgresql.lib}/lib: - s:^# \(LOOKUP_INCLUDE\)=.*:\1=-I${postgresql}/include: ''} ${lib.optionalString enableSqlite '' s:^# \(LOOKUP_SQLITE=yes\)$:\1: diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix index 2c68d6dcbbad..b80d1c203b2c 100644 --- a/pkgs/servers/sql/postgresql/ext/age.nix +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress REGRESS_TESTS=$(make -f Makefile.regress files) - ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ --inputdir=./ \ --bindir='${postgresqlAge}/bin' \ --encoding=UTF-8 \ diff --git a/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/pkgs/servers/sql/postgresql/ext/plv8/default.nix index af1cee81fa78..e0dbc19e353f 100644 --- a/pkgs/servers/sql/postgresql/ext/plv8/default.nix +++ b/pkgs/servers/sql/postgresql/ext/plv8/default.nix @@ -112,7 +112,7 @@ in stdenv.mkDerivation (finalAttrs: { echo -e "include Makefile\nprint_regress_files:\n\t@echo \$(REGRESS)" > Makefile.regress REGRESS_TESTS=$(make -f Makefile.regress print_regress_files) - ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + ${lib.getDev postgresql}/lib/pgxs/src/test/regress/pg_regress \ --bindir='${postgresqlWithSelf}/bin' \ --temp-instance=regress-instance \ --dbname=contrib_regression \ diff --git a/pkgs/servers/sql/postgresql/ext/tsja.nix b/pkgs/servers/sql/postgresql/ext/tsja.nix index f62eae5b6a3e..f0b9238f59ef 100644 --- a/pkgs/servers/sql/postgresql/ext/tsja.nix +++ b/pkgs/servers/sql/postgresql/ext/tsja.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace Makefile \ - --replace /usr/local/pgsql ${postgresql} \ - --replace -L/usr/local/lib "" \ - --replace -I/usr/local/include "" - substituteInPlace tsja.c --replace /usr/local/lib/mecab ${mecab}/lib/mecab + --replace-fail /usr/local/pgsql ${lib.getDev postgresql} \ + --replace-fail -L/usr/local/lib "" \ + --replace-fail -I/usr/local/include "" + substituteInPlace tsja.c --replace-fail /usr/local/lib/mecab ${mecab}/lib/mecab ''; buildInputs = [ mecab postgresql ]; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index f8ec672710f5..386775960a73 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sqlite3=${sqlite.dev}" - "--with-postgresql=${postgresql}" + "--with-postgresql=${lib.getDev postgresql}" "--with-logdir=/var/log/bacula" "--with-working-dir=/var/lib/bacula" "--mandir=\${out}/share/man" diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index a4831b6ef0ef..ac068c39591b 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-openssl=${lib.getDev openssl}" ] - ++ lib.optional withPostgres "--with-pgsql=${postgresql}/bin/pg_config" + ++ lib.optional withPostgres "--with-pgsql=${lib.getDev postgresql}/bin/pg_config" ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"; postConfigure = '' diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e85ae6dea40a..f2398b0502c0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -586,7 +586,7 @@ in { { name = "pdo_pgsql"; internalDeps = [ php.extensions.pdo ]; - configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; + configureFlags = [ "--with-pdo-pgsql=${lib.getDev postgresql}" ]; doCheck = false; } { @@ -599,7 +599,7 @@ in { { name = "pgsql"; buildInputs = [ pcre2 ]; - configureFlags = [ "--with-pgsql=${postgresql}" ]; + configureFlags = [ "--with-pgsql=${lib.getDev postgresql}" ]; doCheck = false; } { name = "posix"; doCheck = false; } From cd81adf5ae33007c3dd914831f98c8ff653c45a2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 24 Aug 2024 11:54:40 -0400 Subject: [PATCH 090/481] openh264: add patch enabling riscv64 support --- pkgs/by-name/op/openh264/package.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/op/openh264/package.nix b/pkgs/by-name/op/openh264/package.nix index ebd93572e29e..12048b593dd0 100644 --- a/pkgs/by-name/op/openh264/package.nix +++ b/pkgs/by-name/op/openh264/package.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, fetchpatch2 , gtest , meson , nasm @@ -20,6 +21,16 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-ai7lcGcQQqpsLGSwHkSs7YAoEfGCIbxdClO6JpGA+MI="; }; + patches = [ + # build: fix build with meson on riscv64 + # https://github.com/cisco/openh264/pull/3773 + (fetchpatch2 { + name = "openh264-riscv64.patch"; + url = "https://github.com/cisco/openh264/commit/cea886eda8fae7ba42c4819e6388ce8fc633ebf6.patch"; + hash = "sha256-ncXuGgogXA7JcCOjGk+kBprmOErFohrYjYzZYzAbbDQ="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ @@ -45,7 +56,8 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ AndersonTorres ]; # See meson.build platforms = lib.platforms.windows ++ lib.intersectLists - (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64) + (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ + lib.platforms.loongarch64 ++ lib.platforms.riscv64) (lib.platforms.linux ++ lib.platforms.darwin); }; }) From 287e0d3288a84c595d83c1bed662b29c50cd7317 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 23 Aug 2024 10:57:26 +0200 Subject: [PATCH 091/481] python3Packages.pytest-order: 1.2.1 -> 1.3.0 https://github.com/pytest-dev/pytest-order/releases/tag/v1.3.0 Also fetch the source from GitHub since that is "closer to the source" and use `pyproject = true`. --- .../python-modules/pytest-order/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pytest-order/default.nix b/pkgs/development/python-modules/pytest-order/default.nix index 34ea35247416..86db6d272fe6 100644 --- a/pkgs/development/python-modules/pytest-order/default.nix +++ b/pkgs/development/python-modules/pytest-order/default.nix @@ -1,8 +1,8 @@ { buildPythonPackage, - fetchPypi, + fetchFromGitHub, lib, - pytest, + setuptools, pytest-xdist, pytest-dependency, pytest-mock, @@ -11,15 +11,17 @@ buildPythonPackage rec { pname = "pytest-order"; - version = "1.2.1"; - format = "setuptools"; + version = "1.3.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-RFG9iCG6T6IQlFWi/MiCr2DvjlPgnSRNZ2dL4I9W6sM="; + src = fetchFromGitHub { + owner = "pytest-dev"; + repo = "pytest-order"; + rev = "refs/tags/v${version}"; + hash = "sha256-V1qJGkXn+HhuK5wiwkkJBEbfnv23R4x9Cv0J6ZTj5xE="; }; - buildInputs = [ pytest ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook From 2d6ba540503a8aca4924bf5f8b3c66bab5d59458 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Aug 2024 18:58:25 +0000 Subject: [PATCH 092/481] aws-c-auth: 0.7.25 -> 0.7.26 --- pkgs/development/libraries/aws-c-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-c-auth/default.nix b/pkgs/development/libraries/aws-c-auth/default.nix index 84724375fea2..70aa863a7ce2 100644 --- a/pkgs/development/libraries/aws-c-auth/default.nix +++ b/pkgs/development/libraries/aws-c-auth/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "aws-c-auth"; - version = "0.7.25"; + version = "0.7.26"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-auth"; rev = "v${version}"; - hash = "sha256-pj2LnvF1/h8AQNc810U7oYWKun13+qPBNCbGPj3wKlo="; + hash = "sha256-02dy2xgMGWkLf+HyBztbkCcazfZNAMwpJPU2gGBPokY="; }; nativeBuildInputs = [ From 0835b9f6deb1aeb59e68446a8c94a92c1c4bbff8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 25 Aug 2024 09:57:06 +0100 Subject: [PATCH 093/481] wayland: 1.23.0 -> 1.23.1 --- pkgs/development/libraries/wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 8398dce70790..3cd2ba5dbe68 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland"; - version = "1.23.0"; + version = "1.23.1"; src = fetchurl { url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz"; - hash = "sha256-BbPhV00+Z2JrWXT4YvNrW0J8fO65Zcs2pObC00LkWrI="; + hash = "sha256-hk+yqDmeLQ7DnVbp2bdTwJN3W+rcYCLOgfRBkpqB5e0="; }; patches = [ From 5eee6cf40ad44fd4f21b76f26f54ca34a7f5e69e Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Wed, 24 Jul 2024 21:34:38 +0300 Subject: [PATCH 094/481] xar: 1.6.1 -> 498 This change switches the xar package from unmaintained fork of the original project to the Apple Open Source tarball. See also https://repology.org/project/xar/versions Since the package is essentially rewritten from scratch, we take an opportunity and move it to pkgs/by-name/xa/xar (formatted with nixfmt). We also remove Windows from the supported platforms because even before this change pkgsCross.mingwW64.xar failed with xar> configure: error: can not detect the size of your system's uid_t type --- pkgs/by-name/xa/xar/package.nix | 178 ++++ ...e-tests-for-Python-3-and-Nix-sandbox.patch | 961 ++++++++++++++++++ ...-Update-for-modern-liblzma5-versions.patch | 153 +++ ...defined-EXT2_ECOMPR_FL-for-e2fsprogs.patch | 39 + ...4-Fix-compatibility-with-openssl-1.0.patch | 60 ++ ...5-Fix-configure.ac-for-Linux-headers.patch | 123 +++ .../0006-Fix-more-non-Darwin-stuff.patch | 38 + ...lized-constant-with-define-statement.patch | 33 + ...ac-not-finding-AR-with-target-prefix.patch | 37 + ...d-useless-descriptions-to-AC_DEFINE.patch} | 42 +- ...ac-for-openssl-libxml2-liblzma-and-.patch} | 98 +- ...udes-and-silence-string-format-warni.patch | 104 ++ ...-char-signedness-for-ARM-and-PowerPC.patch | 46 + ...Enable-extended-attributes-for-btrfs.patch | 43 + ...-segfault-when-copying-xattr-buffers.patch | 123 +++ ...x-segfault-in-xar_attrcopy_from_heap.patch | 59 ++ ...16-Do-not-set-property-for-empty-ACL.patch | 90 ++ .../0017-Fix-time-format-for-musl.patch | 75 ++ ...Replace-memcpy-with-memmove-for-musl.patch | 25 + ...enSSL-over-CommonCrypto-if-available.patch | 150 +++ pkgs/stdenv/darwin/default.nix | 2 +- pkgs/tools/compression/xar/default.nix | 49 - pkgs/top-level/all-packages.nix | 2 - 23 files changed, 2436 insertions(+), 94 deletions(-) create mode 100644 pkgs/by-name/xa/xar/package.nix create mode 100644 pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch create mode 100644 pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch create mode 100644 pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch create mode 100644 pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch create mode 100644 pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch create mode 100644 pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch create mode 100644 pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch create mode 100644 pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch rename pkgs/{tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch => by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch} (70%) rename pkgs/{tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch => by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch} (51%) create mode 100644 pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch create mode 100644 pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch create mode 100644 pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch create mode 100644 pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch create mode 100644 pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch create mode 100644 pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch create mode 100644 pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch create mode 100644 pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch create mode 100644 pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch delete mode 100644 pkgs/tools/compression/xar/default.nix diff --git a/pkgs/by-name/xa/xar/package.nix b/pkgs/by-name/xa/xar/package.nix new file mode 100644 index 000000000000..4ad071f36a1f --- /dev/null +++ b/pkgs/by-name/xa/xar/package.nix @@ -0,0 +1,178 @@ +{ + lib, + stdenv, + fetchFromGitHub, + applyPatches, + autoreconfHook, + nix-update-script, + + # Required dependencies. + openssl, + zlib, + libxml2, + + # Optional dependencies. + e2fsprogs, + bzip2, + xz, # lzma + + # Platform-specific dependencies. + acl, + musl-fts, + + # for tests + testers, + python3, + libxslt, # xsltproc + runCommand, + runCommandCC, + makeWrapper, + xar, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "xar"; + version = "498"; + + src = fetchFromGitHub { + owner = "apple-oss-distributions"; + repo = "xar"; + rev = "xar-${finalAttrs.version}"; + hash = "sha256-RyWeR/ZnDBHIZhwzVxETdrTTPQA2VgsLZegRkxX1240="; + }; + + # Update patch set with + # git clone https://github.com/apple-oss-distributions/xar + # cd xar + # git switch -c nixpkgs + # git am ../pkgs/by-name/xa/xar/patches/* + # # … + # rm -r ../pkgs/by-name/xa/xar/patches + # git format-patch --zero-commit --output-directory ../pkgs/by-name/xa/xar/patches main + patches = lib.filesystem.listFilesRecursive ./patches; + + # We do not use or modify files outside of the xar subdirectory. + patchFlags = [ "-p2" ]; + sourceRoot = "source/xar"; + + outputs = [ + "out" + "lib" + "dev" + ]; + + strictDeps = true; + + nativeBuildInputs = [ autoreconfHook ]; + + # For some reason libxml2 package headers are in subdirectory and thus aren’t + # picked up by stdenv’s C compiler wrapper (see ccWrapper_addCVars). This + # doesn’t really belong here and either should be part of libxml2 package or + # libxml2 in Nixpkgs can just fix their header paths. + env.NIX_CFLAGS_COMPILE = "-isystem ${libxml2.dev}/include/libxml2"; + + buildInputs = + [ + # NB we use OpenSSL instead of CommonCrypto on Darwin. + openssl + zlib + libxml2 + bzip2 + xz + e2fsprogs + ] + ++ lib.optional stdenv.hostPlatform.isLinux acl ++ lib.optional stdenv.hostPlatform.isMusl musl-fts; + + passthru = + let + patchedSource = applyPatches { inherit (finalAttrs) src patches; }; + pythonForTests = python3.withPackages (p: [ p.xattr ]); + in + { + # Tests xar outside of the Nix sandbox (extended attributes are not supported + # in Nix sandbox, e.g. filtered with seccomp on Linux). + # + # Run with + # $ nix run --file . xar.impureTests.integrationTest + # Ensure that all tests are PASSED and none are FAILED or SKIPPED. + impureTests.integrationTest = + runCommand "xar-impure-tests-integration-test" + { + src = patchedSource; + xar = finalAttrs.finalPackage; + xsltproc = lib.getBin libxslt; + pythonInterpreter = pythonForTests.interpreter; + nativeBuildInputs = [ makeWrapper ]; + } + '' + makeWrapper "$pythonInterpreter" "$out/bin/$name" \ + --prefix PATH : "$xar/bin" \ + --suffix PATH : "$xsltproc/bin" \ + --add-flags -- \ + --add-flags "$src/xar/test/run-all.py" + ''; + + tests = lib.optionalAttrs (stdenv.buildPlatform.canExecute stdenv.hostPlatform) { + version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "1.8dev"; + }; + + integrationTest = + runCommand "xar-tests-integration-test" + { + src = patchedSource; + strictDeps = true; + pythonExecutable = pythonForTests.executable; + nativeBuildInputs = [ + finalAttrs.finalPackage + pythonForTests + libxslt + ]; + } + '' + "$pythonExecutable" "$src"/xar/test/run-all.py + touch "$out" + ''; + + smokeTest = + runCommandCC "xar-tests-smoke-test" + { + src = patchedSource; + strictDeps = true; + nativeBuildInputs = [ finalAttrs.finalPackage ]; + buildInputs = [ + finalAttrs.finalPackage + openssl + ]; + } + '' + cp "$src"/xar/test/{buffer.c,validate.c} . + "$CC" -lxar -o buffer buffer.c + "$CC" -lxar -lcrypto -o validate validate.c + ./buffer validate.c + xar -x -f test.xar + diff validate.c mydir/secondfile + ./validate test.xar + touch "$out" + ''; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "xar-(.*)" + ]; + }; + }; + + meta = { + homepage = "https://github.com/apple-oss-distributions/xar"; + description = "An easily extensible archive format"; + license = lib.licenses.bsd3; + maintainers = + lib.teams.darwin.members + ++ lib.attrValues { inherit (lib.maintainers) copumpkin tie; }; + platforms = lib.platforms.unix; + mainProgram = "xar"; + }; +}) diff --git a/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch new file mode 100644 index 000000000000..2b26cc1429df --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0001-Update-tests-for-Python-3-and-Nix-sandbox.patch @@ -0,0 +1,961 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 12:53:54 +0300 +Subject: [PATCH 01/19] Update tests for Python 3 and Nix sandbox + +This change updates integration tests for Python 3 and fixes some +assumptions to work under Nix sandbox (in particular, extended +attributes are not allowed). + +Also updates xar/test/validate.c for modern OpenSSL versions. +--- + xar/test/attr.py | 54 +++++++++++++++++++------- + xar/test/buffer.c | 3 +- + xar/test/checksums.py | 75 +++++++++++++++++++----------------- + xar/test/compression.py | 27 ++++++++----- + xar/test/data.py | 19 +++++---- + xar/test/hardlink.py | 12 ++++-- + xar/test/heap.py | 27 +++++++------ + xar/test/integrity.py | 45 ++++++++++++---------- + xar/test/run-all.py | 25 ++++++++++++ + xar/test/util.py | 85 ++++++++++++++++++++++++++++++++++++----- + xar/test/validate.c | 32 +++++++++------- + 11 files changed, 282 insertions(+), 122 deletions(-) + create mode 100755 xar/test/run-all.py + +diff --git a/xar/test/attr.py b/xar/test/attr.py +index adc2c56..c28a4e6 100755 +--- a/xar/test/attr.py ++++ b/xar/test/attr.py +@@ -6,6 +6,7 @@ import os + import os.path + import shutil + import subprocess ++import sys + import xattr + + import util +@@ -26,20 +27,27 @@ import util + class MissingExtendedAttributeError(AssertionError): + pass + +-def _random_big_data(bytes=65536, path="/dev/random"): ++def _random_big_data(bytes=65536): + """ + Returns a random string with the number of bytes requested. Due to xar + implementation details, this should be greater than 4096 (32768 for + compressed heap testing). + + """ +- with open(path, "r") as f: +- return f.read(bytes) ++ return os.urandom(bytes) ++ ++def _to_bytes(s): ++ if isinstance(s, str): ++ return s.encode("utf-8") ++ return s + + def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_create_flags=[], xar_extract_flags=[]): ++ file_contents = _to_bytes(file_contents) ++ xattr_prefix = "user." if sys.platform != "darwin" else "" ++ xattrs = [(xattr_prefix + k, _to_bytes(v)) for k, v in xattrs] + try: + # Write file out +- with open(filename, "w") as f: ++ with open(filename, "wb") as f: + f.write(file_contents) + for (key, value) in xattrs: + xattr.setxattr(f, key, value) +@@ -51,14 +59,16 @@ def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_cr + with util.directory_created("extracted") as directory: + # Validate resulting xattrs + subprocess.check_call(["xar", "-x", "-C", directory, "-f", path] + xar_extract_flags) ++ extracted_filename = os.path.join(directory, filename) ++ expected_set = {key for key, _ in xattrs} ++ actual_set = set(xattr.listxattr(os.path.join(directory, filename))) ++ for key in expected_set - actual_set: ++ raise MissingExtendedAttributeError("extended attribute \"{n}\" missing after extraction".format(n=key)) + for (key, value) in xattrs: +- try: +- assert xattr.getxattr(os.path.join(directory, filename), key) == value, "extended attribute \"{n}\" has incorrect contents after extraction".format(n=key) +- except KeyError: +- raise MissingExtendedAttributeError("extended attribute \"{n}\" missing after extraction".format(n=key)) ++ assert xattr.getxattr(extracted_filename, key) == value, "extended attribute \"{n}\" has incorrect contents after extraction".format(n=key) + + # Validate file contents +- with open(os.path.join(directory, filename), "r") as f: ++ with open(os.path.join(directory, filename), "rb") as f: + if f.read() != file_contents: + raise MissingExtendedAttributeError("archived file \"{f}\" has has incorrect contents after extraction".format(f=filename)) + finally: +@@ -73,36 +83,47 @@ def _test_xattr_on_file_with_contents(filename, file_contents, xattrs=[], xar_cr + # tests are commented out awaiting a day when this might be different. + + # def empty_xattr_empty_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "")]) + + def small_xattr_empty_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "1234")]) + + def large_xattr_empty_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", _random_big_data(5000))]) + + # def empty_xattr_small_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", "")]) + + def small_xattr_small_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", "1234")]) + + def large_xattr_small_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "small.file.contents", xattrs=[("foo", _random_big_data(4567))]) + + # def empty_xattr_large_file(filename): ++# util.skip_if_no_xattrs_support() + # _test_xattr_on_file_with_contents(filename, _random_big_data(10000000), xattrs=[("foo", "")]) + + def small_xattr_large_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, _random_big_data(5000000), xattrs=[("foo", "1234")]) + + def large_xattr_large_file(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, _random_big_data(9876543), xattrs=[("foo", _random_big_data(6543))]) + + def multiple_xattrs(filename): ++ util.skip_if_no_xattrs_support() + _test_xattr_on_file_with_contents(filename, "", xattrs=[("foo", "bar"), ("baz", "1234"), ("quux", "more")]) # ("empty", "") + + def distribution_create(filename): ++ util.skip_if_no_xattrs_support() + try: + _test_xattr_on_file_with_contents(filename, "dummy", xattrs=[("foo", "bar")], xar_create_flags=["--distribution"]) + except MissingExtendedAttributeError: +@@ -114,6 +135,7 @@ def distribution_create(filename): + # when it can. + + # def distribution_extract(filename): ++# util.skip_if_no_xattrs_support() + # try: + # _test_xattr_on_file_with_contents(filename, "dummy", xattrs=[("foo", "bar")], xar_extract_flags=["--distribution"]) + # except MissingExtendedAttributeError: +@@ -128,12 +150,18 @@ TEST_CASES = (small_xattr_empty_file, large_xattr_empty_file, + multiple_xattrs, distribution_create) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case(case.func_name) +- print("PASSED: {f}".format(f=case.func_name)) ++ case(func_name) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/buffer.c b/xar/test/buffer.c +index a353cef..e4c5639 100644 +--- a/xar/test/buffer.c ++++ b/xar/test/buffer.c +@@ -1,5 +1,6 @@ + #include + #include ++#include + #include + #include + #include +@@ -50,7 +51,7 @@ int main(int argc, char *argv[]) + if( red < sb.st_size ) + fprintf(stderr, "Incomplete read\n"); + +- x = xar_open("/tmp/test.xar", WRITE); ++ x = xar_open("test.xar", WRITE); + if( x == NULL ) { + fprintf(stderr, "Error creating xarchive\n"); + exit(6); +diff --git a/xar/test/checksums.py b/xar/test/checksums.py +index 7080d7c..0f39e63 100755 +--- a/xar/test/checksums.py ++++ b/xar/test/checksums.py +@@ -2,6 +2,7 @@ + + from __future__ import print_function + ++import contextlib + import hashlib + import os + import os.path +@@ -9,6 +10,7 @@ import re + import shutil + import struct + import subprocess ++import sys + + import util + +@@ -17,15 +19,21 @@ import util + # Utility Functions + # + ++@contextlib.contextmanager ++def _test_archive_created(filename, directory, *args, **kwargs): ++ with util.test_directory_created(directory) as test_directory: ++ with util.archive_created(filename, test_directory, *args, **kwargs) as path: ++ yield path ++ + def _get_numeric_value_from_header(archive_name, key): + """ + Dumps the header of the specified xar archive and extracts the header + size from the output, in bytes. + + """ +- header = subprocess.check_output(["xar", "--dump-header", "-f", archive_name]) ++ header = subprocess.check_output(["xar", "--dump-header", "-f", archive_name], text=True) + for line in header.splitlines(): +- matchdata = re.match("^(.+):\s+(.+)$", line) # magic: 0x78617221 (OK) ++ matchdata = re.match(r"^(.+):\s+(.+)$", line) # magic: 0x78617221 (OK) + assert matchdata, "unexpected output from `xar --dump-header`:\n{h}".format(h=header) + if matchdata.groups()[0] == key: + return int(matchdata.groups()[1]) +@@ -38,17 +46,14 @@ def _get_toc_size(archive_name): + return _get_numeric_value_from_header(archive_name, "Compressed TOC length") + + def _clobber_bytes_at(clobber_range, path): +- with open(path, "r+") as f: ++ with open(path, "rb+") as f: + f.seek(clobber_range[0]) +- with open("/dev/random", "r") as r: +- random_bytes = r.read(len(clobber_range)) +- f.write(random_bytes) ++ f.write(os.urandom(len(clobber_range))) + + def _verify_extraction_failed(filename): + with util.directory_created("extracted") as directory: + try: +- with open("/dev/null", "w") as n: +- returncode = subprocess.call(["xar", "-x", "-C", directory, "-f", filename], stdout=n, stderr=n) ++ returncode = subprocess.call(["xar", "-x", "-C", directory, "-f", filename], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + assert returncode != 0, "xar reported success extracting an archive with a broken TOC" + finally: + if os.path.exists(directory): +@@ -63,7 +68,7 @@ def _verify_header_checksum(filename, algorithm): + header_size = _get_header_size(filename) + toc_length = _get_toc_size(filename) + +- with open(filename, "r") as f: ++ with open(filename, "rb") as f: + f.seek(header_size) + h = hashlib.new(algorithm, f.read(toc_length)) + computed_digest = h.digest() +@@ -76,23 +81,23 @@ def _verify_header_checksum(filename, algorithm): + # + + def default_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + _verify_header_checksum(path, "sha1") + + def sha1_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha1") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha1") as path: + _verify_header_checksum(path, "sha1") + + def sha256_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha256") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha256") as path: + _verify_header_checksum(path, "sha256") + + def sha512_toc_checksum_validity(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha512") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha512") as path: + _verify_header_checksum(path, "sha512") + + def broken_toc_default_checksum(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -101,7 +106,7 @@ def broken_toc_default_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha1_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha1") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha1") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -110,7 +115,7 @@ def broken_toc_sha1_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha256_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha256") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha256") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -119,7 +124,7 @@ def broken_toc_sha256_checksum(filename): + _verify_extraction_failed(filename) + + def broken_toc_sha512_checksum(filename): +- with util.archive_created(filename, "/bin", "--toc-cksum", "sha512") as path: ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "sha512") as path: + # Mess up the archive + toc_start = _get_header_size(path) + _clobber_bytes_at(range(toc_start + 4, toc_start + 4 + 100), path) # Why did the original test specify 4? No idea. +@@ -128,7 +133,7 @@ def broken_toc_sha512_checksum(filename): + _verify_extraction_failed(filename) + + def broken_heap_default_checksum(filename): +- with util.archive_created(filename, "/bin") as path: ++ with _test_archive_created(filename, "testdir") as path: + # Mess up the archive + toc_start = _get_header_size(path) + toc_size = _get_toc_size(path) +@@ -139,11 +144,11 @@ def broken_heap_default_checksum(filename): + _verify_extraction_failed(filename) + + def default_checksum_algorithm(filename): +- with util.archive_created(filename, "/bin") as path: +- header = subprocess.check_output(["xar", "--dump-header", "-f", path]) ++ with _test_archive_created(filename, "testdir") as path: ++ header = subprocess.check_output(["xar", "--dump-header", "-f", path], text=True) + found = False + for line in header.splitlines(): +- matchdata = re.match("^Checksum algorithm:\s+(\d+)\s+\\((\w+)\\)$", line) ++ matchdata = re.match(r"^Checksum algorithm:\s+(\d+)\s+\((\w+)\)$", line) + if not matchdata: + continue + found = True +@@ -156,7 +161,7 @@ def default_checksum_algorithm(filename): + # + # def invalid_checksum_algorithm(filename): + # try: +-# with util.archive_created(filename, "/bin", "--toc-cksum", "invalid-algorithm") as path: ++# with _test_archive_created(filename, "testdir", "--toc-cksum", "invalid-algorithm") as path: + # raise AssertionError("xar succeeded when it should have failed") + # except subprocess.CalledProcessError: + # pass +@@ -164,17 +169,15 @@ def default_checksum_algorithm(filename): + # It does fail for md5 explicitly, however + def md5_toc_checksum_failure(filename): + try: +- with open("/dev/null", "a") as devnull: +- with util.archive_created(filename, "/bin", "--toc-cksum", "md5", stderr=devnull) as path: +- raise AssertionError("xar succeeded when it should have failed") ++ with _test_archive_created(filename, "testdir", "--toc-cksum", "md5", stderr=subprocess.DEVNULL) as path: ++ raise AssertionError("xar succeeded when it should have failed") + except subprocess.CalledProcessError: + pass + + def md5_file_checksum_failure(filename): + try: +- with open("/dev/null", "a") as devnull: +- with util.archive_created(filename, "/bin", "--file-cksum", "md5", stderr=devnull) as path: +- raise AssertionError("xar succeeded when it should have failed") ++ with _test_archive_created(filename, "testdir", "--file-cksum", "md5", stderr=subprocess.DEVNULL) as path: ++ raise AssertionError("xar succeeded when it should have failed") + except subprocess.CalledProcessError: + pass + +@@ -185,8 +188,8 @@ def _verify_checksum_algorithm(filename, algorithm): + else: + algorithm = "sha1" + +- with util.archive_created(filename, "/bin", *additional_args) as path: +- toc = subprocess.check_output(["xar", "--dump-toc=-", "-f", path]) ++ with _test_archive_created(filename, "testdir", *additional_args) as path: ++ toc = subprocess.check_output(["xar", "--dump-toc=-", "-f", path], text=True) + found = False + for line in toc.splitlines(): + if ''.format(a=algorithm) in line or ''.format(a=algorithm) in line: +@@ -214,12 +217,16 @@ TEST_CASES = (default_toc_checksum_validity, sha1_toc_checksum_validity, sha256_ + md5_toc_checksum_failure, md5_file_checksum_failure,) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/compression.py b/xar/test/compression.py +index 2b3b2ec..7ed30ca 100755 +--- a/xar/test/compression.py ++++ b/xar/test/compression.py +@@ -2,10 +2,10 @@ + + from __future__ import print_function + +-import cStringIO + import os + import os.path + import subprocess ++import sys + import tempfile + + import util +@@ -16,10 +16,15 @@ import util + # + + def _check_compression(filename, *args, **kwargs): +- with util.archive_created(filename, "/bin", *args, **kwargs) as path: ++ with ( ++ util.directory_created("temp") as temp_directory, ++ util.chdir(temp_directory), ++ util.test_directory_created("testdir") as test_directory, ++ util.archive_created(filename, "testdir", *args, **kwargs) as path, ++ ): + with util.directory_created("extracted") as directory: + subprocess.check_call(["xar", "-x", "-f", path, "-C", directory]) +- util.assert_identical_directories("/bin", os.path.join(directory, "bin")) ++ util.assert_identical_directories(test_directory, os.path.join(directory, "testdir")) + + + # +@@ -61,14 +66,18 @@ TEST_CASES = (no_compression, default_compression, + gzip_compression_short, bzip2_compression_short, lzma_compression_short) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/data.py b/xar/test/data.py +index a9793f0..f902b78 100755 +--- a/xar/test/data.py ++++ b/xar/test/data.py +@@ -6,6 +6,7 @@ import contextlib + import os + import os.path + import subprocess ++import sys + import util + + +@@ -28,7 +29,7 @@ def _process_toc(archive_path): + subprocess.check_call(["xar", "-f", archive_path, "--dump-toc=data_toc.xml"]) + try: + result = subprocess.check_output(["xsltproc", "-o", "-", os.path.realpath(os.path.join(__file__, "..", "data.xsl")), "data_toc.xml"]) +- assert result == "", "expected no data offset, but instead found:{o}".format(o=result) ++ assert result == b"", "expected no data offset, but instead found:{o}".format(o=result) + finally: + os.unlink("data_toc.xml") + +@@ -90,14 +91,18 @@ TEST_CASES = (zero_length_default_compression, zero_length_no_compression, + mixed_length_gzip_compression, mixed_length_bzip2_compression, mixed_length_lzma_compression) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/hardlink.py b/xar/test/hardlink.py +index 5145216..da409d6 100755 +--- a/xar/test/hardlink.py ++++ b/xar/test/hardlink.py +@@ -5,6 +5,7 @@ from __future__ import print_function + import os + import os.path + import subprocess ++import sys + + import util + +@@ -58,12 +59,17 @@ def hard_link_identical_files(filename): + TEST_CASES = (hard_link_in_directory, hard_link_in_cwd, hard_link_identical_files) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): ++ failed = True + import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/heap.py b/xar/test/heap.py +index f431c77..727412a 100755 +--- a/xar/test/heap.py ++++ b/xar/test/heap.py +@@ -8,6 +8,7 @@ import os.path + import re + import shutil + import subprocess ++import sys + + import util + +@@ -19,8 +20,8 @@ import util + def _file_offsets_for_archive(path, xsl_path): + subprocess.check_call(["xar", "--dump-toc=heap_toc.xml", "-f", path]) + try: +- offsets = subprocess.check_output(["xsltproc", xsl_path, "heap_toc.xml"]) +- matches = [re.match("^(.+)\s([^\s]+)$", offset) for offset in offsets.splitlines()] ++ offsets = subprocess.check_output(["xsltproc", xsl_path, "heap_toc.xml"], text=True) ++ matches = [re.match(r"^(.+)\s([^\s]+)$", offset) for offset in offsets.splitlines()] + offsets = [(match.groups()[0], int(match.groups()[1])) for match in matches] + return offsets + finally: +@@ -33,9 +34,8 @@ def _file_offsets_for_archive(path, xsl_path): + XSL_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), "heap1.xsl") + + def normal_heap(filename): +- with util.directory_created("scratch") as directory: +- shutil.copy("/bin/ls", os.path.join(directory, "ls")) +- shutil.copy(os.path.join(directory, "ls"), os.path.join(directory, "foo")) ++ with util.test_directory_created("scratch") as directory: ++ shutil.copy(os.path.join(directory, "script"), os.path.join(directory, "foo")) + with util.chdir(directory): + with util.archive_created(os.path.join("..", "heap.xar"), ".") as path: + # Verify file offsets are as we expect +@@ -50,9 +50,8 @@ def normal_heap(filename): + subprocess.check_call(["xar", "-x", "-f", path, "-C", extracted]) + + def coalesce_heap(filename): +- with util.directory_created("scratch") as directory: +- shutil.copy("/bin/ls", os.path.join(directory, "ls")) +- shutil.copy(os.path.join(directory, "ls"), os.path.join(directory, "foo")) ++ with util.test_directory_created("scratch") as directory: ++ shutil.copy(os.path.join(directory, "script"), os.path.join(directory, "foo")) + with util.chdir(directory): + with util.archive_created(os.path.join("..", "heap.xar"), ".", "--coalesce-heap") as path: + # Verify file offsets are as we expect +@@ -67,12 +66,16 @@ def coalesce_heap(filename): + TEST_CASES = (normal_heap, coalesce_heap) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/integrity.py b/xar/test/integrity.py +index c47ac6a..f4d2af7 100755 +--- a/xar/test/integrity.py ++++ b/xar/test/integrity.py +@@ -5,6 +5,7 @@ from __future__ import print_function + import os + import os.path + import subprocess ++import sys + + import util + +@@ -12,9 +13,9 @@ import util + # Utility Functions + # + +-def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): +- with util.archive_created(filename, path_to_be_archived) as path: +- with open("/dev/null", "w") as bitbucket: ++def _test_truncation(filename, bytes_to_chop, *args): ++ with util.test_directory_created("testdir") as test_directory: ++ with util.archive_created(filename, test_directory) as path: + size = os.stat(path).st_size + while size > 0: + last_size = size +@@ -23,7 +24,7 @@ def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): + f.truncate(size) + + with util.directory_created("scratch") as directory: +- returncode = subprocess.call(["xar", "-x", "-f", path, "-C", directory], stderr=bitbucket) ++ returncode = subprocess.call(["xar", "-x", "-f", path, "-C", directory], stderr=subprocess.DEVNULL) + assert returncode != 0, "xar claimed to succeed when extracting a truncated archive" + + # +@@ -31,42 +32,42 @@ def _test_truncation(filename, path_to_be_archived, bytes_to_chop, *args): + # + + def large_uncompressed(filename): +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=none") ++ _test_truncation(filename, 1024 * 1024, "--compression=none") + + def large_default_compression(filename): +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024) ++ _test_truncation(filename, 1024 * 1024) + + def large_gzip_compressed(filename): + util.skip_if_no_compression_support("gzip") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=gzip") ++ _test_truncation(filename, 1024 * 1024, "--compression=gzip") + + def large_bzip2_compressed(filename): + util.skip_if_no_compression_support("bzip2") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=bzip2") ++ _test_truncation(filename, 1024 * 1024, "--compression=bzip2") + + def large_lzma_compressed(filename): + util.skip_if_no_compression_support("lzma") +- _test_truncation(filename, "/usr/share/man/man1", 1024 * 1024, "--compression=lzma") ++ _test_truncation(filename, 1024 * 1024, "--compression=lzma") + + # "small" variants use a non-base-2 size to try to catch issues that occur on uneven boundaries + + def small_uncompressed(filename): +- _test_truncation(filename, "/bin", 43651, "--compression=none") ++ _test_truncation(filename, 43651, "--compression=none") + + def small_default_compression(filename): +- _test_truncation(filename, "/bin", 43651) ++ _test_truncation(filename, 43651) + + def small_gzip_compressed(filename): + util.skip_if_no_compression_support("gzip") +- _test_truncation(filename, "/bin", 43651, "--compression=gzip") ++ _test_truncation(filename, 43651, "--compression=gzip") + + def small_bzip2_compressed(filename): + util.skip_if_no_compression_support("bzip2") +- _test_truncation(filename, "/bin", 43651, "--compression=bzip2") ++ _test_truncation(filename, 43651, "--compression=bzip2") + + def small_lzma_compressed(filename): + util.skip_if_no_compression_support("lzma") +- _test_truncation(filename, "/bin", 43651, "--compression=lzma") ++ _test_truncation(filename, 43651, "--compression=lzma") + + + TEST_CASES = (large_uncompressed, large_default_compression, +@@ -75,14 +76,18 @@ TEST_CASES = (large_uncompressed, large_default_compression, + small_gzip_compressed, small_bzip2_compressed, small_lzma_compressed) + + if __name__ == "__main__": ++ failed = False + for case in TEST_CASES: ++ func_name = case.__name__ + try: +- case("{f}.xar".format(f=case.func_name)) +- print("PASSED: {f}".format(f=case.func_name)) ++ case("{f}.xar".format(f=func_name)) ++ print("PASSED: {f}".format(f=func_name)) + except (AssertionError, IOError, subprocess.CalledProcessError): +- import sys, os +- print("FAILED: {f}".format(f=case.func_name)) ++ failed = True ++ print("FAILED: {f}".format(f=func_name)) + sys.excepthook(*sys.exc_info()) + print("") +- except util.TestCaseSkipError, e: +- print("SKIPPED: {f}: {m}".format(f=case.func_name, m=e.message)) ++ except util.TestCaseSkipError as e: ++ print("SKIPPED: {f}: {m}".format(f=func_name, m=e)) ++ if failed: ++ sys.exit(1) +diff --git a/xar/test/run-all.py b/xar/test/run-all.py +new file mode 100755 +index 0000000..05e3054 +--- /dev/null ++++ b/xar/test/run-all.py +@@ -0,0 +1,25 @@ ++#!/usr/bin/env python3 ++ ++import os.path ++import subprocess ++import sys ++ ++test_suites = [ ++ "attr.py", ++ "checksums.py", ++ "compression.py", ++ "data.py", ++ "hardlink.py", ++ "heap.py", ++ "integrity.py", ++] ++ ++test_path = os.path.dirname(__file__) ++ ++failed = False ++for suite in test_suites: ++ p = subprocess.run([sys.executable, "--", os.path.join(test_path, suite)]) ++ if p.returncode: ++ failed = True ++if failed: ++ sys.exit(1) +diff --git a/xar/test/util.py b/xar/test/util.py +index da79925..423dd3c 100644 +--- a/xar/test/util.py ++++ b/xar/test/util.py +@@ -1,6 +1,8 @@ + #!/usr/bin/env python + + import contextlib ++import errno ++import functools + import hashlib + import os + import os.path +@@ -13,16 +15,65 @@ import xattr + class TestCaseSkipError(Exception): + pass + ++@functools.cache ++def _check_xattrs_supported(): ++ """ ++ Returns True if the filesystem supports extended attributes. ++ """ ++ with directory_created("empty") as directory: ++ try: ++ xattr.setxattr(directory, "user.xattrcheck", b"supported") ++ return True ++ except OSError as e: ++ if e.errno != errno.ENOTSUP: ++ raise ++ return False ++ ++def skip_if_no_xattrs_support(): ++ """ ++ Raises TestCaseSkipError if the the filesystem does not support extended ++ attributes. ++ """ ++ if not _check_xattrs_supported(): ++ raise TestCaseSkipError("filesystem does not support extended attributes") ++ ++@functools.cache ++def _check_compression_supported(type): ++ """ ++ Returns True if xar has support for the given compression type compiled ++ in. This function performs a runtime check that tries to compress data ++ with the given compression type and looks for a known error string. It ++ ignores all other errors. ++ """ ++ supported = True ++ with directory_created("empty") as directory: ++ archive_path = f"{type}_compression_check.xar" ++ try: ++ return f"{type} support not compiled in." not in subprocess.run( ++ [ ++ "xar", ++ "-c", ++ "-f", ++ archive_path, ++ "--compression=" + type, ++ directory, ++ ], ++ stdout=subprocess.PIPE, ++ text=True, ++ ).stdout ++ except: ++ # Assume that this compression type is supported. ++ pass ++ finally: ++ if os.path.exists(archive_path): ++ os.unlink(archive_path) ++ return supported ++ + def skip_if_no_compression_support(type): + """ +- Raises TestCaseSkipError if the type is "lzma" and the test is running on +- darwin (OS X). In the future, we should add a hidden debugging flag to xar +- to determine valid compression types. This will skip incorrectly if a +- custom xar is used on OS X, or if a custom xar on another platform is +- built without bzip2 or lzma. +- ++ Raises TestCaseSkipError if the compression type is not compiled in. + """ +- if sys.platform == "darwin" and type == "lzma": ++ if not _check_compression_supported(type): + raise TestCaseSkipError("{t} support not compiled in".format(t=type)) + + @contextlib.contextmanager +@@ -43,6 +94,22 @@ def directory_created(directory_path): + if os.path.exists(directory_path): + shutil.rmtree(directory_path) + ++@contextlib.contextmanager ++def test_directory_created(directory_path): ++ """ ++ Like directory_created, but populates the directory with test files. ++ """ ++ with directory_created(directory_path) as directory: ++ with open(os.path.join(directory, "script"), "w+", opener=lambda path, flags: os.open(path, flags, 0o750)) as f: ++ f.write("#!/bin/sh\necho hello world") ++ with open(os.path.join(directory, "random_1kb"), "wb+") as f: ++ f.write(os.urandom(1000)) ++ with open(os.path.join(directory, "random_4kib"), "wb+") as f: ++ f.write(os.urandom(4096)) ++ with open(os.path.join(directory, "random_1mb"), "wb+") as f: ++ f.write(os.urandom(9999999)) ++ yield directory ++ + @contextlib.contextmanager + def archive_created(archive_path, content_path, *extra_args, **extra_kwargs): + """ +@@ -68,7 +135,7 @@ def archive_created(archive_path, content_path, *extra_args, **extra_kwargs): + HASH_CHUNK_SIZE = 32768 + + def _md5_path(path): +- with open(path, "r") as f: ++ with open(path, "rb") as f: + h = hashlib.md5() + while True: + last = f.read(HASH_CHUNK_SIZE) +@@ -122,7 +189,7 @@ def assert_identical_directories(path1, path2): + + # Sizes and the like + assert stat1.st_size == stat2.st_size, "size mismatch for \"{e1}\" ({s1}) and \"{e2}\" ({s2})".format(e1=entry1, s1=stat1.st_size, e2=entry2, s2=stat2.st_size) +- assert stat1.st_mtime == stat2.st_mtime, "mtime mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) ++ assert int(stat1.st_mtime) == int(stat2.st_mtime), "mtime mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) + assert _md5_path(entry1) == _md5_path(entry2), "md5 hash mismatch for \"{e1}\" and \"{e2}\"".format(e1=entry1, e2=entry2) + if os.path.isdir(entry1): + assert_identical_directories(entry1, entry2) +diff --git a/xar/test/validate.c b/xar/test/validate.c +index dfe69eb..a5fbe37 100644 +--- a/xar/test/validate.c ++++ b/xar/test/validate.c +@@ -16,37 +16,40 @@ + + off_t HeapOff = 0; + +-static char* xar_format_md5(const unsigned char* m) { ++static char* xar_format_sha1(const unsigned char* m) { + char* result = NULL; + asprintf(&result, + "%02x%02x%02x%02x" + "%02x%02x%02x%02x" + "%02x%02x%02x%02x" ++ "%02x%02x%02x%02x" + "%02x%02x%02x%02x", + m[0], m[1], m[2], m[3], + m[4], m[5], m[6], m[7], + m[8], m[9], m[10], m[11], +- m[12], m[13], m[14], m[15]); ++ m[12], m[13], m[14], m[15], ++ m[16], m[17], m[18], m[19]); + return result; + } + + void heap_check(int fd, const char *name, const char *prop, off_t offset, off_t length, const char *csum) { + char *buf; +- EVP_MD_CTX ctx; ++ EVP_MD_CTX *ctx; + const EVP_MD *md; +- unsigned char md5str[EVP_MAX_MD_SIZE]; ++ unsigned char sha1str[EVP_MAX_MD_SIZE]; + unsigned int len; + ssize_t r; +- char *formattedmd5; ++ char *formattedsha1; + + fprintf(stderr, "Heap checking %s %s at offset: %" PRIu64 "\n", name, prop, HeapOff+offset); + OpenSSL_add_all_digests(); +- md = EVP_get_digestbyname("md5"); ++ md = EVP_get_digestbyname("sha1"); + if( md == NULL ) { +- fprintf(stderr, "No md5 digest in openssl\n"); ++ fprintf(stderr, "No sha1 digest in openssl\n"); + exit(1); + } +- EVP_DigestInit(&ctx, md); ++ ctx = EVP_MD_CTX_create(); ++ EVP_DigestInit(ctx, md); + + buf = malloc(length); + if( !buf ) { +@@ -65,14 +68,15 @@ void heap_check(int fd, const char *name, const char *prop, off_t offset, off_t + fprintf(stderr, "Error reading from the heap\n"); + exit(1); + } +- EVP_DigestUpdate(&ctx, buf, length); +- EVP_DigestFinal(&ctx, md5str, &len); ++ EVP_DigestUpdate(ctx, buf, length); ++ EVP_DigestFinal(ctx, sha1str, &len); ++ EVP_MD_CTX_destroy(ctx); + +- formattedmd5 = xar_format_md5(md5str); +- if( strcmp(formattedmd5, csum) != 0 ) { +- fprintf(stderr, "%s %s checksum does not match\n", name, prop); ++ formattedsha1 = xar_format_sha1(sha1str); ++ if( strcmp(formattedsha1, csum) != 0 ) { ++ fprintf(stderr, "%s %s checksum does not match (got %s but expected %s)\n", name, prop, formattedsha1, csum); + } +- free(formattedmd5); ++ free(formattedsha1); + free(buf); + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch new file mode 100644 index 000000000000..ef9ad0039410 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0002-Update-for-modern-liblzma5-versions.patch @@ -0,0 +1,153 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 16:34:17 +0300 +Subject: [PATCH 02/19] Update for modern liblzma5 versions +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This change updates liblzma usage for modern xz versions (≥ 5, that is, +released less than a decade ago). + +It also fixes missing realloc buffer calls that were supposed to be +there but were lost in xar-420 (and Apple does not ship xar with LZMA +support so nobody noticed). See also the offending commit: +https://github.com/apple-oss-distributions/xar/commit/2426082efec74e9ed545cc4f5812ad16322bdf2c +--- + xar/lib/lzmaxar.c | 65 ++++++++--------------------------------------- + 1 file changed, 10 insertions(+), 55 deletions(-) + +diff --git a/xar/lib/lzmaxar.c b/xar/lib/lzmaxar.c +index ba9c868..8dcb484 100644 +--- a/xar/lib/lzmaxar.c ++++ b/xar/lib/lzmaxar.c +@@ -54,27 +54,12 @@ + + #ifdef HAVE_LIBLZMA + +-#ifndef UINT32_C +-#define UINT32_C(v) (v ## U) /* from normally */ +-#endif +-#ifndef LZMA_VERSION +-#define LZMA_VERSION UINT32_C(40420000) /* = 4.42.0alpha6 */ +-#endif +- + struct _lzma_context{ + uint8_t lzmacompressed; + lzma_stream lzma; +- lzma_options_stream options; +- lzma_allocator allocator; +-#if LZMA_VERSION < 40420010U +- lzma_memory_limitter *limit; +-#else +- lzma_memlimit *limit; +-#endif + }; + + #define preset_level 7 +-#define memory_limit 93*1024*1024 /* 1=1M, 5=24M, 6=39M, 7=93M, 8=185M, 9=369M */ + + #define LZMA_CONTEXT(x) ((struct _lzma_context *)(*x)) + #endif +@@ -116,9 +101,7 @@ int xar_lzma_fromheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_t + if( !opt ) return 0; + if( strcmp(opt, "application/x-lzma") != 0 ) return 0; + +- lzma_init_decoder(); +- LZMA_CONTEXT(context)->lzma = LZMA_STREAM_INIT_VAR; +- r = lzma_stream_decoder(&LZMA_CONTEXT(context)->lzma, NULL, NULL); ++ r = lzma_stream_decoder(&LZMA_CONTEXT(context)->lzma, UINT64_MAX, LZMA_CONCATENATED); + if( (r != LZMA_OK) ) { + xar_err_new(x); + xar_err_set_file(x, f); +@@ -194,11 +177,6 @@ int xar_lzma_toheap_done(xar_t x, xar_file_t f, xar_prop_t p, void **context) { + + if( LZMA_CONTEXT(context)->lzmacompressed){ + lzma_end(&LZMA_CONTEXT(context)->lzma); +-#if LZMA_VERSION < 40420010U +- lzma_memory_limitter_end(LZMA_CONTEXT(context)->limit, 1); +-#else +- lzma_memlimit_end(LZMA_CONTEXT(context)->limit, 1); +-#endif + + tmpp = xar_prop_pset(f, p, "encoding", NULL); + if( tmpp ) +@@ -222,7 +200,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + + /* on first run, we init the context and check the compression type */ + if( !LZMA_CONTEXT(context) ) { +- int level = preset_level; ++ uint32_t level = preset_level; + *context = calloc(1,sizeof(struct _lzma_context)); + + opt = xar_opt_get(x, XAR_OPT_COMPRESSION); +@@ -243,35 +221,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + } + } + +- lzma_init_encoder(); +- LZMA_CONTEXT(context)->options.check = LZMA_CHECK_CRC64; +- LZMA_CONTEXT(context)->options.has_crc32 = 1; /* true */ +- LZMA_CONTEXT(context)->options.alignment = 0; +-#if defined (__ppc__) || defined (powerpc) || defined (__ppc64__) +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_POWERPC; +-#elif defined (__i386__) || defined (__amd64__) || defined(__x86_64__) +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_X86; +-#else +- LZMA_CONTEXT(context)->options.filters[0].id = LZMA_FILTER_COPY; +-#endif +- LZMA_CONTEXT(context)->options.filters[0].options = NULL; +- LZMA_CONTEXT(context)->options.filters[1].id = LZMA_FILTER_LZMA; +- LZMA_CONTEXT(context)->options.filters[1].options = (lzma_options_lzma *)(lzma_preset_lzma + level - 1); +- /* Terminate the filter options array. */ +- LZMA_CONTEXT(context)->options.filters[2].id = UINT64_MAX; +- LZMA_CONTEXT(context)->lzma = LZMA_STREAM_INIT_VAR; +-#if LZMA_VERSION < 40420010U +- LZMA_CONTEXT(context)->limit = lzma_memory_limitter_create(memory_limit); +- LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memory_alloc; +- LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memory_free; +-#else +- LZMA_CONTEXT(context)->limit = lzma_memlimit_create(memory_limit); +- LZMA_CONTEXT(context)->allocator.alloc = (void*) lzma_memlimit_alloc; +- LZMA_CONTEXT(context)->allocator.free = (void*) lzma_memlimit_free; +-#endif +- LZMA_CONTEXT(context)->allocator.opaque = LZMA_CONTEXT(context)->limit; +- LZMA_CONTEXT(context)->lzma.allocator = &LZMA_CONTEXT(context)->allocator; +- r = lzma_stream_encoder_single(&LZMA_CONTEXT(context)->lzma, &(LZMA_CONTEXT(context)->options)); ++ r = lzma_easy_encoder(&LZMA_CONTEXT(context)->lzma, level, LZMA_CHECK_CRC64); + if( (r != LZMA_OK) ) { + xar_err_new(x); + xar_err_set_file(x, f); +@@ -279,6 +229,7 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + xar_err_callback(x, XAR_SEVERITY_FATAL, XAR_ERR_ARCHIVE_CREATION); + return -1; + } ++ + LZMA_CONTEXT(context)->lzmacompressed = 1; + if( *inlen == 0 ) + return 0; +@@ -303,7 +254,8 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + outlen = newlen; + else + abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ +- ++ ++ out = realloc(out, outlen); + if( out == NULL ) abort(); + + LZMA_CONTEXT(context)->lzma.next_out = ((unsigned char *)out) + offset; +@@ -318,7 +270,10 @@ int32_t xar_lzma_toheap_in(xar_t x, xar_file_t f, xar_prop_t p, void **in, size_ + if (newlen > outlen) + outlen = newlen; + else +- abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ if( out == NULL ) abort(); ++ abort(); /* Someone has somehow malloced over 2^64 bits of ram. */ ++ ++ out = realloc(out, outlen); ++ if( out == NULL ) abort(); + + LZMA_CONTEXT(context)->lzma.next_out = ((unsigned char *)out) + offset; + LZMA_CONTEXT(context)->lzma.avail_out = outlen - offset; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch new file mode 100644 index 000000000000..795c42ad59c4 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0003-Fix-undefined-EXT2_ECOMPR_FL-for-e2fsprogs.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 18:25:48 +0300 +Subject: [PATCH 03/19] Fix undefined EXT2_ECOMPR_FL for e2fsprogs + +See https://github.com/mackyle/xar/issues/10 +--- + xar/lib/ext2.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/xar/lib/ext2.c b/xar/lib/ext2.c +index 767891a..2380846 100644 +--- a/xar/lib/ext2.c ++++ b/xar/lib/ext2.c +@@ -139,8 +139,10 @@ int xar_ext2attr_archive(xar_t x, xar_file_t f, const char* file, const char *bu + if(! (flags & ~EXT2_NOCOMPR_FL) ) + x_addprop(f, "NoCompBlock"); + #endif ++#ifdef EXT2_ECOMPR_FL + if(! (flags & ~EXT2_ECOMPR_FL) ) + x_addprop(f, "CompError"); ++#endif + if(! (flags & ~EXT2_BTREE_FL) ) + x_addprop(f, "BTree"); + if(! (flags & ~EXT2_INDEX_FL) ) +@@ -225,8 +227,10 @@ int xar_ext2attr_extract(xar_t x, xar_file_t f, const char* file, char *buffer, + if( e2prop_get(f, "NoCompBlock", (char **)&tmp) == 0 ) + flags |= EXT2_NOCOMPR_FL ; + #endif ++#ifdef EXT2_ECOMPR_FL + if( e2prop_get(f, "CompError", (char **)&tmp) == 0 ) + flags |= EXT2_ECOMPR_FL ; ++#endif + if( e2prop_get(f, "BTree", (char **)&tmp) == 0 ) + flags |= EXT2_BTREE_FL ; + if( e2prop_get(f, "HashIndexed", (char **)&tmp) == 0 ) +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch new file mode 100644 index 000000000000..bd1fed261c78 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0004-Fix-compatibility-with-openssl-1.0.patch @@ -0,0 +1,60 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen +Date: Tue, 1 Jan 2019 18:00:08 +0100 +Subject: [PATCH 04/19] Fix compatibility with openssl-1.0 + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8-openssl-1.1.patch +-- +lib/hash.c: fix compilation with OpenSSL-1.1+ + +EVP_MD_CTX has become an anonymous struct now, so can't allocate size +for it anymore. +--- + xar/lib/hash.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/xar/lib/hash.c b/xar/lib/hash.c +index 66876ad..cb4f6cf 100644 +--- a/xar/lib/hash.c ++++ b/xar/lib/hash.c +@@ -97,7 +97,7 @@ struct __xar_hash_t { + #ifdef __APPLE__ + CCDigestRef digest; + #else +- EVP_MD_CTX digest; ++ EVP_MD_CTX *digest; + const EVP_MD *type; + #endif + unsigned int length; +@@ -118,7 +118,8 @@ xar_hash_t xar_hash_new(const char *digest_name, void *context) { + #else + OpenSSL_add_all_digests(); + HASH_CTX(hash)->type = EVP_get_digestbyname(digest_name); +- EVP_DigestInit(&HASH_CTX(hash)->digest, HASH_CTX(hash)->type); ++ HASH_CTX(hash)->digest = EVP_MD_CTX_create(); ++ EVP_DigestInit(HASH_CTX(hash)->digest, HASH_CTX(hash)->type); + #endif + + HASH_CTX(hash)->digest_name = strdup(digest_name); +@@ -138,7 +139,7 @@ void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { + #ifdef __APPLE__ + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else +- EVP_DigestUpdate(&HASH_CTX(hash)->digest, buffer, nbyte); ++ EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #endif + } + +@@ -155,7 +156,8 @@ void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #else +- EVP_DigestFinal(&HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_DigestFinal(HASH_CTX(hash)->digest, buffer, &HASH_CTX(hash)->length); ++ EVP_MD_CTX_destroy(HASH_CTX(hash)->digest); + #endif + + *nbyte = HASH_CTX(hash)->length; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch new file mode 100644 index 000000000000..1b24fc6b2dfc --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0005-Fix-configure.ac-for-Linux-headers.patch @@ -0,0 +1,123 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=B6ren=20Tempel?= +Date: Sat, 2 Mar 2024 01:25:52 +0100 +Subject: [PATCH 05/19] Fix configure.ac for Linux headers + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8.0.0.452-linux.patch +--- + xar/configure.ac | 19 +++++++++++++++++-- + xar/include/config.h.in | 3 +++ + xar/lib/util.c | 15 +++++++++++++++ + 3 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 3a36f42..26d41a5 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -183,7 +183,7 @@ AC_SUBST([enable_autogen]) + + AC_TRY_COMPILE([#include + #include ], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) +-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) + AC_CHECK_FUNCS(lgetxattr) + AC_CHECK_FUNCS(lsetxattr) + AC_CHECK_FUNCS(getxattr) +@@ -199,7 +199,22 @@ AC_CHECK_FUNCS(strmode) + + AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[#include + #include +-#include ]) ++#include ++#ifdef HAVE_SYS_VFS_H ++#include ++#endif]) ++AC_CHECK_MEMBERS([struct statfs.f_iosize],,,[#include ++#include ++#include ++#ifdef HAVE_SYS_VFS_H ++#include ++#endif]) ++AC_CHECK_MEMBERS([struct statfs.f_bsize],,,[#include ++#include ++#include ++#ifdef HAVE_SYS_VFS_H ++#include ++#endif]) + AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[#include ]) + AC_CHECK_MEMBERS([struct stat.st_flags]) + +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 2bb997b..16c72d3 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -1,4 +1,5 @@ + #undef HAVE_SYS_STATFS_H ++#undef HAVE_SYS_VFS_H + #undef HAVE_SYS_XATTR_H + #undef HAVE_SYS_EXTATTR_H + #undef HAVE_SYS_PARAM_H +@@ -15,6 +16,8 @@ + #undef HAVE_STRUCT_STAT_ST_FLAGS + #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME + #undef HAVE_STRUCT_STATFS_F_FSTYPENAME ++#undef HAVE_STRUCT_STATFS_F_IOSIZE ++#undef HAVE_STRUCT_STATFS_F_BSIZE + #undef HAVE_SYS_ACL_H + #undef HAVE_LIBUTIL_H + #undef HAVE_LIBPTHREAD +diff --git a/xar/lib/util.c b/xar/lib/util.c +index 0ea661a..1db2daa 100644 +--- a/xar/lib/util.c ++++ b/xar/lib/util.c +@@ -35,11 +35,16 @@ + * Christopher Ryan + */ + ++#include "config.h" ++ + #include + #include + #include + #include + #include ++#ifdef HAVE_SYS_VFS_H ++# include ++#endif + #include + #include + #include +@@ -583,6 +588,14 @@ char *xar_get_mtime(xar_t x, xar_file_t f) { + return tmp; + } + ++#ifndef HAVE_STRUCT_STATFS_F_IOSIZE ++# ifdef HAVE_STRUCT_STATFS_F_BSIZE ++# define f_iosize f_bsize ++# else ++# error need a field to get optimal transfer block size ++# endif ++#endif ++ + size_t xar_optimal_io_size_at_path(const char *path) + { + // Start at 1MiB +@@ -599,6 +612,7 @@ size_t xar_optimal_io_size_at_path(const char *path) + fs_iosize = optimal_rsize; + } + ++#ifdef MNT_LOCAL + // If we're a remote filesystem, never let us go below the optimal size above of 1MiB + // NFS is horrible and lies that the optimal size is 512 bytes. + // Whereas SMB in my testing returns 7MiBs (far more practicle) +@@ -611,6 +625,7 @@ size_t xar_optimal_io_size_at_path(const char *path) + } + } + else ++#endif + { + optimal_rsize = fs_iosize; + } +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch new file mode 100644 index 000000000000..bd052fba25ef --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0006-Fix-more-non-Darwin-stuff.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 18:38:10 +0300 +Subject: [PATCH 06/19] Fix more non-Darwin stuff + +--- + xar/include/xar.h.in | 1 + + xar/lib/linuxattr.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/xar/include/xar.h.in b/xar/include/xar.h.in +index 9c93798..3d24b4f 100644 +--- a/xar/include/xar.h.in ++++ b/xar/include/xar.h.in +@@ -52,6 +52,7 @@ extern "C" { + #import + #else + #define API_DEPRECATED(...) ++#define API_AVAILABLE(...) + #endif + + #pragma pack(4) +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 0fec2bb..58ee6a8 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -226,7 +226,7 @@ int32_t xar_linuxattr_extract(xar_t x, xar_file_t f, const char* file, char *buf + if( statfs(file, &sfs) != 0 ) { + char *tmp, *bname; + tmp = strdup(file); +- bname = safe_dirname(tmp); ++ bname = xar_safe_dirname(tmp); + statfs(bname, &sfs); + free(tmp); + free(bname); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch new file mode 100644 index 000000000000..0a2bc9dd6cb2 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0007-replace-initialized-constant-with-define-statement.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Fabian Groffen +Date: Sat, 16 Jul 2022 21:34:13 +0200 +Subject: [PATCH 07/19] replace initialized constant with #define statement + +GCC doesn't like this: + +filetree.c:744:9: error: variable-sized object may not be initialized + +Since there's nothing changing at runtime at all, just make the compiler +see it's always going to be 1. + +Patch-Source: https://github.com/gentoo/gentoo/blob/dce914f2bbf52360f45c90d877857df3c4c2a353/app-arch/xar/files/xar-1.8.0.0.487-variable-sized-object.patch +--- + xar/lib/filetree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xar/lib/filetree.c b/xar/lib/filetree.c +index f31682a..9c30c03 100644 +--- a/xar/lib/filetree.c ++++ b/xar/lib/filetree.c +@@ -752,7 +752,7 @@ int xar_file_equals_file(xar_file_t f1, xar_file_t f2) + size_t fspath1_size = 0, fspath2_size = 0; + size_t ns1_size = 0, ns2_size = 0; + const struct __xar_file_t * child1 = NULL, * child2 = NULL; +- const uint keys_to_ignore_count = 1; ++#define keys_to_ignore_count 1 + char * keys_to_ignore[keys_to_ignore_count] = { "id" }; // ID is allowed ot mismatch + + // If the two pointers match, call it the same. +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch new file mode 100644 index 000000000000..4345a5b271e7 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0008-Fix-configure.ac-not-finding-AR-with-target-prefix.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 18:43:38 +0300 +Subject: [PATCH 08/19] Fix configure.ac not finding $AR with target prefix +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Fixes AR and RANLIB with target prefix (if not set to absolute paths). +Looks like AC_PATH_PROG doesn’t perform PATH lookups when user overrides +the program via environment variable but sets the value to program name +instead of absolute path. + +Note that LD seems to be unused so we remove it. +--- + xar/configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index 26d41a5..3d8e5de 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -86,9 +86,8 @@ fi + AC_PROG_CPP + + AC_PROG_INSTALL +-AC_PATH_PROG([LD], [ld], , [$PATH]) +-AC_PATH_PROG([AR], [ar], , [$PATH]) +-AC_PATH_PROG([RANLIB], [ranlib], , [$PATH]) ++AC_PROG_AR ++AC_PROG_RANLIB + AC_PATH_PROG([AUTOCONF], [autoconf], , [$PATH]) + + dnl Some libtool envy +-- +2.44.1 + diff --git a/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch similarity index 70% rename from pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch rename to pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch index a605d2db1708..8dd0932d09b6 100644 --- a/pkgs/tools/compression/xar/0001-Add-useless-descriptions-to-AC_DEFINE.patch +++ b/pkgs/by-name/xa/xar/patches/0009-Add-useless-descriptions-to-AC_DEFINE.patch @@ -1,18 +1,18 @@ -From a14be07c0aae3bf6f732d1ca5f625ba375702121 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 15 Nov 2020 19:12:33 +0900 -Subject: [PATCH 1/2] Add useless descriptions to AC_DEFINE +Subject: [PATCH 09/19] Add useless descriptions to AC_DEFINE -Removes autoheader warnings. +Removes autoheader warnings from autoreconfHook. --- - configure.ac | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) + xar/configure.ac | 46 +++++++++++++++++++++++----------------------- + 1 file changed, 23 insertions(+), 23 deletions(-) -diff --git a/configure.ac b/configure.ac -index 812b5ff..358ab89 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -210,48 +210,48 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) +diff --git a/xar/configure.ac b/xar/configure.ac +index 3d8e5de..0cc04dd 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -219,48 +219,48 @@ AC_CHECK_MEMBERS([struct stat.st_flags]) AC_CHECK_SIZEOF(uid_t) if test $ac_cv_sizeof_uid_t = "4"; then @@ -81,7 +81,7 @@ index 812b5ff..358ab89 100644 else AC_ERROR(can not detect the size of your system's dev_t type) fi -@@ -261,7 +261,7 @@ AC_CHECK_LIB(acl, acl_get_file) +@@ -270,7 +270,7 @@ AC_CHECK_LIB(acl, acl_get_file) dnl Check for paths AC_PREFIX_DEFAULT(/usr/local) @@ -90,6 +90,24 @@ index 812b5ff..358ab89 100644 dnl dnl Configure libxml2. +@@ -350,7 +350,7 @@ have_libbz2="1" + AC_CHECK_HEADERS([bzlib.h], , [have_libbz2="0"]) + AC_CHECK_LIB([bz2], [BZ2_bzCompress], , [have_libbz2="0"]) + if test "x${have_libbz2}" = "x1" ; then +- AC_DEFINE([HAVE_LIBBZ2]) ++ AC_DEFINE([HAVE_LIBBZ2], [], [HAVE_LIBBZ2]) + fi + + dnl +@@ -360,7 +360,7 @@ have_libpthread="1" + AC_CHECK_HEADERS([pthread.h], , [have_pthread="0"]) + AC_CHECK_LIB([pthread], [pthread_mutex_lock], , [have_pthread="0"]) + if test "x${have_pthread}" = "x1" ; then +- AC_DEFINE([HAVE_PTHREAD]) ++ AC_DEFINE([HAVE_PTHREAD], [], [HAVE_PTHREAD]) + fi + + dnl -- -2.28.0 +2.44.1 diff --git a/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch similarity index 51% rename from pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch rename to pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch index d71ad4b753c1..a1b5aef3ca6c 100644 --- a/pkgs/tools/compression/xar/0002-Use-pkg-config-for-libxml2.patch +++ b/pkgs/by-name/xa/xar/patches/0010-Update-configure.ac-for-openssl-libxml2-liblzma-and-.patch @@ -1,21 +1,31 @@ -From 276833851657c85651c053ee16b8e1a8dc768a50 Mon Sep 17 00:00:00 2001 -From: Andrew Childs -Date: Sun, 15 Nov 2020 19:12:56 +0900 -Subject: [PATCH 2/2] Use pkg-config for libxml2 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 18:58:14 +0300 +Subject: [PATCH 10/19] Update configure.ac for openssl, libxml2, liblzma and + musl-fts +Simplifies libxml2 detection, adds detection for liblzma (from xz), +openssl and fts (for musl libc). --- - configure.ac | 66 +++++++++------------------------------------------- - 1 file changed, 11 insertions(+), 55 deletions(-) + xar/configure.ac | 83 +++++++++++++++++------------------------------- + 1 file changed, 30 insertions(+), 53 deletions(-) -diff --git a/configure.ac b/configure.ac -index 358ab89..984a694 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -268,61 +268,17 @@ dnl Configure libxml2. - dnl - LIBXML2_VERSION_MIN=2.6.11 +diff --git a/xar/configure.ac b/xar/configure.ac +index 0cc04dd..e466ee0 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -272,63 +272,14 @@ AC_PREFIX_DEFAULT(/usr/local) --have_libxml2="1" + AC_CHECK_FUNC([asprintf], AC_DEFINE([HAVE_ASPRINTF], [], [HAVE_ASPRINTF])) + ++AC_SEARCH_LIBS([fts_close], [fts]) ++ + dnl + dnl Configure libxml2. + dnl +-LIBXML2_VERSION_MIN=2.6.11 +- + have_libxml2="1" - -AC_ARG_WITH([xml2-config], [ --with-xml2-config libxml2 config program], -if test "x${with_xml2_config}" = "xno" ; then @@ -67,23 +77,51 @@ index 358ab89..984a694 100644 - dnl Final sanity check, to make sure that xmlwriter is present. - AC_CHECK_HEADER([libxml/xmlwriter.h], , [have_libxml2="0"]) -fi --if test "x${have_libxml2}" = "x0" ; then -- AC_MSG_ERROR([Cannot build without libxml2]) --fi -+PKG_PROG_PKG_CONFIG -+ -+PKG_CHECK_MODULES(LIBXML2_PKGCONFIG, [libxml-2.0 >= ${LIBXML2_VERSION_MIN}], -+ [ -+ have_libxml2=1 -+ CPPFLAGS="${CPPFLAGS} ${LIBXML2_PKGCONFIG_CFLAGS}" -+ LIBS="${LIBS} ${LIBXML2_PKGCONFIG_LIBS}" -+ ], -+ [ -+ have_libxml2=0 -+ ]) ++AC_CHECK_HEADERS([libxml/xmlwriter.h], , [have_libxml2="0"]) ++AC_CHECK_LIB([xml2], [xmlInitParser], , [have_libxml2="0"]) + if test "x${have_libxml2}" = "x0" ; then + AC_MSG_ERROR([Cannot build without libxml2]) + fi +@@ -343,6 +294,22 @@ if test "x${have_libz}" = "x0" ; then + AC_MSG_ERROR([Cannot build without libz]) + fi ++dnl ++dnl Configure openssl. ++dnl ++have_openssl="1" ++AC_CHECK_HEADERS([openssl/evp.h], , [have_openssl="0"]) ++AC_CHECK_LIB([crypto], [OPENSSL_config], , [have_openssl="0"]) ++if test "x${have_openssl}" = "x0" ; then ++ case "${host}" in ++ *-*-darwin*) ++ ;; ++ *) ++ AC_MSG_ERROR([Cannot build without OpenSSL for non-Darwin host]) ++ ;; ++ esac ++fi ++ + dnl + dnl Configure libbz2. + dnl +@@ -353,6 +320,16 @@ if test "x${have_libbz2}" = "x1" ; then + AC_DEFINE([HAVE_LIBBZ2], [], [HAVE_LIBBZ2]) + fi + ++dnl ++dnl Configure liblzma. ++dnl ++have_liblzma="1" ++AC_CHECK_HEADERS([lzma.h], , [have_liblzma="0"]) ++AC_CHECK_LIB([lzma], [lzma_stream_decoder], , [have_liblzma="0"]) ++if test "x${have_liblzma}" = "x1" ; then ++ AC_DEFINE([HAVE_LIBLZMA], [], [HAVE_LIBLZMA]) ++fi ++ + dnl + dnl Configure libpthread. dnl - dnl Configure libcrypto (part of OpenSSL). -- -2.28.0 +2.44.1 diff --git a/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch new file mode 100644 index 000000000000..3eac163156e4 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0011-Fix-missing-includes-and-silence-string-format-warni.patch @@ -0,0 +1,104 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 19:10:46 +0300 +Subject: [PATCH 11/19] Fix missing includes and silence string format warnings + +Based on patch from Gentoo; see +https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/xar/files/xar-1.8.0.0.498-impl-decls.patch?id=cc91eb0f86043ae92c10cce55b326244bed3f061 +--- + xar/lib/Makefile.inc.in | 1 + + xar/lib/darwinattr.c | 1 + + xar/lib/ea.c | 3 ++- + xar/lib/ext2.c | 1 + + xar/lib/util.c | 1 + + xar/src/xar_internal.h | 4 ---- + 6 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/xar/lib/Makefile.inc.in b/xar/lib/Makefile.inc.in +index c046b25..d5e9003 100644 +--- a/xar/lib/Makefile.inc.in ++++ b/xar/lib/Makefile.inc.in +@@ -127,6 +127,7 @@ lib_distclean : + + CPPFLAGS := -I@objroot@include $(CPPFLAGS) + CPPFLAGS := -I@srcroot@include $(CPPFLAGS) ++CPPFLAGS := -I@srcroot@lib $(CPPFLAGS) + + # + # Build rules. +diff --git a/xar/lib/darwinattr.c b/xar/lib/darwinattr.c +index 4938965..18302b0 100644 +--- a/xar/lib/darwinattr.c ++++ b/xar/lib/darwinattr.c +@@ -37,6 +37,7 @@ + + #include "config.h" + #include ++#include + #include + #include + #include +diff --git a/xar/lib/ea.c b/xar/lib/ea.c +index 1bb8e27..fa1d06a 100644 +--- a/xar/lib/ea.c ++++ b/xar/lib/ea.c +@@ -29,6 +29,7 @@ + #include "config.h" + #include + #include ++#include /* for PRId64 */ + #include + #include + #include +@@ -67,7 +68,7 @@ xar_ea_t xar_ea_new(xar_file_t f, const char *name) + xar_prop_setvalue(XAR_EA(ret)->prop, NULL); + XAR_PROP(XAR_EA(ret)->prop)->attrs = xar_attr_new(); + XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->key = strdup("id"); +- asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%lld", XAR_FILE(f)->nexteaid++); ++ asprintf((char **)&XAR_ATTR(XAR_PROP(XAR_EA(ret)->prop)->attrs)->value, "%"PRId64, XAR_FILE(f)->nexteaid++); + + xar_prop_pset(f, XAR_EA(ret)->prop, "name", name); + +diff --git a/xar/lib/ext2.c b/xar/lib/ext2.c +index 2380846..b4ca1b0 100644 +--- a/xar/lib/ext2.c ++++ b/xar/lib/ext2.c +@@ -41,6 +41,7 @@ + #include "asprintf.h" + #endif + #include ++#include + #include + #include "xar.h" + #include "arcmod.h" +diff --git a/xar/lib/util.c b/xar/lib/util.c +index 1db2daa..ac0b822 100644 +--- a/xar/lib/util.c ++++ b/xar/lib/util.c +@@ -38,6 +38,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include +diff --git a/xar/src/xar_internal.h b/xar/src/xar_internal.h +index b78745c..2e6199e 100644 +--- a/xar/src/xar_internal.h ++++ b/xar/src/xar_internal.h +@@ -8,11 +8,7 @@ + #ifndef _XAR_INTERNAL_H_ + #define _XAR_INTERNAL_H_ + +-#ifdef XARSIG_BUILDING_WITH_XAR + #include "xar.h" +-#else +-#include +-#endif // XARSIG_BUILDING_WITH_XAR + + // Undeprecate these for internal usage + xar_t xar_open(const char *file, int32_t flags) API_AVAILABLE(macos(10.4)); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch new file mode 100644 index 000000000000..bc4fb7ff8504 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0012-Fix-char-signedness-for-ARM-and-PowerPC.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 19:26:14 +0300 +Subject: [PATCH 12/19] Fix char signedness for ARM and PowerPC +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use signed char explicitly for ARM and PowerPC (defaults to unsigned). +Otherwise -1 integer literal is helpfully converted to char 255… + +Derives from https://gitweb.gentoo.org/repo/gentoo.git/plain/app-arch/xar/files/xar-1.8-arm-ppc.patch?id=cc91eb0f86043ae92c10cce55b326244bed3f061 +--- + xar/lib/b64.c | 2 +- + xar/src/xar.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xar/lib/b64.c b/xar/lib/b64.c +index 6361acd..4ffc34c 100644 +--- a/xar/lib/b64.c ++++ b/xar/lib/b64.c +@@ -59,7 +59,7 @@ typedef enum _B64CommandCodes { + B64_IgnorableCharacter = -1 + } B64CommandCodes; + +-static char b64revtb[256] = { ++static signed char b64revtb[256] = { + -3, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*0-15*/ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, /*16-31*/ + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63, /*32-47*/ +diff --git a/xar/src/xar.c b/xar/src/xar.c +index 9977e8a..1bceb63 100644 +--- a/xar/src/xar.c ++++ b/xar/src/xar.c +@@ -910,7 +910,7 @@ static void print_version() { + int main(int argc, char *argv[]) { + int ret; + char *filename = NULL; +- char command = 0, c; ++ signed char command = 0, c; + char **args; + const char *tocfile = NULL; + int arglen, i, err; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch new file mode 100644 index 000000000000..7722e5c748e5 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0013-Enable-extended-attributes-for-btrfs.patch @@ -0,0 +1,43 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 19:28:09 +0300 +Subject: [PATCH 13/19] Enable extended attributes for btrfs + +--- + xar/lib/linuxattr.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 58ee6a8..496dd82 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -80,6 +80,10 @@ + #define XFS_SUPER_MAGIC 0x58465342 + #endif + ++#ifndef BTRFS_SUPER_MAGIC ++#define BTRFS_SUPER_MAGIC 0x9123683E ++#endif ++ + #if defined(HAVE_SYS_XATTR_H) && defined(HAVE_LGETXATTR) && !defined(__APPLE__) + + struct _linuxattr_context{ +@@ -175,6 +179,7 @@ TRYAGAIN: + case JFS_SUPER_MAGIC: fsname = "jfs" ; break; + case REISERFS_SUPER_MAGIC:fsname = "reiser" ; break; + case XFS_SUPER_MAGIC: fsname = "xfs" ; break; ++ case BTRFS_SUPER_MAGIC: fsname = "btrfs" ; break; + default: retval=0; goto BAIL; + }; + +@@ -236,6 +241,7 @@ int32_t xar_linuxattr_extract(xar_t x, xar_file_t f, const char* file, char *buf + case JFS_SUPER_MAGIC: fsname = "jfs" ; break; + case REISERFS_SUPER_MAGIC:fsname = "reiser" ; break; + case XFS_SUPER_MAGIC: fsname = "xfs" ; break; ++ case BTRFS_SUPER_MAGIC:fsname = "btrfs" ; break; + }; + + for(p = xar_prop_pfirst(f); p; p = xar_prop_pnext(p)) { +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch new file mode 100644 index 000000000000..6a9f3998e512 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0014-Fix-segfault-when-copying-xattr-buffers.patch @@ -0,0 +1,123 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 20:46:31 +0300 +Subject: [PATCH 14/19] Fix segfault when copying xattr buffers +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +xar_linuxattr_read allocates an internal buffer and incrementally copies +the data to xar_attrcopy_to_heap’s inbuf. This change fixes the offset +handling by rewriting xar_linuxattr_read function from scratch (with an +arguably cleaner implementation). +--- + xar/lib/linuxattr.c | 68 +++++++++++++++++++++++++++------------------ + 1 file changed, 41 insertions(+), 27 deletions(-) + +diff --git a/xar/lib/linuxattr.c b/xar/lib/linuxattr.c +index 496dd82..30c85c2 100644 +--- a/xar/lib/linuxattr.c ++++ b/xar/lib/linuxattr.c +@@ -97,39 +97,50 @@ struct _linuxattr_context{ + + #define LINUXATTR_CONTEXT(x) ((struct _linuxattr_context *)(x)) + +-int32_t xar_linuxattr_read(xar_t x, xar_file_t f, void * buf, size_t len, void *context) { +- +- if( !LINUXATTR_CONTEXT(context)->buf ) { +- int r; +- LINUXATTR_CONTEXT(context)->bufsz = 1024; ++int32_t xar_linuxattr_read(xar_t x, xar_file_t f, void *inbuf, size_t len, void *context) { ++ void *buf; ++ int bufsz, off, ret; ++ int r; ++ ++ buf = LINUXATTR_CONTEXT(context)->buf; ++ bufsz = LINUXATTR_CONTEXT(context)->bufsz; ++ off = LINUXATTR_CONTEXT(context)->off; ++ ++ if (buf == NULL) { ++ bufsz = 1024; + AGAIN2: +- LINUXATTR_CONTEXT(context)->buf = malloc(LINUXATTR_CONTEXT(context)->bufsz); +- if(!LINUXATTR_CONTEXT(context)->buf) +- goto AGAIN2; +- memset(LINUXATTR_CONTEXT(context)->buf, 0, LINUXATTR_CONTEXT(context)->bufsz); +- r = lgetxattr(LINUXATTR_CONTEXT(context)->file, LINUXATTR_CONTEXT(context)->attrname, LINUXATTR_CONTEXT(context)->buf, LINUXATTR_CONTEXT(context)->bufsz); +- if( r < 0 ) { +- switch(errno) { +- case ERANGE: LINUXATTR_CONTEXT(context)->bufsz *= 2; free(LINUXATTR_CONTEXT(context)->buf); goto AGAIN2; +- case ENOTSUP: free(LINUXATTR_CONTEXT(context)->buf); return 0; +- default: break; ++ buf = malloc(bufsz); ++ if (!buf) { ++ return -1; ++ } ++ memset(buf, 0, bufsz); ++ r = lgetxattr(LINUXATTR_CONTEXT(context)->file, LINUXATTR_CONTEXT(context)->attrname, buf, bufsz); ++ if (r < 0) { ++ free(buf); ++ switch (errno) { ++ case ERANGE: ++ bufsz *= 2; ++ goto AGAIN2; ++ case ENOTSUP: ++ return 0; + }; + return -1; + } ++ LINUXATTR_CONTEXT(context)->buf = buf; + LINUXATTR_CONTEXT(context)->bufsz = r; ++ bufsz = r; + } + +- if( (LINUXATTR_CONTEXT(context)->bufsz-LINUXATTR_CONTEXT(context)->off) <= len ) { +- int32_t ret; +- ret = LINUXATTR_CONTEXT(context)->bufsz - LINUXATTR_CONTEXT(context)->off; +- memcpy(buf, ((char *)LINUXATTR_CONTEXT(context)->buf)+LINUXATTR_CONTEXT(context)->off, ret); +- LINUXATTR_CONTEXT(context)->off += ret; +- return(ret); +- } else { +- memcpy(buf, ((char *)LINUXATTR_CONTEXT(context)->buf)+LINUXATTR_CONTEXT(context)->off, len); +- LINUXATTR_CONTEXT(context)->buf = ((char *)LINUXATTR_CONTEXT(context)->buf) + len; +- return len; ++ ret = bufsz - off; ++ if (ret <= len) { ++ memcpy(inbuf, ((char *)buf) + off, ret); ++ LINUXATTR_CONTEXT(context)->off = bufsz; ++ return ret; + } ++ ++ memcpy(inbuf, ((char *)buf) + off, len); ++ LINUXATTR_CONTEXT(context)->off += len; ++ return len; + } + + int32_t xar_linuxattr_write(xar_t x, xar_file_t f, void *buf, size_t len, void *context) { +@@ -185,6 +196,7 @@ TRYAGAIN: + + for( i=buf; (i-buf) < ret; i += strlen(i)+1 ) { + xar_ea_t e; ++ int rc; + + context.bufsz = 0; + context.off = 0; +@@ -194,11 +206,13 @@ TRYAGAIN: + xar_ea_pset(f, e, "fstype", fsname); + context.attrname = i; + context.ea = e; +- if (XAR(x)->attrcopy_to_heap(x, f, xar_ea_root(e), xar_linuxattr_read,&context) < 0) { ++ rc = XAR(x)->attrcopy_to_heap(x, f, xar_ea_root(e), xar_linuxattr_read, &context); ++ if (context.buf != NULL) ++ free(context.buf); ++ if (rc < 0) { + retval = -1; + goto BAIL; + } +- free(context.buf); + context.attrname = NULL; + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch new file mode 100644 index 000000000000..bfec41f10a73 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0015-Fix-segfault-in-xar_attrcopy_from_heap.patch @@ -0,0 +1,59 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 27 Jul 2024 21:04:20 +0300 +Subject: [PATCH 15/19] Fix segfault in xar_attrcopy_from_heap + +Fixes a nasty segfault crash when extracting files with extended +attributes (and perhaps in other cases). + +xar_attrcopy_from_heap (in lib/io.c) must not assume that context is +convertible to DATA_CONTEXT. Without this change, it calls the callback +from the provided context as if it was DATA_CONTEXT, but the context can +actually be other types, e.g. LINUXATTR_CONTEXT. +--- + xar/lib/data.c | 9 ++++++++- + xar/lib/io.c | 3 --- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/xar/lib/data.c b/xar/lib/data.c +index dcb5783..cfb3d58 100644 +--- a/xar/lib/data.c ++++ b/xar/lib/data.c +@@ -245,6 +245,13 @@ int32_t xar_data_extract(xar_t x, xar_file_t f, const char *file, char *buffer, + return retval; + } + ++static int xar_data_verify_callback(xar_t x, xar_file_t f, void *inbuf, size_t bsize, void *context) { ++ DATA_CONTEXT(context)->total += bsize; ++ if (DATA_CONTEXT(context)->progress) ++ DATA_CONTEXT(context)->progress(x, f, DATA_CONTEXT(context)->total); ++ return 0; ++} ++ + int32_t xar_data_verify(xar_t x, xar_file_t f, xar_progress_callback p) + { + const char *opt; +@@ -269,5 +276,5 @@ int32_t xar_data_verify(xar_t x, xar_file_t f, xar_progress_callback p) + if (!tmpp) // It appears that xar can have truely empty files, aka, no data. We should just fail to verify these files. + return 0; // After all, the checksum of blank is meaningless. So, failing to do so will cause a crash. + +- return XAR(x)->attrcopy_from_heap(x, f, tmpp, NULL , (void *)(&context)); ++ return XAR(x)->attrcopy_from_heap(x, f, tmpp, xar_data_verify_callback, (void *)(&context)); + } +diff --git a/xar/lib/io.c b/xar/lib/io.c +index fb9a72e..64c69af 100644 +--- a/xar/lib/io.c ++++ b/xar/lib/io.c +@@ -529,9 +529,6 @@ int32_t xar_attrcopy_from_heap(xar_t x, xar_file_t f, xar_prop_t p, write_callba + + readsofar += bsize; + +- if (DATA_CONTEXT(context)->progress) +- DATA_CONTEXT(context)->progress(x, f, readsofar); +- + bsize = def_bsize; + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch new file mode 100644 index 000000000000..d036d1e3eb82 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0016-Do-not-set-property-for-empty-ACL.patch @@ -0,0 +1,90 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sun, 28 Jul 2024 12:00:01 +0300 +Subject: [PATCH 16/19] Do not set property for empty ACL + +On Linux, acl_get_file helpfully converts file mode bits to ACL if no +extended attribute is set. See +https://git.savannah.nongnu.org/cgit/acl.git/tree/libacl/acl_get_file.c?id=d9bb1759d4dad2f28a6dcc8c1742ff75d16dd10d#n83 + +At the same time, Nix sandbox does not filter getxattr syscalls to +return ENOTSUP, but does filter setxattr. So we are in a intricate +situation where acl library thinks that EAs/ACLs are supported and +returns meaningful values for reads, so xar archives files with acl +property, but extraction fails because of the syscall filter. + +As a workaround, we add acl_extended_file check that actually returns +whether the file is associated with ACLs (internally represented as +extended attributes). +--- + xar/configure.ac | 5 ++--- + xar/include/config.h.in | 2 ++ + xar/lib/stat.c | 9 +++++++++ + 3 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index e466ee0..c3d9ff7 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -180,9 +180,8 @@ fi + ) + AC_SUBST([enable_autogen]) + +-AC_TRY_COMPILE([#include +-#include ], [acl_t a], [AC_DEFINE([HAVE_SYS_ACL_H],[1], [define if you have sys/acl.h and it has a working acl_t type])]) +-AC_CHECK_HEADERS(ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_HEADERS(sys/acl.h acl/libacl.h ext2fs/ext2_fs.h sys/statfs.h sys/vfs.h sys/xattr.h sys/param.h sys/extattr.h libutil.h) ++AC_CHECK_DECLS([acl_extended_file], [], [], [[#include ]]) + AC_CHECK_FUNCS(lgetxattr) + AC_CHECK_FUNCS(lsetxattr) + AC_CHECK_FUNCS(getxattr) +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 16c72d3..779f5aa 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -3,6 +3,7 @@ + #undef HAVE_SYS_XATTR_H + #undef HAVE_SYS_EXTATTR_H + #undef HAVE_SYS_PARAM_H ++#undef HAVE_DECL_ACL_EXTENDED_FILE + #undef HAVE_LGETXATTR + #undef HAVE_LSETXATTR + #undef HAVE_GETXATTR +@@ -12,6 +13,7 @@ + #undef HAVE_CHFLAGS + #undef HAVE_STATVFS + #undef HAVE_STATFS ++#undef HAVE_ACL_LIBACL_H + #undef HAVE_EXT2FS_EXT2_FS_H + #undef HAVE_STRUCT_STAT_ST_FLAGS + #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME +diff --git a/xar/lib/stat.c b/xar/lib/stat.c +index b0cce7c..81771dc 100644 +--- a/xar/lib/stat.c ++++ b/xar/lib/stat.c +@@ -66,6 +66,9 @@ + #ifdef HAVE_SYS_ACL_H + #include + #endif ++#ifdef HAVE_ACL_LIBACL_H ++#include ++#endif + #include "xar.h" + #include "arcmod.h" + #include "archive.h" +@@ -131,6 +134,12 @@ static int32_t aacls(xar_t x, xar_file_t f, const char *file) { + if( !xar_check_prop(x, "acl") ) + return 0; + ++#ifdef HAVE_DECL_ACL_EXTENDED_FILE ++ /* Do nothing if the file is not associated with ACL. */ ++ if( !acl_extended_file(file) ) ++ return 0; ++#endif ++ + a = acl_get_file(file, ACL_TYPE_DEFAULT); + if( a ) { + char *t; +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch new file mode 100644 index 000000000000..6123eef845f8 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0017-Fix-time-format-for-musl.patch @@ -0,0 +1,75 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Tue, 30 Jul 2024 16:06:57 +0300 +Subject: [PATCH 17/19] Fix time format for musl + +Directive %F is not supported in musl (until recent versions). +https://git.musl-libc.org/cgit/musl/commit/src/time/strptime.c?id=fced99e93daeefb0192fd16304f978d4401d1d77 + +Avoid using it for str[fp]time. +--- + xar/lib/stat.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/xar/lib/stat.c b/xar/lib/stat.c +index 81771dc..d71a613 100644 +--- a/xar/lib/stat.c ++++ b/xar/lib/stat.c +@@ -82,6 +82,8 @@ + #define LLONG_MAX LONG_LONG_MAX + #endif + ++static const char time_format[] = "%Y-%m-%dT%H:%M:%SZ"; ++ + static struct { + const char *name; + mode_t type; +@@ -513,24 +515,21 @@ int32_t xar_stat_archive(xar_t x, xar_file_t f, const char *file, const char *bu + if( xar_check_prop(x, "atime") ) { + gmtime_r(&XAR(x)->sbcache.st_atime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "atime", time); + } + + if( xar_check_prop(x, "mtime") ) { + gmtime_r(&XAR(x)->sbcache.st_mtime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "mtime", time); + } + + if( xar_check_prop(x, "ctime") ) { + gmtime_r(&XAR(x)->sbcache.st_ctime, &t); + memset(time, 0, sizeof(time)); +- strftime(time, sizeof(time), "%FT%T", &t); +- strcat(time, "Z"); ++ strftime(time, sizeof(time), time_format, &t); + xar_prop_set(f, "ctime", time); + } + +@@ -680,7 +679,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size + xar_prop_get(f, "atime", ×tr); + if( timestr ) { + memset(&t, 0, sizeof(t)); +- strptime(timestr, "%FT%T", &t); ++ strptime(timestr, time_format, &t); + tv[ATIME].tv_sec = timegm(&t); + } else { + tv[ATIME].tv_sec = time(NULL); +@@ -689,7 +688,7 @@ int32_t xar_set_perm(xar_t x, xar_file_t f, const char *file, char *buffer, size + xar_prop_get(f, "mtime", ×tr); + if( timestr ) { + memset(&t, 0, sizeof(t)); +- strptime(timestr, "%FT%T", &t); ++ strptime(timestr, time_format, &t); + tv[MTIME].tv_sec = timegm(&t); + } else { + tv[MTIME].tv_sec = time(NULL); +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch new file mode 100644 index 000000000000..2b8c17100951 --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0018-Replace-memcpy-with-memmove-for-musl.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Tue, 30 Jul 2024 17:29:06 +0300 +Subject: [PATCH 18/19] Replace memcpy with memmove for musl + +--- + xar/lib/io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xar/lib/io.c b/xar/lib/io.c +index 64c69af..c962c4b 100644 +--- a/xar/lib/io.c ++++ b/xar/lib/io.c +@@ -650,7 +650,7 @@ static int32_t flush_stream(xar_stream *stream) { + state->pending_buf = NULL; + } else if( state->pending_buf_size > len ) { + state->pending_buf_size -= len; +- memcpy(state->pending_buf, state->pending_buf + len, state->pending_buf_size); ++ memmove(state->pending_buf, state->pending_buf + len, state->pending_buf_size); + } + } + +-- +2.44.1 + diff --git a/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch new file mode 100644 index 000000000000..622ae16dc5fe --- /dev/null +++ b/pkgs/by-name/xa/xar/patches/0019-Prefer-OpenSSL-over-CommonCrypto-if-available.patch @@ -0,0 +1,150 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ivan Trubach +Date: Sat, 24 Aug 2024 10:44:09 +0300 +Subject: [PATCH 19/19] Prefer OpenSSL over CommonCrypto if available + +In Nixpkgs, we always have OpenSSL input available, so it makes sense to +prefer it over the CommonCrypto library. +See https://github.com/NixOS/nixpkgs/pull/329721#discussion_r1713492113 +--- + xar/configure.ac | 5 ++++- + xar/include/config.h.in | 1 + + xar/lib/archive.h | 6 ------ + xar/lib/hash.c | 20 +++++++++++--------- + 4 files changed, 16 insertions(+), 16 deletions(-) + +diff --git a/xar/configure.ac b/xar/configure.ac +index c3d9ff7..f7626bf 100644 +--- a/xar/configure.ac ++++ b/xar/configure.ac +@@ -299,9 +299,12 @@ dnl + have_openssl="1" + AC_CHECK_HEADERS([openssl/evp.h], , [have_openssl="0"]) + AC_CHECK_LIB([crypto], [OPENSSL_config], , [have_openssl="0"]) +-if test "x${have_openssl}" = "x0" ; then ++if test "x${have_openssl}" = "x1" ; then ++ AC_DEFINE([HAVE_OPENSSL], [], [HAVE_OPENSSL]) ++else + case "${host}" in + *-*-darwin*) ++ # Darwin uses CommonCrypto if OpenSSL is not available. + ;; + *) + AC_MSG_ERROR([Cannot build without OpenSSL for non-Darwin host]) +diff --git a/xar/include/config.h.in b/xar/include/config.h.in +index 779f5aa..dd44002 100644 +--- a/xar/include/config.h.in ++++ b/xar/include/config.h.in +@@ -24,6 +24,7 @@ + #undef HAVE_LIBUTIL_H + #undef HAVE_LIBPTHREAD + #undef HAVE_ASPRINTF ++#undef HAVE_OPENSSL + #undef HAVE_LIBBZ2 + #undef HAVE_LIBLZMA + #undef HAVE_LCHOWN +diff --git a/xar/lib/archive.h b/xar/lib/archive.h +index f926245..8743120 100644 +--- a/xar/lib/archive.h ++++ b/xar/lib/archive.h +@@ -40,12 +40,6 @@ + #define _XAR_ARCHIVE_H_ + #include + #include +-#ifdef __APPLE__ +-#include +-#include +-#else +-#include +-#endif + #include + #include + #include "xar.h" +diff --git a/xar/lib/hash.c b/xar/lib/hash.c +index cb4f6cf..b99eca9 100644 +--- a/xar/lib/hash.c ++++ b/xar/lib/hash.c +@@ -41,7 +41,10 @@ + #include + #include + #include +-#ifdef __APPLE__ ++ ++#include "config.h" ++ ++#if !defined(HAVE_OPENSSL) + #include + #include + #else +@@ -50,7 +53,6 @@ + + #include "xar.h" + #include "hash.h" +-#include "config.h" + #ifndef HAVE_ASPRINTF + #include "asprintf.h" + #endif +@@ -58,7 +60,7 @@ + + #pragma mark Hash Wrapper Object + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + + CCDigestRef digestRef_from_name(const char* name, unsigned int *outHashSize) { + CCDigestRef result = NULL; +@@ -88,13 +90,13 @@ CCDigestRef digestRef_from_name(const char* name, unsigned int *outHashSize) { + + return result; + } +-#endif // __APPLE__ ++#endif // !defined(HAVE_OPENSSL) + + + struct __xar_hash_t { + const char *digest_name; + void *context; +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestRef digest; + #else + EVP_MD_CTX *digest; +@@ -113,7 +115,7 @@ xar_hash_t xar_hash_new(const char *digest_name, void *context) { + if( context ) + HASH_CTX(hash)->context = context; + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + HASH_CTX(hash)->digest = digestRef_from_name(digest_name, &HASH_CTX(hash)->length); + #else + OpenSSL_add_all_digests(); +@@ -136,7 +138,7 @@ const char *xar_hash_get_digest_name(xar_hash_t hash) { + } + + void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); + #else + EVP_DigestUpdate(HASH_CTX(hash)->digest, buffer, nbyte); +@@ -144,7 +146,7 @@ void xar_hash_update(xar_hash_t hash, void *buffer, size_t nbyte) { + } + + void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + void *buffer = calloc(1, CC_SHA512_DIGEST_LENGTH); // current biggest digest size This is what OpenSSL uses + #else + void *buffer = calloc(1, EVP_MAX_MD_SIZE); +@@ -152,7 +154,7 @@ void *xar_hash_finish(xar_hash_t hash, size_t *nbyte) { + if( ! buffer ) + return NULL; + +-#ifdef __APPLE__ ++#if !defined(HAVE_OPENSSL) + CCDigestFinal(HASH_CTX(hash)->digest, buffer); + CCDigestDestroy(HASH_CTX(hash)->digest); + #else +-- +2.44.1 + diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 13d53ad6e678..b8c8f1219c9d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -2331,7 +2331,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check openpam openssl.out patch - xar + xar.lib xz.bin xz.out zlib.dev diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix deleted file mode 100644 index 9c03c41054be..000000000000 --- a/pkgs/tools/compression/xar/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, xz, openssl, zlib, bzip2, fts, autoreconfHook }: - -stdenv.mkDerivation rec { - version = "1.6.1"; - pname = "xar"; - - src = fetchurl { - url = "https://github.com/downloads/mackyle/xar/${pname}-${version}.tar.gz"; - sha256 = "0ghmsbs6xwg1092v7pjcibmk5wkyifwxw6ygp08gfz25d2chhipf"; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libxml2 xz openssl zlib bzip2 fts ]; - - patches = [ - ./0001-Add-useless-descriptions-to-AC_DEFINE.patch - ./0002-Use-pkg-config-for-libxml2.patch - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace 'OpenSSL_add_all_ciphers' 'OPENSSL_init_crypto' \ - --replace 'openssl/evp.h' 'openssl/crypto.h' - ''; - - configureFlags = lib.optional (fts != null) "LDFLAGS=-lfts"; - - meta = { - homepage = "https://mackyle.github.io/xar/"; - description = "Extensible Archiver"; - - longDescription = - '' The XAR project aims to provide an easily extensible archive format. - Important design decisions include an easily extensible XML table of - contents for random access to archived files, storing the toc at the - beginning of the archive to allow for efficient handling of streamed - archives, the ability to handle files of arbitrarily large sizes, the - ability to choose independent encodings for individual files in the - archive, the ability to store checksums for individual files in both - compressed and uncompressed form, and the ability to query the table - of content's rich meta-data. - ''; - - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ copumpkin ]; - platforms = lib.platforms.all; - mainProgram = "xar"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a0d28150f966..fdaaf001d650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14082,8 +14082,6 @@ with pkgs; vul = callPackage ../applications/misc/vul { }; - xar = callPackage ../tools/compression/xar { }; - xarchive = callPackage ../tools/archivers/xarchive { }; xarchiver = callPackage ../tools/archivers/xarchiver { }; From f3ece34945e145358cd8c2604b37fb683393f510 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 25 Aug 2024 17:08:37 +0100 Subject: [PATCH 095/481] nixos/postgresql: fix documentation markdown Without the change the doc build fails as: $ nix build -f nixos config.system.build.manual.manualHTML -L ... nixos-manual-html> RuntimeError: heading in line 366 does not have an id --- nixos/modules/services/databases/postgresql.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 4de0ca9d2e90..77c87e3f063b 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -363,6 +363,6 @@ postgresql.withJIT.pname evaluates to `"foobar"`. -## Notable differences to upstream +## Notable differences to upstream {#module-services-postgres-upstream-deviation} - To avoid circular dependencies between default and -dev outputs, the output of the `pg_config` system view has been removed. From 2f9c580c6f48b8bdea941188b85389601c1ad867 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Mon, 26 Aug 2024 01:48:48 +0300 Subject: [PATCH 096/481] postgresql: use systemdLibs Reduces the set of dependencies required to build PostgreSQL. --- pkgs/servers/sql/postgresql/generic.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 08b32befb672..ad2bd184a4e2 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -3,12 +3,12 @@ let generic = # dependencies { stdenv, lib, fetchurl, fetchpatch, makeWrapper - , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid + , glibc, zlib, readline, openssl, icu, lz4, zstd, systemdLibs, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , linux-pam # This is important to obtain a version of `libpq` that does not depend on systemd. - , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd && !stdenv.hostPlatform.isStatic + , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs && !stdenv.hostPlatform.isStatic , enableSystemd ? null , gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic @@ -69,7 +69,7 @@ let ++ lib.optionals jitSupport [ llvmPackages.llvm ] ++ lib.optionals lz4Enabled [ lz4 ] ++ lib.optionals zstdEnabled [ zstd ] - ++ lib.optionals systemdSupport' [ systemd ] + ++ lib.optionals systemdSupport' [ systemdLibs ] ++ lib.optionals pythonSupport [ python3 ] ++ lib.optionals gssSupport [ libkrb5 ] ++ lib.optionals stdenv'.isLinux [ linux-pam ] From 23eacd40cf5907665262e0dbeb24dc4347c575d1 Mon Sep 17 00:00:00 2001 From: Ivan Trubach Date: Mon, 19 Aug 2024 17:28:11 +0300 Subject: [PATCH 097/481] gnupatch: fix segfault on cleanup See https://savannah.gnu.org/bugs/?57717 Reproducer: ```console $ patch -p1 <<'EOF' diff --git a/file2.txt b/file2.txt index e69de29..d20e9cd 100644 --- a/file2.txt +++ b/file2.txt @@ -1 +1 @@ -old content +new content EOF ``` ``` (repeated lines omitted) patch: **** Can't create file file2.txt.orig : Too many open files patch: **** Can't create file file2.txt.orig : Too many open files patch: **** Can't create file file2.txt.origSegmentation fault (core dumped) ``` --- .../Abort_when_cleaning_up_fails.patch | 51 +++++++++++++++++++ pkgs/tools/text/gnupatch/default.nix | 3 ++ 2 files changed, 54 insertions(+) create mode 100644 pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch diff --git a/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch b/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch new file mode 100644 index 000000000000..ab3baf80f8c1 --- /dev/null +++ b/pkgs/tools/text/gnupatch/Abort_when_cleaning_up_fails.patch @@ -0,0 +1,51 @@ +From b7b028a77bd855f6f56b17c8837fc1cca77b469d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 28 Jun 2019 00:30:25 +0200 +Subject: Abort when cleaning up fails + +When a fatal error triggers during cleanup, another attempt will be made to +clean up, which will likely lead to the same fatal error. So instead, bail out +when that happens. +src/patch.c (cleanup): Bail out when called recursively. +(main): There is no need to call output_files() before cleanup() as cleanup() +already does that. +--- + src/patch.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/patch.c b/src/patch.c +index 4616a48..02fd982 100644 +--- a/src/patch.c ++++ b/src/patch.c +@@ -685,7 +685,6 @@ main (int argc, char **argv) + } + if (outstate.ofp && (ferror (outstate.ofp) || fclose (outstate.ofp) != 0)) + write_fatal (); +- output_files (NULL); + cleanup (); + delete_files (); + if (somefailed) +@@ -1991,7 +1990,6 @@ void + fatal_exit (int sig) + { + cleanup (); +- + if (sig) + exit_with_signal (sig); + +@@ -2011,6 +2009,12 @@ remove_if_needed (char const *name, bool *needs_removal) + static void + cleanup (void) + { ++ static bool already_cleaning_up; ++ ++ if (already_cleaning_up) ++ return; ++ already_cleaning_up = true; ++ + remove_if_needed (TMPINNAME, &TMPINNAME_needs_removal); + remove_if_needed (TMPOUTNAME, &TMPOUTNAME_needs_removal); + remove_if_needed (TMPPATNAME, &TMPPATNAME_needs_removal); +-- +cgit v1.1 + diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index c19e087ea547..19d8652396c9 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b5a91a01e5d0897facdd0f49d64b76b0f02b43e1 ./Allow_input_files_to_be_missing_for_ed-style_patches.patch + # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=b7b028a77bd855f6f56b17c8837fc1cca77b469d + ./Abort_when_cleaning_up_fails.patch + # https://git.savannah.gnu.org/cgit/patch.git/patch/?id=123eaff0d5d1aebe128295959435b9ca5909c26d ./CVE-2018-1000156.patch From 005b0d6ef55ce26badb81883a7394893ae791e6c Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 26 Aug 2024 17:52:13 +0300 Subject: [PATCH 098/481] graphene: fix `tests.installedTests` `glib`'s typelib was split from `gobject-introspection`. `ImportError: Typelib file for namespace 'GObject', version '2.0' not found` --- pkgs/development/libraries/graphene/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 7b64aa2bc586..a1f3fee6656d 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { in lib.optionalString withIntrospection '' if [ -x '${introspectionPy}' ] ; then wrapProgram '${introspectionPy}' \ - --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0" + --prefix GI_TYPELIB_PATH : "${lib.makeSearchPath "lib/girepository-1.0" [ glib.out (placeholder "out") ]}" fi ''; From cf99b99fe673c2861da33adfc6598de46ec01a67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Aug 2024 15:07:51 +0000 Subject: [PATCH 099/481] rabbitmq-server: 3.13.6 -> 3.13.7 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index d2184a208c00..68cad9be1a69 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.13.6"; + version = "3.13.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-y6rHZpAhXVuO6sn18ZRvbG8qajTCVdE7iWkn+KXUhwI="; + hash = "sha256-GDUyYudwhQSLrFXO21W3fwmH2tl2STF9gSuZsb3GZh0="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From 60bd9fec1eb137eda17ba0390a20059ef1ff012a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Aug 2024 00:12:27 +0000 Subject: [PATCH 100/481] vscode-extensions.ms-python.vscode-pylance: 2024.8.1 -> 2024.8.2 --- .../vscode/extensions/ms-python.vscode-pylance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix index d1aca87dc496..9fc9a29c1b22 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.vscode-pylance/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-pylance"; publisher = "MS-python"; - version = "2024.8.1"; - hash = "sha256-UfbhvEWZVAQ/3xg57JpNqURTx/+g6zsWZ0WOzRHtrOU="; + version = "2024.8.2"; + hash = "sha256-EwxQjCBSmJ78L06EtKB8twIz5x51Jo/DHNlpD31pIKA="; }; buildInputs = [ pyright ]; From 1feaea91067bd93947cba889f2479c1733908880 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 27 Aug 2024 00:13:11 -0400 Subject: [PATCH 101/481] swig: swig3 -> swig4 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index adf61ba3d026..46084dc70a2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19018,7 +19018,7 @@ with pkgs; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; swig4 = callPackage ../development/tools/misc/swig/4.nix { }; - swig = swig3; + swig = swig4; swigWithJava = swig; c2ffi = callPackage ../development/tools/misc/c2ffi { }; From 4075c526ec619f32a946c2cb93f9e081cdc38014 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 27 Aug 2024 18:23:51 +0300 Subject: [PATCH 102/481] python312Packages.scipy: don't use with lib in meta --- pkgs/development/python-modules/scipy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index c6daa99905d2..aad048e88f52 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -211,12 +211,12 @@ buildPythonPackage { SCIPY_USE_G77_ABI_WRAPPER = 1; - meta = with lib; { + meta = { changelog = "https://github.com/scipy/scipy/releases/tag/v${version}"; description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering"; downloadPage = "https://github.com/scipy/scipy"; homepage = "https://www.scipy.org/"; - license = licenses.bsd3; - maintainers = with maintainers; [ doronbehar ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ doronbehar ]; }; } From 5d63abee89ac0afca31bf7e35be438194634ebc9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 27 Aug 2024 18:26:03 +0300 Subject: [PATCH 103/481] python312Packages.scipy: use modern deps Python attributes --- pkgs/development/python-modules/scipy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index aad048e88f52..028771ca5dbf 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -95,7 +95,7 @@ buildPythonPackage { --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ ''; - nativeBuildInputs = [ + build-system = [ cython gfortran meson-python @@ -120,7 +120,7 @@ buildPythonPackage { xsimd ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; __darwinAllowLocalNetworking = true; From 0c8ccd6b96b5c755f63a50822e5fd44f35b9ff4d Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 27 Aug 2024 20:43:16 +0300 Subject: [PATCH 104/481] luaPackages.luarocks_bootstrap: Fix build I don't know what conditions are necessary to have the files in `/etc/luarocks` populated so using `replace-quiet`. At least on cross there is a file which contains configuration. --- pkgs/development/tools/misc/luarocks/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 996bfeacb2d1..b15924b34f3c 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* substituteInPlace $out/etc/luarocks/* \ - --replace-fail '${lua.luaOnBuild}' '${lua}' + --replace-quiet '${lua.luaOnBuild}' '${lua}' '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks \ From 34123fcafb67ccc676fe5520f2ff1f31c8278ab7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 27 Aug 2024 18:30:09 +0300 Subject: [PATCH 105/481] python312Packages.scipy: cleaning + inputs sorting --- .../python-modules/scipy/default.nix | 70 +++++++++++-------- 1 file changed, 39 insertions(+), 31 deletions(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 028771ca5dbf..5084f741c838 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -1,34 +1,41 @@ { lib, stdenv, - fetchFromGitHub, - fetchpatch, fetchurl, writeText, - xcbuild, python, buildPythonPackage, + fetchFromGitHub, + fetchpatch, + + # build-system cython, gfortran, meson-python, nukeReferences, - pkg-config, pythran, - wheel, + pkg-config, setuptools, - hypothesis, - pytest7CheckHook, - pytest-xdist, - numpy, - pybind11, - pooch, - xsimd, + xcbuild, + + # buildInputs # Upstream has support for using Darwin's Accelerate package. However this # requires a Darwin user to work on a nice way to do that via an override. # See: # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L194-L211 blas, lapack, + pybind11, + pooch, + xsimd, + + # dependencies + numpy, + + # tests + hypothesis, + pytest7CheckHook, + pytest-xdist, # Reverse dependency sage, @@ -66,12 +73,12 @@ let in buildPythonPackage { inherit pname version; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "scipy"; - repo = pname; - rev = "v${version}"; + repo = "scipy"; + rev = "refs/tags/v${version}"; hash = srcHash; fetchSubmodules = true; }; @@ -95,22 +102,23 @@ buildPythonPackage { --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \ ''; - build-system = [ - cython - gfortran - meson-python - nukeReferences - pythran - pkg-config - wheel - setuptools - ] ++ lib.optionals stdenv.isDarwin [ - # Minimal version required according to: - # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 - (xcbuild.override { - sdkVer = "13.3"; - }) - ]; + build-system = + [ + cython + gfortran + meson-python + nukeReferences + pythran + pkg-config + setuptools + ] + ++ lib.optionals stdenv.isDarwin [ + # Minimal version required according to: + # https://github.com/scipy/scipy/blob/v1.14.0/scipy/meson.build#L185-L188 + (xcbuild.override { + sdkVer = "13.3"; + }) + ]; buildInputs = [ blas From 8f4200d165b73db63dc277e9984a480984415593 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 11:16:23 -0300 Subject: [PATCH 106/481] installShellFiles: move setup script to the same directory So that it can be migrated to by-name later. --- pkgs/build-support/install-shell-files/default.nix | 4 ++-- .../setup-hook.sh} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/build-support/{setup-hooks/install-shell-files.sh => install-shell-files/setup-hook.sh} (100%) diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index d50661ddc65d..00f3caa7f721 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,8 +1,8 @@ { makeSetupHook, tests }: -# See the header comment in ../setup-hooks/install-shell-files.sh for example usage. +# See the header comment in ./setup-hook.sh for example usage. let - setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; + setupHook = makeSetupHook { name = "install-shell-files"; } ./setup-hook.sh; in setupHook.overrideAttrs (oldAttrs: { diff --git a/pkgs/build-support/setup-hooks/install-shell-files.sh b/pkgs/build-support/install-shell-files/setup-hook.sh similarity index 100% rename from pkgs/build-support/setup-hooks/install-shell-files.sh rename to pkgs/build-support/install-shell-files/setup-hook.sh From f72e74d7aef142ea16d0841fa4322fc1310bb913 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 11:34:43 -0300 Subject: [PATCH 107/481] installShellFiles: migrate tests to tests subdirectory Rationale: Since RFCs 140 and 146, the old category-based hierarchy is deprecated and obsolete, and a new approach took place: packages should be as self-contained as possible. This paradigm is reflected in many new strict checks that prohibit a package to refer to files outside its directory tree. Following this spirit, this commit essentially moves nixpkgs pkgs/test/default.nix to ./tests/default.nix. Further, to keep the top-level `tests` attribute, a green alias is kept in the place of older file. --- .../install-shell-files/default.nix | 4 +- .../install-shell-files/tests/default.nix | 125 +++++++++++++++++ pkgs/test/install-shell-files/default.nix | 126 +----------------- 3 files changed, 129 insertions(+), 126 deletions(-) create mode 100644 pkgs/build-support/install-shell-files/tests/default.nix diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index 00f3caa7f721..1b7351847258 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -1,4 +1,4 @@ -{ makeSetupHook, tests }: +{ callPackage, makeSetupHook }: # See the header comment in ./setup-hook.sh for example usage. let @@ -7,6 +7,6 @@ in setupHook.overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or {}) // { - tests = tests.install-shell-files; + tests = callPackage ./tests { }; }; }) diff --git a/pkgs/build-support/install-shell-files/tests/default.nix b/pkgs/build-support/install-shell-files/tests/default.nix new file mode 100644 index 000000000000..aef5acc1de6b --- /dev/null +++ b/pkgs/build-support/install-shell-files/tests/default.nix @@ -0,0 +1,125 @@ +{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: + +let + runTest = name: env: buildCommand: + runCommandLocal "install-shell-files--${name}" ({ + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } // env) buildCommand; +in + +recurseIntoAttrs { + # installManPage + + install-manpage = runTest "install-manpage" {} '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + ''; + install-manpage-outputs = runTest "install-manpage-outputs" { + outputs = [ "out" "man" "devman" ]; + } '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + ''; + + # installShellCompletion + + install-completion = runTest "install-completion" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + ''; + install-completion-output = runTest "install-completion-output" { + outputs = [ "out" "bin" ]; + } '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + ''; + install-completion-name = runTest "install-completion-name" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + ''; + install-completion-inference = runTest "install-completion-inference" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + ''; + install-completion-cmd = runTest "install-completion-cmd" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + ''; + install-completion-fifo = runTest "install-completion-fifo" {} '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + ''; +} diff --git a/pkgs/test/install-shell-files/default.nix b/pkgs/test/install-shell-files/default.nix index aef5acc1de6b..21894698fe1b 100644 --- a/pkgs/test/install-shell-files/default.nix +++ b/pkgs/test/install-shell-files/default.nix @@ -1,125 +1,3 @@ -{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ installShellFiles }: -let - runTest = name: env: buildCommand: - runCommandLocal "install-shell-files--${name}" ({ - nativeBuildInputs = [ installShellFiles ]; - meta.platforms = lib.platforms.all; - } // env) buildCommand; -in - -recurseIntoAttrs { - # installManPage - - install-manpage = runTest "install-manpage" {} '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.2.gz - echo baz > doc/baz.3 - - installManPage doc/* - - cmp doc/foo.1 $out/share/man/man1/foo.1 - cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz - cmp doc/baz.3 $out/share/man/man3/baz.3 - ''; - install-manpage-outputs = runTest "install-manpage-outputs" { - outputs = [ "out" "man" "devman" ]; - } '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.3 - - installManPage doc/* - - # assert they didn't go into $out - [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] - - # foo.1 alone went into man - cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 - [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] - - # bar.3 alone went into devman - cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 - [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] - - touch $out - ''; - - # installShellCompletion - - install-completion = runTest "install-completion" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - echo qux > qux.zsh - echo quux > quux - - installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux - - cmp foo $out/share/bash-completion/completions/foo - cmp bar $out/share/bash-completion/completions/bar - cmp baz $out/share/zsh/site-functions/_baz - cmp qux.zsh $out/share/zsh/site-functions/_qux - cmp quux $out/share/fish/vendor_completions.d/quux - ''; - install-completion-output = runTest "install-completion-output" { - outputs = [ "out" "bin" ]; - } '' - echo foo > foo - - installShellCompletion --bash foo - - # assert it didn't go into $out - [[ ! -f $out/share/bash-completion/completions/foo ]] - - cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo - - touch $out - ''; - install-completion-name = runTest "install-completion-name" {} '' - echo foo > foo - echo bar > bar - echo baz > baz - - installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz - - cmp foo $out/share/bash-completion/completions/foobar.bash - cmp bar $out/share/zsh/site-functions/_foobar - cmp baz $out/share/fish/vendor_completions.d/baz - ''; - install-completion-inference = runTest "install-completion-inference" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - - installShellCompletion foo.bash bar.zsh baz.fish - - cmp foo.bash $out/share/bash-completion/completions/foo.bash - cmp bar.zsh $out/share/zsh/site-functions/_bar - cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish - ''; - install-completion-cmd = runTest "install-completion-cmd" {} '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - echo qux > qux.fish - - installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish - - cmp foo.bash $out/share/bash-completion/completions/foobar.bash - cmp bar.zsh $out/share/zsh/site-functions/_foobar - cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish - cmp qux.fish $out/share/fish/vendor_completions.d/qux - ''; - install-completion-fifo = runTest "install-completion-fifo" {} '' - installShellCompletion \ - --bash --name foo.bash <(echo foo) \ - --zsh --name _foo <(echo bar) \ - --fish --name foo.fish <(echo baz) - - [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } - [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } - [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } - ''; -} +installShellFiles.tests From 8b674370c42fd5312d53edd2002af0978ff3f2b9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 11:59:49 -0300 Subject: [PATCH 108/481] installShellFiles: nixfmt-rfc-style --- .../install-shell-files/default.nix | 3 +- .../install-shell-files/tests/default.nix | 100 +++++++++++------- 2 files changed, 62 insertions(+), 41 deletions(-) diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/build-support/install-shell-files/default.nix index 1b7351847258..12595850c393 100644 --- a/pkgs/build-support/install-shell-files/default.nix +++ b/pkgs/build-support/install-shell-files/default.nix @@ -4,9 +4,8 @@ let setupHook = makeSetupHook { name = "install-shell-files"; } ./setup-hook.sh; in - setupHook.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or {}) // { + passthru = (oldAttrs.passthru or { }) // { tests = callPackage ./tests { }; }; }) diff --git a/pkgs/build-support/install-shell-files/tests/default.nix b/pkgs/build-support/install-shell-files/tests/default.nix index aef5acc1de6b..456edc5c6330 100644 --- a/pkgs/build-support/install-shell-files/tests/default.nix +++ b/pkgs/build-support/install-shell-files/tests/default.nix @@ -1,17 +1,26 @@ -{ lib, runCommandLocal, recurseIntoAttrs, installShellFiles }: +{ + lib, + runCommandLocal, + recurseIntoAttrs, + installShellFiles, +}: let - runTest = name: env: buildCommand: - runCommandLocal "install-shell-files--${name}" ({ - nativeBuildInputs = [ installShellFiles ]; - meta.platforms = lib.platforms.all; - } // env) buildCommand; + runTest = + name: env: buildCommand: + runCommandLocal "install-shell-files--${name}" ( + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + // env + ) buildCommand; in recurseIntoAttrs { # installManPage - install-manpage = runTest "install-manpage" {} '' + install-manpage = runTest "install-manpage" { } '' mkdir -p doc echo foo > doc/foo.1 echo bar > doc/bar.2.gz @@ -23,32 +32,39 @@ recurseIntoAttrs { cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz cmp doc/baz.3 $out/share/man/man3/baz.3 ''; - install-manpage-outputs = runTest "install-manpage-outputs" { - outputs = [ "out" "man" "devman" ]; - } '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.3 + install-manpage-outputs = + runTest "install-manpage-outputs" + { + outputs = [ + "out" + "man" + "devman" + ]; + } + '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 - installManPage doc/* + installManPage doc/* - # assert they didn't go into $out - [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] - # foo.1 alone went into man - cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 - [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] - # bar.3 alone went into devman - cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 - [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] - touch $out - ''; + touch $out + ''; # installShellCompletion - install-completion = runTest "install-completion" {} '' + install-completion = runTest "install-completion" { } '' echo foo > foo echo bar > bar echo baz > baz @@ -63,21 +79,27 @@ recurseIntoAttrs { cmp qux.zsh $out/share/zsh/site-functions/_qux cmp quux $out/share/fish/vendor_completions.d/quux ''; - install-completion-output = runTest "install-completion-output" { - outputs = [ "out" "bin" ]; - } '' - echo foo > foo + install-completion-output = + runTest "install-completion-output" + { + outputs = [ + "out" + "bin" + ]; + } + '' + echo foo > foo - installShellCompletion --bash foo + installShellCompletion --bash foo - # assert it didn't go into $out - [[ ! -f $out/share/bash-completion/completions/foo ]] + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] - cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo - touch $out - ''; - install-completion-name = runTest "install-completion-name" {} '' + touch $out + ''; + install-completion-name = runTest "install-completion-name" { } '' echo foo > foo echo bar > bar echo baz > baz @@ -88,7 +110,7 @@ recurseIntoAttrs { cmp bar $out/share/zsh/site-functions/_foobar cmp baz $out/share/fish/vendor_completions.d/baz ''; - install-completion-inference = runTest "install-completion-inference" {} '' + install-completion-inference = runTest "install-completion-inference" { } '' echo foo > foo.bash echo bar > bar.zsh echo baz > baz.fish @@ -99,7 +121,7 @@ recurseIntoAttrs { cmp bar.zsh $out/share/zsh/site-functions/_bar cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish ''; - install-completion-cmd = runTest "install-completion-cmd" {} '' + install-completion-cmd = runTest "install-completion-cmd" { } '' echo foo > foo.bash echo bar > bar.zsh echo baz > baz.fish @@ -112,7 +134,7 @@ recurseIntoAttrs { cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish cmp qux.fish $out/share/fish/vendor_completions.d/qux ''; - install-completion-fifo = runTest "install-completion-fifo" {} '' + install-completion-fifo = runTest "install-completion-fifo" { } '' installShellCompletion \ --bash --name foo.bash <(echo foo) \ --zsh --name _foo <(echo bar) \ From e548b3170836504cc2be8159c9aadccfbd63c469 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 12:12:18 -0300 Subject: [PATCH 109/481] installShellFiles: migrate to by-name --- .../default.nix => by-name/in/installShellFiles/package.nix} | 0 .../in/installShellFiles}/setup-hook.sh | 0 .../in/installShellFiles}/tests/default.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{build-support/install-shell-files/default.nix => by-name/in/installShellFiles/package.nix} (100%) rename pkgs/{build-support/install-shell-files => by-name/in/installShellFiles}/setup-hook.sh (100%) rename pkgs/{build-support/install-shell-files => by-name/in/installShellFiles}/tests/default.nix (100%) diff --git a/pkgs/build-support/install-shell-files/default.nix b/pkgs/by-name/in/installShellFiles/package.nix similarity index 100% rename from pkgs/build-support/install-shell-files/default.nix rename to pkgs/by-name/in/installShellFiles/package.nix diff --git a/pkgs/build-support/install-shell-files/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh similarity index 100% rename from pkgs/build-support/install-shell-files/setup-hook.sh rename to pkgs/by-name/in/installShellFiles/setup-hook.sh diff --git a/pkgs/build-support/install-shell-files/tests/default.nix b/pkgs/by-name/in/installShellFiles/tests/default.nix similarity index 100% rename from pkgs/build-support/install-shell-files/tests/default.nix rename to pkgs/by-name/in/installShellFiles/tests/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95a3f8e10570..f6e2250c6bc5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1204,8 +1204,6 @@ with pkgs; inherit url; }; - installShellFiles = callPackage ../build-support/install-shell-files { }; - lazydocker = callPackage ../tools/misc/lazydocker { }; ld-is-cc-hook = makeSetupHook { name = "ld-is-cc-hook"; } From 98e9fbb530d572f057d1b9ea787a5a67a1d3a24c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 13:06:30 -0300 Subject: [PATCH 110/481] installShellFiles: dismember tests into their own files It makes the maintenance and creation of tests more intuitive: just throw a Nix package under tests! --- pkgs/by-name/in/installShellFiles/package.nix | 11 +- .../in/installShellFiles/tests/default.nix | 147 ------------------ .../tests/install-completion-cmd.nix | 24 +++ .../tests/install-completion-fifo.nix | 21 +++ .../tests/install-completion-inference.nix | 22 +++ .../tests/install-completion-name.nix | 22 +++ .../tests/install-completion-output.nix | 27 ++++ .../tests/install-completion.nix | 26 ++++ .../tests/install-manpage-outputs.nix | 36 +++++ .../tests/install-manpage.nix | 23 +++ 10 files changed, 210 insertions(+), 149 deletions(-) delete mode 100644 pkgs/by-name/in/installShellFiles/tests/default.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-completion.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-manpage.nix diff --git a/pkgs/by-name/in/installShellFiles/package.nix b/pkgs/by-name/in/installShellFiles/package.nix index 12595850c393..87787ad872ee 100644 --- a/pkgs/by-name/in/installShellFiles/package.nix +++ b/pkgs/by-name/in/installShellFiles/package.nix @@ -1,4 +1,8 @@ -{ callPackage, makeSetupHook }: +{ + lib, + callPackage, + makeSetupHook, +}: # See the header comment in ./setup-hook.sh for example usage. let @@ -6,6 +10,9 @@ let in setupHook.overrideAttrs (oldAttrs: { passthru = (oldAttrs.passthru or { }) // { - tests = callPackage ./tests { }; + tests = lib.packagesFromDirectoryRecursive { + inherit callPackage; + directory = ./tests; + }; }; }) diff --git a/pkgs/by-name/in/installShellFiles/tests/default.nix b/pkgs/by-name/in/installShellFiles/tests/default.nix deleted file mode 100644 index 456edc5c6330..000000000000 --- a/pkgs/by-name/in/installShellFiles/tests/default.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - lib, - runCommandLocal, - recurseIntoAttrs, - installShellFiles, -}: - -let - runTest = - name: env: buildCommand: - runCommandLocal "install-shell-files--${name}" ( - { - nativeBuildInputs = [ installShellFiles ]; - meta.platforms = lib.platforms.all; - } - // env - ) buildCommand; -in - -recurseIntoAttrs { - # installManPage - - install-manpage = runTest "install-manpage" { } '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.2.gz - echo baz > doc/baz.3 - - installManPage doc/* - - cmp doc/foo.1 $out/share/man/man1/foo.1 - cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz - cmp doc/baz.3 $out/share/man/man3/baz.3 - ''; - install-manpage-outputs = - runTest "install-manpage-outputs" - { - outputs = [ - "out" - "man" - "devman" - ]; - } - '' - mkdir -p doc - echo foo > doc/foo.1 - echo bar > doc/bar.3 - - installManPage doc/* - - # assert they didn't go into $out - [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] - - # foo.1 alone went into man - cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 - [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] - - # bar.3 alone went into devman - cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 - [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] - - touch $out - ''; - - # installShellCompletion - - install-completion = runTest "install-completion" { } '' - echo foo > foo - echo bar > bar - echo baz > baz - echo qux > qux.zsh - echo quux > quux - - installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux - - cmp foo $out/share/bash-completion/completions/foo - cmp bar $out/share/bash-completion/completions/bar - cmp baz $out/share/zsh/site-functions/_baz - cmp qux.zsh $out/share/zsh/site-functions/_qux - cmp quux $out/share/fish/vendor_completions.d/quux - ''; - install-completion-output = - runTest "install-completion-output" - { - outputs = [ - "out" - "bin" - ]; - } - '' - echo foo > foo - - installShellCompletion --bash foo - - # assert it didn't go into $out - [[ ! -f $out/share/bash-completion/completions/foo ]] - - cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo - - touch $out - ''; - install-completion-name = runTest "install-completion-name" { } '' - echo foo > foo - echo bar > bar - echo baz > baz - - installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz - - cmp foo $out/share/bash-completion/completions/foobar.bash - cmp bar $out/share/zsh/site-functions/_foobar - cmp baz $out/share/fish/vendor_completions.d/baz - ''; - install-completion-inference = runTest "install-completion-inference" { } '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - - installShellCompletion foo.bash bar.zsh baz.fish - - cmp foo.bash $out/share/bash-completion/completions/foo.bash - cmp bar.zsh $out/share/zsh/site-functions/_bar - cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish - ''; - install-completion-cmd = runTest "install-completion-cmd" { } '' - echo foo > foo.bash - echo bar > bar.zsh - echo baz > baz.fish - echo qux > qux.fish - - installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish - - cmp foo.bash $out/share/bash-completion/completions/foobar.bash - cmp bar.zsh $out/share/zsh/site-functions/_foobar - cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish - cmp qux.fish $out/share/fish/vendor_completions.d/qux - ''; - install-completion-fifo = runTest "install-completion-fifo" { } '' - installShellCompletion \ - --bash --name foo.bash <(echo foo) \ - --zsh --name _foo <(echo bar) \ - --fish --name foo.fish <(echo baz) - - [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } - [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } - [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } - ''; -} diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix new file mode 100644 index 000000000000..a8687ccc2c7d --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-cmd.nix @@ -0,0 +1,24 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-cmd" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix new file mode 100644 index 000000000000..2c777f0fb68a --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-fifo.nix @@ -0,0 +1,21 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-fifo" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix new file mode 100644 index 000000000000..9a51965ccecb --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-inference.nix @@ -0,0 +1,22 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-inference" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix new file mode 100644 index 000000000000..2473318dee2c --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-name.nix @@ -0,0 +1,22 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-name" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix new file mode 100644 index 000000000000..380b241e4f01 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion-output.nix @@ -0,0 +1,27 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion-output" + { + outputs = [ + "out" + "bin" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-completion.nix b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix new file mode 100644 index 000000000000..2738dd647f56 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-completion.nix @@ -0,0 +1,26 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-completion" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix new file mode 100644 index 000000000000..4e249a9e5061 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage-outputs.nix @@ -0,0 +1,36 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-manpage-outputs" + { + outputs = [ + "out" + "man" + "devman" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix new file mode 100644 index 000000000000..7b67d0aed94c --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-manpage.nix @@ -0,0 +1,23 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-manpage" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + '' From 1c9d4799c297aa0a2c8292d8d4b97992aa7bdd7d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 13:16:44 -0300 Subject: [PATCH 111/481] installShellFiles: add new function installBin --- .../in/installShellFiles/setup-hook.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/by-name/in/installShellFiles/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh index 4f4e215da4df..f51733e5f11f 100644 --- a/pkgs/by-name/in/installShellFiles/setup-hook.sh +++ b/pkgs/by-name/in/installShellFiles/setup-hook.sh @@ -233,3 +233,27 @@ installShellCompletion() { fi return $retval } + +# installBin [...] +# +# Install each argument to $outputBin +installBin() { + local path + for path in "$@"; do + if (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "installBin: installing $path" + fi + if test -z "$path"; then + echo "installBin: error: path cannot be empty" >&2 + return 1 + fi + local basename + # use stripHash in case it's a nix store path + basename=$(stripHash "$path") + + local outRoot + outRoot=${!outputBin:?} + + install -D --mode=755 --no-target-directory "$path" "${outRoot}/bin/$basename" || return + done +} From 507416c3115ee4b2c26b49ad4c1f2b2f014ef7ae Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 14 Aug 2024 13:20:51 -0300 Subject: [PATCH 112/481] installShellFiles: add new tests install-bin and install-bin-output --- .../tests/install-bin-output.nix | 31 +++++++++++++++++++ .../installShellFiles/tests/install-bin.nix | 21 +++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix create mode 100644 pkgs/by-name/in/installShellFiles/tests/install-bin.nix diff --git a/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix b/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix new file mode 100644 index 000000000000..900f1eaa7e71 --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-bin-output.nix @@ -0,0 +1,31 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-bin-output" + { + outputs = [ + "out" + "bin" + ]; + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p bin + echo "echo hello za warudo" > bin/hello + echo "echo amigo me gusta mucho" > bin/amigo + + installBin bin/* + + # assert it didn't go into $out + [[ ! -f $out/bin/amigo ]] + [[ ! -f $out/bin/hello ]] + + cmp bin/amigo ''${!outputBin}/bin/amigo + cmp bin/hello ''${!outputBin}/bin/hello + + touch $out + '' diff --git a/pkgs/by-name/in/installShellFiles/tests/install-bin.nix b/pkgs/by-name/in/installShellFiles/tests/install-bin.nix new file mode 100644 index 000000000000..ba00c59b21be --- /dev/null +++ b/pkgs/by-name/in/installShellFiles/tests/install-bin.nix @@ -0,0 +1,21 @@ +{ + lib, + installShellFiles, + runCommandLocal, +}: + +runCommandLocal "install-shell-files--install-bin" + { + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = lib.platforms.all; + } + '' + mkdir -p bin + echo "echo hello za warudo" > bin/hello + echo "echo amigo me gusta mucho" > bin/amigo + + installBin bin/* + + cmp bin/amigo $out/bin/amigo + cmp bin/hello $out/bin/hello + '' From bb5aa086d69be1bfe5c3777210edb748d10e31d2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 22:15:25 -0300 Subject: [PATCH 113/481] installShellFiles: rewrite functions - Use FUNCNAME to track the name of function being called - use long options for install commands - use nix*Log functions for logging, instead of custom echoes - remove silent error construction `|| return` --- .../in/installShellFiles/setup-hook.sh | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/pkgs/by-name/in/installShellFiles/setup-hook.sh b/pkgs/by-name/in/installShellFiles/setup-hook.sh index f51733e5f11f..b34893916541 100644 --- a/pkgs/by-name/in/installShellFiles/setup-hook.sh +++ b/pkgs/by-name/in/installShellFiles/setup-hook.sh @@ -24,19 +24,17 @@ installManPage() { local path for path in "$@"; do - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "installManPage: installing $path" - fi if test -z "$path"; then - echo "installManPage: error: path cannot be empty" >&2 + nixErrorLog "${FUNCNAME[0]}: path cannot be empty" return 1 fi + nixInfoLog "${FUNCNAME[0]}: installing $path" local basename basename=$(stripHash "$path") # use stripHash in case it's a nix store path local trimmed=${basename%.gz} # don't get fooled by compressed manpages local suffix=${trimmed##*.} if test -z "$suffix" -o "$suffix" = "$trimmed"; then - echo "installManPage: error: path missing manpage section suffix: $path" >&2 + nixErrorLog "${FUNCNAME[0]}: path missing manpage section suffix: $path" return 1 fi local outRoot @@ -45,7 +43,8 @@ installManPage() { else outRoot=${!outputMan:?} fi - install -Dm644 -T "$path" "${outRoot}/share/man/man$suffix/$basename" || return + local outPath="${outRoot}/share/man/man$suffix/$basename" + install -D --mode=644 --no-target-directory "$path" "$outPath" done } @@ -107,7 +106,7 @@ installShellCompletion() { --name) name=$1 shift || { - echo 'installShellCompletion: error: --name flag expected an argument' >&2 + nixErrorLog "${FUNCNAME[0]}: --name flag expected an argument" return 1 } continue;; @@ -118,7 +117,7 @@ installShellCompletion() { --cmd) cmdname=$1 shift || { - echo 'installShellCompletion: error: --cmd flag expected an argument' >&2 + nixErrorLog "${FUNCNAME[0]}: --cmd flag expected an argument" return 1 } continue;; @@ -127,7 +126,7 @@ installShellCompletion() { cmdname=${arg#--cmd=} continue;; --?*) - echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 + nixWarnLog "${FUNCNAME[0]}: unknown flag ${arg%%=*}" retval=2 continue;; --) @@ -136,23 +135,21 @@ installShellCompletion() { continue;; esac fi - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "installShellCompletion: installing $arg${name:+ as $name}" - fi + nixInfoLog "${FUNCNAME[0]}: installing $arg${name:+ as $name}" # if we get here, this is a path or named pipe # Identify shell and output name local curShell=$shell local outName='' if [[ -z "$arg" ]]; then - echo "installShellCompletion: error: empty path is not allowed" >&2 + nixErrorLog "${FUNCNAME[0]}: empty path is not allowed" return 1 elif [[ -p "$arg" ]]; then # this is a named fd or fifo if [[ -z "$curShell" ]]; then - echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2 + nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --bash, --fish, or --zsh" return 1 elif [[ -z "$name" && -z "$cmdname" ]]; then - echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2 + nixErrorLog "${FUNCNAME[0]}: named pipe requires one of --cmd or --name" return 1 fi else @@ -168,10 +165,10 @@ installShellCompletion() { *) if [[ "$argbase" = _* && "$argbase" != *.* ]]; then # probably zsh - echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 + nixWarnLog "${FUNCNAME[0]}: assuming path \`$arg' is zsh; please specify with --zsh" curShell=zsh else - echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 + nixWarnLog "${FUNCNAME[0]}: unknown shell for path: $arg" >&2 retval=2 continue fi;; @@ -188,7 +185,7 @@ installShellCompletion() { zsh) outName=_$cmdname;; *) # Our list of shells is out of sync with the flags we accept or extensions we detect. - echo 'installShellCompletion: internal error' >&2 + nixErrorLog "${FUNCNAME[0]}: internal: shell $curShell not recognized" return 1;; esac fi @@ -206,7 +203,7 @@ installShellCompletion() { fi;; *) # Our list of shells is out of sync with the flags we accept or extensions we detect. - echo 'installShellCompletion: internal error' >&2 + nixErrorLog "${FUNCNAME[0]}: internal: shell $curShell not recognized" return 1;; esac # Install file @@ -217,18 +214,18 @@ installShellCompletion() { mkdir -p "$outDir" \ && cat "$arg" > "$outPath" else - install -Dm644 -T "$arg" "$outPath" - fi || return + install -D --mode=644 --no-target-directory "$arg" "$outPath" + fi if [ ! -s "$outPath" ]; then - echo "installShellCompletion: error: installed shell completion file \`$outPath' does not exist or has zero size" >&2 + nixErrorLog "${FUNCNAME[0]}: installed shell completion file \`$outPath' does not exist or has zero size" return 1 fi # Clear the per-path flags name= done if [[ -n "$name" ]]; then - echo 'installShellCompletion: error: --name flag given with no path' >&2 + nixErrorLog "${FUNCNAME[0]}: --name flag given with no path" >&2 return 1 fi return $retval @@ -240,13 +237,12 @@ installShellCompletion() { installBin() { local path for path in "$@"; do - if (( "${NIX_DEBUG:-0}" >= 1 )); then - echo "installBin: installing $path" - fi if test -z "$path"; then - echo "installBin: error: path cannot be empty" >&2 + nixErrorLog "${FUNCNAME[0]}: path cannot be empty" return 1 fi + nixInfoLog "${FUNCNAME[0]}: installing $path" + local basename # use stripHash in case it's a nix store path basename=$(stripHash "$path") @@ -254,6 +250,7 @@ installBin() { local outRoot outRoot=${!outputBin:?} - install -D --mode=755 --no-target-directory "$path" "${outRoot}/bin/$basename" || return + local outPath="${outRoot}/bin/$basename" + install -D --mode=755 --no-target-directory "$path" "${outRoot}/bin/$basename" done } From 56ff39832db97b06ab3abc658a4569a30c6449f6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 23:11:50 -0300 Subject: [PATCH 114/481] installShellFiles: set passthru directly instead of overriding it --- pkgs/by-name/in/installShellFiles/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/in/installShellFiles/package.nix b/pkgs/by-name/in/installShellFiles/package.nix index 87787ad872ee..f1cf436a9b79 100644 --- a/pkgs/by-name/in/installShellFiles/package.nix +++ b/pkgs/by-name/in/installShellFiles/package.nix @@ -5,14 +5,12 @@ }: # See the header comment in ./setup-hook.sh for example usage. -let - setupHook = makeSetupHook { name = "install-shell-files"; } ./setup-hook.sh; -in -setupHook.overrideAttrs (oldAttrs: { - passthru = (oldAttrs.passthru or { }) // { +makeSetupHook { + name = "install-shell-files"; + passthru = { tests = lib.packagesFromDirectoryRecursive { inherit callPackage; directory = ./tests; }; }; -}) +} ./setup-hook.sh From 1fc77a5ce2a6884e8cc69fc59986a08648f4eb83 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 6 Aug 2024 22:12:58 -0300 Subject: [PATCH 115/481] doc: rewrite installShellFiles --- doc/hooks/installShellFiles.section.md | 83 ++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/doc/hooks/installShellFiles.section.md b/doc/hooks/installShellFiles.section.md index 9be67d57bfc6..edaea5895a3b 100644 --- a/doc/hooks/installShellFiles.section.md +++ b/doc/hooks/installShellFiles.section.md @@ -1,16 +1,79 @@ # `installShellFiles` {#installshellfiles} -This hook helps with installing manpages and shell completion files. It exposes 2 shell functions `installManPage` and `installShellCompletion` that can be used from your `postInstall` hook. +This hook adds helpers that install artifacts like executable files, manpages +and shell completions. -The `installManPage` function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with `.gz` suffix). This function will place them into the correct `share/man/man
/` directory, in [`outputMan`](#outputman). +It exposes the following functions that can be used from your `postInstall` +hook: -The `installShellCompletion` function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of `--bash`, `--fish`, or `--zsh`. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag `--name NAME` before the path. If this flag is not provided, zsh completions will be renamed automatically such that `foobar.zsh` becomes `_foobar`. A root name may be provided for all paths using the flag `--cmd NAME`; this synthesizes the appropriate name depending on the shell (e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for zsh). +## `installBin` {#installshellfiles-installbin} + +The `installBin` function takes one or more paths to files to install as +executable files. + +This function will place them into [`outputBin`](#outputbin). + +### Example Usage {#installshellfiles-installbin-exampleusage} + +```nix +{ + nativeBuildInputs = [ installShellFiles ]; + + # Sometimes the file has an undersirable name. It should be renamed before + # being installed via installBin + postInstall = '' + mv a.out delmar + installBin foobar delmar + ''; +} +``` + +## `installManPage` {#installshellfiles-installmanpage} + +The `installManPage` function takes one or more paths to manpages to install. + +The manpages must have a section suffix, and may optionally be compressed (with +`.gz` suffix). This function will place them into the correct +`share/man/man
/` directory in [`outputMan`](#outputman). + +### Example Usage {#installshellfiles-installmanpage-exampleusage} + +```nix +{ + nativeBuildInputs = [ installShellFiles ]; + + # Sometimes the manpage file has an undersirable name; e.g. it conflicts with + # another software with an equal name. It should be renamed before being + # installed via installManPage + postInstall = '' + mv fromsea.3 delmar.3 + installManPage foobar.1 delmar.3 + ''; +} +``` + +## `installShellCompletion` {#installshellfiles-installshellcompletion} + +The `installShellCompletion` function takes one or more paths to shell +completion files. + +By default it will autodetect the shell type from the completion file extension, +but you may also specify it by passing one of `--bash`, `--fish`, or +`--zsh`. These flags apply to all paths listed after them (up until another +shell flag is given). Each path may also have a custom installation name +provided by providing a flag `--name NAME` before the path. If this flag is not +provided, zsh completions will be renamed automatically such that `foobar.zsh` +becomes `_foobar`. A root name may be provided for all paths using the flag +`--cmd NAME`; this synthesizes the appropriate name depending on the shell +(e.g. `--cmd foo` will synthesize the name `foo.bash` for bash and `_foo` for +zsh). + +### Example Usage {#installshellfiles-installshellcompletion-exampleusage} ```nix { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installManPage doc/foobar.1 doc/barfoo.3 # explicit behavior installShellCompletion --bash --name foobar.bash share/completions.bash installShellCompletion --fish --name foobar.fish share/completions.fish @@ -21,9 +84,17 @@ The `installShellCompletion` function takes one or more paths to shell completio } ``` -The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which case the shell and name must be provided (see below). +The path may also be a fifo or named fd (such as produced by `<(cmd)`), in which +case the shell and name must be provided (see below). -If the destination shell completion file is not actually present or consists of zero bytes after calling `installShellCompletion` this is treated as a build failure. In particular, if completion files are not vendored but are generated by running an executable, this is likely to fail in cross compilation scenarios. The result will be a zero byte completion file and hence a build failure. To prevent this, guard the completion commands against this, e.g. +If the destination shell completion file is not actually present or consists of +zero bytes after calling `installShellCompletion` this is treated as a build +failure. In particular, if completion files are not vendored but are generated +by running an executable, this is likely to fail in cross compilation +scenarios. The result will be a zero byte completion file and hence a build +failure. To prevent this, guard the completion generation commands. + +### Example Usage {#installshellfiles-installshellcompletion-exampleusage-guarded} ```nix { From 32897dce904cb05328940293f289d82d9b413bcb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 5 Aug 2024 22:20:38 -0300 Subject: [PATCH 116/481] CODEOWNERS: update ownership for installShellFiles Since Ericson2314 is the original codeowner of the files. --- .github/CODEOWNERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e138cd66152a..22728d6a0b1a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -389,3 +389,8 @@ pkgs/by-name/lx/lxc* @adamcstephens /pkgs/os-specific/linux/checkpolicy @RossComputerGuy /pkgs/os-specific/linux/libselinux @RossComputerGuy /pkgs/os-specific/linux/libsepol @RossComputerGuy + +# installShellFiles +/pkgs/by-name/in/installShellFiles/* @Ericson2314 +/pkgs/test/install-shell-files/* @Ericson2314 +/doc/hooks/installShellFiles.section.md @Ericson2314 From 618cffa8e16a5c3182602841d848e7fcbc3c14ca Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 23 Aug 2024 23:05:28 -0300 Subject: [PATCH 117/481] nawk: uses installBin to install the binary --- pkgs/by-name/na/nawk/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/na/nawk/package.nix b/pkgs/by-name/na/nawk/package.nix index cb8766c8c6b0..d2132c25f277 100644 --- a/pkgs/by-name/na/nawk/package.nix +++ b/pkgs/by-name/na/nawk/package.nix @@ -34,7 +34,8 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 a.out "$out/bin/nawk" + mv a.out nawk + installBin nawk mv awk.1 nawk.1 installManPage nawk.1 runHook postInstall From 73c1748c1e0827c996ae7c71034d3eb105a122a3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Aug 2024 13:57:41 +0200 Subject: [PATCH 118/481] python312Packages.oauthlib: disable failing test with pyjwt 2.9.0 --- pkgs/development/python-modules/oauthlib/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index e8211953bb44..84fc4a2627b8 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -47,6 +47,11 @@ buildPythonPackage rec { pytestCheckHook ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); + disabledTests = [ + # https://github.com/oauthlib/oauthlib/issues/877 + "test_rsa_bad_keys" + ]; + pythonImportsCheck = [ "oauthlib" ]; passthru.tests = { From 92134fa6c7417a28b326c4feb8d49988dc3929d9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 29 Aug 2024 16:49:01 +0200 Subject: [PATCH 119/481] python312Packages.pyjwt: test oauthlib in passthru --- pkgs/development/python-modules/pyjwt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index 2dee3c550a12..daffbcb6d70c 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -9,6 +9,7 @@ sphinxHook, sphinx-rtd-theme, zope-interface, + oauthlib, }: buildPythonPackage rec { @@ -49,6 +50,10 @@ buildPythonPackage rec { pythonImportsCheck = [ "jwt" ]; + passthru.tests = { + inherit oauthlib; + }; + meta = with lib; { changelog = "https://github.com/jpadilla/pyjwt/blob/${version}/CHANGELOG.rst"; description = "JSON Web Token implementation in Python"; From 9729387a99fcff79e06dfd631f74a2923a84d585 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 30 Aug 2024 08:56:00 +0300 Subject: [PATCH 120/481] fontconfig: fix properly, remove NixOS module hack This reverts 49d33d4a6b15330b492a194edc4b67fb20a15fa1. --- nixos/modules/config/fonts/fontconfig.nix | 8 +------- pkgs/development/libraries/fontconfig/default.nix | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index a44b1fecd29a..9a9ac08eefeb 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -180,14 +180,8 @@ let mkdir -p $dst # fonts.conf - cp ${pkg.out}/etc/fonts/fonts.conf \ + ln -s ${pkg.out}/etc/fonts/fonts.conf \ $dst/../fonts.conf - - # horrible sed hack to add the line that was accidentally removed - # from the default config in #324516 - # FIXME: fix that, revert this - sed "5i /etc/fonts/conf.d" -i $dst/../fonts.conf - # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged mkdir -p $out/etc/fonts/2.11 ln -s /etc/fonts/fonts.conf \ diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 569c2716f0e5..83c5e3afc271 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' cd "$out/etc/fonts" xsltproc --stringparam fontDirectories "${dejavu_fonts.minimal}" \ + --stringparam includes /etc/fonts/conf.d \ --path $out/share/xml/fontconfig \ ${./make-fonts-conf.xsl} $out/etc/fonts/fonts.conf \ > fonts.conf.tmp From 74ec7d89989335e69d7897baebb98514ee243d11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 14:36:47 +0000 Subject: [PATCH 121/481] snabb: 2024.06 -> 2024.08 --- pkgs/tools/networking/snabb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 2cb9f3b62a92..0c0b009cc7a8 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snabb"; - version = "2024.06"; + version = "2024.08"; src = fetchFromGitHub { owner = "snabbco"; repo = "snabb"; rev = "v${version}"; - sha256 = "sha256-iCW0oEbLLqRKaxqxhSDsmRnI5YTi4HYcg+IWRAbt9WI="; + sha256 = "sha256-2ULkzNeyEkXFdd8BUEcY5wZswh8Z4s4ONqSQbeWK2Qs="; }; installPhase = '' From 9994e4df96fdedd44fba7f11d37ad8600467d494 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 17:01:15 -0700 Subject: [PATCH 122/481] tinyxxd: init at 1.3.5 --- pkgs/by-name/ti/tinyxxd/package.nix | 50 +++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/ti/tinyxxd/package.nix diff --git a/pkgs/by-name/ti/tinyxxd/package.nix b/pkgs/by-name/ti/tinyxxd/package.nix new file mode 100644 index 000000000000..a19f9d7ef3f3 --- /dev/null +++ b/pkgs/by-name/ti/tinyxxd/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + installShellFiles, + vim, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "tinyxxd"; + version = "1.3.5"; + + src = fetchFromGitHub { + repo = "tinyxxd"; + owner = "xyproto"; + rev = "v${finalAttrs.version}"; + hash = "sha256-W7BrQga98ACrhTHF3UlGQMRmcdJaxgorDP6FpD5mr2A="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + installFlags = [ "PREFIX=$(out)" ]; + + postInstall = '' + installManPage tinyxxd.1 + + # Allow using `tinyxxd` as `xxd`. This is similar to the Arch packaging. + # https://gitlab.archlinux.org/archlinux/packaging/packages/tinyxxd/-/blob/main/PKGBUILD + ln -s $out/bin/{tiny,}xxd + ln -s $out/share/man/man1/{tiny,}xxd.1.gz + ''; + + meta = { + homepage = "https://github.com/xyproto/tinyxxd"; + description = "Drop-in replacement and standalone version of the hex dump utility that comes with ViM"; + license = [ + lib.licenses.mit # or + lib.licenses.gpl2Only + ]; + mainProgram = "tinyxxd"; + maintainers = with lib.maintainers; [ + emily + philiptaron + ]; + platforms = lib.platforms.unix; + + # If the two `xxd` providers are present, choose this one. + priority = (vim.xxd.meta.priority or lib.meta.defaultPriority) - 1; + }; +}) From 7118909e8222d9d7dd4dbf8c153c8a0cae9a87a1 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 17:23:49 -0700 Subject: [PATCH 123/481] unixtools: use tinyxxd to serve up xxd --- pkgs/top-level/unixtools.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/unixtools.nix b/pkgs/top-level/unixtools.nix index 959d87d5864d..93bb34bba20d 100644 --- a/pkgs/top-level/unixtools.nix +++ b/pkgs/top-level/unixtools.nix @@ -224,9 +224,9 @@ let darwin = pkgs.darwin.basic_cmds; }; xxd = { - linux = pkgs.vim.xxd; - darwin = pkgs.vim.xxd; - freebsd = pkgs.vim.xxd; + linux = pkgs.tinyxxd; + darwin = pkgs.tinyxxd; + freebsd = pkgs.tinyxxd; }; }; From 04cf7c0cd4faa09e36f264bfb326c21e7d63a349 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 16 Aug 2024 17:17:44 -0700 Subject: [PATCH 124/481] doc: add release note about `xxd` now being provided by `tinyxxd` instead of `vim.xxd` --- nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index dd8d377e14eb..f9672d9bfe57 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -417,6 +417,8 @@ - The `shadowstack` hardening flag has been added, though disabled by default. +- `xxd` is now provided by the `tinyxxd` package, rather than `vim.xxd`, to reduce closure size and vulnerability impact. Since it has the same options and semantics as Vim's `xxd` utility, there is no user impact. Vim's `xxd` remains available as the `vim.xxd` package. + - `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups..inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep). - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872) From af10a338feb5c039ef2ae4a606697b7b5e769c1e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 10:11:35 +0200 Subject: [PATCH 125/481] gst_all_1.gstreamer: disable libunwind if unavailable --- .../libraries/gstreamer/core/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 40d40d742463..2cf0569b3e9e 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -10,7 +10,6 @@ , glib , makeWrapper , libcap -, libunwind , elfutils # for libdw , bash-completion , lib @@ -19,6 +18,9 @@ , gobject-introspection , rustc , testers +, libunwind +# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. +, withLibunwind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform libunwind # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: @@ -70,9 +72,10 @@ stdenv.mkDerivation (finalAttrs: { bash-completion ] ++ lib.optionals stdenv.isLinux [ libcap - libunwind ] ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [ elfutils + ] ++ lib.optionals withLibunwind [ + libunwind ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreServices @@ -86,10 +89,8 @@ stdenv.mkDerivation (finalAttrs: { "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users (lib.mesonEnable "doc" enableDocumentation) - ] ++ lib.optionals stdenv.isDarwin [ - # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. - "-Dlibunwind=disabled" - "-Dlibdw=disabled" + (lib.mesonEnable "libunwind" withLibunwind) + (lib.mesonEnable "libdw" withLibunwind) ]; postPatch = '' From b5c88efba7d7ce6ae830930613b40bd3b0a4aba9 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 10:12:42 +0200 Subject: [PATCH 126/481] gst_all_1.gstreamer: disable introspection if unavailable --- pkgs/development/libraries/gstreamer/core/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 2cf0569b3e9e..e8f873555d70 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -15,9 +15,11 @@ , lib , Cocoa , CoreServices -, gobject-introspection , rustc , testers +, gobject-introspection +, buildPackages +, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , libunwind # darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. , withLibunwind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform libunwind @@ -60,10 +62,11 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper glib bash-completion - gobject-introspection rustc ] ++ lib.optionals stdenv.isLinux [ libcap # for setcap binary + ] ++ lib.optionals withIntrospection [ + gobject-introspection ] ++ lib.optionals enableDocumentation [ hotdoc ]; @@ -88,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users + (lib.mesonEnable "introspection" withIntrospection) (lib.mesonEnable "doc" enableDocumentation) (lib.mesonEnable "libunwind" withLibunwind) (lib.mesonEnable "libdw" withLibunwind) From ac58a5e8b51e03b429b21f28afe7497bdd71126c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 31 Aug 2024 08:24:07 +0000 Subject: [PATCH 127/481] ibus-engines.typing-booster-unwrapped: 2.25.11 -> 2.25.15 --- .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 883ed6a2b5a3..cb0a8f7c7e29 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.25.11"; + version = "2.25.15"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-of8FcuYeLIEQgPmEQt1UqcMT6Bd2l5sCDj0Cia0JbmM="; + hash = "sha256-fSB/CnxzqCK63gBpHB3rkUCE492W3jmb4hfQXuJchiQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; From 22786dadf499ddcfaada6c66eeef055752e62672 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:45:46 +0300 Subject: [PATCH 128/481] vulkan-headers: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index cd9dbec03208..c9126e954140 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.3.283.0"; + version = "1.3.290.0"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-DpbTYlEJPtyf/m9QEI8fdAm1Hw8MpFd+iCd7WB2gp/M="; + hash = "sha256-goxA3Wg3u5hNCz54tWMJnFaS0JGVjphy14Ng/sAK/EM="; }; passthru.updateScript = ./update.sh; From 44e1b2986d70210d4339c6d3f8207ab40db56b93 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:45:48 +0300 Subject: [PATCH 129/481] vulkan-loader: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 97e513107825..352060ef8dcb 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-loader"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-pe4WYbfB20yRI5Pg+RxgmQcmdXsSoRxbBkQ3DdAL8r4="; + hash = "sha256-z26xvp7bKaOQAXF+/Sk24Syuw3N9QXc6sk2vlQwceJ8="; }; patches = [ ./fix-pkgconfig.patch ]; From 83ee093947ea50e0f9ed688c865b485d1738747f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:45:52 +0300 Subject: [PATCH 130/481] vulkan-validation-layers: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/development/tools/vulkan-validation-layers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index fdcf2994c189..d5de37245c21 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-OT9VfGg3+NBVV6SCGZ+Hu9FAxGJXXT45yvt2sHDIFTA="; + hash = "sha256-FMzQpc7mwZGib544w0Dx6LeGi64cercm5oUW45raasc="; }; nativeBuildInputs = [ From 9a94f57d73d101fe3bfdb7f93b3ba2f12c3da141 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:45:54 +0300 Subject: [PATCH 131/481] vulkan-tools: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/tools/graphics/vulkan-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 19d1597b72d0..759841d02e66 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-IAlqFCenv5e70XyLSYh2fE84JZQFJwg+YKTGaK7ShKA="; + hash = "sha256-8xuE4OTwtH8ckCKDU7oo0WI7/R4Ox53+j+F+ZuKysKI="; }; nativeBuildInputs = [ From 2cf5c8b852e31930a3866346f56841e67f4be17f Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:45:57 +0300 Subject: [PATCH 132/481] vulkan-tools-lunarg: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index afe23265572d..bef94286ac80 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-kRioHGrk6zsBIsnvusq6usAQqxQmCMmGk+O3ckkGEG4="; + hash = "sha256-APJRiO5xNHml3k9goFQKwmxb3BXDN7tmvcs/oNCVU58="; }; nativeBuildInputs = [ cmake python3 jq which pkg-config libsForQt5.qt5.wrapQtAppsHook ]; From 7b2ce5236d94c79fbeea87ae815a3c8efd723aa6 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:02 +0300 Subject: [PATCH 133/481] vulkan-extension-layer: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/tools/graphics/vulkan-extension-layer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/pkgs/tools/graphics/vulkan-extension-layer/default.nix index 6f5961de851d..b428672fe9fe 100644 --- a/pkgs/tools/graphics/vulkan-extension-layer/default.nix +++ b/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vulkan-extension-layer"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ExtensionLayer"; rev = "vulkan-sdk-${version}"; - hash = "sha256-ClmCYJD9GRtM0XgbZqbW1OY1ukP8+FifneaXUjvNGQ4="; + hash = "sha256-Cz4C8HoyP768H9ZI7Ys9oX3/qEEhz6vfkdKXoVfodT0="; }; nativeBuildInputs = [ cmake pkg-config jq ]; From 0d6ff0ddccbfb6285bb6811873c832172b1002d6 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:04 +0300 Subject: [PATCH 134/481] vulkan-utility-libraries: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- .../libraries/vulkan-utility-libraries/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-utility-libraries/default.nix b/pkgs/development/libraries/vulkan-utility-libraries/default.nix index 769cdb95908d..060f609c8566 100644 --- a/pkgs/development/libraries/vulkan-utility-libraries/default.nix +++ b/pkgs/development/libraries/vulkan-utility-libraries/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "vulkan-utility-libraries"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Utility-Libraries"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-oQC//4RHJjSncQtHPVsYnpLYtXfxSSJdbUBf8clevDI="; + hash = "sha256-dzX2xePUkjL4G+IMwPCUgFs1iKsqwZScQQBDt5toUzc="; }; nativeBuildInputs = [ cmake python3 ]; From 2314a5687b0a165dad261e465f20d36a3f30786a Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:07 +0300 Subject: [PATCH 135/481] vulkan-volk: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix index d65002027a17..378e32cd01a2 100644 --- a/pkgs/by-name/vu/vulkan-volk/package.nix +++ b/pkgs/by-name/vu/vulkan-volk/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "volk"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "zeux"; repo = "volk"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-AoUStYeSTu6YmdyKgx0n3O+p3asb39GU6HSHgOhhFhQ="; + hash = "sha256-SbTBwS4mJETrXRT7QMJX9F8ukcZmzz8+1atVbB/fid4="; }; nativeBuildInputs = [ cmake ]; From a919d00a29344642c0c0145c39008ff747a08f84 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:10 +0300 Subject: [PATCH 136/481] spirv-headers: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/development/libraries/spirv-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spirv-headers/default.nix b/pkgs/development/libraries/spirv-headers/default.nix index 31efd76209a3..8326a71041da 100644 --- a/pkgs/development/libraries/spirv-headers/default.nix +++ b/pkgs/development/libraries/spirv-headers/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-headers"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; rev = "vulkan-sdk-${version}"; - hash = "sha256-CAmDDqeMVKNdV/91VQYAKyCc+e+H99PRYZzt5WjswBI="; + hash = "sha256-c9ruBCnf9PNJz030bfRhHwyqju6T8YCRx+efKCEYgSo="; }; nativeBuildInputs = [ cmake ]; From d4bd2a8446c36c4e06f55628a71a7e200e35f4bd Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:14 +0300 Subject: [PATCH 137/481] spirv-cross: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.3.290.0 --- pkgs/tools/graphics/spirv-cross/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index aec81ac9c406..ee211e6c0318 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "spirv-cross"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Cross"; rev = "vulkan-sdk-${finalAttrs.version}"; - hash = "sha256-UEXKzx1NXCInOnI96Z1hfrpyoWdb3BOGEKstX1gVzIo="; + hash = "sha256-h5My9PbPq1l03xpXQQFolNy7G1RhExtTH6qPg7vVF/8="; }; nativeBuildInputs = [ cmake python3 ]; From 4441399c6475e24c34fed6e979d86b00f12c326d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 31 Aug 2024 13:46:18 +0300 Subject: [PATCH 138/481] spirv-tools: 1.3.283.0 -> 1.3.290.0 Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/vulkan-sdk-1.3.283.0...vulkan-sdk-1.3.290.0 --- pkgs/development/tools/spirv-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix index 50d04ba050c3..40764df42280 100644 --- a/pkgs/development/tools/spirv-tools/default.nix +++ b/pkgs/development/tools/spirv-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "spirv-tools"; - version = "1.3.283.0"; + version = "1.3.290.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; rev = "vulkan-sdk-${version}"; - hash = "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="; + hash = "sha256-5swjNHeJpsCDkUVBL1uFqAzOPFzCESsYtDfRkno2bN4="; }; # The cmake options are sufficient for turning on static building, but not From 90534869fb973c7d8d49f343ff1c999d19f06e55 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 31 Aug 2024 21:26:58 +0200 Subject: [PATCH 139/481] vim: 9.1.0689 -> 9.1.0707 Fixes 2 heap-buffer-overflows (GHSA-4ghr-c62x-cqfh / CVE-2024-43802, GHSA-wxf9-c5gx-qrwr). https://www.openwall.com/lists/oss-security/2024/08/31/1 https://www.openwall.com/lists/oss-security/2024/08/25/1 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 4113157d4f24..5b9cfec4cb32 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub }: rec { - version = "9.1.0689"; + version = "9.1.0707"; outputs = [ "out" "xxd" ]; @@ -8,7 +8,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-87y/STnGB2Yf64TMwCd6VCFF2kvy+DmNyaXVKPIc86E="; + hash = "sha256-iHOLABPk5B7Sh7EBYnM7wdxnK2Wv7q4WS3FEp780SV4="; }; enableParallelBuilding = true; From 0295652d91b30980e534251734b94d249643bec7 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 24 Aug 2024 22:25:52 +0800 Subject: [PATCH 140/481] todesk: init at 4.7.2.0 --- pkgs/by-name/to/todesk/package.nix | 144 +++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) create mode 100644 pkgs/by-name/to/todesk/package.nix diff --git a/pkgs/by-name/to/todesk/package.nix b/pkgs/by-name/to/todesk/package.nix new file mode 100644 index 000000000000..24f9ec992a41 --- /dev/null +++ b/pkgs/by-name/to/todesk/package.nix @@ -0,0 +1,144 @@ +{ + stdenv, + lib, + procps, + fetchurl, + dpkg, + writeShellScript, + buildFHSEnv, + nspr, + kmod, + systemdMinimal, + glib, + pulseaudio, + libXext, + libX11, + libXrandr, + glibc, + cairo, + libva, + libdrm, + coreutils, + libXi, + libGL, + bash, + libXcomposite, + libXdamage, + libXfixes, + libXtst, + nss, + libXxf86vm, + gtk3, + gdk-pixbuf, + pango, + libz, + libayatana-appindicator, +}: + +let + version = "4.7.2.0"; + todesk-unwrapped = stdenv.mkDerivation (finalAttrs: { + pname = "todesk-unwrapped"; + version = version; + src = fetchurl { + url = "https://newdl.todesk.com/linux/todesk-v${finalAttrs.version}-amd64.deb"; + hash = "sha256-v7VpXXFVaKI99RpzUWfAc6eE7NHGJeFrNeUTbVuX+yg="; + curlOptsList = [ + "--user-agent" + "Mozilla/5.0" + ]; + }; + nativeBuildInputs = [ dpkg ]; + + unpackPhase = '' + runHook preUnpack + dpkg -x $src ./todesk-src + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + mkdir -p "$out/lib" + cp -r todesk-src/* "$out" + cp "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" "$out/opt/todesk/bin/libappindicator3.so.1" + mv "$out/opt/todesk/bin" "$out/bin" + cp "$out/bin/libmfx.so.1" "$out/lib" + cp "$out/bin/libglut.so.3" "$out/lib" + mkdir "$out/opt/todesk/config" + mkdir "$out/opt/todesk/bin" + mkdir -p "$out/share/applications" + mkdir "$out/share/icons" + runHook postInstall + ''; + + }); + +in +buildFHSEnv { + inherit version; + name = "todesk"; + targetPkgs = pkgs: [ + todesk-unwrapped + pulseaudio + nspr + kmod + libXi + systemdMinimal + glib + libz + bash + coreutils + libX11 + libXext + libXrandr + glibc + libdrm + libGL + procps + cairo + libXcomposite + libXdamage + libXfixes + libXtst + nss + libXxf86vm + gtk3 + gdk-pixbuf + pango + libva + ]; + extraBwrapArgs = [ + "--bind /var/lib/todesk /opt/todesk/config" # create the folder before bind to avoid permission denided. + "--bind ${todesk-unwrapped}/bin /opt/todesk/bin" + "--bind /var/lib/todesk /etc/todesk" # service write uuid here. Such a pain! + ]; # soft link doesn't work so that we should bind ourselves + runScript = writeShellScript "ToDesk.sh" '' + export LIBVA_DRIVER_NAME=iHD + export LIBVA_DRIVERS_PATH=${todesk-unwrapped}/bin + if [ "''${1}" = 'service' ] + then + /opt/todesk/bin/ToDesk_Service + else + /opt/todesk/bin/ToDesk + fi + ''; # a small script to choose what to exec + extraInstallCommands = '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/icons" + cp ${todesk-unwrapped}/usr/share/applications/todesk.desktop $out/share/applications + cp -rf ${todesk-unwrapped}/usr/share/icons/* $out/share/icons + substituteInPlace "$out/share/applications/todesk.desktop" \ + --replace-fail '/opt/todesk/bin/ToDesk' "$out/bin/todesk desktop" + substituteInPlace "$out/share/applications/todesk.desktop" \ + --replace-fail '/opt/todesk/bin' "${todesk-unwrapped}/lib" + ''; + meta = { + description = "Remote Desktop Application"; + homepage = "https://www.todesk.com/linux.html"; + license = lib.licenses.unfree; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + mainProgram = "todesk"; + }; +} From 1c77c14c21d415c5b461c345aa340e63efe96159 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Sat, 24 Aug 2024 22:26:00 +0800 Subject: [PATCH 141/481] nixos/todesk: init --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/todesk.nix | 45 +++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 nixos/modules/services/monitoring/todesk.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 0fea2aa31494..5d0fdb6e3790 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -109,6 +109,8 @@ - [foot](https://codeberg.org/dnkl/foot), a fast, lightweight and minimalistic Wayland terminal emulator. Available as [programs.foot](#opt-programs.foot.enable). +- [ToDesk](https://www.todesk.com/linux.html), a remote desktop applicaton. Available as [services.todesk.enable](#opt-services.todesk.enable). + ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} - `transmission` package has been aliased with a `trace` warning to `transmission_3`. Since [Transmission 4 has been released last year](https://github.com/transmission/transmission/releases/tag/4.0.0), and Transmission 3 will eventually go away, it was decided perform this warning alias to make people aware of the new version. The `services.transmission.package` defaults to `transmission_3` as well because the upgrade can cause data loss in certain specific usage patterns (examples: [#5153](https://github.com/transmission/transmission/issues/5153), [#6796](https://github.com/transmission/transmission/issues/6796)). Please make sure to back up to your data directory per your usage: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 88715af4dc0e..8540a70789cd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -928,6 +928,7 @@ ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix + ./services/monitoring/todesk.nix ./services/monitoring/tremor-rs.nix ./services/monitoring/tuptime.nix ./services/monitoring/unpoller.nix diff --git a/nixos/modules/services/monitoring/todesk.nix b/nixos/modules/services/monitoring/todesk.nix new file mode 100644 index 000000000000..807d924abfcf --- /dev/null +++ b/nixos/modules/services/monitoring/todesk.nix @@ -0,0 +1,45 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.todesk; +in +{ + options = { + services.todesk.enable = lib.mkEnableOption "ToDesk daemon"; + services.todesk.package = lib.mkPackageOption pkgs "todesk" { }; + }; + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + systemd.services.todeskd = { + description = "ToDesk Daemon Service"; + + wantedBy = [ "multi-user.target" ]; + wants = [ + "network-online.target" + "display-manager.service" + "nss-lookup.target" + ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${cfg.package}/bin/todesk service"; + ExecReload = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID"; + Restart = "on-failure"; + WorkingDirectory = "/var/lib/todesk"; + PrivateTmp = true; + StateDirectory = "todesk"; + StateDirectoryMode = "0777"; # Desktop application read and write /opt/todesk/config/config.ini. Such a pain! + ProtectSystem = "strict"; + ProtectHome = "read-only"; + RemoveIPC = "yes"; + }; + }; + }; +} From ad0aa8e34d25f8f9263527a76ae26f3c28b00881 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 31 Aug 2024 19:28:04 +0800 Subject: [PATCH 142/481] emacs: set foundMakefile in buildPhase of elisp builders foundMakefile is used[1] in stdenv checkPhase. [1]: https://github.com/NixOS/nixpkgs/blob/12228ff1752d7b7624a54e9c1af4b222b3c1073b/pkgs/stdenv/generic/setup.sh#L1471-L1475 --- pkgs/applications/editors/emacs/build-support/melpa.nix | 5 +++++ pkgs/applications/editors/emacs/build-support/trivial.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/applications/editors/emacs/build-support/melpa.nix b/pkgs/applications/editors/emacs/build-support/melpa.nix index bda412a0957f..e129e3ebdeb0 100644 --- a/pkgs/applications/editors/emacs/build-support/melpa.nix +++ b/pkgs/applications/editors/emacs/build-support/melpa.nix @@ -126,6 +126,11 @@ EOF buildPhase = args.buildPhase or '' runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + pushd "$NIX_BUILD_TOP" emacs --batch -Q \ diff --git a/pkgs/applications/editors/emacs/build-support/trivial.nix b/pkgs/applications/editors/emacs/build-support/trivial.nix index 2c20b0567c68..8c515363f427 100644 --- a/pkgs/applications/editors/emacs/build-support/trivial.nix +++ b/pkgs/applications/editors/emacs/build-support/trivial.nix @@ -14,6 +14,11 @@ args: buildPhase = args.buildPhase or '' runHook preBuild + # This is modified from stdenv buildPhase. foundMakefile is used in stdenv checkPhase. + if [[ ! ( -z "''${makeFlags-}" && -z "''${makefile:-}" && ! ( -e Makefile || -e makefile || -e GNUmakefile ) ) ]]; then + foundMakefile=1 + fi + emacs -L . --batch -f batch-byte-compile *.el runHook postBuild From e74bbbf47c4fa0c0ecb87e6c151ad07ded9b5608 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 13:03:10 +0000 Subject: [PATCH 143/481] xray: 1.8.16 -> 1.8.24 --- pkgs/tools/networking/xray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index 8b196b5f3133..765423b644d7 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.16"; + version = "1.8.24"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-IHa+7eZkDDK8ZH+WUMoD0F9eiDvD9yYtFrTswBA00O0="; + hash = "sha256-gteiRkdCuRTBkzljQgxo6oMvr1t2aUgeBIXQikwYtdE="; }; - vendorHash = "sha256-nMVMbZPIn/mBHgPqH026t1dgi6t/RT+jhT/KseRO1fE="; + vendorHash = "sha256-GyzZI0NaOm2GBqrqzXYpv1ml12iBvHMyu2y7A3UwdPY="; nativeBuildInputs = [ makeWrapper ]; From 8edaa084143de2d9b58beafe21989d4d4688eb43 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Sep 2024 15:41:36 +0000 Subject: [PATCH 144/481] tartube-yt-dlp: 2.5.0 -> 2.5.040 --- pkgs/applications/video/tartube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix index 057484d379e8..480c36edcfbd 100644 --- a/pkgs/applications/video/tartube/default.nix +++ b/pkgs/applications/video/tartube/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "tartube"; - version = "2.5.0"; + version = "2.5.040"; src = fetchFromGitHub { owner = "axcore"; repo = "tartube"; rev = "refs/tags/v${version}"; - sha256 = "sha256-IcJDh8Q9K6SROZWVi98R1N2kSdgwJczScLdJFKy2FIU="; + sha256 = "sha256-yFsQbEXjWPxLYqFxsI6MjK1hE8Lk2Z0sPj3peLBs7r8="; }; nativeBuildInputs = [ From f87b978abed6a81c3c003174aed1b8f093190a8c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 15 Aug 2024 10:15:02 +0200 Subject: [PATCH 145/481] roc-toolkit: disable libunwind if unavailable --- pkgs/development/libraries/audio/roc-toolkit/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/roc-toolkit/default.nix b/pkgs/development/libraries/audio/roc-toolkit/default.nix index 4654e29a835f..a062afcfa1d0 100644 --- a/pkgs/development/libraries/audio/roc-toolkit/default.nix +++ b/pkgs/development/libraries/audio/roc-toolkit/default.nix @@ -9,7 +9,7 @@ openfecSupport ? true, openfec, speexdsp, - libunwindSupport ? true, + libunwindSupport ? lib.meta.availableOn stdenv.hostPlatform libunwind, libunwind, pulseaudioSupport ? true, libpulseaudio, From f0a86e6d119877f47452a790157def800aef5a61 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Sep 2024 15:31:13 +0200 Subject: [PATCH 146/481] libunwind.meta.pkgConfigModules: init This will allow packages like gstreamer that need to find libunwind via pkg-config to check whether the libunwind they've been given has the modules they expect. --- .../development/libraries/libunwind/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 1f7074866d58..6f491a5c527f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,13 +1,16 @@ -{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, xz, buildPackages }: +{ stdenv, lib, fetchpatch, fetchFromGitHub, autoreconfHook, buildPackages +, xz +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunwind"; version = "1.8.1"; src = fetchFromGitHub { owner = "libunwind"; repo = "libunwind"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-rCFBHs6rCSnp5FEwbUR5veNNTqSQpFblAv8ebSPX0qE="; }; @@ -50,12 +53,18 @@ stdenv.mkDerivation rec { doCheck = false; # fails + passthru.tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + meta = with lib; { homepage = "https://www.nongnu.org/libunwind"; description = "Portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; + pkgConfigModules = [ "libunwind" "libunwind-coredump" "libunwind-generic" "libunwind-ptrace" "libunwind-setjmp" ]; # https://github.com/libunwind/libunwind#libunwind platforms = [ "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux" "i686-freebsd" "i686-linux" "loongarch64-linux" "mips64el-linux" "mipsel-linux" "powerpc64-linux" "powerpc64le-linux" "riscv64-linux" "s390x-linux" "x86_64-freebsd" "x86_64-linux" "x86_64-solaris" ]; license = licenses.mit; }; -} +}) From 52b0b4ef3d2b1b6a76f97d0c8c50def5640ab7c1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 2 Sep 2024 15:33:23 +0200 Subject: [PATCH 147/481] gst_all_1.gstreamer: use a better libunwind check Checking for Darwin didn't take into account that we also use a libunwind implementation without pkg-config on riscv32-linux. Fix by checking for the presence of the pkg-config file required directly, rather than by using platform as a proxy. --- pkgs/development/libraries/gstreamer/core/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index e8f873555d70..d1094cfc8794 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -21,8 +21,9 @@ , buildPackages , withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages , libunwind -# darwin.libunwind doesn't have pkg-config definitions so meson doesn't detect it. -, withLibunwind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform libunwind +, withLibunwind ? + lib.meta.availableOn stdenv.hostPlatform libunwind && + lib.elem "libunwind" libunwind.meta.pkgConfigModules or [] # Checks meson.is_cross_build(), so even canExecute isn't enough. , enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform, hotdoc }: From 5e8cc2796282a951dc81d49efd15903de0a7f157 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 2 Sep 2024 09:49:02 -0400 Subject: [PATCH 148/481] nixos/openvpn: add extraArgs option --- nixos/modules/services/networking/openvpn.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index fba6d5e48f92..d122390c88ca 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -64,7 +64,7 @@ let path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ]; - serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}"; + serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile} ${cfg.extraArgs}"; serviceConfig.Restart = "always"; serviceConfig.Type = "notify"; }; @@ -181,6 +181,15 @@ in ''; }; + extraArgs = mkOption { + default = null; + type = listOf str; + description = '' + Additional command line arguments to pass to this OpenVPN instance. + ''; + apply = lib.escapeShellArgs; + }; + authUserPass = mkOption { default = null; description = '' From 97e4ebd0e8ecbcb877fc1c4ecb41e02cfe776ef4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 2 Sep 2024 17:17:33 +0200 Subject: [PATCH 149/481] intel-gmmlib: 22.4.1 -> 22.5.1 --- pkgs/development/libraries/intel-gmmlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index f685a571de0c..a54872d6c2a5 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "22.4.1"; + version = "22.5.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "intel-gmmlib-${version}"; - sha256 = "sha256-z8FPSqWlSubtt+gurntWnkeKsdO2B+KZXTv2Y+TL7t4="; + hash = "sha256-YHloVW5TtNI583GOEhx7S27jzHEVTSdbJSDOzv7KZiI="; }; nativeBuildInputs = [ cmake ]; From c7188fe301c79ba920869f27570e8bd77a17aefb Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:05:20 -0500 Subject: [PATCH 150/481] kubectl-gadget: move to by-name --- .../default.nix => by-name/ku/kubectl-gadget/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/cluster/kubectl-gadget/default.nix => by-name/ku/kubectl-gadget/package.nix} (100%) diff --git a/pkgs/applications/networking/cluster/kubectl-gadget/default.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix similarity index 100% rename from pkgs/applications/networking/cluster/kubectl-gadget/default.nix rename to pkgs/by-name/ku/kubectl-gadget/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4e6490162f4..27890bbffb36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31259,8 +31259,6 @@ with pkgs; kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { }; - kubectl-gadget = callPackage ../applications/networking/cluster/kubectl-gadget { }; - kubectl-images = callPackage ../applications/networking/cluster/kubectl-images { }; kubectl-klock = callPackage ../applications/networking/cluster/kubectl-klock { }; From a4ffcf5664f1a90922f3572f60c2cc2457370446 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:08:08 -0500 Subject: [PATCH 151/481] kubectl-gadget: 0.31.0 -> 0.32.0 --- pkgs/by-name/ku/kubectl-gadget/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 30e835ba2c0b..a72836b29dfe 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-gadget"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; rev = "v${version}"; - hash = "sha256-f93PdSA3OGiUUXSQn0aUP3o5xfvjiq/3L3Bz9k4OigI="; + hash = "sha256-c6hy7B8zaU/LnTMAohc9KPzu1ocOVFJ9wL4GOIwxqkw="; }; - vendorHash = "sha256-lBfz0tzCWKEAAmpvjB2kUJ3aLjlzAjniIu/1aNE80Xg="; + vendorHash = "sha256-7HfYCHxQUapDo33IAzxCp2iaL4G7oOqK0KyjqbmbR/w="; CGO_ENABLED = 0; From 7a41a8c71d466c3b1091da22aa6fb383194f24e3 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Mon, 2 Sep 2024 12:09:16 -0500 Subject: [PATCH 152/481] kubectl-gadget: add version test --- pkgs/by-name/ku/kubectl-gadget/package.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index a72836b29dfe..5126591d7960 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, kubectl-gadget, testers }: buildGoModule rec { pname = "kubectl-gadget"; @@ -28,6 +28,12 @@ buildGoModule rec { subPackages = [ "cmd/kubectl-gadget" ]; + passthru.tests.version = testers.testVersion { + package = kubectl-gadget; + command = "kubectl-gadget version || true"; # mask non-zero return code if no kubeconfig present + version = "v${version}"; + }; + meta = with lib; { description = "Collection of gadgets for troubleshooting Kubernetes applications using eBPF"; mainProgram = "kubectl-gadget"; From 60e8c03c9bb26c45763ac3f1e54ac46b0eed248a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:38 +0200 Subject: [PATCH 153/481] nixos/services.snapserver: remove `with lib;` --- nixos/modules/services/audio/snapserver.nix | 119 ++++++++++---------- 1 file changed, 58 insertions(+), 61 deletions(-) diff --git a/nixos/modules/services/audio/snapserver.nix b/nixos/modules/services/audio/snapserver.nix index 7f781ee44e36..6c60fc2d4875 100644 --- a/nixos/modules/services/audio/snapserver.nix +++ b/nixos/modules/services/audio/snapserver.nix @@ -1,7 +1,4 @@ { config, options, lib, pkgs, ... }: - -with lib; - let name = "snapserver"; @@ -9,8 +6,8 @@ let cfg = config.services.snapserver; # Using types.nullOr to inherit upstream defaults. - sampleFormat = mkOption { - type = with types; nullOr str; + sampleFormat = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Default sample format. @@ -18,8 +15,8 @@ let example = "48000:16:2"; }; - codec = mkOption { - type = with types; nullOr str; + codec = lib.mkOption { + type = with lib.types; nullOr str; default = null; description = '' Default audio compression method. @@ -30,20 +27,20 @@ let streamToOption = name: opt: let os = val: - optionalString (val != null) "${val}"; + lib.optionalString (val != null) "${val}"; os' = prefix: val: - optionalString (val != null) (prefix + "${val}"); + lib.optionalString (val != null) (prefix + "${val}"); flatten = key: value: "&${key}=${value}"; in "--stream.stream=\"${opt.type}://" + os opt.location + "?" + os' "name=" name + os' "&sampleformat=" opt.sampleFormat + os' "&codec=" opt.codec - + concatStrings (mapAttrsToList flatten opt.query) + "\""; + + lib.concatStrings (lib.mapAttrsToList lib.flatten opt.query) + "\""; optionalNull = val: ret: - optional (val != null) ret; + lib.optional (val != null) ret; - optionString = concatStringsSep " " (mapAttrsToList streamToOption cfg.streams + optionString = lib.concatStringsSep " " (lib.mapAttrsToList streamToOption cfg.streams # global options ++ [ "--stream.bind_to_address=${cfg.listenAddress}" ] ++ [ "--stream.port=${toString cfg.port}" ] @@ -51,22 +48,22 @@ let ++ optionalNull cfg.codec "--stream.codec=${cfg.codec}" ++ optionalNull cfg.streamBuffer "--stream.stream_buffer=${toString cfg.streamBuffer}" ++ optionalNull cfg.buffer "--stream.buffer=${toString cfg.buffer}" - ++ optional cfg.sendToMuted "--stream.send_to_muted" + ++ lib.optional cfg.sendToMuted "--stream.send_to_muted" # tcp json rpc ++ [ "--tcp.enabled=${toString cfg.tcp.enable}" ] - ++ optionals cfg.tcp.enable [ + ++ lib.optionals cfg.tcp.enable [ "--tcp.bind_to_address=${cfg.tcp.listenAddress}" "--tcp.port=${toString cfg.tcp.port}" ] # http json rpc ++ [ "--http.enabled=${toString cfg.http.enable}" ] - ++ optionals cfg.http.enable [ + ++ lib.optionals cfg.http.enable [ "--http.bind_to_address=${cfg.http.listenAddress}" "--http.port=${toString cfg.http.port}" - ] ++ optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); + ] ++ lib.optional (cfg.http.docRoot != null) "--http.doc_root=\"${toString cfg.http.docRoot}\""); in { imports = [ - (mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ]) + (lib.mkRenamedOptionModule [ "services" "snapserver" "controlPort" ] [ "services" "snapserver" "tcp" "port" ]) ]; ###### interface @@ -75,16 +72,16 @@ in { services.snapserver = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable snapserver. ''; }; - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -92,16 +89,16 @@ in { ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 1704; description = '' The port that snapclients can connect to. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to automatically open the specified ports in the firewall. @@ -111,8 +108,8 @@ in { inherit sampleFormat; inherit codec; - streamBuffer = mkOption { - type = with types; nullOr int; + streamBuffer = lib.mkOption { + type = with lib.types; nullOr int; default = null; description = '' Stream read (input) buffer in ms. @@ -120,8 +117,8 @@ in { example = 20; }; - buffer = mkOption { - type = with types; nullOr int; + buffer = lib.mkOption { + type = with lib.types; nullOr int; default = null; description = '' Network buffer in ms. @@ -129,24 +126,24 @@ in { example = 1000; }; - sendToMuted = mkOption { - type = types.bool; + sendToMuted = lib.mkOption { + type = lib.types.bool; default = false; description = '' Send audio to muted clients. ''; }; - tcp.enable = mkOption { - type = types.bool; + tcp.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the JSON-RPC via TCP. ''; }; - tcp.listenAddress = mkOption { - type = types.str; + tcp.listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -154,24 +151,24 @@ in { ''; }; - tcp.port = mkOption { - type = types.port; + tcp.port = lib.mkOption { + type = lib.types.port; default = 1705; description = '' The port where the TCP JSON-RPC listens on. ''; }; - http.enable = mkOption { - type = types.bool; + http.enable = lib.mkOption { + type = lib.types.bool; default = true; description = '' Whether to enable the JSON-RPC via HTTP. ''; }; - http.listenAddress = mkOption { - type = types.str; + http.listenAddress = lib.mkOption { + type = lib.types.str; default = "::"; example = "0.0.0.0"; description = '' @@ -179,27 +176,27 @@ in { ''; }; - http.port = mkOption { - type = types.port; + http.port = lib.mkOption { + type = lib.types.port; default = 1780; description = '' The port where the HTTP JSON-RPC listens on. ''; }; - http.docRoot = mkOption { - type = with types; nullOr path; + http.docRoot = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Path to serve from the HTTP servers root. ''; }; - streams = mkOption { - type = with types; attrsOf (submodule { + streams = lib.mkOption { + type = with lib.types; attrsOf (submodule { options = { - location = mkOption { - type = types.oneOf [ types.path types.str ]; + location = lib.mkOption { + type = lib.types.oneOf [ lib.types.path lib.types.str ]; description = '' For type `pipe` or `file`, the path to the pipe or file. For type `librespot`, `airplay` or `process`, the path to the corresponding binary. @@ -207,27 +204,27 @@ in { For type `meta`, a list of stream names in the form `/one/two/...`. Don't forget the leading slash. For type `alsa`, use an empty string. ''; - example = literalExpression '' + example = lib.literalExpression '' "/path/to/pipe" "/path/to/librespot" "192.168.1.2:4444" "/MyTCP/Spotify/MyPipe" ''; }; - type = mkOption { - type = types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ]; + type = lib.mkOption { + type = lib.types.enum [ "pipe" "librespot" "airplay" "file" "process" "tcp" "alsa" "spotify" "meta" ]; default = "pipe"; description = '' The type of input stream. ''; }; - query = mkOption { + query = lib.mkOption { type = attrsOf str; default = {}; description = '' Key-value pairs that convey additional parameters about a stream. ''; - example = literalExpression '' + example = lib.literalExpression '' # for type == "pipe": { mode = "create"; @@ -255,7 +252,7 @@ in { description = '' The definition for an input source. ''; - example = literalExpression '' + example = lib.literalExpression '' { mpd = { type = "pipe"; @@ -272,11 +269,11 @@ in { ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { warnings = # https://github.com/badaix/snapcast/blob/98ac8b2fb7305084376607b59173ce4097c620d8/server/streamreader/stream_manager.cpp#L85 - filter (w: w != "") (mapAttrsToList (k: v: optionalString (v.type == "spotify") '' + lib.filter (w: w != "") (lib.mapAttrsToList (k: v: lib.optionalString (v.type == "spotify") '' services.snapserver.streams.${k}.type = "spotify" is deprecated, use services.snapserver.streams.${k}.type = "librespot" instead. '') cfg.streams); @@ -305,13 +302,13 @@ in { }; networking.firewall.allowedTCPPorts = - optionals cfg.openFirewall [ cfg.port ] - ++ optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port - ++ optional (cfg.openFirewall && cfg.http.enable) cfg.http.port; + lib.optionals cfg.openFirewall [ cfg.port ] + ++ lib.optional (cfg.openFirewall && cfg.tcp.enable) cfg.tcp.port + ++ lib.optional (cfg.openFirewall && cfg.http.enable) cfg.http.port; }; meta = { - maintainers = with maintainers; [ tobim ]; + maintainers = with lib.maintainers; [ tobim ]; }; } From f51cd1081633c201e96f28cd73defbb231549fcd Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:39 +0200 Subject: [PATCH 154/481] nixos/services.borgbackup: remove `with lib;` --- nixos/modules/services/backup/borgbackup.nix | 271 +++++++++---------- 1 file changed, 134 insertions(+), 137 deletions(-) diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index abb7925e0935..36f2274d5eaa 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -1,7 +1,4 @@ { config, lib, pkgs, ... }: - -with lib; - let isLocalPath = x: @@ -11,17 +8,17 @@ let mkExcludeFile = cfg: # Write each exclude pattern to a new line - pkgs.writeText "excludefile" (concatMapStrings (s: s + "\n") cfg.exclude); + pkgs.writeText "excludefile" (lib.concatMapStrings (s: s + "\n") cfg.exclude); mkPatternsFile = cfg: # Write each pattern to a new line - pkgs.writeText "patternsfile" (concatMapStrings (s: s + "\n") cfg.patterns); + pkgs.writeText "patternsfile" (lib.concatMapStrings (s: s + "\n") cfg.patterns); mkKeepArgs = cfg: # If cfg.prune.keep e.g. has a yearly attribute, # its content is passed on as --keep-yearly - concatStringsSep " " - (mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); + lib.concatStringsSep " " + (lib.mapAttrsToList (x: y: "--keep-${x}=${toString y}") cfg.prune.keep); mkBackupScript = name: cfg: pkgs.writeShellScript "${name}-script" ('' set -e @@ -44,10 +41,10 @@ let fi } - archiveName="${optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" - archiveSuffix="${optionalString cfg.appendFailedSuffix ".failed"}" + archiveName="${lib.optionalString (cfg.archiveBaseName != null) (cfg.archiveBaseName + "-")}$(date ${cfg.dateFormat})" + archiveSuffix="${lib.optionalString cfg.appendFailedSuffix ".failed"}" ${cfg.preHook} - '' + optionalString cfg.doInit '' + '' + lib.optionalString cfg.doInit '' # Run borg init if the repo doesn't exist yet if ! borgWrapper list $extraArgs > /dev/null; then borgWrapper init $extraArgs \ @@ -58,24 +55,24 @@ let '' + '' ( set -o pipefail - ${optionalString (cfg.dumpCommand != null) ''${escapeShellArg cfg.dumpCommand} | \''} + ${lib.optionalString (cfg.dumpCommand != null) ''${lib.escapeShellArg cfg.dumpCommand} | \''} borgWrapper create $extraArgs \ --compression ${cfg.compression} \ --exclude-from ${mkExcludeFile cfg} \ --patterns-from ${mkPatternsFile cfg} \ $extraCreateArgs \ "::$archiveName$archiveSuffix" \ - ${if cfg.paths == null then "-" else escapeShellArgs cfg.paths} + ${if cfg.paths == null then "-" else lib.escapeShellArgs cfg.paths} ) - '' + optionalString cfg.appendFailedSuffix '' + '' + lib.optionalString cfg.appendFailedSuffix '' borgWrapper rename $extraArgs \ "::$archiveName$archiveSuffix" "$archiveName" '' + '' ${cfg.postCreate} - '' + optionalString (cfg.prune.keep != { }) '' + '' + lib.optionalString (cfg.prune.keep != { }) '' borgWrapper prune $extraArgs \ ${mkKeepArgs cfg} \ - ${optionalString (cfg.prune.prefix != null) "--glob-archives ${escapeShellArg "${cfg.prune.prefix}*"}"} \ + ${lib.optionalString (cfg.prune.prefix != null) "--glob-archives ${lib.escapeShellArg "${cfg.prune.prefix}*"}"} \ $extraPruneArgs borgWrapper compact $extraArgs $extraCompactArgs ${cfg.postPrune} @@ -93,18 +90,18 @@ let userHome = config.users.users.${cfg.user}.home; backupJobName = "borgbackup-job-${name}"; backupScript = mkBackupScript backupJobName cfg; - in nameValuePair backupJobName { + in lib.nameValuePair backupJobName { description = "BorgBackup job ${name}"; path = [ config.services.borgbackup.package pkgs.openssh ]; - script = "exec " + optionalString cfg.inhibitsSleep ''\ + script = "exec " + lib.optionalString cfg.inhibitsSleep ''\ ${pkgs.systemd}/bin/systemd-inhibit \ --who="borgbackup" \ --what="sleep" \ --why="Scheduled backup" \ '' + backupScript; - unitConfig = optionalAttrs (isLocalPath cfg.repo) { + unitConfig = lib.optionalAttrs (isLocalPath cfg.repo) { RequiresMountsFor = [ cfg.repo ]; }; serviceConfig = { @@ -118,7 +115,7 @@ let [ "${userHome}/.config/borg" "${userHome}/.cache/borg" ] ++ cfg.readWritePaths # Borg needs write access to repo if it is not remote - ++ optional (isLocalPath cfg.repo) cfg.repo; + ++ lib.optional (isLocalPath cfg.repo) cfg.repo; PrivateTmp = cfg.privateTmp; }; environment = { @@ -128,7 +125,7 @@ let }; mkBackupTimers = name: cfg: - nameValuePair "borgbackup-job-${name}" { + lib.nameValuePair "borgbackup-job-${name}" { description = "BorgBackup job ${name} timer"; wantedBy = [ "timers.target" ]; timerConfig = { @@ -136,8 +133,8 @@ let OnCalendar = cfg.startAt; }; # if remote-backup wait for network - after = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; - wants = optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; + after = lib.optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; + wants = lib.optional (cfg.persistentTimer && !isLocalPath cfg.repo) "network-online.target"; }; # utility function around makeWrapper @@ -148,11 +145,11 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; } (with lib; '' makeWrapper "${original}" "$out/bin/${name}" \ - ${concatStringsSep " \\\n " (mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)} + ${lib.concatStringsSep " \\\n " (lib.mapAttrsToList (name: value: ''--set ${name} "${value}"'') set)} ''); mkBorgWrapper = name: cfg: mkWrapperDrv { - original = getExe config.services.borgbackup.package; + original = lib.getExe config.services.borgbackup.package; name = "borg-job-${name}"; set = { BORG_REPO = cfg.repo; } // (mkPassEnv cfg) // cfg.environment; }; @@ -167,7 +164,7 @@ let "${config.users.users."${cfg.user}".home}/.cache".d = settings; "${config.users.users."${cfg.user}".home}/.config/borg".d = settings; "${config.users.users."${cfg.user}".home}/.cache/borg".d = settings; - } // optionalAttrs (isLocalPath cfg.repo && !cfg.removableDevice) { + } // lib.optionalAttrs (isLocalPath cfg.repo && !cfg.removableDevice) { "${cfg.repo}".d = settings; }); @@ -180,11 +177,11 @@ let }; mkRepoService = name: cfg: - nameValuePair "borgbackup-repo-${name}" { + lib.nameValuePair "borgbackup-repo-${name}" { description = "Create BorgBackup repository ${name} directory"; script = '' - mkdir -p ${escapeShellArg cfg.path} - chown ${cfg.user}:${cfg.group} ${escapeShellArg cfg.path} + mkdir -p ${lib.escapeShellArg cfg.path} + chown ${cfg.user}:${cfg.group} ${lib.escapeShellArg cfg.path} ''; serviceConfig = { # The service's only task is to ensure that the specified path exists @@ -196,10 +193,10 @@ let mkAuthorizedKey = cfg: appendOnly: key: let # Because of the following line, clients do not need to specify an absolute repo path - cdCommand = "cd ${escapeShellArg cfg.path}"; + cdCommand = "cd ${lib.escapeShellArg cfg.path}"; restrictedArg = "--restrict-to-${if cfg.allowSubRepos then "path" else "repository"} ."; - appendOnlyArg = optionalString appendOnly "--append-only"; - quotaArg = optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; + appendOnlyArg = lib.optionalString appendOnly "--append-only"; + quotaArg = lib.optionalString (cfg.quota != null) "--storage-quota ${cfg.quota}"; serveCommand = "borg serve ${restrictedArg} ${appendOnlyArg} ${quotaArg}"; in ''command="${cdCommand} && ${serveCommand}",restrict ${key}''; @@ -224,7 +221,7 @@ let }; mkSourceAssertions = name: cfg: { - assertion = count isNull [ cfg.dumpCommand cfg.paths ] == 1; + assertion = lib.count isNull [ cfg.dumpCommand cfg.paths ] == 1; message = '' Exactly one of borgbackup.jobs.${name}.paths or borgbackup.jobs.${name}.dumpCommand must be set. @@ -239,14 +236,14 @@ let }; in { - meta.maintainers = with maintainers; [ dotlambda ]; + meta.maintainers = with lib.maintainers; [ dotlambda ]; meta.doc = ./borgbackup.md; ###### interface - options.services.borgbackup.package = mkPackageOption pkgs "borgbackup" { }; + options.services.borgbackup.package = lib.mkPackageOption pkgs "borgbackup" { }; - options.services.borgbackup.jobs = mkOption { + options.services.borgbackup.jobs = lib.mkOption { description = '' Deduplicating backups using BorgBackup. Adding a job will cause a borg-job-NAME wrapper to be added @@ -254,7 +251,7 @@ in { See also the chapter about BorgBackup in the NixOS manual. ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { # for a local backup rootBackup = { paths = "/"; @@ -286,12 +283,12 @@ in { startAt = "daily"; }; ''; - type = types.attrsOf (types.submodule (let globalConfig = config; in + type = lib.types.attrsOf (lib.types.submodule (let globalConfig = config; in { name, config, ... }: { options = { - paths = mkOption { - type = with types; nullOr (coercedTo str lib.singleton (listOf str)); + paths = lib.mkOption { + type = with lib.types; nullOr (coercedTo str lib.singleton (listOf str)); default = null; description = '' Path(s) to back up. @@ -300,8 +297,8 @@ in { example = "/home/user"; }; - dumpCommand = mkOption { - type = with types; nullOr path; + dumpCommand = lib.mkOption { + type = with lib.types; nullOr path; default = null; description = '' Backup the stdout of this program instead of filesystem paths. @@ -310,22 +307,22 @@ in { example = "/path/to/createZFSsend.sh"; }; - repo = mkOption { - type = types.str; + repo = lib.mkOption { + type = lib.types.str; description = "Remote or local repository to back up to."; example = "user@machine:/path/to/repo"; }; - removableDevice = mkOption { - type = types.bool; + removableDevice = lib.mkOption { + type = lib.types.bool; default = false; description = "Whether the repo (which must be local) is a removable device."; }; - archiveBaseName = mkOption { - type = types.nullOr (types.strMatching "[^/{}]+"); + archiveBaseName = lib.mkOption { + type = lib.types.nullOr (lib.types.strMatching "[^/{}]+"); default = "${globalConfig.networking.hostName}-${name}"; - defaultText = literalExpression ''"''${config.networking.hostName}-"''; + defaultText = lib.literalExpression ''"''${config.networking.hostName}-"''; description = '' How to name the created archives. A timestamp, whose format is determined by {option}`dateFormat`, will be appended. The full @@ -335,8 +332,8 @@ in { ''; }; - dateFormat = mkOption { - type = types.str; + dateFormat = lib.mkOption { + type = lib.types.str; description = '' Arguments passed to {command}`date` to create a timestamp suffix for the archive name. @@ -345,8 +342,8 @@ in { example = "-u +%s"; }; - startAt = mkOption { - type = with types; either str (listOf str); + startAt = lib.mkOption { + type = with lib.types; either str (listOf str); default = "daily"; description = '' When or how often the backup should run. @@ -359,9 +356,9 @@ in { ''; }; - persistentTimer = mkOption { + persistentTimer = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Set the `Persistent` option for the @@ -371,17 +368,17 @@ in { ''; }; - inhibitsSleep = mkOption { + inhibitsSleep = lib.mkOption { default = false; - type = types.bool; + type = lib.types.bool; example = true; description = '' Prevents the system from sleeping while backing up. ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; description = '' The user {command}`borg` is run as. User or group need read permission @@ -390,8 +387,8 @@ in { default = "root"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = '' The group borg is run as. User or group needs read permission for the specified {option}`paths`. @@ -399,8 +396,8 @@ in { default = "root"; }; - encryption.mode = mkOption { - type = types.enum [ + encryption.mode = lib.mkOption { + type = lib.types.enum [ "repokey" "keyfile" "repokey-blake2" "keyfile-blake2" "authenticated" "authenticated-blake2" @@ -415,8 +412,8 @@ in { example = "repokey-blake2"; }; - encryption.passCommand = mkOption { - type = with types; nullOr str; + encryption.passCommand = lib.mkOption { + type = with lib.types; nullOr str; description = '' A command which prints the passphrase to stdout. Mutually exclusive with {option}`passphrase`. @@ -425,8 +422,8 @@ in { example = "cat /path/to/passphrase_file"; }; - encryption.passphrase = mkOption { - type = with types; nullOr str; + encryption.passphrase = lib.mkOption { + type = with lib.types; nullOr str; description = '' The passphrase the backups are encrypted with. Mutually exclusive with {option}`passCommand`. @@ -436,11 +433,11 @@ in { default = null; }; - compression = mkOption { + compression = lib.mkOption { # "auto" is optional, # compression mode must be given, # compression level is optional - type = types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; + type = lib.types.strMatching "none|(auto,)?(lz4|zstd|zlib|lzma)(,[[:digit:]]{1,2})?"; description = '' Compression method to use. Refer to {command}`borg help compression` @@ -450,8 +447,8 @@ in { example = "auto,lzma"; }; - exclude = mkOption { - type = with types; listOf str; + exclude = lib.mkOption { + type = with lib.types; listOf str; description = '' Exclude paths matching any of the given patterns. See {command}`borg help patterns` for pattern syntax. @@ -463,8 +460,8 @@ in { ]; }; - patterns = mkOption { - type = with types; listOf str; + patterns = lib.mkOption { + type = with lib.types; listOf str; description = '' Include/exclude paths matching the given patterns. The first matching patterns is used, so if an include pattern (prefix `+`) @@ -478,8 +475,8 @@ in { ]; }; - readWritePaths = mkOption { - type = with types; listOf path; + readWritePaths = lib.mkOption { + type = with lib.types; listOf path; description = '' By default, borg cannot write anywhere on the system but `$HOME/.config/borg` and `$HOME/.cache/borg`. @@ -492,8 +489,8 @@ in { ]; }; - privateTmp = mkOption { - type = types.bool; + privateTmp = lib.mkOption { + type = lib.types.bool; description = '' Set the `PrivateTmp` option for the systemd-service. Set to false if you need sockets @@ -502,8 +499,8 @@ in { default = true; }; - failOnWarnings = mkOption { - type = types.bool; + failOnWarnings = lib.mkOption { + type = lib.types.bool; description = '' Fail the whole backup job if any borg command returns a warning (exit code 1), for example because a file changed during backup. @@ -511,8 +508,8 @@ in { default = true; }; - doInit = mkOption { - type = types.bool; + doInit = lib.mkOption { + type = lib.types.bool; description = '' Run {command}`borg init` if the specified {option}`repo` does not exist. @@ -523,8 +520,8 @@ in { default = true; }; - appendFailedSuffix = mkOption { - type = types.bool; + appendFailedSuffix = lib.mkOption { + type = lib.types.bool; description = '' Append a `.failed` suffix to the archive name, which is only removed if @@ -533,18 +530,18 @@ in { default = true; }; - prune.keep = mkOption { + prune.keep = lib.mkOption { # Specifying e.g. `prune.keep.yearly = -1` # means there is no limit of yearly archives to keep # The regex is for use with e.g. --keep-within 1y - type = with types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); + type = with lib.types; attrsOf (either int (strMatching "[[:digit:]]+[Hdwmy]")); description = '' Prune a repository by deleting all archives not matching any of the specified retention options. See {command}`borg help prune` for the available options. ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { within = "1d"; # Keep all archives from the last day daily = 7; @@ -554,19 +551,19 @@ in { ''; }; - prune.prefix = mkOption { - type = types.nullOr (types.str); + prune.prefix = lib.mkOption { + type = lib.types.nullOr (lib.types.str); description = '' Only consider archive names starting with this prefix for pruning. By default, only archives created by this job are considered. Use `""` or `null` to consider all archives. ''; default = config.archiveBaseName; - defaultText = literalExpression "archiveBaseName"; + defaultText = lib.literalExpression "archiveBaseName"; }; - environment = mkOption { - type = with types; attrsOf str; + environment = lib.mkOption { + type = with lib.types; attrsOf str; description = '' Environment variables passed to the backup script. You can for example specify which SSH key to use. @@ -575,8 +572,8 @@ in { example = { BORG_RSH = "ssh -i /path/to/key"; }; }; - preHook = mkOption { - type = types.lines; + preHook = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run before the backup. This can for example be used to mount file systems. @@ -588,16 +585,16 @@ in { ''; }; - postInit = mkOption { - type = types.lines; + postInit = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg init`. ''; default = ""; }; - postCreate = mkOption { - type = types.lines; + postCreate = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg create`. The name of the created archive is stored in `$archiveName`. @@ -605,16 +602,16 @@ in { default = ""; }; - postPrune = mkOption { - type = types.lines; + postPrune = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run after {command}`borg prune`. ''; default = ""; }; - postHook = mkOption { - type = types.lines; + postHook = lib.mkOption { + type = lib.types.lines; description = '' Shell commands to run just before exit. They are executed even if a previous command exits with a non-zero exit code. @@ -623,8 +620,8 @@ in { default = ""; }; - extraArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for all {command}`borg` calls the service has. Handle with care. @@ -633,8 +630,8 @@ in { example = [ "--remote-path=/path/to/borg" ]; }; - extraInitArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraInitArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg init`. Can also be set at runtime using `$extraInitArgs`. @@ -643,8 +640,8 @@ in { example = [ "--append-only" ]; }; - extraCreateArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraCreateArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg create`. Can also be set at runtime using `$extraCreateArgs`. @@ -656,8 +653,8 @@ in { ]; }; - extraPruneArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraPruneArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg prune`. Can also be set at runtime using `$extraPruneArgs`. @@ -666,8 +663,8 @@ in { example = [ "--save-space" ]; }; - extraCompactArgs = mkOption { - type = with types; coercedTo (listOf str) escapeShellArgs str; + extraCompactArgs = lib.mkOption { + type = with lib.types; coercedTo (listOf str) lib.escapeShellArgs str; description = '' Additional arguments for {command}`borg compact`. Can also be set at runtime using `$extraCompactArgs`. @@ -680,7 +677,7 @@ in { )); }; - options.services.borgbackup.repos = mkOption { + options.services.borgbackup.repos = lib.mkOption { description = '' Serve BorgBackup repositories to given public SSH keys, restricting their access to the repository only. @@ -689,11 +686,11 @@ in { i.e. `user@machine:.` is enough. (Note colon and dot.) ''; default = { }; - type = types.attrsOf (types.submodule ( + type = lib.types.attrsOf (lib.types.submodule ( { ... }: { options = { - path = mkOption { - type = types.path; + path = lib.mkOption { + type = lib.types.path; description = '' Where to store the backups. Note that the directory is created automatically, with correct permissions. @@ -701,8 +698,8 @@ in { default = "/var/lib/borgbackup"; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; description = '' The user {command}`borg serve` is run as. User or group needs write permission @@ -711,8 +708,8 @@ in { default = "borg"; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; description = '' The group {command}`borg serve` is run as. User or group needs write permission @@ -721,8 +718,8 @@ in { default = "borg"; }; - authorizedKeys = mkOption { - type = with types; listOf str; + authorizedKeys = lib.mkOption { + type = with lib.types; listOf str; description = '' Public SSH keys that are given full write access to this repository. You should use a different SSH key for each repository you write to, because @@ -732,8 +729,8 @@ in { default = [ ]; }; - authorizedKeysAppendOnly = mkOption { - type = with types; listOf str; + authorizedKeysAppendOnly = lib.mkOption { + type = with lib.types; listOf str; description = '' Public SSH keys that can only be used to append new data (archives) to the repository. Note that archives can still be marked as deleted and are subsequently removed from disk @@ -742,8 +739,8 @@ in { default = [ ]; }; - allowSubRepos = mkOption { - type = types.bool; + allowSubRepos = lib.mkOption { + type = lib.types.bool; description = '' Allow clients to create repositories in subdirectories of the specified {option}`path`. These can be accessed using @@ -755,9 +752,9 @@ in { default = false; }; - quota = mkOption { + quota = lib.mkOption { # See the definition of parse_file_size() in src/borg/helpers/parseformat.py - type = with types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); + type = with lib.types; nullOr (strMatching "[[:digit:].]+[KMGTP]?"); description = '' Storage quota for the repository. This quota is ensured for all sub-repositories if {option}`allowSubRepos` is enabled @@ -774,29 +771,29 @@ in { ###### implementation - config = mkIf (with config.services.borgbackup; jobs != { } || repos != { }) + config = lib.mkIf (with config.services.borgbackup; jobs != { } || repos != { }) (with config.services.borgbackup; { assertions = - mapAttrsToList mkPassAssertion jobs - ++ mapAttrsToList mkKeysAssertion repos - ++ mapAttrsToList mkSourceAssertions jobs - ++ mapAttrsToList mkRemovableDeviceAssertions jobs; + lib.mapAttrsToList mkPassAssertion jobs + ++ lib.mapAttrsToList mkKeysAssertion repos + ++ lib.mapAttrsToList mkSourceAssertions jobs + ++ lib.mapAttrsToList mkRemovableDeviceAssertions jobs; - systemd.tmpfiles.settings = mapAttrs' mkTmpfiles jobs; + systemd.tmpfiles.settings = lib.mapAttrs' mkTmpfiles jobs; systemd.services = # A job named "foo" is mapped to systemd.services.borgbackup-job-foo - mapAttrs' mkBackupService jobs + lib.mapAttrs' mkBackupService jobs # A repo named "foo" is mapped to systemd.services.borgbackup-repo-foo - // mapAttrs' mkRepoService repos; + // lib.mapAttrs' mkRepoService repos; # A job named "foo" is mapped to systemd.timers.borgbackup-job-foo # only generate the timer if interval (startAt) is set - systemd.timers = mapAttrs' mkBackupTimers (filterAttrs (_: cfg: cfg.startAt != []) jobs); + systemd.timers = lib.mapAttrs' mkBackupTimers (lib.filterAttrs (_: cfg: cfg.startAt != []) jobs); - users = mkMerge (mapAttrsToList mkUsersConfig repos); + users = lib.mkMerge (lib.mapAttrsToList mkUsersConfig repos); environment.systemPackages = - [ config.services.borgbackup.package ] ++ (mapAttrsToList mkBorgWrapper jobs); + [ config.services.borgbackup.package ] ++ (lib.mapAttrsToList mkBorgWrapper jobs); }); } From cd7695ae97b64354c6d1c75548f6cdfd6f6be94e Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:42 +0200 Subject: [PATCH 155/481] nixos/services.portunus: remove `with lib;` --- nixos/modules/services/misc/portunus.nix | 101 +++++++++++------------ 1 file changed, 49 insertions(+), 52 deletions(-) diff --git a/nixos/modules/services/misc/portunus.nix b/nixos/modules/services/misc/portunus.nix index a9a069b0c055..20486f0212f7 100644 --- a/nixos/modules/services/misc/portunus.nix +++ b/nixos/modules/services/misc/portunus.nix @@ -1,23 +1,20 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.portunus; in { options.services.portunus = { - enable = mkEnableOption "Portunus, a self-contained user/group management and authentication service for LDAP"; + enable = lib.mkEnableOption "Portunus, a self-contained user/group management and authentication service for LDAP"; - domain = mkOption { - type = types.str; + domain = lib.mkOption { + type = lib.types.str; example = "sso.example.com"; description = "Subdomain which gets reverse proxied to Portunus webserver."; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 8080; description = '' Port where the Portunus webserver should listen on. @@ -26,10 +23,10 @@ in ''; }; - package = mkPackageOption pkgs "portunus" { }; + package = lib.mkPackageOption pkgs "portunus" { }; - seedPath = mkOption { - type = types.nullOr types.path; + seedPath = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Path to a portunus seed file in json format. @@ -46,26 +43,26 @@ in ''; }; - stateDir = mkOption { - type = types.path; + stateDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/portunus"; description = "Path where Portunus stores its state."; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "portunus"; description = "User account under which Portunus runs its webserver."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "portunus"; description = "Group account under which Portunus runs its webserver."; }; dex = { - enable = mkEnableOption '' + enable = lib.mkEnableOption '' Dex ldap connector. To activate dex, first a search user must be created in the Portunus web ui @@ -73,15 +70,15 @@ in in the [](#opt-services.dex.environmentFile) setting ''; - oidcClients = mkOption { - type = types.listOf (types.submodule { + oidcClients = lib.mkOption { + type = lib.types.listOf (lib.types.submodule { options = { - callbackURL = mkOption { - type = types.str; + callbackURL = lib.mkOption { + type = lib.types.str; description = "URL where the OIDC client should redirect"; }; - id = mkOption { - type = types.str; + id = lib.mkOption { + type = lib.types.str; description = "ID of the OIDC client"; }; }; @@ -105,23 +102,23 @@ in ''; }; - port = mkOption { - type = types.port; + port = lib.mkOption { + type = lib.types.port; default = 5556; description = "Port where dex should listen on."; }; }; ldap = { - package = mkOption { - type = types.package; + package = lib.mkOption { + type = lib.types.package; default = pkgs.openldap; defaultText = lib.literalExpression "pkgs.openldap.override { libxcrypt = pkgs.libxcrypt-legacy; }"; description = "The OpenLDAP package to use."; }; - searchUserName = mkOption { - type = types.str; + searchUserName = lib.mkOption { + type = lib.types.str; default = ""; example = "admin"; description = '' @@ -130,8 +127,8 @@ in ''; }; - suffix = mkOption { - type = types.str; + suffix = lib.mkOption { + type = lib.types.str; example = "dc=example,dc=org"; description = '' The DN of the topmost entry in your LDAP directory. @@ -139,8 +136,8 @@ in ''; }; - tls = mkOption { - type = types.bool; + tls = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to enable LDAPS protocol. @@ -151,21 +148,21 @@ in ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "openldap"; description = "User account under which Portunus runs its LDAP server."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "openldap"; description = "Group account under which Portunus runs its LDAP server."; }; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { assertions = [ { assertion = cfg.dex.enable -> cfg.ldap.searchUserName != ""; @@ -177,13 +174,13 @@ in environment.systemPackages = [ cfg.ldap.package ]; # allow connecting via ldaps /w certificate without opening ports - networking.hosts = mkIf cfg.ldap.tls { + networking.hosts = lib.mkIf cfg.ldap.tls { "::1" = [ cfg.domain ]; "127.0.0.1" = [ cfg.domain ]; }; services = { - dex = mkIf cfg.dex.enable { + dex = lib.mkIf cfg.dex.enable { enable = true; settings = { issuer = "https://${cfg.domain}/dex"; @@ -219,7 +216,7 @@ in }; }]; - staticClients = forEach cfg.dex.oidcClients (client: { + staticClients = lib.forEach cfg.dex.oidcClients (client: { inherit (client) id; redirectURIs = [ client.callbackURL ]; name = "OIDC for ${client.id}"; @@ -232,7 +229,7 @@ in }; systemd.services = { - dex = mkIf cfg.dex.enable { + dex = lib.mkIf cfg.dex.enable { serviceConfig = { # `dex.service` is super locked down out of the box, but we need some # place to write the SQLite database. This creates $STATE_DIRECTORY below @@ -261,9 +258,9 @@ in PORTUNUS_SLAPD_GROUP = cfg.ldap.group; PORTUNUS_SLAPD_USER = cfg.ldap.user; PORTUNUS_SLAPD_SCHEMA_DIR = "${cfg.ldap.package}/etc/schema"; - } // (optionalAttrs (cfg.seedPath != null) ({ + } // (lib.optionalAttrs (cfg.seedPath != null) ({ PORTUNUS_SEED_PATH = cfg.seedPath; - })) // (optionalAttrs cfg.ldap.tls ( + })) // (lib.optionalAttrs cfg.ldap.tls ( let acmeDirectory = config.security.acme.certs."${cfg.domain}".directory; in @@ -277,14 +274,14 @@ in }; }; - users.users = mkMerge [ - (mkIf (cfg.ldap.user == "openldap") { + users.users = lib.mkMerge [ + (lib.mkIf (cfg.ldap.user == "openldap") { openldap = { group = cfg.ldap.group; isSystemUser = true; }; }) - (mkIf (cfg.user == "portunus") { + (lib.mkIf (cfg.user == "portunus") { portunus = { group = cfg.group; isSystemUser = true; @@ -292,15 +289,15 @@ in }) ]; - users.groups = mkMerge [ - (mkIf (cfg.ldap.user == "openldap") { + users.groups = lib.mkMerge [ + (lib.mkIf (cfg.ldap.user == "openldap") { openldap = { }; }) - (mkIf (cfg.user == "portunus") { + (lib.mkIf (cfg.user == "portunus") { portunus = { }; }) ]; }; - meta.maintainers = [ maintainers.majewsky ] ++ teams.c3d2.members; + meta.maintainers = [ lib.maintainers.majewsky ] ++ lib.teams.c3d2.members; } From 11dd437b6572f479d9d86c964f208ccf63e96b3f Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:43 +0200 Subject: [PATCH 156/481] nixos/services.radicle: remove `with lib;` --- nixos/modules/services/misc/radicle.nix | 123 ++++++++++++------------ 1 file changed, 61 insertions(+), 62 deletions(-) diff --git a/nixos/modules/services/misc/radicle.nix b/nixos/modules/services/misc/radicle.nix index 3a393bf0f1f2..cd7a2452223a 100644 --- a/nixos/modules/services/misc/radicle.nix +++ b/nixos/modules/services/misc/radicle.nix @@ -1,5 +1,4 @@ { config, lib, pkgs, ... }: -with lib; let cfg = config.services.radicle; @@ -14,18 +13,18 @@ let # Convenient wrapper to run `rad` in the namespaces of `radicle-node.service` rad-system = pkgs.writeShellScriptBin "rad-system" '' set -o allexport - ${toShellVars env} + ${lib.toShellVars env} # Note that --env is not used to preserve host's envvars like $TERM - exec ${getExe' pkgs.util-linux "nsenter"} -a \ - -t "$(${getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \ - -S "$(${getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \ - -G "$(${getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \ - ${getExe' cfg.package "rad"} "$@" + exec ${lib.getExe' pkgs.util-linux "nsenter"} -a \ + -t "$(${lib.getExe' config.systemd.package "systemctl"} show -P MainPID radicle-node.service)" \ + -S "$(${lib.getExe' config.systemd.package "systemctl"} show -P UID radicle-node.service)" \ + -G "$(${lib.getExe' config.systemd.package "systemctl"} show -P GID radicle-node.service)" \ + ${lib.getExe' cfg.package "rad"} "$@" ''; commonServiceConfig = serviceName: { environment = env // { - RUST_LOG = mkDefault "info"; + RUST_LOG = lib.mkDefault "info"; }; path = [ pkgs.gitMinimal @@ -41,11 +40,11 @@ let "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig = mkMerge [ + serviceConfig = lib.mkMerge [ { BindReadOnlyPaths = [ "${cfg.configFile}:${env.RAD_HOME}/config.json" - "${if types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" + "${if lib.types.path.check cfg.publicKey then cfg.publicKey else pkgs.writeText "radicle.pub" cfg.publicKey}:${env.RAD_HOME}/keys/radicle.pub" ]; KillMode = "process"; StateDirectory = [ "radicle" ]; @@ -107,7 +106,7 @@ let pkgs.gitMinimal cfg.package pkgs.iana-etc - (getLib pkgs.nss) + (lib.getLib pkgs.nss) pkgs.tzdata ]; }; @@ -116,11 +115,11 @@ in { options = { services.radicle = { - enable = mkEnableOption "Radicle Seed Node"; - package = mkPackageOption pkgs "radicle-node" { }; - privateKeyFile = mkOption { + enable = lib.mkEnableOption "Radicle Seed Node"; + package = lib.mkPackageOption pkgs "radicle-node" { }; + privateKeyFile = lib.mkOption { # Note that a key encrypted by systemd-creds is not a path but a str. - type = with types; either path str; + type = with lib.types; either path str; description = '' Absolute file path to an SSH private key, usually generated by `rad auth`. @@ -130,44 +129,44 @@ in and the string after as a path encrypted with `systemd-creds`. ''; }; - publicKey = mkOption { - type = with types; either path str; + publicKey = lib.mkOption { + type = with lib.types; either path str; description = '' An SSH public key (as an absolute file path or directly as a string), usually generated by `rad auth`. ''; }; node = { - listenAddress = mkOption { - type = types.str; + listenAddress = lib.mkOption { + type = lib.types.str; default = "[::]"; example = "127.0.0.1"; description = "The IP address on which `radicle-node` listens."; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; default = 8776; description = "The port on which `radicle-node` listens."; }; - openFirewall = mkEnableOption "opening the firewall for `radicle-node`"; - extraArgs = mkOption { - type = with types; listOf str; + openFirewall = lib.mkEnableOption "opening the firewall for `radicle-node`"; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = "Extra arguments for `radicle-node`"; }; }; - configFile = mkOption { - type = types.package; + configFile = lib.mkOption { + type = lib.types.package; internal = true; default = (json.generate "config.json" cfg.settings).overrideAttrs (previousAttrs: { preferLocalBuild = true; # None of the usual phases are run here because runCommandWith uses buildCommand, # so just append to buildCommand what would usually be a checkPhase. - buildCommand = previousAttrs.buildCommand + optionalString cfg.checkConfig '' + buildCommand = previousAttrs.buildCommand + lib.optionalString cfg.checkConfig '' ln -s $out config.json install -D -m 644 /dev/stdin keys/radicle.pub <<<"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil" export RAD_HOME=$PWD - ${getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || { + ${lib.getExe' pkgs.buildPackages.radicle-node "rad"} config >/dev/null || { cat -n config.json echo "Invalid config.json according to rad." echo "Please double-check your services.radicle.settings (producing the config.json above)," @@ -177,13 +176,13 @@ in ''; }); }; - checkConfig = mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; }; - settings = mkOption { + checkConfig = lib.mkEnableOption "checking the {file}`config.json` file resulting from {option}`services.radicle.settings`" // { default = true; }; + settings = lib.mkOption { description = '' See https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5/tree/radicle/src/node/config.rs#L275 ''; default = { }; - example = literalExpression '' + example = lib.literalExpression '' { web.pinned.repositories = [ "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5" # heartwood @@ -191,27 +190,27 @@ in ]; } ''; - type = types.submodule { + type = lib.types.submodule { freeformType = json.type; }; }; httpd = { - enable = mkEnableOption "Radicle HTTP gateway to radicle-node"; - package = mkPackageOption pkgs "radicle-httpd" { }; - listenAddress = mkOption { - type = types.str; + enable = lib.mkEnableOption "Radicle HTTP gateway to radicle-node"; + package = lib.mkPackageOption pkgs "radicle-httpd" { }; + listenAddress = lib.mkOption { + type = lib.types.str; default = "127.0.0.1"; description = "The IP address on which `radicle-httpd` listens."; }; - listenPort = mkOption { - type = types.port; + listenPort = lib.mkOption { + type = lib.types.port; default = 8080; description = "The port on which `radicle-httpd` listens."; }; - nginx = mkOption { + nginx = lib.mkOption { # Type of a single virtual host, or null. - type = types.nullOr (types.submodule ( - recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + type = lib.types.nullOr (lib.types.submodule ( + lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { options.serverName = { default = "radicle-${config.networking.hostName}.${config.networking.domain}"; defaultText = "radicle-\${config.networking.hostName}.\${config.networking.domain}"; @@ -219,7 +218,7 @@ in } )); default = null; - example = literalExpression '' + example = lib.literalExpression '' { serverAliases = [ "seed.''${config.networking.domain}" @@ -237,8 +236,8 @@ in If this is set to null (the default), no nginx virtual host will be configured. ''; }; - extraArgs = mkOption { - type = with types; listOf str; + extraArgs = lib.mkOption { + type = with lib.types; listOf str; default = [ ]; description = "Extra arguments for `radicle-httpd`"; }; @@ -246,19 +245,19 @@ in }; }; - config = mkIf cfg.enable (mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { - systemd.services.radicle-node = mkMerge [ + systemd.services.radicle-node = lib.mkMerge [ (commonServiceConfig "radicle-node") { description = "Radicle Node"; documentation = [ "man:radicle-node(1)" ]; serviceConfig = { - ExecStart = "${getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${escapeShellArgs cfg.node.extraArgs}"; - Restart = mkDefault "on-failure"; + ExecStart = "${lib.getExe' cfg.package "radicle-node"} --force --listen ${cfg.node.listenAddress}:${toString cfg.node.listenPort} ${lib.escapeShellArgs cfg.node.extraArgs}"; + Restart = lib.mkDefault "on-failure"; RestartSec = "30"; SocketBindAllow = [ "tcp:${toString cfg.node.listenPort}" ]; - SystemCallFilter = mkAfter [ + SystemCallFilter = lib.mkAfter [ # Needed by git upload-pack which calls alarm() and setitimer() when providing a rad clone "@timer" ]; @@ -271,11 +270,11 @@ in { serviceConfig = let keyCred = builtins.split ":" "${cfg.privateKeyFile}"; in - if length keyCred > 1 + if lib.length keyCred > 1 then { LoadCredentialEncrypted = [ cfg.privateKeyFile ]; # Note that neither %d nor ${CREDENTIALS_DIRECTORY} works in BindReadOnlyPaths= - BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${head keyCred}:${env.RAD_HOME}/keys/radicle" ]; + BindReadOnlyPaths = [ "/run/credentials/radicle-node.service/${lib.head keyCred}:${env.RAD_HOME}/keys/radicle" ]; } else { LoadCredential = [ "radicle:${cfg.privateKeyFile}" ]; @@ -288,7 +287,7 @@ in rad-system ]; - networking.firewall = mkIf cfg.node.openFirewall { + networking.firewall = lib.mkIf cfg.node.openFirewall { allowedTCPPorts = [ cfg.node.listenPort ]; }; @@ -304,19 +303,19 @@ in }; } - (mkIf cfg.httpd.enable (mkMerge [ + (lib.mkIf cfg.httpd.enable (lib.mkMerge [ { - systemd.services.radicle-httpd = mkMerge [ + systemd.services.radicle-httpd = lib.mkMerge [ (commonServiceConfig "radicle-httpd") { description = "Radicle HTTP gateway to radicle-node"; documentation = [ "man:radicle-httpd(1)" ]; serviceConfig = { - ExecStart = "${getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${escapeShellArgs cfg.httpd.extraArgs}"; - Restart = mkDefault "on-failure"; + ExecStart = "${lib.getExe' cfg.httpd.package "radicle-httpd"} --listen ${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort} ${lib.escapeShellArgs cfg.httpd.extraArgs}"; + Restart = lib.mkDefault "on-failure"; RestartSec = "10"; SocketBindAllow = [ "tcp:${toString cfg.httpd.listenPort}" ]; - SystemCallFilter = mkAfter [ + SystemCallFilter = lib.mkAfter [ # Needed by git upload-pack which calls alarm() and setitimer() when providing a git clone "@timer" ]; @@ -328,12 +327,12 @@ in ]; } - (mkIf (cfg.httpd.nginx != null) { + (lib.mkIf (cfg.httpd.nginx != null) { services.nginx.virtualHosts.${cfg.httpd.nginx.serverName} = lib.mkMerge [ cfg.httpd.nginx { - forceSSL = mkDefault true; - enableACME = mkDefault true; + forceSSL = lib.mkDefault true; + enableACME = lib.mkDefault true; locations."/" = { proxyPass = "http://${cfg.httpd.listenAddress}:${toString cfg.httpd.listenPort}"; recommendedProxySettings = true; @@ -342,8 +341,8 @@ in ]; services.radicle.settings = { - node.alias = mkDefault cfg.httpd.nginx.serverName; - node.externalAddresses = mkDefault [ + node.alias = lib.mkDefault cfg.httpd.nginx.serverName; + node.externalAddresses = lib.mkDefault [ "${cfg.httpd.nginx.serverName}:${toString cfg.node.listenPort}" ]; }; From 9ed63429ab7c5afbeb7097e0354b1322c8824e6b Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:45 +0200 Subject: [PATCH 157/481] nixos/services.rippled: remove `with lib;` --- nixos/modules/services/misc/rippled.nix | 189 ++++++++++++------------ 1 file changed, 93 insertions(+), 96 deletions(-) diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index 3a906f3e714f..5f011dbee4a6 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -1,7 +1,4 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.rippled; opt = options.services.rippled; @@ -11,28 +8,28 @@ let dbCfg = db: '' type=${db.type} path=${db.path} - ${optionalString (db.compression != null) ("compression=${b2i db.compression}") } - ${optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} - ${optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")} + ${lib.optionalString (db.compression != null) ("compression=${b2i db.compression}") } + ${lib.optionalString (db.onlineDelete != null) ("online_delete=${toString db.onlineDelete}")} + ${lib.optionalString (db.advisoryDelete != null) ("advisory_delete=${b2i db.advisoryDelete}")} ${db.extraOpts} ''; rippledCfg = '' [server] - ${concatMapStringsSep "\n" (n: "port_${n}") (attrNames cfg.ports)} + ${lib.concatMapStringsSep "\n" (n: "port_${n}") (lib.attrNames cfg.ports)} - ${concatMapStrings (p: '' + ${lib.concatMapStrings (p: '' [port_${p.name}] ip=${p.ip} port=${toString p.port} - protocol=${concatStringsSep "," p.protocol} - ${optionalString (p.user != "") "user=${p.user}"} - ${optionalString (p.password != "") "user=${p.password}"} - admin=${concatStringsSep "," p.admin} - ${optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} - ${optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} - ${optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} - '') (attrValues cfg.ports)} + protocol=${lib.concatStringsSep "," p.protocol} + ${lib.optionalString (p.user != "") "user=${p.user}"} + ${lib.optionalString (p.password != "") "user=${p.password}"} + admin=${lib.concatStringsSep "," p.admin} + ${lib.optionalString (p.ssl.key != null) "ssl_key=${p.ssl.key}"} + ${lib.optionalString (p.ssl.cert != null) "ssl_cert=${p.ssl.cert}"} + ${lib.optionalString (p.ssl.chain != null) "ssl_chain=${p.ssl.chain}"} + '') (lib.attrValues cfg.ports)} [database_path] ${cfg.databasePath} @@ -40,22 +37,22 @@ let [node_db] ${dbCfg cfg.nodeDb} - ${optionalString (cfg.tempDb != null) '' + ${lib.optionalString (cfg.tempDb != null) '' [temp_db] ${dbCfg cfg.tempDb}''} - ${optionalString (cfg.importDb != null) '' + ${lib.optionalString (cfg.importDb != null) '' [import_db] ${dbCfg cfg.importDb}''} [ips] - ${concatStringsSep "\n" cfg.ips} + ${lib.concatStringsSep "\n" cfg.ips} [ips_fixed] - ${concatStringsSep "\n" cfg.ipsFixed} + ${lib.concatStringsSep "\n" cfg.ipsFixed} [validators] - ${concatStringsSep "\n" cfg.validators} + ${lib.concatStringsSep "\n" cfg.validators} [node_size] ${cfg.nodeSize} @@ -70,9 +67,9 @@ let ${toString cfg.validationQuorum} [sntp_servers] - ${concatStringsSep "\n" cfg.sntpServers} + ${lib.concatStringsSep "\n" cfg.sntpServers} - ${optionalString cfg.statsd.enable '' + ${lib.optionalString cfg.statsd.enable '' [insight] server=statsd address=${cfg.statsd.address} @@ -85,70 +82,70 @@ let portOptions = { name, ...}: { options = { - name = mkOption { + name = lib.mkOption { internal = true; default = name; }; - ip = mkOption { + ip = lib.mkOption { default = "127.0.0.1"; description = "Ip where rippled listens."; - type = types.str; + type = lib.types.str; }; - port = mkOption { + port = lib.mkOption { description = "Port where rippled listens."; - type = types.port; + type = lib.types.port; }; - protocol = mkOption { + protocol = lib.mkOption { description = "Protocols expose by rippled."; - type = types.listOf (types.enum ["http" "https" "ws" "wss" "peer"]); + type = lib.types.listOf (lib.types.enum ["http" "https" "ws" "wss" "peer"]); }; - user = mkOption { + user = lib.mkOption { description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; + type = lib.types.str; default = ""; }; - password = mkOption { + password = lib.mkOption { description = "When set, these credentials will be required on HTTP/S requests."; - type = types.str; + type = lib.types.str; default = ""; }; - admin = mkOption { + admin = lib.mkOption { description = "A comma-separated list of admin IP addresses."; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = ["127.0.0.1"]; }; ssl = { - key = mkOption { + key = lib.mkOption { description = '' Specifies the filename holding the SSL key in PEM format. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - cert = mkOption { + cert = lib.mkOption { description = '' Specifies the path to the SSL certificate file in PEM format. This is not needed if the chain includes it. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; - chain = mkOption { + chain = lib.mkOption { description = '' If you need a certificate chain, specify the path to the certificate chain here. The chain may include the end certificate. ''; default = null; - type = types.nullOr types.path; + type = lib.types.nullOr lib.types.path; }; }; }; @@ -156,44 +153,44 @@ let dbOptions = { options = { - type = mkOption { + type = lib.mkOption { description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb"]; + type = lib.types.enum ["rocksdb" "nudb"]; default = "rocksdb"; }; - path = mkOption { + path = lib.mkOption { description = "Location to store the database."; - type = types.path; + type = lib.types.path; default = cfg.databasePath; - defaultText = literalExpression "config.${opt.databasePath}"; + defaultText = lib.literalExpression "config.${opt.databasePath}"; }; - compression = mkOption { + compression = lib.mkOption { description = "Whether to enable snappy compression."; - type = types.nullOr types.bool; + type = lib.types.nullOr lib.types.bool; default = null; }; - onlineDelete = mkOption { + onlineDelete = lib.mkOption { description = "Enable automatic purging of older ledger information."; - type = types.nullOr (types.addCheck types.int (v: v > 256)); + type = lib.types.nullOr (lib.types.addCheck lib.types.int (v: v > 256)); default = cfg.ledgerHistory; - defaultText = literalExpression "config.${opt.ledgerHistory}"; + defaultText = lib.literalExpression "config.${opt.ledgerHistory}"; }; - advisoryDelete = mkOption { + advisoryDelete = lib.mkOption { description = '' If set, then require administrative RPC call "can_delete" to enable online deletion of ledger records. ''; - type = types.nullOr types.bool; + type = lib.types.nullOr lib.types.bool; default = null; }; - extraOpts = mkOption { + extraOpts = lib.mkOption { description = "Extra database options."; - type = types.lines; + type = lib.types.lines; default = ""; }; }; @@ -207,13 +204,13 @@ in options = { services.rippled = { - enable = mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++"; + enable = lib.mkEnableOption "rippled, a decentralized cryptocurrency blockchain daemon implementing the XRP Ledger protocol in C++"; - package = mkPackageOption pkgs "rippled" { }; + package = lib.mkPackageOption pkgs "rippled" { }; - ports = mkOption { + ports = lib.mkOption { description = "Ports exposed by rippled"; - type = with types; attrsOf (submodule portOptions); + type = with lib.types; attrsOf (submodule portOptions); default = { rpc = { port = 5005; @@ -235,9 +232,9 @@ in }; }; - nodeDb = mkOption { + nodeDb = lib.mkOption { description = "Rippled main database options."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = { type = "rocksdb"; extraOpts = '' @@ -250,28 +247,28 @@ in }; }; - tempDb = mkOption { + tempDb = lib.mkOption { description = "Rippled temporary database options."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = null; }; - importDb = mkOption { + importDb = lib.mkOption { description = "Settings for performing a one-time import."; - type = with types; nullOr (submodule dbOptions); + type = with lib.types; nullOr (submodule dbOptions); default = null; }; - nodeSize = mkOption { + nodeSize = lib.mkOption { description = '' Rippled size of the node you are running. "tiny", "small", "medium", "large", and "huge" ''; - type = types.enum ["tiny" "small" "medium" "large" "huge"]; + type = lib.types.enum ["tiny" "small" "medium" "large" "huge"]; default = "small"; }; - ips = mkOption { + ips = lib.mkOption { description = '' List of hostnames or ips where the Ripple protocol is served. For a starter list, you can either copy entries from: @@ -282,11 +279,11 @@ in address. By convention, if known, IPs are listed in from most to least trusted. ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = ["r.ripple.com 51235"]; }; - ipsFixed = mkOption { + ipsFixed = lib.mkOption { description = '' List of IP addresses or hostnames to which rippled should always attempt to maintain peer connections with. This is useful for @@ -296,16 +293,16 @@ in A port may optionally be specified after adding a space to the address ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = []; }; - validators = mkOption { + validators = lib.mkOption { description = '' List of nodes to always accept as validators. Nodes are specified by domain or public key. ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ "n949f75evCHwgyP4fPVgaHqNHxUVN15PsJEZ3B3HnXPcPjcZAoy7 RL1" "n9MD5h24qrQqiyBC8aeqqCWvpiBiYQ3jxSr91uiDvmrkyHRdYLUj RL2" @@ -315,46 +312,46 @@ in ]; }; - databasePath = mkOption { + databasePath = lib.mkOption { description = '' Path to the ripple database. ''; - type = types.path; + type = lib.types.path; default = "/var/lib/rippled"; }; - validationQuorum = mkOption { + validationQuorum = lib.mkOption { description = '' The minimum number of trusted validations a ledger must have before the server considers it fully validated. ''; - type = types.int; + type = lib.types.int; default = 3; }; - ledgerHistory = mkOption { + ledgerHistory = lib.mkOption { description = '' The number of past ledgers to acquire on server startup and the minimum to maintain while running. ''; - type = types.either types.int (types.enum ["full"]); + type = lib.types.either lib.types.int (lib.types.enum ["full"]); default = 1296000; # 1 month }; - fetchDepth = mkOption { + fetchDepth = lib.mkOption { description = '' The number of past ledgers to serve to other peers that request historical ledger data (or "full" for no limit). ''; - type = types.either types.int (types.enum ["full"]); + type = lib.types.either lib.types.int (lib.types.enum ["full"]); default = "full"; }; - sntpServers = mkOption { + sntpServers = lib.mkOption { description = '' IP address or domain of NTP servers to use for time synchronization.; ''; - type = types.listOf types.str; + type = lib.types.listOf lib.types.str; default = [ "time.windows.com" "time.apple.com" @@ -363,40 +360,40 @@ in ]; }; - logLevel = mkOption { + logLevel = lib.mkOption { description = "Logging verbosity."; - type = types.enum ["debug" "error" "info"]; + type = lib.types.enum ["debug" "error" "info"]; default = "error"; }; statsd = { - enable = mkEnableOption "statsd monitoring for rippled"; + enable = lib.mkEnableOption "statsd monitoring for rippled"; - address = mkOption { + address = lib.mkOption { description = "The UDP address and port of the listening StatsD server."; default = "127.0.0.1:8125"; - type = types.str; + type = lib.types.str; }; - prefix = mkOption { + prefix = lib.mkOption { description = "A string prepended to each collected metric."; default = ""; - type = types.str; + type = lib.types.str; }; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = ""; - type = types.lines; + type = lib.types.lines; description = '' Extra lines to be added verbatim to the rippled.cfg configuration file. ''; }; - config = mkOption { + config = lib.mkOption { internal = true; default = pkgs.writeText "rippled.conf" rippledCfg; - defaultText = literalMD "generated config file"; + defaultText = lib.literalMD "generated config file"; }; }; }; @@ -404,7 +401,7 @@ in ###### implementation - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.rippled = { description = "Ripple server user"; From d37789ce5dde15a74f7b5b45cc142b7329937da9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:50 +0200 Subject: [PATCH 158/481] nixos/services.taskserver: remove `with lib;` --- .../services/misc/taskserver/default.nix | 141 +++++++++--------- 1 file changed, 69 insertions(+), 72 deletions(-) diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 7760f1bdadeb..618d369be21f 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -1,14 +1,11 @@ { config, lib, pkgs, ... }: - -with lib; - let cfg = config.services.taskserver; taskd = "${pkgs.taskserver}/bin/taskd"; - mkManualPkiOption = desc: mkOption { - type = types.nullOr types.path; + mkManualPkiOption = desc: lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' ${desc} @@ -46,8 +43,8 @@ let ::: ''; - mkExpireOption = desc: mkOption { - type = types.nullOr types.int; + mkExpireOption = desc: lib.mkOption { + type = lib.types.nullOr lib.types.int; default = null; example = 365; apply = val: if val == null then -1 else val; @@ -58,8 +55,8 @@ let }; autoPkiOptions = { - bits = mkOption { - type = types.int; + bits = lib.mkOption { + type = lib.types.int; default = 4096; example = 2048; description = mkAutoDesc "The bit size for generated keys."; @@ -75,20 +72,20 @@ let needToCreateCA = let notFound = path: let - dotted = concatStringsSep "." path; + dotted = lib.concatStringsSep "." path; in throw "Can't find option definitions for path `${dotted}'."; findPkiDefinitions = path: attrs: let mkSublist = key: val: let - newPath = path ++ singleton key; - in if isOption val - then attrByPath newPath (notFound newPath) cfg.pki.manual + newPath = path ++ lib.singleton key; + in if lib.isOption val + then lib.attrByPath newPath (notFound newPath) cfg.pki.manual else findPkiDefinitions newPath val; - in flatten (mapAttrsToList mkSublist attrs); - in all (x: x == null) (findPkiDefinitions [] manualPkiOptions); + in lib.flatten (lib.mapAttrsToList mkSublist attrs); + in lib.all (x: x == null) (findPkiDefinitions [] manualPkiOptions); orgOptions = { ... }: { - options.users = mkOption { - type = types.uniq (types.listOf types.str); + options.users = lib.mkOption { + type = lib.types.uniq (lib.types.listOf lib.types.str); default = []; example = [ "alice" "bob" ]; description = '' @@ -96,8 +93,8 @@ let ''; }; - options.groups = mkOption { - type = types.listOf types.str; + options.groups = lib.mkOption { + type = lib.types.listOf lib.types.str; default = []; example = [ "workers" "slackers" ]; description = '' @@ -137,8 +134,8 @@ let in { options = { services.taskserver = { - enable = mkOption { - type = types.bool; + enable = lib.mkOption { + type = lib.types.bool; default = false; description = let url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver"; @@ -150,26 +147,26 @@ in { ''; }; - user = mkOption { - type = types.str; + user = lib.mkOption { + type = lib.types.str; default = "taskd"; description = "User for Taskserver."; }; - group = mkOption { - type = types.str; + group = lib.mkOption { + type = lib.types.str; default = "taskd"; description = "Group for Taskserver."; }; - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/lib/taskserver"; description = "Data directory for Taskserver."; }; - ciphers = mkOption { - type = types.nullOr (types.separatedString ":"); + ciphers = lib.mkOption { + type = lib.types.nullOr (lib.types.separatedString ":"); default = null; example = "NORMAL:-VERS-SSL3.0"; description = let @@ -180,8 +177,8 @@ in { ''; }; - organisations = mkOption { - type = types.attrsOf (types.submodule orgOptions); + organisations = lib.mkOption { + type = lib.types.attrsOf (lib.types.submodule orgOptions); default = {}; example.myShinyOrganisation.users = [ "alice" "bob" ]; example.myShinyOrganisation.groups = [ "staff" "outsiders" ]; @@ -193,24 +190,24 @@ in { ''; }; - confirmation = mkOption { - type = types.bool; + confirmation = lib.mkOption { + type = lib.types.bool; default = true; description = '' Determines whether certain commands are confirmed. ''; }; - debug = mkOption { - type = types.bool; + debug = lib.mkOption { + type = lib.types.bool; default = false; description = '' Logs debugging information. ''; }; - extensions = mkOption { - type = types.nullOr types.path; + extensions = lib.mkOption { + type = lib.types.nullOr lib.types.path; default = null; description = '' Fully qualified path of the Taskserver extension scripts. @@ -218,32 +215,32 @@ in { ''; }; - ipLog = mkOption { - type = types.bool; + ipLog = lib.mkOption { + type = lib.types.bool; default = false; description = '' Logs the IP addresses of incoming requests. ''; }; - queueSize = mkOption { - type = types.int; + queueSize = lib.mkOption { + type = lib.types.int; default = 10; description = '' Size of the connection backlog, see {manpage}`listen(2)`. ''; }; - requestLimit = mkOption { - type = types.int; + requestLimit = lib.mkOption { + type = lib.types.int; default = 1048576; description = '' Size limit of incoming requests, in bytes. ''; }; - allowedClientIDs = mkOption { - type = with types; either str (listOf str); + allowedClientIDs = lib.mkOption { + type = with lib.types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -256,8 +253,8 @@ in { ''; }; - disallowedClientIDs = mkOption { - type = with types; either str (listOf str); + disallowedClientIDs = lib.mkOption { + type = with lib.types; either str (listOf str); default = []; example = [ "[Tt]ask [2-9]+" ]; description = '' @@ -270,8 +267,8 @@ in { ''; }; - listenHost = mkOption { - type = types.str; + listenHost = lib.mkOption { + type = lib.types.str; default = "localhost"; example = "::"; description = '' @@ -279,24 +276,24 @@ in { ''; }; - listenPort = mkOption { - type = types.int; + listenPort = lib.mkOption { + type = lib.types.int; default = 53589; description = '' Port number of the Taskserver. ''; }; - openFirewall = mkOption { - type = types.bool; + openFirewall = lib.mkOption { + type = lib.types.bool; default = false; description = '' Whether to open the firewall for the specified Taskserver port. ''; }; - fqdn = mkOption { - type = types.str; + fqdn = lib.mkOption { + type = lib.types.str; default = "localhost"; description = '' The fully qualified domain name of this server, which is also used @@ -304,8 +301,8 @@ in { ''; }; - trust = mkOption { - type = types.enum [ "allow all" "strict" ]; + trust = lib.mkOption { + type = lib.types.enum [ "allow all" "strict" ]; default = "strict"; description = '' Determines how client certificates are validated. @@ -320,8 +317,8 @@ in { pki.manual = manualPkiOptions; pki.auto = autoPkiOptions; - config = mkOption { - type = types.attrs; + config = lib.mkOption { + type = lib.types.attrs; example.client.cert = "/tmp/debugging.cert"; description = '' Configuration options to pass to Taskserver. @@ -340,23 +337,23 @@ in { ''; apply = let mkKey = path: if path == ["server" "listen"] then "server" - else concatStringsSep "." path; + else lib.concatStringsSep "." path; recurse = path: attrs: let mapper = name: val: let newPath = path ++ [ name ]; scalar = if val == true then "true" else if val == false then "false" else toString val; - in if isAttrs val then recurse newPath val + in if lib.isAttrs val then recurse newPath val else [ "${mkKey newPath}=${scalar}" ]; - in concatLists (mapAttrsToList mapper attrs); + in lib.concatLists (lib.mapAttrsToList mapper attrs); in recurse []; }; }; }; imports = [ - (mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' + (lib.mkRemovedOptionModule ["services" "taskserver" "extraConfig"] '' This option was removed in favor of `services.taskserver.config` with different semantics (it's now a list of attributes instead of lines). @@ -366,11 +363,11 @@ in { '') ]; - config = mkMerge [ - (mkIf cfg.enable { + config = lib.mkMerge [ + (lib.mkIf cfg.enable { environment.systemPackages = [ nixos-taskserver ]; - users.users = optionalAttrs (cfg.user == "taskd") { + users.users = lib.optionalAttrs (cfg.user == "taskd") { taskd = { uid = config.ids.uids.taskd; description = "Taskserver user"; @@ -378,7 +375,7 @@ in { }; }; - users.groups = optionalAttrs (cfg.group == "taskd") { + users.groups = lib.optionalAttrs (cfg.group == "taskd") { taskd.gid = config.ids.gids.taskd; }; @@ -413,7 +410,7 @@ in { } else { cert = "${cfg.pki.manual.server.cert}"; key = "${cfg.pki.manual.server.key}"; - ${mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}"; + ${lib.mapNullable (_: "crl") cfg.pki.manual.server.crl} = "${cfg.pki.manual.server.crl}"; }); ca.cert = if needToCreateCA then "${cfg.dataDir}/keys/ca.cert" @@ -464,8 +461,8 @@ in { serviceConfig = { ExecStart = let - mkCfgFlag = flag: escapeShellArg "--${flag}"; - cfgFlags = concatMapStringsSep " " mkCfgFlag cfg.config; + mkCfgFlag = flag: lib.escapeShellArg "--${flag}"; + cfgFlags = lib.concatMapStringsSep " " mkCfgFlag cfg.config; in "@${taskd} taskd server ${cfgFlags}"; ExecReload = "${pkgs.coreutils}/bin/kill -USR1 $MAINPID"; Restart = "on-failure"; @@ -477,7 +474,7 @@ in { }; }; }) - (mkIf (cfg.enable && needToCreateCA) { + (lib.mkIf (cfg.enable && needToCreateCA) { systemd.services.taskserver-ca = { wantedBy = [ "taskserver.service" ]; after = [ "taskserver-init.service" ]; @@ -561,7 +558,7 @@ in { ''; }; }) - (mkIf (cfg.enable && cfg.openFirewall) { + (lib.mkIf (cfg.enable && cfg.openFirewall) { networking.firewall.allowedTCPPorts = [ cfg.listenPort ]; }) ]; From 4f6d325a8ad337d97d443a22eeea376ddf8c4308 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Fri, 30 Aug 2024 00:46:58 +0200 Subject: [PATCH 159/481] nixos/services.graphite: remove `with lib;` --- .../modules/services/monitoring/graphite.nix | 131 +++++++++--------- 1 file changed, 64 insertions(+), 67 deletions(-) diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 3a8f41f32078..cb259013c670 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -1,11 +1,8 @@ { config, lib, options, pkgs, ... }: - -with lib; - let cfg = config.services.graphite; opt = options.services.graphite; - writeTextOrNull = f: t: mapNullable (pkgs.writeTextDir f) t; + writeTextOrNull = f: t: lib.mapNullable (pkgs.writeTextDir f) t; dataDir = cfg.dataDir; staticDir = cfg.dataDir + "/static"; @@ -20,7 +17,7 @@ let graphiteLocalSettings = pkgs.writeText "graphite_local_settings.py" ( "STATIC_ROOT = '${staticDir}'\n" + - optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + lib.optionalString (config.time.timeZone != null) "TIME_ZONE = '${config.time.timeZone}'\n" + cfg.web.extraConfig ); @@ -32,7 +29,7 @@ let configDir = pkgs.buildEnv { name = "graphite-config"; - paths = lists.filter (el: el != null) [ + paths = lib.lists.filter (el: el != null) [ (writeTextOrNull "carbon.conf" cfg.carbon.config) (writeTextOrNull "storage-aggregation.conf" cfg.carbon.storageAggregation) (writeTextOrNull "storage-schemas.conf" cfg.carbon.storageSchemas) @@ -62,16 +59,16 @@ let in { imports = [ - (mkRemovedOptionModule ["services" "graphite" "api"] "") - (mkRemovedOptionModule ["services" "graphite" "beacon"] "") - (mkRemovedOptionModule ["services" "graphite" "pager"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "api"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "beacon"] "") + (lib.mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; ###### interface options.services.graphite = { - dataDir = mkOption { - type = types.path; + dataDir = lib.mkOption { + type = lib.types.path; default = "/var/db/graphite"; description = '' Data directory for graphite. @@ -79,26 +76,26 @@ in { }; web = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable graphite web frontend."; default = false; - type = types.bool; + type = lib.types.bool; }; - listenAddress = mkOption { + listenAddress = lib.mkOption { description = "Graphite web frontend listen address."; default = "127.0.0.1"; - type = types.str; + type = lib.types.str; }; - port = mkOption { + port = lib.mkOption { description = "Graphite web frontend port."; default = 8080; - type = types.port; + type = lib.types.port; }; - extraConfig = mkOption { - type = types.str; + extraConfig = lib.mkOption { + type = lib.types.str; default = ""; description = '' Graphite webapp settings. See: @@ -108,7 +105,7 @@ in { }; carbon = { - config = mkOption { + config = lib.mkOption { description = "Content of carbon configuration file."; default = '' [cache] @@ -121,19 +118,19 @@ in { LOG_UPDATES = False LOG_CACHE_HITS = False ''; - type = types.str; + type = lib.types.str; }; - enableCache = mkOption { + enableCache = lib.mkOption { description = "Whether to enable carbon cache, the graphite storage daemon."; default = false; - type = types.bool; + type = lib.types.bool; }; - storageAggregation = mkOption { + storageAggregation = lib.mkOption { description = "Defines how to aggregate data to lower-precision retentions."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [all_min] pattern = \.min$ @@ -142,10 +139,10 @@ in { ''; }; - storageSchemas = mkOption { + storageSchemas = lib.mkOption { description = "Defines retention rates for storing metrics."; default = ""; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [apache_busyWorkers] pattern = ^servers\.www.*\.workers\.busyWorkers$ @@ -153,27 +150,27 @@ in { ''; }; - blacklist = mkOption { + blacklist = lib.mkOption { description = "Any metrics received which match one of the expressions will be dropped."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = "^some\\.noisy\\.metric\\.prefix\\..*"; }; - whitelist = mkOption { + whitelist = lib.mkOption { description = "Only metrics received which match one of the expressions will be persisted."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = ".*"; }; - rewriteRules = mkOption { + rewriteRules = lib.mkOption { description = '' Regular expression patterns that can be used to rewrite metric names in a search and replace fashion. ''; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [post] _sum$ = @@ -181,16 +178,16 @@ in { ''; }; - enableRelay = mkOption { + enableRelay = lib.mkOption { description = "Whether to enable carbon relay, the carbon replication and sharding service."; default = false; - type = types.bool; + type = lib.types.bool; }; - relayRules = mkOption { + relayRules = lib.mkOption { description = "Relay rules are used to send certain metrics to a certain backend."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' [example] pattern = ^mydata\.foo\..+ @@ -198,16 +195,16 @@ in { ''; }; - enableAggregator = mkOption { + enableAggregator = lib.mkOption { description = "Whether to enable carbon aggregator, the carbon buffering service."; default = false; - type = types.bool; + type = lib.types.bool; }; - aggregationRules = mkOption { + aggregationRules = lib.mkOption { description = "Defines if and how received metrics will be aggregated."; default = null; - type = types.nullOr types.str; + type = lib.types.nullOr lib.types.str; example = '' .applications..all.requests (60) = sum .applications..*.requests .applications..all.latency (60) = avg .applications..*.latency @@ -216,47 +213,47 @@ in { }; seyren = { - enable = mkOption { + enable = lib.mkOption { description = "Whether to enable seyren service."; default = false; - type = types.bool; + type = lib.types.bool; }; - port = mkOption { + port = lib.mkOption { description = "Seyren listening port."; default = 8081; - type = types.port; + type = lib.types.port; }; - seyrenUrl = mkOption { + seyrenUrl = lib.mkOption { default = "http://localhost:${toString cfg.seyren.port}/"; - defaultText = literalExpression ''"http://localhost:''${toString config.${opt.seyren.port}}/"''; + defaultText = lib.literalExpression ''"http://localhost:''${toString config.${opt.seyren.port}}/"''; description = "Host where seyren is accessible."; - type = types.str; + type = lib.types.str; }; - graphiteUrl = mkOption { + graphiteUrl = lib.mkOption { default = "http://${cfg.web.listenAddress}:${toString cfg.web.port}"; - defaultText = literalExpression ''"http://''${config.${opt.web.listenAddress}}:''${toString config.${opt.web.port}}"''; + defaultText = lib.literalExpression ''"http://''${config.${opt.web.listenAddress}}:''${toString config.${opt.web.port}}"''; description = "Host where graphite service runs."; - type = types.str; + type = lib.types.str; }; - mongoUrl = mkOption { + mongoUrl = lib.mkOption { default = "mongodb://${config.services.mongodb.bind_ip}:27017/seyren"; - defaultText = literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"''; + defaultText = lib.literalExpression ''"mongodb://''${config.services.mongodb.bind_ip}:27017/seyren"''; description = "Mongodb connection string."; - type = types.str; + type = lib.types.str; }; - extraConfig = mkOption { + extraConfig = lib.mkOption { default = {}; description = '' Extra seyren configuration. See ''; - type = types.attrsOf types.str; - example = literalExpression '' + type = lib.types.attrsOf lib.types.str; + example = lib.literalExpression '' { GRAPHITE_USERNAME = "user"; GRAPHITE_PASSWORD = "pass"; @@ -268,8 +265,8 @@ in { ###### implementation - config = mkMerge [ - (mkIf cfg.carbon.enableCache { + config = lib.mkMerge [ + (lib.mkIf cfg.carbon.enableCache { systemd.services.carbonCache = let name = "carbon-cache"; in { description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; @@ -290,7 +287,7 @@ in { }; }) - (mkIf cfg.carbon.enableAggregator { + (lib.mkIf cfg.carbon.enableAggregator { systemd.services.carbonAggregator = let name = "carbon-aggregator"; in { enable = cfg.carbon.enableAggregator; description = "Carbon Data Aggregator"; @@ -307,7 +304,7 @@ in { }; }) - (mkIf cfg.carbon.enableRelay { + (lib.mkIf cfg.carbon.enableRelay { systemd.services.carbonRelay = let name = "carbon-relay"; in { description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; @@ -323,13 +320,13 @@ in { }; }) - (mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { + (lib.mkIf (cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay) { environment.systemPackages = [ pkgs.python3Packages.carbon ]; }) - (mkIf cfg.web.enable ({ + (lib.mkIf cfg.web.enable ({ systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; @@ -343,7 +340,7 @@ in { ]; }; penvPack = "${penv}/${pkgs.python3.sitePackages}"; - in concatStringsSep ":" [ + in lib.concatStringsSep ":" [ "${graphiteLocalSettingsDir}" "${penvPack}" # explicitly adding pycairo in path because it cannot be imported via buildEnv @@ -389,7 +386,7 @@ in { environment.systemPackages = [ pkgs.python3Packages.graphite-web ]; })) - (mkIf cfg.seyren.enable { + (lib.mkIf cfg.seyren.enable { systemd.services.seyren = { description = "Graphite Alerting Dashboard"; wantedBy = [ "multi-user.target" ]; @@ -409,10 +406,10 @@ in { ''; }; - services.mongodb.enable = mkDefault true; + services.mongodb.enable = lib.mkDefault true; }) - (mkIf ( + (lib.mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.seyren.enable ) { From 11b4b119cf2bdb9a2400f3095f49a0a1f21c8742 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 01:26:26 +0000 Subject: [PATCH 160/481] htpdate: 1.3.7 -> 2.0.0 --- pkgs/tools/networking/htpdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 60934216a2ef..0f906b4586a0 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "1.3.7"; + version = "2.0.0"; pname = "htpdate"; src = fetchFromGitHub { owner = "twekkel"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XdqQQw87gvWvdx150fQhnCio478PNCQBMw/g/l/T1ZA="; + sha256 = "sha256-X7r95Uc4oGB0eVum5D7pC4tebZIyyz73g6Q/D0cjuFM="; }; makeFlags = [ From 3f56b1b1087e78e4cdf922fe43836c1678d183aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 08:15:46 +0000 Subject: [PATCH 161/481] gaugePlugins.dotnet: 0.5.7 -> 0.6.0 --- pkgs/development/tools/gauge/plugins/dotnet/data.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gauge/plugins/dotnet/data.json b/pkgs/development/tools/gauge/plugins/dotnet/data.json index fd2d19ec864e..396b444a5cb3 100644 --- a/pkgs/development/tools/gauge/plugins/dotnet/data.json +++ b/pkgs/development/tools/gauge/plugins/dotnet/data.json @@ -1,5 +1,5 @@ { - "version": "0.5.7", - "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.5.7/gauge-dotnet-0.5.7.zip", - "hash": "sha256-VKs25WzS0UZAeCg91f/f6ZOGH28PulUvyDSc/dbJeoE=" + "version": "0.6.0", + "url": "https://github.com/getgauge/gauge-dotnet/releases/download/v0.6.0/gauge-dotnet-0.6.0.zip", + "hash": "sha256-xivSxTRs6yWfAR/ac/jLok3gcTobNu2a/vPGLwxt1Kk=" } From 20291241fdb8fd44961d44f6df51929b507d1fe3 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 3 Sep 2024 10:37:37 +0200 Subject: [PATCH 162/481] wstunnel: the ping frequency can now also be configured for the server See: https://github.com/erebe/wstunnel/pull/338 --- nixos/modules/services/networking/wstunnel.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix index 941e3e7366de..c05e00809357 100644 --- a/nixos/modules/services/networking/wstunnel.nix +++ b/nixos/modules/services/networking/wstunnel.nix @@ -48,6 +48,13 @@ let }; }; + # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval. + websocketPingInterval = lib.mkOption { + description = "Frequency at which the client will send websocket ping to the server."; + type = lib.types.nullOr lib.types.ints.unsigned; + default = null; + }; + loggingLevel = lib.mkOption { description = '' Passed to --log-lvl @@ -232,13 +239,6 @@ let default = true; }; - # The original argument name `websocketPingFrequency` is a misnomer, as the frequency is the inverse of the interval. - websocketPingInterval = lib.mkOption { - description = "Frequency at which the client will send websocket ping to the server."; - type = lib.types.nullOr lib.types.ints.unsigned; - default = null; - }; - upgradeCredentials = lib.mkOption { description = '' Use these credentials to authenticate during the HTTP upgrade request @@ -321,6 +321,7 @@ let tls-certificate = if useACMEHost != null then "${certConfig.directory}/fullchain.pem" else "${tlsCertificate}"; tls-private-key = if useACMEHost != null then "${certConfig.directory}/key.pem" else "${tlsKey}"; + websocket-ping-frequency-sec = websocketPingInterval; } extraArgs ) } \ From 38a04a864da888d40894d318c4cfcff7ede82df7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 13:58:17 +0000 Subject: [PATCH 163/481] kuma-cp: 2.8.2 -> 2.8.3 --- pkgs/applications/networking/cluster/kuma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 1351b9fe7051..54c014fb4e68 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.8.2"; + version = "2.8.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-znjOMegh0lgFDonUXtRfs+1ZMN5Olzz01E2tX+tRcns="; + hash = "sha256-wGEO7DJLWy/d6SYsTb8EZhF9c1ptYBXDL/Owter4nfo="; }; - vendorHash = "sha256-FEdDOpz6C89OlzU3Pl4Uu6P0WgM4QsuccQ9vAHnb4xI="; + vendorHash = "sha256-PAW2Byzz6Ky4I51QrJoNoyn1QH/i0SeU2dDHvj2BqXM="; # no test files doCheck = false; From 235ae9c70fbb260384cb6497f45c443002c5fed0 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Tue, 3 Sep 2024 16:01:37 +0200 Subject: [PATCH 164/481] nodejs_22: 22.7.0 -> 22.8.0 --- pkgs/development/web/nodejs/v22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix index 3c6508fc5c5d..90174977ffa9 100644 --- a/pkgs/development/web/nodejs/v22.nix +++ b/pkgs/development/web/nodejs/v22.nix @@ -12,8 +12,8 @@ let in buildNodejs { inherit enableNpm; - version = "22.7.0"; - sha256 = "1e0b6f2f2ca4fb0b4644a11363169daf4b7c42f00e5a53d2c65a9fdc463e7d88"; + version = "22.8.0"; + sha256 = "f130e82176d1ee0702d99afc1995d0061bf8ed357c38834a32a08c9ef74f1ac7"; patches = [ ./configure-emulator.patch ./configure-armv6-vfpv2.patch From dfefafb8f66a9269882f60f72a3d27b695820c36 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 4 Sep 2024 02:41:21 +0200 Subject: [PATCH 165/481] python312Packages.django_4: 4.2.15 -> 4.2.16 https://docs.djangoproject.com/en/4.2/releases/4.2.16/ https://www.djangoproject.com/weblog/2024/sep/03/security-releases/ Fixes: CVE-2024-45230, CVE-2024-45231 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 398e0516b7d4..99d71f2b38b1 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { pname = "django"; - version = "4.2.15"; + version = "4.2.16"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -53,7 +53,7 @@ buildPythonPackage rec { owner = "django"; repo = "django"; rev = "refs/tags/${version}"; - hash = "sha256-SWENMUsTgP3X3EvFiTgpKCZO0/KaZ1x1stSyp2kM/P4="; + hash = "sha256-VW/qfqOadivtU8Xg70FLqENtOV7GqJM4bR2Ik6Yag+o="; }; patches = From 29bc1320208295f630b169d8e9b0d1e8ab9844c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 05:58:06 +0000 Subject: [PATCH 166/481] trillian: 1.6.0 -> 1.6.1 --- pkgs/tools/misc/trillian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/trillian/default.nix b/pkgs/tools/misc/trillian/default.nix index 2224adec8044..9f0cfb4d51b4 100644 --- a/pkgs/tools/misc/trillian/default.nix +++ b/pkgs/tools/misc/trillian/default.nix @@ -5,14 +5,14 @@ buildGoModule rec { pname = "trillian"; - version = "1.6.0"; - vendorHash = "sha256-tLhq6ILiKzFM1lIK0DbiIKsn1NWEI168BMaf/MOAtEo="; + version = "1.6.1"; + vendorHash = "sha256-TOzIb8QmvoKlVwoVeYKLcyWgb/sQT4oYuIodtSZoufs="; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YHwT+ddVRyHkmXkw2vROL4PS948pOMj9UwOtHorbTAQ="; + sha256 = "sha256-dbRu+VjUxYZB1aWUZ2w/5+zKs5RcxWDqmYD9vmIGqG0="; }; subPackages = [ From 8f61973d92aee06e2e0854f13433940c5e169a35 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 4 Sep 2024 05:06:42 +0100 Subject: [PATCH 167/481] Revert "e2fsprogs: build fuse2fs on darwin" This change, while fine in isolation, breaks evaluation in combination with , as `xar` depends on `e2fsprogs` which now depends on `macfuse-stubs` which depends on `xar`. This broke `staging-next`. A couple possible solutions are to disable the `e2fsprogs` dependency in the version of `xar` used for the bootstrap, or to build `macfuse-stubs` from source to avoid the `xar` dependency. This reverts commit 0dfc820f4a915a979ccb4ba420a8fcad48345170. --- pkgs/tools/filesystems/e2fsprogs/default.nix | 8 ++++---- .../tools/filesystems/e2fsprogs/macfuse.patch | 20 ------------------- 2 files changed, 4 insertions(+), 24 deletions(-) delete mode 100644 pkgs/tools/filesystems/e2fsprogs/macfuse.patch diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 1c453fb95893..b8443e8ac880 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux || stdenv.isDarwin, fuse3, macfuse-stubs +, withFuse ? stdenv.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ] - ++ lib.optional withFuse (if stdenv.isDarwin then macfuse-stubs else fuse3); + ++ lib.optionals withFuse [ fuse3 ]; patches = [ # Avoid trouble with older systems like NixOS 23.05. @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { url = "https://lore.kernel.org/linux-ext4/20240527091542.4121237-2-hi@alyssa.is/raw"; hash = "sha256-pMoqm2eo5zYaTdU+Ppa4+posCVFb2A9S4uo5oApaaqc="; }) - ] ++ lib.optional stdenv.isDarwin ./macfuse.patch; + ]; configureFlags = if stdenv.isLinux then [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { "--disable-uuidd" ] else [ "--enable-libuuid --disable-e2initrd-helper" - ] ++ lib.optional stdenv.isDarwin "CFLAGS=-D_FILE_OFFSET_BITS=64"; + ]; nativeCheckInputs = [ buildPackages.perl ]; doCheck = true; diff --git a/pkgs/tools/filesystems/e2fsprogs/macfuse.patch b/pkgs/tools/filesystems/e2fsprogs/macfuse.patch deleted file mode 100644 index 2445958edd79..000000000000 --- a/pkgs/tools/filesystems/e2fsprogs/macfuse.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/misc/fuse2fs.c -+++ b/misc/fuse2fs.c -@@ -2441,7 +2441,7 @@ - #undef XATTR_TRANSLATOR - - static int op_getxattr(const char *path, const char *key, char *value, -- size_t len) -+ size_t len, uint32_t position EXT2FS_ATTR((unused))) - { - struct fuse_context *ctxt = fuse_get_context(); - struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data; -@@ -2623,7 +2623,7 @@ - - static int op_setxattr(const char *path EXT2FS_ATTR((unused)), - const char *key, const char *value, -- size_t len, int flags EXT2FS_ATTR((unused))) -+ size_t len, int flags EXT2FS_ATTR((unused)), uint32_t position EXT2FS_ATTR((unused))) - { - struct fuse_context *ctxt = fuse_get_context(); - struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data; From 55c63e297cf4beeb362f7fa2ce0ada4ca907cae8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 09:42:20 +0000 Subject: [PATCH 168/481] flameshot: 12.1.0-unstable-2024-08-02 -> 12.1.0-unstable-2024-09-01 --- pkgs/by-name/fl/flameshot/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index f8172c2ecc03..c86e5cc62bc8 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -25,13 +25,13 @@ in stdenv'.mkDerivation { pname = "flameshot"; # wlr screenshotting is currently only available on unstable version (>12.1.0) - version = "12.1.0-unstable-2024-08-02"; + version = "12.1.0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; - rev = "fd3772e2abb0b852573fcaa549ba13517f13555c"; - hash = "sha256-WXUxrirlevqJ+dnXZbN1C1l5ibuSI/DBi5fqPx9nOGQ="; + rev = "14a136777cd82ab70f42c13b4bc9418c756d91d2"; + hash = "sha256-xM99adstwfOOaeecKyWQU3yY0p65pQyFgoz7WJNra98="; }; patches = [ From 9827d943d68b6e2e1f911c6e6ca1df49461240b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 12:36:52 +0000 Subject: [PATCH 169/481] deck: 1.39.5 -> 1.39.6 --- pkgs/applications/networking/deck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index 63cc06b0dc8e..608739266618 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.39.5"; + version = "1.39.6"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-kG7eT9g4akiQV2dpZuIi3uabW2lnCm2SF2uT/wFIUiA="; + hash = "sha256-IiwS+NsjXW4kVAaJnsI8HEAl2pPRQr3K2ZpC7n/VjU4="; }; nativeBuildInputs = [ installShellFiles ]; @@ -21,7 +21,7 @@ buildGoModule rec { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-3iUnNSelViAgmwsA9XZg50+JGbizamiM1Y64rZ7KeFo="; + vendorHash = "sha256-wpTXuyeUIPg6WPzVyOIFadodlKHzr5DeDeHhDRKsYbY="; postInstall = '' installShellCompletion --cmd deck \ From 17a622b98ea16b9ddaee530c39d831f1ad3dd321 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 14:00:01 +0000 Subject: [PATCH 170/481] jbrowse: 2.14.0 -> 2.15.0 --- pkgs/applications/science/biology/jbrowse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/jbrowse/default.nix b/pkgs/applications/science/biology/jbrowse/default.nix index de3e1138970b..0762dcd364e0 100644 --- a/pkgs/applications/science/biology/jbrowse/default.nix +++ b/pkgs/applications/science/biology/jbrowse/default.nix @@ -2,11 +2,11 @@ let pname = "jbrowse"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { url = "https://github.com/GMOD/jbrowse-components/releases/download/v${version}/jbrowse-desktop-v${version}-linux.AppImage"; - sha256 = "sha256-fxXOUB+glJmg4WdL+mNfkp0O4iUsl8L1EuIYpBO1gRA="; + sha256 = "sha256-WA0R1V83xlUFSDR4B95BX7VpzLUVF4U7f+t+x+lt30o="; }; appimageContents = appimageTools.extractType2 { From e61a242d06b8361b03c9ec1907b3a4dfe5fb22c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 14:00:22 +0000 Subject: [PATCH 171/481] intermodal: 0.1.13 -> 0.1.14 --- pkgs/tools/misc/intermodal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix index a12008408723..4d6868d5d364 100644 --- a/pkgs/tools/misc/intermodal/default.nix +++ b/pkgs/tools/misc/intermodal/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "intermodal"; - version = "0.1.13"; + version = "0.1.14"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - hash = "sha256-hKMO7ZicXSYESXWKmDC2ILD996KoYDXS5HJExyXMdX4="; + hash = "sha256-N3TumAwHcHDuVyY4t6FPNOO28D7xX5jheCTodfn71/Q="; }; - cargoHash = "sha256-7vtUMG6mxAHKnbouyTsaUf1myJssxYoqAIOjc6m86Fo="; + cargoHash = "sha256-k34psGOs6G+B/msmLSDHLNxnjO1yyE4OY6aQU8bt+is="; # include_hidden test tries to use `chflags` on darwin checkFlags = lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; From 6cbccdca5a7bbbe45898d0dc85e6197ab8965b91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 14:00:37 +0000 Subject: [PATCH 172/481] melange: 0.11.2 -> 0.11.3 --- pkgs/development/tools/melange/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 30cc14902e15..318f1a7ff1e1 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-OHIpMVXfuX5ezkDGsJIaFgsh5+YolJyap+i9jcUQch0="; + hash = "sha256-+G6lSG3iaKWC1SU0cyeU1sU8r9VBUwwtU7D/yjZmu04="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-X4jyLZATJIbTeL4moRrrJQ4B36tlUEfpK6SjBhlJTHQ="; + vendorHash = "sha256-GNY1ez7qC2aaEm8WAQqGy4vWZEZFQhze15r3QQZBNzA="; subPackages = [ "." ]; From 7080574bdd2da4e5f0721fe7bc23d2497d00e630 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 16:44:27 +0000 Subject: [PATCH 173/481] linkerd_edge: 24.8.2 -> 24.8.3 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index 341e9767a902..00ec65791a60 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.8.2"; - sha256 = "0jvyw002xy5zdb27q02r3bj88138zpc73an61sbgmls3jwp9w9iq"; - vendorHash = "sha256-16tdpREYDJDvwIZLpwCxGsZGERxMdSyPH7c6wbD2GCI="; + version = "24.8.3"; + sha256 = "05ynk7p86pa81nyfj9vkfmvgss0nfz3zszrlm967cakhanc5083g"; + vendorHash = "sha256-Edn5w264IU3ez47jb2wqX5zXeKiLtewWs05LXYr5q50="; } From d27dc73da5ab21c186694d4efa090d54b6d6d5c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 Sep 2024 19:14:38 +0000 Subject: [PATCH 174/481] qdrant: 1.11.2 -> 1.11.3 --- pkgs/servers/search/qdrant/Cargo.lock | 4 ++-- pkgs/servers/search/qdrant/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/qdrant/Cargo.lock b/pkgs/servers/search/qdrant/Cargo.lock index 493bd645969b..4b8d95ba02c8 100644 --- a/pkgs/servers/search/qdrant/Cargo.lock +++ b/pkgs/servers/search/qdrant/Cargo.lock @@ -471,7 +471,7 @@ checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "api" -version = "1.11.2" +version = "1.11.3" dependencies = [ "chrono", "common", @@ -4561,7 +4561,7 @@ dependencies = [ [[package]] name = "qdrant" -version = "1.11.2" +version = "1.11.3" dependencies = [ "actix-cors", "actix-files", diff --git a/pkgs/servers/search/qdrant/default.nix b/pkgs/servers/search/qdrant/default.nix index a55e5192f01d..f9669759171a 100644 --- a/pkgs/servers/search/qdrant/default.nix +++ b/pkgs/servers/search/qdrant/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "qdrant"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ngDxabfs5cPu04Hn1V10qF1ryi100jzp5MmvPrkOD3k="; + sha256 = "sha256-Mq8669+feSXWHofCU/qMk1kWa3uNuMX3kwCO/tFHr2A="; }; cargoLock = { From 5ffe217cd9b3834cdd916720723d2a28be6cae50 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 4 Sep 2024 17:22:03 +0200 Subject: [PATCH 175/481] mongodb-ce: remove custom `curl` override (cherry picked from commit 3a41bcd617109a6161d702f7458d4a508a499a5a) --- pkgs/by-name/mo/mongodb-ce/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index ba527df39564..d3dc490bdcfe 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -49,11 +49,7 @@ stdenv.mkDerivation (finalAttrs: { dontStrip = true; buildInputs = [ - # Remove this after https://github.com/NixOS/nixpkgs/pull/336712 - # has landed in `nixpkgs-unstable` - (curl.overrideAttrs (old: { - configureFlags = old.configureFlags ++ [ "--enable-versioned-symbols" ]; - })).dev + curl.dev openssl.dev stdenv.cc.cc.lib ]; From ccc257f60d51880e6274d6215676c2d1cab4bd87 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 00:59:56 +0000 Subject: [PATCH 176/481] automatic-timezoned: 2.0.30 -> 2.0.31 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 7021d1ff63fe..61c663b527d8 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.30"; + version = "2.0.31"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7Qczara48SIuoKhfaQLFzkYYylvJlb6dV7pUEXucCWY="; + sha256 = "sha256-jMQpnob6J3lPkrjsh8abNA5/8FVYk/xtWiylWFPk1WM="; }; - cargoHash = "sha256-m/IEFVlOCE8aiMqPQ/f/b/tVxRjJBlOO4V9uoLiOJ0o="; + cargoHash = "sha256-55nfiC8tWZNgK0il+N9NMzq525xqWd2IdDHhPLMYaXU="; meta = with lib; { description = "Automatically update system timezone based on location"; From 0a899446e8050cd992e28fecb691a919101caf75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:01:39 +0000 Subject: [PATCH 177/481] fulcio: 1.6.3 -> 1.6.4 --- pkgs/tools/security/fulcio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/fulcio/default.nix b/pkgs/tools/security/fulcio/default.nix index 494486021c67..9f3207dbc6ce 100644 --- a/pkgs/tools/security/fulcio/default.nix +++ b/pkgs/tools/security/fulcio/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fulcio"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-JoJ7kYL5EJOI6TwMh0arMXXnj/Y93szrvlFsv0FJn3w="; + hash = "sha256-eRf504i9kYQua/p0SNlDGNeXa9ztoyz6M8nukhRyzIY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-Xv+wiG3MRAE49Wu+FoHBIXz8B2mnqzzcDCchgYjZC/o="; + vendorHash = "sha256-VTJhQrsqwGHq8211N3pUf4fmU4H90gRWYJTdEufNGg4="; nativeBuildInputs = [ installShellFiles ]; From 8aa2a80b3f1c68d8e0456a4db8cc7fd31c83a014 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 Sep 2024 01:13:54 +0000 Subject: [PATCH 178/481] gosec: 2.20.0 -> 2.21.1 --- pkgs/development/tools/gosec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 8068988d0e6f..d9937e56764a 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gosec"; - version = "2.20.0"; + version = "2.21.1"; src = fetchFromGitHub { owner = "securego"; repo = pname; rev = "v${version}"; - hash = "sha256-QQD24Z755AurBFXZj/wlRBJegQ74kTvWVy2cN5PnblY="; + hash = "sha256-0YSDeJEX7dAxIxW+dTiZtsieafzDRADggMBnJ3Sjjow="; }; - vendorHash = "sha256-VWbsSS3j8zgsZQzsO/ZyKoOUqhNhmMmDICImUZHmC9Y="; + vendorHash = "sha256-3O3uk/KB348++FAuH0WKTlqTK+RsDXkAXL3y4xud0r4="; subPackages = [ "cmd/gosec" From 02a4d9a728489f78a8265d84c6fd6c1057f449d1 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 5 Sep 2024 11:41:01 +0300 Subject: [PATCH 179/481] mesa: cherry-pick fixes for software rendering fallback --- pkgs/development/libraries/mesa/default.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index dc722d44243f..3593faa13edb 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -6,6 +6,7 @@ , expat , fetchCrate , fetchFromGitLab +, fetchpatch , file , flex , glslang @@ -139,6 +140,18 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch + + # dril/swrast fixes + # FIXME: remove when backported upstream + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/06d417af80bc1f171cadc338e63a7aa75c877754.diff"; + hash = "sha256-JbrygyjtgNcQlggv1X+3HWf4WRWdtyeEvg3jwthEspM="; + }) + + (fetchpatch { + url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/56ac37845487b62f495428b0f20d145489f621e2.diff"; + hash = "sha256-J6P7k6SuOqRzmeqiiAc+QgBDp5nIBY+sPwvnQ+hlCW8="; + }) ]; postPatch = '' From b745b4f77cf3d6ec227aed31302065b5f974a2c5 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 5 Sep 2024 11:26:22 +0200 Subject: [PATCH 180/481] hyperion-ng: 2.0.14 -> 2.0.16 --- pkgs/applications/video/hyperion-ng/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/hyperion-ng/default.nix b/pkgs/applications/video/hyperion-ng/default.nix index 00c2467624b8..50c00e03c4ef 100644 --- a/pkgs/applications/video/hyperion-ng/default.nix +++ b/pkgs/applications/video/hyperion-ng/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , cmake, wrapQtAppsHook, perl , flatbuffers, protobuf, mbedtls -, hidapi, libcec, libusb1 +, alsa-lib, hidapi, libcec, libusb1 , libX11, libxcb, libXrandr, python3 , qtbase, qtserialport, qtsvg, qtx11extras , withRPiDispmanx ? false, libraspberrypi @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "hyperion.ng"; - version = "2.0.14"; + version = "2.0.16"; src = fetchFromGitHub { owner = "hyperion-project"; repo = pname; rev = version; - hash = "sha256-Y1PZ+YyPMZEX4fBpMG6IVT1gtXR9ZHlavJMCQ4KAenc="; + hash = "sha256-nQPtJw9DOKMPGI5trxZxpP+z2PYsbRKqOQEyaGzvmmA="; # needed for `dependencies/external/`: # * rpi_ws281x` - not possible to use as a "system" lib # * qmdnsengine - not in nixpkgs yet @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ + alsa-lib hidapi libusb1 libX11 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 327ad752c650..3cbf8f5f0ab4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30663,9 +30663,7 @@ with pkgs; hydroxide = callPackage ../applications/networking/hydroxide { }; - hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { - protobuf = protobuf_21; - }; + hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { }; hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; From 0be133aa115608034924f5f1608035073ac45b9e Mon Sep 17 00:00:00 2001 From: Savyasachee Jha Date: Thu, 5 Sep 2024 23:30:47 +0530 Subject: [PATCH 181/481] firefly-iii-data-importer: 1.5.4 -> 1.5.5 --- pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index d647783f7381..a4614f5ae27b 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -13,13 +13,13 @@ let pname = "firefly-iii-data-importer"; - version = "1.5.4"; + version = "1.5.5"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; rev = "v${version}"; - hash = "sha256-XnPdoNtUoJpOpKVzQlFirh7u824H4xKAe2VRXfGIKeg="; + hash = "sha256-nAeLXxUwaw/wHYh3NywI4/mFi82i/2b3McFfCFGAIjE="; }; in @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-EjEco8zBR787eQuPhNsRScfuPQ6eS6TIJmMJOcmZA+Q="; + vendorHash = "sha256-yLu/FMKn/uUy5g6td3mfPAb9ptjJne4vd478fjaS9U0="; npmDeps = fetchNpmDeps { inherit src; name = "${pname}-npm-deps"; - hash = "sha256-VP1wM0+ca17aQU4FJ9gSbT2Np/sxb8wZ4pCJ6FV1V7w="; + hash = "sha256-35mS+0Ea69CAwV9liTU3lcKp3ww3qLbTRWlF0AQNx5w="; }; composerRepository = php83.mkComposerRepository { From 4333fa1caa944786110a0342b4cd1057eec74e14 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 5 Sep 2024 21:12:46 -0400 Subject: [PATCH 182/481] go_1_22: 1.22.6 -> 1.22.7 Changelog: https://go.dev/doc/devel/release#go1.22 --- pkgs/development/compilers/go/1.22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index 5cc070d34e0d..4060a6cf6975 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.6"; + version = "1.22.7"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-nkjZnVGYgleZF9gYnBfpjDc84lq667mHcuKScIiZKlE="; + hash = "sha256-ZkMth9heDPrD7f/mN9WTD8Td9XkzE/4R5KDzMwI8h58="; }; strictDeps = true; From 6efb622aca97c5bdf051f9bf554b2fc9a958d07e Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 6 Sep 2024 08:24:55 +0300 Subject: [PATCH 183/481] mesa: 24.2.1 -> 24.2.2 --- pkgs/development/libraries/mesa/common.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix index 37ae8905891f..1390ba84397e 100644 --- a/pkgs/development/libraries/mesa/common.nix +++ b/pkgs/development/libraries/mesa/common.nix @@ -5,14 +5,14 @@ # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa rec { pname = "mesa"; - version = "24.2.1"; + version = "24.2.2"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mesa"; repo = "mesa"; rev = "mesa-${version}"; - hash = "sha256-1aOK5M4Xe1FnmouOIoyafrvnxyoGpNK8wLVDC8yO4p0="; + hash = "sha256-1aRnG5BnFDuBOnGIb7X3yDk4PkhpBbMpp+IjfpmgtkM="; }; meta = { diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 3593faa13edb..94a72143a71f 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -140,18 +140,6 @@ in stdenv.mkDerivation { patches = [ ./opencl.patch - - # dril/swrast fixes - # FIXME: remove when backported upstream - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/06d417af80bc1f171cadc338e63a7aa75c877754.diff"; - hash = "sha256-JbrygyjtgNcQlggv1X+3HWf4WRWdtyeEvg3jwthEspM="; - }) - - (fetchpatch { - url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/56ac37845487b62f495428b0f20d145489f621e2.diff"; - hash = "sha256-J6P7k6SuOqRzmeqiiAc+QgBDp5nIBY+sPwvnQ+hlCW8="; - }) ]; postPatch = '' From 32ba12249468741eb097a763ea9f843d830bac32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 10:48:40 +0000 Subject: [PATCH 184/481] fstar: 2024.01.13 -> 2024.09.05 --- pkgs/development/compilers/fstar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 3b3ad0ff5569..bcec02476fc6 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -12,13 +12,13 @@ let - version = "2024.01.13"; + version = "2024.09.05"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - hash = "sha256-xjSWDP8mSjLcn+0hsRpEdzsBgBR+mKCZB8yLmHl+WqE="; + hash = "sha256-yaA6WpP2XIQhjK7kpXBdBFUgKZyvtThd6JmSchUCfbI="; }; fstar-dune = ocamlPackages.callPackage ./dune.nix { inherit version src; }; From 6e24b86def4c2ebf5a7f88ae0d639a530d0bb792 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 09:30:15 +0000 Subject: [PATCH 185/481] nc4nix: 0-unstable-2024-08-01 -> 0-unstable-2024-09-07 --- pkgs/by-name/nc/nc4nix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nc/nc4nix/package.nix b/pkgs/by-name/nc/nc4nix/package.nix index cba2af827d1d..95c31ecc14c0 100644 --- a/pkgs/by-name/nc/nc4nix/package.nix +++ b/pkgs/by-name/nc/nc4nix/package.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "nc4nix"; - version = "0-unstable-2024-08-01"; + version = "0-unstable-2024-09-07"; src = fetchFromGitHub { owner = "helsinki-systems"; repo = "nc4nix"; - rev = "827bb7244a3529e71c9474fe1f74aed51a4b08d5"; - hash = "sha256-ToT+VvdXiUMmy0dNJAeyMlzMx87QhZPIwzxPXm2fR7s="; + rev = "6be14e56aabc0c0a686037a7d1fa6fff8ea97045"; + hash = "sha256-RVimsyyErf9eaHLIRp5U8zHJSNC2vBlk/ga4VRitJM8="; }; vendorHash = "sha256-qntRsv3KvAbV3lENjAHKkQOqh3uTo3gacfwase489tQ="; From 3e798311643f79be5502e084815afd267ad0abbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 11:36:37 +0000 Subject: [PATCH 186/481] python312Packages.etils: 1.9.3 -> 1.9.4 --- pkgs/development/python-modules/etils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/etils/default.nix b/pkgs/development/python-modules/etils/default.nix index 401fbba09893..a78831b4aedf 100644 --- a/pkgs/development/python-modules/etils/default.nix +++ b/pkgs/development/python-modules/etils/default.nix @@ -29,14 +29,14 @@ buildPythonPackage rec { pname = "etils"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-qjt6hF3jwbabMMoHBG6MT9LoXsvmBKpL8Y6pPnsxhPA="; + hash = "sha256-+tlQQU8KHKWMcMcJFbABT5lT3ZvPiqlRoPdf+b7L6yQ="; }; nativeBuildInputs = [ flit-core ]; From 345c8a7310f91296f5a9ffdf6ff94cd1c1b3b4ad Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 7 Sep 2024 14:39:07 +0100 Subject: [PATCH 187/481] =?UTF-8?q?nixos/dokuwiki:=20don=E2=80=99t=20use?= =?UTF-8?q?=20`lib.escapeShellArg`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHP strings don't obey shell quoting rules. See #333744. --- nixos/modules/services/web-apps/dokuwiki.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index c5ea809c8d59..328a9a74a921 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -43,12 +43,12 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; in - if isString v then escapeShellArg v + if isString v then "'${escape [ "'" "\\" ] v}'" # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then escapeShellArg (concatMapStringsSep "," toString v) + else if isList v && any lib.strings.isCoercibleToString v then "'${escape [ "'" "\\" ] (concatMapStringsSep "," toString v)}'" else if isInt v then toString v else if isBool v then toString (if v then 1 else 0) - else if isHasAttr "_file" then "trim(file_get_contents(${lib.escapeShellArg v._file}))" + else if isHasAttr "_file" then "trim(file_get_contents('${escape [ "'" "\\" ] v._file}'))" else if isHasAttr "_raw" then v._raw else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded." ; @@ -59,7 +59,7 @@ let [" = ${mkPhpValue v};"] else mkPhpAttrVals v; - in map (e: "[${escapeShellArg k}]${e}") (flatten values); + in map (e: "['${escape [ "'" "\\" ] k}']${e}") (flatten values); dokuwikiLocalConfig = hostName: cfg: let conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c); From 67deb643a5562bea290f3a6bb1388e989231d4dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 7 Sep 2024 13:49:16 +0000 Subject: [PATCH 188/481] ssdfs-utils: 4.40 -> 4.43 --- pkgs/tools/filesystems/ssdfs-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index 8a80d362c902..e77eaa1126ea 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.40"; + version = "4.43"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "5f121f793e344cbbe98764b0a5758511da8c3d23"; - hash = "sha256-VSHs8BBp+n7jbr9KtTXykpUZbTfc999eYA5wtFsmMdY="; + rev = "cb0b3d8a01eb2c27d3bf59de6313d14fc7d3b6ac"; + hash = "sha256-LDxL0+IkQ6sgkFjbiUwB416ZjQGA3JV05o6D6ibAHJE="; }; strictDeps = true; From 2bab9e4eba4e9099ad03a870d1faf58603073fb5 Mon Sep 17 00:00:00 2001 From: ash Date: Sat, 7 Sep 2024 15:30:54 +0100 Subject: [PATCH 189/481] nixos/dokuwiki: factor out `toPhpString` --- nixos/modules/services/web-apps/dokuwiki.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 328a9a74a921..a075070f38b2 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -17,6 +17,10 @@ let extraConfig = mkPhpIni cfg.phpOptions; }; + # "you're escaped" -> "'you\'re escaped'" + # https://www.php.net/manual/en/language.types.string.php#language.types.string.syntax.single + toPhpString = s: "'${escape [ "'" "\\" ] s}'"; + dokuwikiAclAuthConfig = hostName: cfg: let inherit (cfg) acl; acl_gen = concatMapStringsSep "\n" (l: "${l.page} \t ${l.actor} \t ${toString l.level}"); @@ -43,12 +47,12 @@ let mkPhpValue = v: let isHasAttr = s: isAttrs v && hasAttr s v; in - if isString v then "'${escape [ "'" "\\" ] v}'" + if isString v then toPhpString v # NOTE: If any value contains a , (comma) this will not get escaped - else if isList v && any lib.strings.isCoercibleToString v then "'${escape [ "'" "\\" ] (concatMapStringsSep "," toString v)}'" + else if isList v && any lib.strings.isCoercibleToString v then toPhpString (concatMapStringsSep "," toString v) else if isInt v then toString v else if isBool v then toString (if v then 1 else 0) - else if isHasAttr "_file" then "trim(file_get_contents('${escape [ "'" "\\" ] v._file}'))" + else if isHasAttr "_file" then "trim(file_get_contents(${toPhpString v._file}))" else if isHasAttr "_raw" then v._raw else abort "The dokuwiki localConf value ${lib.generators.toPretty {} v} can not be encoded." ; @@ -59,7 +63,7 @@ let [" = ${mkPhpValue v};"] else mkPhpAttrVals v; - in map (e: "['${escape [ "'" "\\" ] k}']${e}") (flatten values); + in map (e: "[${toPhpString k}]${e}") (flatten values); dokuwikiLocalConfig = hostName: cfg: let conf_gen = c: map (v: "$conf${v}") (mkPhpAttrVals c); From b060a3333f782c689d9b431da2c8dce356dc7a29 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 03:17:02 +0000 Subject: [PATCH 190/481] rdkafka: 2.4.0 -> 2.5.3 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 3b9580840f4d..a748f3a86c57 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "2.4.0"; + version = "2.5.3"; src = fetchFromGitHub { owner = "confluentinc"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "sha256-RLjshOnMmCdlv73M8siIvBZ5kVG3v2XttkLVPU+BHY4="; + sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg="; }; nativeBuildInputs = [ pkg-config python3 which ]; From 2f78cc659426561e097edacf7aa9c52884e1594f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 05:12:12 +0000 Subject: [PATCH 191/481] vivaldi: 6.9.3447.37 -> 6.9.3447.41 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 7563f184d2a7..652cf97de4c1 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.9.3447.37"; + version = "6.9.3447.41"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-kYTnWad/jrJt9z+AhjXzHYxVSIwIIO3RKD7szuPEg2s="; - x86_64-linux = "sha256-+h7SHci8gZ+epKFHD0PiXyME2xT+loD2KXpJGFCfIFg="; + aarch64-linux = "sha256-Up2n7G3vatsQC9JKF1A1jAIBbdWm9UhL/75AXuxDCsg="; + x86_64-linux = "sha256-Hcd8W8bDlRUT/zPYP+aiJnUmepS38KuK0wRFYB3uW1Y="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 1e31bdf2b806ff39ded6419001e5a2b51397a510 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 8 Sep 2024 07:26:22 +0200 Subject: [PATCH 192/481] vulkan-headers: fixup build on darwin Broken after update by PR #338599 --- pkgs/development/libraries/vulkan-headers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index c9126e954140..9b5916810ab0 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -5,6 +5,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # TODO: investigate why isn't found + cmakeFlags = lib.optionals stdenv.isDarwin [ "-DVULKAN_HEADERS_ENABLE_MODULE=OFF" ]; + src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Headers"; From 8649798b71b1b1213df6fcfedeb0fb48d4e48e9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 07:39:38 +0000 Subject: [PATCH 193/481] buf: 1.38.0 -> 1.40.1 --- pkgs/development/tools/buf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index b1250a366a22..b1d5bee33651 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.38.0"; + version = "1.40.1"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-BONfkSLQAnqKW/1PfMwK/DjAbLm5/i6V55SZDOF0rJA="; + hash = "sha256-NctOr9eAOQr2pkPSYbFasU2D9PsPxRPZOAxVBJNw5NY="; }; - vendorHash = "sha256-NV5l7dlb05rRLtNe2cFvaC/G2rhZLY+DmVQcuyJU/08="; + vendorHash = "sha256-n6SGBfelHNdpU5O1mMrre0D0B/2UEhX0fqepy1UDHlY="; patches = [ # Skip a test that requires networking to be available to work. From f5b62a54775e154392e9d23696ae9897033e675b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 08:15:55 +0000 Subject: [PATCH 194/481] keymapper: 4.6.0 -> 4.8.2 --- pkgs/tools/inputmethods/keymapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/keymapper/default.nix b/pkgs/tools/inputmethods/keymapper/default.nix index 4394d708cc10..8f643d71812c 100644 --- a/pkgs/tools/inputmethods/keymapper/default.nix +++ b/pkgs/tools/inputmethods/keymapper/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "keymapper"; - version = "4.6.0"; + version = "4.8.2"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; rev = finalAttrs.version; - hash = "sha256-xHnCRn7fGo46T5rs9BtvEAEdxCY08zDTUipbbl6OUlU="; + hash = "sha256-4LYGsqHD3msJNgkaInJyH7o+jebeQoh/rUAsvIsqkdM="; }; # all the following must be in nativeBuildInputs From 800623c7342b5c5b1ae3fc1d87a8071af31caa60 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 08:45:44 +0000 Subject: [PATCH 195/481] papermc: 1.21-124 -> 1.21.1-69 --- pkgs/games/papermc/versions.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json index 79068fcc3995..343f7abb0595 100644 --- a/pkgs/games/papermc/versions.json +++ b/pkgs/games/papermc/versions.json @@ -52,11 +52,15 @@ "version": "1.20.5-22" }, "1.20.6": { - "hash": "sha256-u9adg4SOJb3w7LBAzJiiJj2V7WbjvVEoqMhVL3v5lL0=", - "version": "1.20.6-148" + "hash": "sha256-hOFGBazDab9moLwJyy1wwymsLGzeHZhcRluXSHfMK6M=", + "version": "1.20.6-149" }, "1.21": { - "hash": "sha256-BiD2eK6xWBogwZFiG0J8ELTw2G4YvwSVX9xE/5vcdY8=", - "version": "1.21-124" + "hash": "sha256-q5uxr8POppeKDAPOhEiqZU/oqcTd3zQefL2hsO2qc/U=", + "version": "1.21-130" + }, + "1.21.1": { + "hash": "sha256-7nMJ/ePyaJxEOCKusg52ERnFtmPlW+Ilbz/Q8KKpJ0E=", + "version": "1.21.1-69" } } From e2db383cb685c8425f1f5fdc471635349a5daaae Mon Sep 17 00:00:00 2001 From: r-vdp Date: Thu, 30 Nov 2023 17:39:39 +0100 Subject: [PATCH 196/481] activation: avoid error due to unset PATH variable --- nixos/modules/system/activation/activation-script.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 195ad31b1e56..140d453589b8 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -170,7 +170,7 @@ in apply = set: { script = '' - unset PATH + export PATH= for i in ${toString path}; do PATH=$PATH:$i/bin:$i/sbin done From 3d200d28912fc1e5afb8e0b126a0edbde109b469 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 8 Sep 2024 16:24:30 +0530 Subject: [PATCH 197/481] weechat: 4.4.1 -> 4.4.2 Changes: https://github.com/weechat/weechat/releases/tag/v4.4.2 --- pkgs/applications/networking/irc/weechat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 0633199787ee..42090534bcc3 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -36,14 +36,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "4.4.1"; + version = "4.4.2"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-5d4L0UwqV6UFgTqDw9NyZI0tlXPccoNoV78ocXMmk2w="; + hash = "sha256-1N8ompxbygOm1PrgBuUgNwZO8Dutb76VnFOPMZdDTew="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 From 32a1f2f245f82e366162b827f79720abcbf14e92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 Sep 2024 16:14:06 +0000 Subject: [PATCH 198/481] asterisk: 20.9.2 -> 20.9.3 --- pkgs/servers/asterisk/versions.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json index 69cc9af11021..19e2e2651d11 100644 --- a/pkgs/servers/asterisk/versions.json +++ b/pkgs/servers/asterisk/versions.json @@ -1,14 +1,14 @@ { "asterisk_18": { - "sha256": "11af7b24a7e027282696dda9370e812dcc5214e7ffb802ba42ee4ef3444c03b4", - "version": "18.24.2" + "sha256": "70af95d1067a5afec7acbf98a242d853ae5dc8637c8f20d1f30d0dcf96eadb29", + "version": "18.24.3" }, "asterisk_20": { - "sha256": "acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca", - "version": "20.9.2" + "sha256": "3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4", + "version": "20.9.3" }, "asterisk_21": { - "sha256": "a14f8e13c3099343ed3df45252965866d93642644404512ce4492b18ecc1a187", - "version": "21.4.2" + "sha256": "bd9f492d3a9e6a5c9f0a69440402be61285d14df9dc7049377f29f9cbecfeeda", + "version": "21.4.3" } } From 7d8908a49941c1e8e7a11050bafa9f8e68cb229f Mon Sep 17 00:00:00 2001 From: sarahec Date: Sun, 25 Aug 2024 13:08:17 -0700 Subject: [PATCH 199/481] code-cursor: init at 0.40.4 --- pkgs/by-name/co/code-cursor/package.nix | 76 +++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 pkgs/by-name/co/code-cursor/package.nix diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix new file mode 100644 index 000000000000..a2f9a62ce378 --- /dev/null +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -0,0 +1,76 @@ +{ + lib, + stdenvNoCC, + fetchurl, + appimageTools, + makeWrapper, + writeShellApplication, + curl, + yq, + common-updater-scripts, +}: +let + pname = "cursor"; + version = "0.40.4"; + appKey = "230313mzl4w4u92"; + src = fetchurl { + url = "https://download.todesktop.com/${appKey}/cursor-0.40.4-build-2409052yfcjagw2-x86_64.AppImage"; + hash = "sha256-ZURE8UoLPw+Qo1e4xuwXgc+JSwGrgb/6nfIGXMacmSg="; + }; + appimageContents = appimageTools.extractType2 { inherit version pname src; }; +in +stdenvNoCC.mkDerivation { + inherit pname version; + + src = appimageTools.wrapType2 { inherit version pname src; }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r bin $out/bin + + mkdir -p $out/share/cursor + cp -a ${appimageContents}/locales $out/share/cursor + cp -a ${appimageContents}/resources $out/share/cursor + cp -a ${appimageContents}/usr/share/icons $out/share/ + install -Dm 644 ${appimageContents}/cursor.desktop -t $out/share/applications/ + + substituteInPlace $out/share/applications/cursor.desktop --replace-fail "AppRun" "cursor" + + wrapProgram $out/bin/cursor \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}} --no-update" + + runHook postInstall + ''; + + passthru = { + updateScript = lib.getExe (writeShellApplication { + name = "update-cursor"; + runtimeInputs = [ + curl + yq + common-updater-scripts + ]; + text = '' + set -o errexit + latestLinux="$(curl -s https://download.todesktop.com/${appKey}/latest-linux.yml)" + version="$(echo "$latestLinux" | yq -r .version)" + filename="$(echo "$latestLinux" | yq -r '.files[] | .url | select(. | endswith(".AppImage"))')" + update-source-version cursor "$version" "" "https://download.todesktop.com/${appKey}/$filename" --source-key=src.src + ''; + }); + }; + + meta = { + description = "AI-powered code editor built on vscode"; + homepage = "https://cursor.com"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ sarahec ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "cursor"; + }; +} From 4a208d7c65eac5e807b2b8b238d9001ee2ffdac6 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 8 Sep 2024 23:41:04 +0200 Subject: [PATCH 200/481] cook-framework: init at 2.2.1 --- pkgs/by-name/co/cook-framework/package.nix | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/co/cook-framework/package.nix diff --git a/pkgs/by-name/co/cook-framework/package.nix b/pkgs/by-name/co/cook-framework/package.nix new file mode 100644 index 000000000000..8d8591750945 --- /dev/null +++ b/pkgs/by-name/co/cook-framework/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "cook-framework"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "glitchedgitz"; + repo = "cook"; + rev = "refs/tags/v${version}"; + hash = "sha256-DK0kbvM11t64nGkrzThZgSruHTCHAPP374YPWmoM50g="; + }; + + sourceRoot = "${src.name}/v2"; + + vendorHash = "sha256-VpNr06IiVKpMsJXzcKCuNfJ+T+zeA9dMBMp6jeCRgn8="; + + doCheck = false; # uses network to fetch data sources + + meta = { + description = "Wordlist generator, splitter, merger, finder, saver for security researchers, bug bounty and hackers"; + homepage = "https://github.com/glitchedgitz/cook"; + changelog = "https://github.com/glitchedgitz/cook/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "cook"; + maintainers = with lib.maintainers; [ tomasajt ]; + }; +} From 9bffc1352a6ed8db45ae4236e88da56c06faf385 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 01:20:17 +0000 Subject: [PATCH 201/481] quarkus: 3.14.1 -> 3.14.2 --- pkgs/by-name/qu/quarkus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix index 18f47753c8fd..407d19d50b39 100644 --- a/pkgs/by-name/qu/quarkus/package.nix +++ b/pkgs/by-name/qu/quarkus/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "quarkus-cli"; - version = "3.14.1"; + version = "3.14.2"; src = fetchurl { url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz"; - hash = "sha256-OiA45lItW5IhOboxS+/kcUxvuVuJmvT+m6wX1REGUGI="; + hash = "sha256-LYh+vWOMghjdwBXqgbdQd945+OX2lKbRTFJ1GIzOyH0="; }; nativeBuildInputs = [ makeWrapper ]; From 05b0f36dd9ef759b02f60c98af3b85115aa739e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 09:47:14 +0000 Subject: [PATCH 202/481] melonDS: 0.9.5-unstable-2024-08-21 -> 0.9.5-unstable-2024-09-06 --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 6ab2a211b710..2be371c93476 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-08-21"; + version = "0.9.5-unstable-2024-09-06"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "4f6498c99c5dcdb780371fe936d49e32df148e6e"; - hash = "sha256-GfcPWWWAO9zQrqr2+CxNMaIxcfswZhDw1DFjrmpWZ2Q="; + rev = "268c4f14c194b72ced33f520688fb0d3d096fad5"; + hash = "sha256-D7tponrkD+YI6MYeilP5YlpIJ3brdZYKpDV/YE9vOFA="; }; nativeBuildInputs = [ From 249b7bd0a069184f56eee6ac9aa1e6c7ca466c7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 10:17:26 +0000 Subject: [PATCH 203/481] envision-unwrapped: 0-unstable-2024-09-06 -> 0-unstable-2024-09-09 --- pkgs/by-name/en/envision-unwrapped/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/en/envision-unwrapped/package.nix b/pkgs/by-name/en/envision-unwrapped/package.nix index 4011c7487c2c..f72410f1f814 100644 --- a/pkgs/by-name/en/envision-unwrapped/package.nix +++ b/pkgs/by-name/en/envision-unwrapped/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "envision-unwrapped"; - version = "0-unstable-2024-09-06"; + version = "0-unstable-2024-09-09"; src = fetchFromGitLab { owner = "gabmus"; repo = "envision"; - rev = "849f47a8533bc3fc673afbdd9b32acac3ff26f7d"; - hash = "sha256-t1+4MXD1s4NW38r3Ht+1OmCAY44MqEPijXdUVKy0rY4="; + rev = "f8a18e96f049f2fd51409aac011e1aa09eaac2db"; + hash = "sha256-ZEczUdFyjgqCisFjgQeYWJ9JQP0/G7cgVpkHwWjNfRQ="; }; strictDeps = true; From 3f03dc83bef65245c1b14be80260203822be9678 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 9 Sep 2024 13:36:26 +0200 Subject: [PATCH 204/481] jasmin-compiler: propagate angstrom --- pkgs/development/compilers/jasmin-compiler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/jasmin-compiler/default.nix b/pkgs/development/compilers/jasmin-compiler/default.nix index 26b4309eb919..a19dd7cfb603 100644 --- a/pkgs/development/compilers/jasmin-compiler/default.nix +++ b/pkgs/development/compilers/jasmin-compiler/default.nix @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { mpfr ppl ] ++ (with ocamlPackages; [ - angstrom apron yojson ]); propagatedBuildInputs = with ocamlPackages; [ + angstrom batteries menhirLib zarith From d2f4f38b161f6100e1eca73e1e3065dcff2c207c Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Sep 2024 13:41:45 +0200 Subject: [PATCH 205/481] python312Packages.qcodes: 0.47.0 -> 0.48.0 Diff: https://github.com/microsoft/Qcodes/compare/refs/tags/v0.47.0...v0.48.0 Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.48.0 --- .../python-modules/qcodes/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix index 8d4867923692..e10eb77d2816 100644 --- a/pkgs/development/python-modules/qcodes/default.nix +++ b/pkgs/development/python-modules/qcodes/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -38,13 +37,13 @@ xarray, # optional-dependencies + furo, jinja2, nbsphinx, pyvisa-sim, scipy, sphinx, sphinx-issues, - sphinx-rtd-theme, towncrier, opencensus, opencensus-ext-azure, @@ -63,16 +62,14 @@ buildPythonPackage rec { pname = "qcodes"; - version = "0.47.0"; + version = "0.48.0"; pyproject = true; - disabled = pythonOlder "3.10"; - src = fetchFromGitHub { owner = "microsoft"; repo = "Qcodes"; rev = "refs/tags/v${version}"; - hash = "sha256-Gp+HeYJGWyW49jisadnavjIpzu7C2uS2qWn7eC6okqg="; + hash = "sha256-Q1WyuK1mCbs75kGY1Aaw7S5EfFRjwqzZnhNyeSx7qc8="; }; build-system = [ @@ -112,6 +109,7 @@ buildPythonPackage rec { optional-dependencies = { docs = [ # autodocsumm + furo jinja2 nbsphinx pyvisa-sim @@ -121,7 +119,6 @@ buildPythonPackage rec { # sphinx-favicon sphinx-issues # sphinx-jsonschema - sphinx-rtd-theme # sphinxcontrib-towncrier towncrier ]; @@ -195,9 +192,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes" ]; + # Remove the `asyncio_default_fixture_loop_scope` option as it has been introduced in newer `pytest-asyncio` v0.24 + # which is not in nixpkgs yet: + # pytest.PytestConfigWarning: Unknown config option: asyncio_default_fixture_loop_scope postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' + --replace-fail 'default-version = "0.0"' 'default-version = "${version}"' \ + --replace-fail 'asyncio_default_fixture_loop_scope = "function"' "" ''; postInstall = '' From 7f17e857c2e4094036e0cbe8ac6b78d0235e220f Mon Sep 17 00:00:00 2001 From: Marco Rebhan Date: Sun, 24 Mar 2024 18:47:34 +0100 Subject: [PATCH 206/481] nix-plugin-pijul: init at 0.1.4 --- pkgs/by-name/ni/nix-plugin-pijul/package.nix | 90 ++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 pkgs/by-name/ni/nix-plugin-pijul/package.nix diff --git a/pkgs/by-name/ni/nix-plugin-pijul/package.nix b/pkgs/by-name/ni/nix-plugin-pijul/package.nix new file mode 100644 index 000000000000..0b78c43ba6f1 --- /dev/null +++ b/pkgs/by-name/ni/nix-plugin-pijul/package.nix @@ -0,0 +1,90 @@ +{ + lib, + stdenv, + fetchzip, + cmake, + pkg-config, + boost, + howard-hinnant-date, + nix, + + # for tests + runCommand, + pijul, + nixVersions, + nix-plugin-pijul, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "nix-plugin-pijul"; + version = "0.1.4"; + + src = fetchzip { + url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz"; + hash = "sha256-X25tFqcAgNWmkMxbfXGx8KJ25BV6sFWAQM9NvjQeSmQ="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + howard-hinnant-date + nix + ]; + + passthru.tests = let + localRepoCheck = nix: + runCommand "localRepoCheck-${nix.name}" + { + nativeBuildInputs = [ + pijul + nix + ]; + } + '' + export HOME=$(mktemp -d) + export EDITOR=true + pijul identity new --no-link --no-prompt --display-name 'Test User' --email 'test@example.com' + + pijul init repo + cd repo + + echo "it works" > foo + pijul add foo + pijul record --message 'Add foo' + + output=$( + nix \ + --option plugin-files ${nix-plugin-pijul.override {inherit nix;}}/lib/nix/plugins/pijul.so \ + --extra-experimental-features 'nix-command flakes' \ + eval --impure --raw --expr "builtins.readFile ((builtins.fetchTree \"pijul+file://$PWD\") + \"/foo\")" + ) + + echo $output + + [[ "$output" = "it works" ]] + + mkdir $out + ''; + in { + stable = localRepoCheck nixVersions.stable; + latest = localRepoCheck nixVersions.latest; + git = localRepoCheck nixVersions.git; + nix_2_18 = localRepoCheck nixVersions.nix_2_18; + nix_2_19 = localRepoCheck nixVersions.nix_2_19; + nix_2_20 = localRepoCheck nixVersions.nix_2_20; + nix_2_21 = localRepoCheck nixVersions.nix_2_21; + nix_2_22 = localRepoCheck nixVersions.nix_2_22; + nix_2_23 = localRepoCheck nixVersions.nix_2_23; + }; + + meta = { + description = "Plugin to add Pijul support to the Nix package manager"; + homepage = "https://nest.pijul.com/dblsaiko/nix-plugin-pijul"; + license = lib.licenses.lgpl3Plus; + maintainers = [lib.maintainers.dblsaiko]; + platforms = lib.platforms.unix; + }; +}) From 7a45e7e486c13452f210e8269e2d02882d1606ea Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 9 Sep 2024 14:29:29 +0200 Subject: [PATCH 207/481] python312Packages.qcodes-contrib-drivers: skip failing test on aarch64-linux --- .../qcodes-contrib-drivers/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix index 1e33ae96db9d..4c2db9b41f5c 100644 --- a/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix +++ b/pkgs/development/python-modules/qcodes-contrib-drivers/default.nix @@ -49,10 +49,15 @@ buildPythonPackage rec { pythonImportsCheck = [ "qcodes_contrib_drivers" ]; - disabledTests = lib.optionals (stdenv.isDarwin) [ - # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' - "test_stability_diagram_external" - ]; + disabledTests = + lib.optionals (stdenv.isDarwin) [ + # At index 13 diff: 'sour6:volt 0.29000000000000004' != 'sour6:volt 0.29' + "test_stability_diagram_external" + ] + ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ + # AssertionError: assert ['outp:trig4:...9999996', ...] == ['outp:trig4:...t 0.266', ...] + "test_stability_diagram_external" + ]; postInstall = '' export HOME="$TMPDIR" From 4d183800f55a5ffee2959f902013c037213fd494 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 9 Sep 2024 20:39:58 +0800 Subject: [PATCH 208/481] keypunch: 1.0 -> 3.1 --- pkgs/by-name/ke/keypunch/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/keypunch/package.nix b/pkgs/by-name/ke/keypunch/package.nix index 31365c7431ce..420b7ff0de6a 100644 --- a/pkgs/by-name/ke/keypunch/package.nix +++ b/pkgs/by-name/ke/keypunch/package.nix @@ -18,19 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "keypunch"; - version = "1.0"; + version = "3.1"; src = fetchFromGitHub { owner = "bragefuglseth"; repo = "keypunch"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-S4RckHwrVVQrxy9QngTisNM4+cMM+1dXucwEDnM98Rg="; + hash = "sha256-2S5S7SvMYdEOOrF3SiwpbijsgHcSIyWEVJB41jbrn1A="; }; cargoDeps = rustPlatform.fetchCargoTarball { - name = "${finalAttrs.pname}-${finalAttrs.version}"; - inherit (finalAttrs) src; - hash = "sha256-YzENAGy7zEu1dyuhme+x+gJQlE74Vw0JZvRso0vNQXs="; + inherit (finalAttrs) pname version src; + hash = "sha256-sD+wy1D6nl333PxlDz73YtnfBEmDzb+kNZkZI8JbfSg="; }; strictDeps = true; From dc6dbca63899de7bafe62781acfd712b3fda45de Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 27 Aug 2024 23:22:10 +0800 Subject: [PATCH 209/481] qtalarm: init at 2.5.1 --- pkgs/by-name/qt/qtalarm/package.nix | 81 +++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 pkgs/by-name/qt/qtalarm/package.nix diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix new file mode 100644 index 000000000000..f66c1040e5a2 --- /dev/null +++ b/pkgs/by-name/qt/qtalarm/package.nix @@ -0,0 +1,81 @@ +{ + stdenv, + lib, + fetchFromGitHub, + libsForQt5, + qt5, + makeDesktopItem, + nix-update-script, + copyDesktopItems, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "qtalarm"; + version = "2.5.1"; + + src = fetchFromGitHub { + owner = "CountMurphy"; + repo = "QTalarm"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-87w5YFQ9olLnCfPF04jOnIMn1NtE2M2n5WZX4e69UGU="; + }; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtmultimedia + ]; + + installPhase = + '' + runHook preInstall + '' + + ( + if stdenv.isDarwin then + '' + mkdir -p $out/Applications + mv qtalarm.app $out/Applications + '' + else + '' + install -Dm755 qtalarm -t $out/bin + install -Dm644 Icons/1349069370_Alarm_Clock.png $out/share/icons/hicolor/48x48/apps/qtalarm.png + install -Dm644 Icons/1349069370_Alarm_Clock24.png $out/share/icons/hicolor/24x24/apps/qtalarm.png + install -Dm644 Icons/1349069370_Alarm_Clock16.png $out/share/icons/hicolor/16x16/apps/qtalarm.png + '' + ) + + '' + runHook postInstall + ''; + + nativeBuildInputs = [ + qt5.wrapQtAppsHook + qt5.qmake + copyDesktopItems + ]; + + passthru.updateScript = nix-update-script { }; + + desktopItems = [ + (makeDesktopItem { + name = "QTalarm"; + exec = "qtalarm"; + icon = "qtalarm"; + desktopName = "QTalarm"; + genericName = "Nifty alarm clock"; + categories = [ + "Application" + "Utility" + ]; + terminal = false; + }) + ]; + meta = { + description = "Nifty alarm clock written in QT"; + changelog = "https://github.com/CountMurphy/QTalarm/releases/tag/${finalAttrs.version}"; + homepage = "https://github.com/CountMurphy/QTalarm"; + license = lib.licenses.gpl3Only; + mainProgram = "qtalarm"; + maintainers = with lib.maintainers; [ bot-wxt1221 ]; + platforms = lib.platforms.unix; + }; +}) From 7e21e7225521fda1577c7a136831628f816c50e4 Mon Sep 17 00:00:00 2001 From: aleksana Date: Mon, 9 Sep 2024 20:59:08 +0800 Subject: [PATCH 210/481] monitorets: init at 0.10.1 --- pkgs/by-name/mo/monitorets/package.nix | 61 ++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/mo/monitorets/package.nix diff --git a/pkgs/by-name/mo/monitorets/package.nix b/pkgs/by-name/mo/monitorets/package.nix new file mode 100644 index 000000000000..4234bbf0904f --- /dev/null +++ b/pkgs/by-name/mo/monitorets/package.nix @@ -0,0 +1,61 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, +}: + +python3Packages.buildPythonApplication rec { + pname = "monitorets"; + version = "0.10.1"; + # built with meson, not a python format + pyproject = false; + + src = fetchFromGitHub { + owner = "jorchube"; + repo = "monitorets"; + rev = "refs/tags/${version}"; + hash = "sha256-Y6cd9Wf2IzHwdxzLUP/U4rervlPUr8s2gKSW8y5I7bg="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ libadwaita ]; + + dependencies = with python3Packages; [ + pygobject3 + xdg + psutil + ]; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + description = "Simple and quick view at the usage of your computer resources"; + homepage = "https://github.com/jorchube/monitorets"; + license = with lib.licenses; [ + gpl3Plus + cc0 + ]; + mainProgram = "monitorets"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} From 58ec2867859613da33cf08e674f70224335c42eb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 9 Sep 2024 14:25:07 +0200 Subject: [PATCH 211/481] nixos/gancio: actually enable ssl by default. --- nixos/modules/services/web-apps/gancio.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 0a2db3bce5f8..893f5702518a 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -157,11 +157,18 @@ in }; nginx = mkOption { - type = types.submodule (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }); + type = types.submodule ( + lib.recursiveUpdate (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) { + # enable encryption by default, + # as sensitive login credentials should not be transmitted in clear text. + options.forceSSL.default = true; + options.enableACME.default = true; + } + ); default = { }; example = { - enableACME = true; - forceSSL = true; + enableACME = false; + forceSSL = false; }; description = "Extra configuration for the nginx virtual host of gancio."; }; @@ -260,8 +267,6 @@ in virtualHosts."${cfg.settings.hostname}" = mkMerge [ cfg.nginx { - enableACME = mkDefault true; - forceSSL = mkDefault true; locations = { "/" = { index = "index.html"; From 3178e4bc9ecd90edc703f951338f9f01bf56c3fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 Sep 2024 16:22:57 +0200 Subject: [PATCH 212/481] ctranslate2: 4.3.1 -> 4.4.0 https://github.com/OpenNMT/CTranslate2/blob/v4.4.0/CHANGELOG.md --- pkgs/development/libraries/ctranslate2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ctranslate2/default.nix b/pkgs/development/libraries/ctranslate2/default.nix index c640d5f700e2..4668404f9794 100644 --- a/pkgs/development/libraries/ctranslate2/default.nix +++ b/pkgs/development/libraries/ctranslate2/default.nix @@ -24,13 +24,13 @@ let in stdenv.mkDerivation rec { pname = "ctranslate2"; - version = "4.3.1"; + version = "4.4.0"; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; rev = "v${version}"; - hash = "sha256-ApmGto9RzT8t49bsZVwk8aQnIau9sQyFvt9qnWKUGAE="; + hash = "sha256-E/ulk+Oo1zEP+sCKMZuMVSoO0MDjQ2opTflSwLmCJMw="; fetchSubmodules = true; }; From abc759221fc62d75c0441a278b381591af717c7a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 9 Sep 2024 09:57:01 -0400 Subject: [PATCH 213/481] linux: remove unneeded and misleading passthru.isVanilla This was added for use by ZFS, but it turned out that `pname == "linux"` is sufficient enough and has better coverage since many of our Linux variants do not have an existing `passthru.isX`, and instead are identifiable by a different pname. --- pkgs/os-specific/linux/kernel/generic.nix | 1 - pkgs/os-specific/linux/zfs/generic.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index a6067439a8f3..74e603623412 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -230,7 +230,6 @@ kernel.overrideAttrs (finalAttrs: previousAttrs: { passthru = previousAttrs.passthru or { } // basicArgs // { features = kernelFeatures; inherit commonStructuredConfig structuredExtraConfig extraMakeFlags isZen isHardened isLibre; - isVanilla = !(isHardened || isLibre || isZen); isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true; # Adds dependencies needed to edit the config: diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index d9cba044d501..263fcc448097 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -203,7 +203,7 @@ let inherit enableMail kernelModuleAttribute; latestCompatibleLinuxPackages = lib.pipe linuxKernel.packages [ builtins.attrValues - (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.passthru.isVanilla && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel)) + (builtins.filter (kPkgs: (builtins.tryEval kPkgs).success && kPkgs ? kernel && kPkgs.kernel.pname == "linux" && kernelCompatible kPkgs.kernel)) (builtins.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version))) lib.last ]; From 6162e8b74cba9405472444ec7fce994ce367bb54 Mon Sep 17 00:00:00 2001 From: Callum Leslie Date: Mon, 9 Sep 2024 13:46:15 +0100 Subject: [PATCH 214/481] thrift-ls: init at 0.2.1 --- pkgs/by-name/th/thrift-ls/package.nix | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/th/thrift-ls/package.nix diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix new file mode 100644 index 000000000000..b41880c6a97d --- /dev/null +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "thrift-ls"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "joyme123"; + repo = "thrift-ls"; + rev = "v${version}"; + hash = "sha256-ywrb1pOpqHnVhb9MA2cgkF5croA9iqtvLxvVmeloOpE="; + }; + + vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = { + description = "Thrift Language Server"; + homepage = "https://github.com/joyme123/thrift-ls"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ callumio ]; + mainProgram = "thrift-ls"; + }; +} From 51f8dfeeeead6e8b905c86146005ba320245ad65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 15:58:23 +0000 Subject: [PATCH 215/481] python312Packages.icalevents: 0.1.27 -> 0.1.28 --- pkgs/development/python-modules/icalevents/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 7cbffd265e8f..6b988932ac96 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "icalevents"; - version = "0.1.27"; + version = "0.1.28"; pyproject = true; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-vSYQEJFBjXUF4WwEAtkLtcO3y/am00jGS+8Vj+JMMqQ="; + hash = "sha256-JX4j2CsEY/bHrD7Rb9ru3C4T2e94mpC369nDN6Cv/I0="; }; nativeBuildInputs = [ From 584c1b910ddf1c7051c4ad8e7b878e3919d08377 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 15:59:35 +0000 Subject: [PATCH 216/481] vbam: 2.1.9 -> 2.1.10 --- pkgs/applications/emulators/vbam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/vbam/default.nix b/pkgs/applications/emulators/vbam/default.nix index b5141c59f91e..67a2d62f7567 100644 --- a/pkgs/applications/emulators/vbam/default.nix +++ b/pkgs/applications/emulators/vbam/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "visualboyadvance-m"; - version = "2.1.9"; + version = "2.1.10"; src = fetchFromGitHub { owner = "visualboyadvance-m"; repo = "visualboyadvance-m"; rev = "v${version}"; - sha256 = "sha256-t5/CM5KXDG0OCByu7mUyuC5NkYmB3BFmEHHgnMY05nE="; + sha256 = "sha256-ca+BKedHuOwHOCXgjLkkpR6Pd+59X2R66dbPWEg2O5A="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; From cfecc8eb9004dac2b4231f74ebea216c330289d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 16:32:48 +0000 Subject: [PATCH 217/481] python312Packages.ansible-compat: 24.8.0 -> 24.9.0 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 012a749e3831..cbe3fde9a5bf 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "24.8.0"; + version = "24.9.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "ansible_compat"; inherit version; - hash = "sha256-z6rcY/TYXcv0eI97zsLKhWPntcn9MFgAXv15iPHBciw="; + hash = "sha256-xaQqVt0hJiXPyx0x5RpuD1JZNpG94f5KeIgeixt4prg="; }; nativeBuildInputs = [ From 1e3de70908d1c377e95e8350279475b470dfa27e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:06:52 +0200 Subject: [PATCH 218/481] python311Packages.openstackdocstheme: 3.2.0 -> 3.3.0 https://github.com/openstack/openstackdocstheme/compare/3.2.0...3.3.0 --- .../python-modules/openstackdocstheme/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/openstackdocstheme/default.nix b/pkgs/development/python-modules/openstackdocstheme/default.nix index 20c0dd9c176c..b316a7aaeee2 100644 --- a/pkgs/development/python-modules/openstackdocstheme/default.nix +++ b/pkgs/development/python-modules/openstackdocstheme/default.nix @@ -6,19 +6,20 @@ pbr, sphinx, pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "openstackdocstheme"; - version = "3.2.0"; - format = "setuptools"; + version = "3.3.0"; + pyproject = true; # breaks on import due to distutils import through pbr.packaging disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-PwSWLJr5Hjwz8cRXXutnE4Jc+vLcL3TJTZl6biK/4E4="; + hash = "sha256-wmZJmX5bQKM1uwqWxynkY5jPJaBn+Y2eqSRkE2Ub0qM="; }; postPatch = '' @@ -27,7 +28,9 @@ buildPythonPackage rec { rm test-requirements.txt ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ dulwich pbr sphinx From 4ba44026b4ce40ec96e1d389bb40008c6137ad40 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:11:34 +0200 Subject: [PATCH 219/481] python311Packages.python-cinderclient: 9.5.0 -> 9.6.0 https://github.com/openstack/python-cinderclient/compare/9.5.0...9.6.0 --- .../python-cinderclient/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index b942574c6e9c..cad6609e3c78 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -10,7 +10,9 @@ pbr, requests, prettytable, + pythonOlder, requests-mock, + setuptools, simplejson, stestr, stevedore, @@ -18,15 +20,19 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "9.5.0"; - format = "setuptools"; + version = "9.6.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-G51xev+TytQgBF+2xS9jdqty8IX4GTEwiSAg7EbJNVU="; + hash = "sha256-P+/eJoJS5S4w/idz9lgienjG3uN4/LEy0xyG5uybojg="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ simplejson keystoneauth1 oslo-i18n @@ -45,7 +51,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "cinderclient" ]; From d95f47992b90b0a8b4b18ad25a6e0c4a99c27aef Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:13:31 +0200 Subject: [PATCH 220/481] python311Packages.python-keystoneclient: 5.4.0 -> 5.5.0 https://github.com/openstack/python-keystoneclient/compare/5.4.0...5.5.0 --- .../python-keystoneclient/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-keystoneclient/default.nix b/pkgs/development/python-modules/python-keystoneclient/default.nix index e8f19e2a01a2..3c25f946ea2e 100644 --- a/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -9,6 +9,7 @@ pbr, pythonOlder, requests-mock, + setuptools, stestr, testresources, testscenarios, @@ -16,17 +17,19 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "5.4.0"; - format = "setuptools"; + version = "5.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-srS9vp2vews1O4gHZy7u0B+H3QO0+LQtDQYbCbiTH0E="; + hash = "sha256-wvWTT5VXaTbJjkW/WZrUi8sKxFFZPl+DROv1LLD0EfU="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ keystoneauth1 oslo-config oslo-serialization @@ -42,7 +45,9 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run + runHook postCheck ''; pythonImportsCheck = [ "keystoneclient" ]; From b473e96d0395d78adbdee89c1d9490fd3ac11207 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 00:40:02 +0000 Subject: [PATCH 221/481] libngspice: 42 -> 43 --- pkgs/development/libraries/libngspice/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index eb6a057dcae3..3578441dd61a 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -7,15 +7,17 @@ , withNgshared ? true , libXaw , libXext +, llvmPackages +, readline }: stdenv.mkDerivation rec { pname = "${lib.optionalString withNgshared "lib"}ngspice"; - version = "42"; + version = "43"; src = fetchurl { url = "mirror://sourceforge/ngspice/ngspice-${version}.tar.gz"; - hash = "sha256-c3/jhGqyMzolDfrfHtbr4YYK8dil/154A8dyzEJW5Qo="; + hash = "sha256-FN1qbwhTHyBRwTrmN5CkVwi9Q/PneIamqEiYwpexNpk="; }; nativeBuildInputs = [ @@ -25,9 +27,12 @@ stdenv.mkDerivation rec { buildInputs = [ fftw + readline ] ++ lib.optionals (!withNgshared) [ libXaw libXext + ] ++ lib.optionals stdenv.isDarwin [ + llvmPackages.openmp ]; configureFlags = lib.optionals withNgshared [ From a48e735877e737b6fdd805fe1d72acc6b7452831 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:17:21 +0200 Subject: [PATCH 222/481] python311Packages.python-novaclient: 18.6.0 -> 18.7.0 https://github.com/openstack/python-novaclient/compare/18.6.0...18.7.0 --- .../python-modules/python-novaclient/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index e0257ae1cfda..a6a4b3d33e88 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -12,23 +12,26 @@ prettytable, pythonOlder, requests-mock, + setuptools, stestr, testscenarios, }: buildPythonPackage rec { pname = "python-novaclient"; - version = "18.6.0"; - format = "setuptools"; + version = "18.7.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-VzwQqkILCJjTX7FG7di7AFgGv/8BMa4rWjDKIqyJR3s="; + hash = "sha256-lMrQ8PTBYc7VKl7NhdE0/Wc7mX2nGUoDHAymk0Q0Cw0="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ iso8601 keystoneauth1 oslo-i18n @@ -46,12 +49,14 @@ buildPythonPackage rec { ]; checkPhase = '' + runHook preCheck stestr run -e <(echo " novaclient.tests.unit.test_shell.ParserTest.test_ambiguous_option novaclient.tests.unit.test_shell.ParserTest.test_not_really_ambiguous_option novaclient.tests.unit.test_shell.ShellTest.test_osprofiler novaclient.tests.unit.test_shell.ShellTestKeystoneV3.test_osprofiler ") + runHook postCheck ''; pythonImportsCheck = [ "novaclient" ]; From b9c817baad8477a9a626b1165a27ca7199728043 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:33:57 +0200 Subject: [PATCH 223/481] python311Packages.oslo-config: 9.5.0 -> 9.6.0 https://github.com/openstack/oslo.config/compare/9.5.0...9.6.0 --- pkgs/development/python-modules/oslo-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix index c799b6c67f30..dbcde501d345 100644 --- a/pkgs/development/python-modules/oslo-config/default.nix +++ b/pkgs/development/python-modules/oslo-config/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "oslo-config"; - version = "9.5.0"; + version = "9.6.0"; pyproject = true; src = fetchPypi { pname = "oslo.config"; inherit version; - hash = "sha256-qlAARIhrbFX3ZXfLWpNJKkWWxfkoM3Z2DqeFLMScmaM="; + hash = "sha256-nwXvcOSNmmGo0Mm+04naJPLvWonfW26N63x0HWETZn4="; }; postPatch = '' From 46616aeda0e1daa9644a216a5461564d75e65f24 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 21:43:22 +0200 Subject: [PATCH 224/481] python311Packages.python-novaclient: generate manpages --- .../python-modules/python-novaclient/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/python-novaclient/default.nix b/pkgs/development/python-modules/python-novaclient/default.nix index a6a4b3d33e88..481827342f53 100644 --- a/pkgs/development/python-modules/python-novaclient/default.nix +++ b/pkgs/development/python-modules/python-novaclient/default.nix @@ -6,6 +6,7 @@ iso8601, keystoneauth1, openssl, + openstackdocstheme, oslo-i18n, oslo-serialization, pbr, @@ -13,6 +14,8 @@ pythonOlder, requests-mock, setuptools, + sphinxcontrib-apidoc, + sphinxHook, stestr, testscenarios, }: @@ -29,6 +32,14 @@ buildPythonPackage rec { hash = "sha256-lMrQ8PTBYc7VKl7NhdE0/Wc7mX2nGUoDHAymk0Q0Cw0="; }; + nativeBuildInputs = [ + openstackdocstheme + sphinxcontrib-apidoc + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + build-system = [ setuptools ]; dependencies = [ From 01311de0f63d8791aaaf61b26d4bfef94742e88e Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 22:41:39 +0200 Subject: [PATCH 225/481] python311Packages.bindep: enable `pyproject = true` --- .../python-modules/bindep/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 8153354843a4..6d8c2d0a5a22 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -1,47 +1,48 @@ { lib, - fetchPypi, buildPythonPackage, distro, - pbr, - setuptools, + fetchPypi, packaging, parsley, + pbr, + setuptools, }: + buildPythonPackage rec { pname = "bindep"; version = "2.11.0"; - format = "pyproject"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-rLLyWbzh/RUIhzR5YJu95bmq5Qg3hHamjWtqGQAufi8="; }; - buildInputs = [ + env.PBR_VERSION = version; + + build-system = [ distro pbr setuptools ]; - propagatedBuildInputs = [ + dependencies = [ parsley pbr packaging distro ]; - patchPhase = '' - # Setting the pbr version will skip any version checking logic - # This is required because pbr thinks it gets it's own version from git tags - # See https://docs.openstack.org/pbr/latest/user/packagers.html - export PBR_VERSION=5.11.1 - ''; + # Checks moved to 'passthru.tests' to workaround infinite recursion + doCheck = false; + + pythonImportsCheck = [ "bindep" ]; meta = with lib; { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; homepage = "https://docs.opendev.org/opendev/bindep/latest/"; license = licenses.asl20; - maintainers = with maintainers; [ melkor333 ]; + maintainers = teams.openstack.members ++ (with maintainers; [ melkor333 ]); }; } From 2b5b1f13cbfd616dc5dc23a8c165a65a743b2298 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 23:03:18 +0200 Subject: [PATCH 226/481] reno: 3.1.0 -> 4.1.0 https://github.com/openstack/reno/compare/3.1.0...4.1.0 --- pkgs/development/tools/reno/default.nix | 64 +++++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 47 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index f687583888f2..c5d79f3badf6 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -1,33 +1,44 @@ -{ lib -, git -, gnupg1 -, python3Packages -, fetchPypi +{ + lib, + fetchPypi, + git, + gnupg1, + python3Packages, }: -with python3Packages; buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "reno"; - version = "3.1.0"; + version = "4.1.0"; + pyproject = true; # Must be built from python sdist because of versioning quirks src = fetchPypi { inherit pname version; - sha256 = "2510e3aae4874674187f88f22f854e6b0ea1881b77039808a68ac1a5e8ee69b6"; + hash = "sha256-+ZLx/b0WIV7J3kevCBMdU6KDDJ54Q561Y86Nan9iU3A="; }; - propagatedBuildInputs = [ + # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs + postPatch = '' + rm test-requirements.txt + ''; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = with python3Packages; [ dulwich pbr pyyaml setuptools # required for finding pkg_resources at runtime ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ # Python packages - pytestCheckHook docutils fixtures sphinx + stestr testtools testscenarios @@ -36,17 +47,30 @@ with python3Packages; buildPythonApplication rec { gnupg1 ]; - # remove b/c doesn't list all dependencies, and requires a few packages not in nixpkgs - postPatch = '' - rm test-requirements.txt + checkPhase = '' + runHook preCheck + export HOME=$TMPDIR + stestr run -e <(echo " + # Expects to be run from a git repository + reno.tests.test_cache.TestCache.test_build_cache_db + reno.tests.test_semver.TestSemVer.test_major_post_release + reno.tests.test_semver.TestSemVer.test_major_working_and_post_release + reno.tests.test_semver.TestSemVer.test_major_working_copy + reno.tests.test_semver.TestSemVer.test_minor_post_release + reno.tests.test_semver.TestSemVer.test_minor_working_and_post_release + reno.tests.test_semver.TestSemVer.test_minor_working_copy + reno.tests.test_semver.TestSemVer.test_patch_post_release + reno.tests.test_semver.TestSemVer.test_patch_working_and_post_release + reno.tests.test_semver.TestSemVer.test_patch_working_copy + reno.tests.test_semver.TestSemVer.test_same + reno.tests.test_semver.TestSemVer.test_same_with_note + ") + runHook postCheck ''; - disabledTests = [ - "test_build_cache_db" # expects to be run from a git repository - ]; + pythonImportsCheck = [ "reno" ]; - # verify executable - postCheck = '' + postInstallCheck = '' $out/bin/reno -h ''; @@ -55,6 +79,6 @@ with python3Packages; buildPythonApplication rec { mainProgram = "reno"; homepage = "https://docs.openstack.org/reno/latest"; license = licenses.asl20; - maintainers = with maintainers; [ drewrisinger guillaumekoenig ]; + maintainers = teams.openstack.members ++ (with maintainers; [ drewrisinger guillaumekoenig ]); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d13526153f6..d87ceb14e4e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18719,7 +18719,9 @@ with pkgs; regex-cli = callPackage ../development/tools/misc/regex-cli { }; - reno = callPackage ../development/tools/reno { }; + reno = callPackage ../development/tools/reno { + python3Packages = python311Packages; + }; re2c = callPackage ../development/tools/parsing/re2c { }; From d725bdcf0dca08e9c660458b9b59520ec6b5b2ff Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 23:07:01 +0200 Subject: [PATCH 227/481] python311Packages.python-cinderclient: enable manpages --- .../python-modules/python-cinderclient/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/python-modules/python-cinderclient/default.nix b/pkgs/development/python-modules/python-cinderclient/default.nix index cad6609e3c78..92e896e3ff65 100644 --- a/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/pkgs/development/python-modules/python-cinderclient/default.nix @@ -4,6 +4,7 @@ fetchPypi, ddt, keystoneauth1, + openstackdocstheme, oslo-i18n, oslo-serialization, oslo-utils, @@ -11,9 +12,11 @@ requests, prettytable, pythonOlder, + reno, requests-mock, setuptools, simplejson, + sphinxHook, stestr, stevedore, }: @@ -30,6 +33,14 @@ buildPythonPackage rec { hash = "sha256-P+/eJoJS5S4w/idz9lgienjG3uN4/LEy0xyG5uybojg="; }; + nativeBuildInputs = [ + openstackdocstheme + reno + sphinxHook + ]; + + sphinxBuilders = [ "man" ]; + build-system = [ setuptools ]; dependencies = [ From 8cad130f389f4e347a7c0d67f0398ebd4026dd47 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 23:17:38 +0200 Subject: [PATCH 228/481] bashate: enable `pyproject = true` --- pkgs/development/tools/bashate/default.nix | 37 ++++++++++++---------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index fd4161499c72..3cbf97398953 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -1,39 +1,42 @@ -{ lib -, babel -, buildPythonApplication -, fetchPypi -, fixtures -, mock -, pbr -, pytestCheckHook -, pythonOlder -, setuptools -, testtools +{ + lib, + fetchPypi, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "bashate"; version = "2.1.1"; - disabled = pythonOlder "3.5"; + pyproject = true; + + disabled = python3Packages.pythonOlder "3.5"; src = fetchPypi { inherit pname version; hash = "sha256-S6tul3+DBacgU1+Pk/H7QsUh/LxKbCs9PXZx9C8iH0w="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ babel pbr setuptools ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ fixtures mock - pytestCheckHook + stestr testtools ]; + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; + pythonImportsCheck = [ "bashate" ]; meta = with lib; { @@ -41,6 +44,6 @@ buildPythonApplication rec { mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ fab ]; + maintainers = teams.openstack.members ++ (with maintainers; [ fab ]); }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d87ceb14e4e8..16bf44e616ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3371,7 +3371,9 @@ with pkgs; base16384 = callPackage ../tools/text/base16384 { }; - bashate = python3Packages.callPackage ../development/tools/bashate { }; + bashate = python3Packages.callPackage ../development/tools/bashate { + python3Packages = python311Packages; + }; bash-my-aws = callPackage ../tools/admin/bash-my-aws { }; From fc470cc822a802568f8fb9d9d4a50225c299c545 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Fri, 30 Aug 2024 22:24:20 +0200 Subject: [PATCH 229/481] python311Packages.stevedore: 5.2.0 -> 5.3.0 https://github.com/openstack/stevedore/compare/5.2.0...5.3.0 --- .../python-modules/stevedore/default.nix | 29 +++++++++++++------ .../python-modules/stevedore/tests.nix | 29 +++++++++++++++++++ 2 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/stevedore/tests.nix diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index b1642c4df199..5d6c048ecfb4 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,38 +1,49 @@ { lib, buildPythonPackage, + callPackage, fetchPypi, pythonOlder, importlib-metadata, pbr, setuptools, - six, }: buildPythonPackage rec { pname = "stevedore"; - version = "5.2.0"; - format = "setuptools"; - disabled = pythonOlder "3.6"; + version = "5.3.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Rrk8pA4RFM6pPXOKbB42U5aYG7a7eMJwRbdYfJRzVE0="; + hash = "sha256-mmQmX0BgMSgoFRwgTvvpt6mFKg2SKHVjRNvH5AI+N1o="; }; - propagatedBuildInputs = [ + build-system = [ pbr setuptools - six - ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + ]; + dependencies = [ + importlib-metadata + setuptools + ]; + + # Checks moved to 'passthru.tests' to workaround infinite recursion doCheck = false; + + passthru.tests = { + tests = callPackage ./tests.nix { }; + }; + pythonImportsCheck = [ "stevedore" ]; meta = with lib; { description = "Manage dynamic plugins for Python applications"; homepage = "https://docs.openstack.org/stevedore/"; license = licenses.asl20; - maintainers = with maintainers; [ fab ]; + maintainers = teams.openstack.members ++ (with maintainers; [ fab ]); }; } diff --git a/pkgs/development/python-modules/stevedore/tests.nix b/pkgs/development/python-modules/stevedore/tests.nix new file mode 100644 index 000000000000..7ae013a6e241 --- /dev/null +++ b/pkgs/development/python-modules/stevedore/tests.nix @@ -0,0 +1,29 @@ +{ + buildPythonPackage, + docutils, + sphinx, + stestr, + stevedore, +}: + +buildPythonPackage { + pname = "stevedore-tests"; + inherit (stevedore) version src; + format = "other"; + + dontBuild = true; + dontInstall = true; + + nativeCheckInputs = [ + docutils + sphinx + stestr + stevedore + ]; + + checkPhase = '' + runHook preCheck + stestr run + runHook postCheck + ''; +} From f448b0ef13c5b17cab875f00f3f60608319292f7 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 16:45:54 +0200 Subject: [PATCH 230/481] python311Packages.python-designateclient: 6.0.1 -> 6.1.0 https://github.com/openstack/python-designateclient/compare/6.0.1...6.1.0 --- .../python-designateclient/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-designateclient/default.nix b/pkgs/development/python-modules/python-designateclient/default.nix index fa2a61d85aa4..44b5b4a665ef 100644 --- a/pkgs/development/python-modules/python-designateclient/default.nix +++ b/pkgs/development/python-modules/python-designateclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "python-designateclient"; - version = "6.0.1"; + version = "6.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -32,21 +32,24 @@ buildPythonPackage rec { owner = "openstack"; repo = "python-designateclient"; rev = version; - hash = "sha256-vuaouOA69REx+ZrzXjLGVz5Az1/d6x4WRT1h78xeebk="; + hash = "sha256-MwcpRQXH8EjWv41iHxorbFL9EpYu8qOLkDeUx6inEAU="; }; env.PBR_VERSION = version; - build-system = [ + nativeBuildInputs = [ openstackdocstheme - pbr - setuptools sphinxHook sphinxcontrib-apidoc ]; sphinxBuilders = [ "man" ]; + build-system = [ + pbr + setuptools + ]; + dependencies = [ debtcollector jsonschema @@ -57,8 +60,6 @@ buildPythonPackage rec { requests ]; - doCheck = true; - nativeCheckInputs = [ oslotest requests-mock From 52d83592fd3ec30e8df3ebad2f64ff42c3514073 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:22:00 +0200 Subject: [PATCH 231/481] python311Packages.bindep: remove melkor333 from maintainers --- pkgs/development/python-modules/bindep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 6d8c2d0a5a22..3927c841b6e3 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -43,6 +43,6 @@ buildPythonPackage rec { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; homepage = "https://docs.opendev.org/opendev/bindep/latest/"; license = licenses.asl20; - maintainers = teams.openstack.members ++ (with maintainers; [ melkor333 ]); + maintainers = teams.openstack.members; }; } From 8b4fa8c7abd26810bd51c38896c999c264663d58 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Sun, 1 Sep 2024 21:23:17 +0200 Subject: [PATCH 232/481] python311Packages.bindep: add meta.mainProgram --- pkgs/development/python-modules/bindep/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bindep/default.nix b/pkgs/development/python-modules/bindep/default.nix index 3927c841b6e3..7feb91d8d971 100644 --- a/pkgs/development/python-modules/bindep/default.nix +++ b/pkgs/development/python-modules/bindep/default.nix @@ -43,6 +43,7 @@ buildPythonPackage rec { description = "Bindep is a tool for checking the presence of binary packages needed to use an application / library"; homepage = "https://docs.opendev.org/opendev/bindep/latest/"; license = licenses.asl20; + mainProgram = "bindep"; maintainers = teams.openstack.members; }; } From de188ad0d237d85b48bab990e195981e0779bf74 Mon Sep 17 00:00:00 2001 From: Anthony ROUSSEL Date: Tue, 3 Sep 2024 20:58:53 +0200 Subject: [PATCH 233/481] python311Packages.openstacksdk: 3.3.0 -> 4.0.0 https://github.com/openstack/openstacksdk/compare/3.3.0...4.0.0 --- .../python-modules/openstacksdk/default.nix | 11 ++++++----- .../development/python-modules/openstacksdk/tests.nix | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/openstacksdk/default.nix b/pkgs/development/python-modules/openstacksdk/default.nix index 5bf0f23accba..121f64dd535b 100644 --- a/pkgs/development/python-modules/openstacksdk/default.nix +++ b/pkgs/development/python-modules/openstacksdk/default.nix @@ -23,10 +23,10 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "3.3.0"; + version = "4.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; outputs = [ "out" @@ -35,7 +35,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-BghpDKN8pzMnsPo3YdF+ZTlb43/yALhzXY8kJ3tPSYA="; + hash = "sha256-54YN2WtwUxMJI8EdVx0lgCuWjx4xOIRct8rHxrMzv0s="; }; postPatch = '' @@ -44,14 +44,15 @@ buildPythonPackage rec { --replace-fail "'sphinxcontrib.rsvgconverter'," "#'sphinxcontrib.rsvgconverter'," ''; - build-system = [ + nativeBuildInputs = [ openstackdocstheme - setuptools sphinxHook ]; sphinxBuilders = [ "man" ]; + build-system = [ setuptools ]; + dependencies = [ platformdirs cryptography diff --git a/pkgs/development/python-modules/openstacksdk/tests.nix b/pkgs/development/python-modules/openstacksdk/tests.nix index 43633f98a038..be333be87665 100644 --- a/pkgs/development/python-modules/openstacksdk/tests.nix +++ b/pkgs/development/python-modules/openstacksdk/tests.nix @@ -56,6 +56,7 @@ buildPythonPackage { openstack.tests.unit.image.v2.test_proxy.TestImageProxy.test_wait_for_task_wait openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_error_396 openstack.tests.unit.image.v2.test_proxy.TestTask.test_wait_for_task_wait + openstack.tests.unit.test_resource.TestWaitForDelete.test_callback openstack.tests.unit.test_resource.TestWaitForDelete.test_callback_without_progress openstack.tests.unit.test_resource.TestWaitForDelete.test_status openstack.tests.unit.test_resource.TestWaitForDelete.test_success_not_found From 0b8ac40f56727f7883efdbf745b6cd55bbadfb18 Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Wed, 4 Sep 2024 12:41:40 +0200 Subject: [PATCH 234/481] jira-cli-go: add fish completions Co-authored-by: Nikolay Korotkiy --- pkgs/development/tools/jira-cli-go/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index d031cd9394d7..eab6becf61ff 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, less, more, installShellFiles, testers, jira-cli-go, nix-update-script }: buildGoModule rec { pname = "jira-cli-go"; @@ -34,9 +34,10 @@ buildGoModule rec { }; nativeBuildInputs = [ installShellFiles ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd jira \ --bash <($out/bin/jira completion bash) \ + --fish <($out/bin/jira completion fish) \ --zsh <($out/bin/jira completion zsh) $out/bin/jira man --generate --output man From 888540f5884b8e9a29203ff8abe0e350ffcb6fd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 17:25:58 +0000 Subject: [PATCH 235/481] kitex: 0.10.3 -> 0.11.0 --- pkgs/by-name/ki/kitex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix index ee1f5fcf85ff..b18d972886f0 100644 --- a/pkgs/by-name/ki/kitex/package.nix +++ b/pkgs/by-name/ki/kitex/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kitex"; - version = "0.10.3"; + version = "0.11.0"; src = fetchFromGitHub { owner = "cloudwego"; repo = "kitex"; rev = "v${version}"; - hash = "sha256-aSvN8yjCHxhzLHwQovWFMaoD6ljy8aikxI7jUoeRvDs="; + hash = "sha256-SD898LbygIHL0X5YVSoJRdP1GQiB8NGfIAFAlx4Gfe8="; }; - vendorHash = "sha256-nscMcJGFZ1YPPynTV+Mp8tXndtlIcszDZm36zMbNBYs="; + vendorHash = "sha256-tdtiG0jf7Ilvs1KZWggGyqBOQXAWs+zlF09AN80AoC0="; subPackages = [ "tool/cmd/kitex" ]; From 105211a310a7bb03429e5845125dc283a5da69a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 17:26:00 +0000 Subject: [PATCH 236/481] python312Packages.rns: 0.7.6 -> 0.7.7 --- pkgs/development/python-modules/rns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix index 0b17ff43caf5..0dd92d28305f 100644 --- a/pkgs/development/python-modules/rns/default.nix +++ b/pkgs/development/python-modules/rns/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "rns"; - version = "0.7.6"; + version = "0.7.7"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "Reticulum"; rev = "refs/tags/${version}"; - hash = "sha256-YSaabiCsSoG3BZ/0gM/fRIKQKdQ9MRtlHe+tPnzFJSw="; + hash = "sha256-cNOVk7JCu4kMevH9MAWWvtLIzfbBBy+h7bhTBhkfrvI="; }; patches = [ From dc08f934bf4c395b1f84e1fa800da4d89baee5f4 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 9 Sep 2024 20:00:00 +0200 Subject: [PATCH 237/481] libbase58: init at 0.1.4 --- pkgs/by-name/li/libbase58/package.nix | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/li/libbase58/package.nix diff --git a/pkgs/by-name/li/libbase58/package.nix b/pkgs/by-name/li/libbase58/package.nix new file mode 100644 index 000000000000..94f7c4ec8bc7 --- /dev/null +++ b/pkgs/by-name/li/libbase58/package.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + libgcrypt, + pkg-config, +}: + +stdenv.mkDerivation rec { + pname = "libbase58"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "bitcoin"; + repo = "libbase58"; + rev = "v${version}"; + hash = "sha256-CU55V89GbcYnrhwTPFMd13EGeCk/x9nQswUZ2JsYsUU="; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ libgcrypt ]; + + meta = { + description = "C library for Bitcoin's base58 encoding"; + homepage = "https://github.com/bitcoin/libbase58"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ nagy ]; + mainProgram = "base58"; + platforms = lib.platforms.all; + }; +} From 7dfa72b5fdef1a334c1376b7b24a00ad11034cb9 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Mon, 9 Sep 2024 20:41:33 +0200 Subject: [PATCH 238/481] mouse-actions-gui: 0.4.4 -> 0.4.5 --- pkgs/by-name/mo/mouse-actions-gui/package.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix index 96051b6ab3e6..80f845038582 100644 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mouse-actions-gui"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "jersou"; repo = "mouse-actions"; - rev = "v${finalAttrs.version}"; - hash = "sha256-02E4HrKIoBV3qZPVH6Tjz9Bv/mh5C8amO1Ilmd+YO5g="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg="; }; sourceRoot = "${finalAttrs.src.name}/config-editor"; @@ -58,16 +58,15 @@ stdenv.mkDerivation (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src sourceRoot; - hash = "sha256-Rnr5jRupdUu6mIsWvdN6AnQnsxB5h31n/24pYslGs5g="; + hash = "sha256-amDTYAvEoDHb7+dg39+lUne0dv0M9vVe1vHoXk2agZA="; }; cargoRoot = "src-tauri"; cargoDeps = rustPlatform.fetchCargoTarball { - name = "${finalAttrs.pname}-${finalAttrs.version}"; - inherit (finalAttrs) src; + inherit (finalAttrs) pname version src; sourceRoot = "${finalAttrs.sourceRoot}/${finalAttrs.cargoRoot}"; - hash = "sha256-VQFRatnxzmywAiMLfkVgB7g8AFoqfWFYjt/vezpE1o8="; + hash = "sha256-H8TMpYFJWp227jPA5H2ZhSqTMiT/U6pT6eLyjibuoLU="; }; buildPhase = '' From 432762ae2f8c47692660cae2536ce8c4c3822d1d Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Mon, 9 Sep 2024 14:45:22 -0400 Subject: [PATCH 239/481] nebula: 1.9.3 -> 1.9.4 --- pkgs/tools/networking/nebula/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 0f6c0cc8b754..9c3bf4494666 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.3"; + version = "1.9.4"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+RferzOPlx7UuqpckQBY/RDO9gptknhuan+Es0Vf/yM="; + hash = "sha256-Y8BTbvdSJ+xlxHuy0TzQEGiymJzAqlHe3PiXAlUddPs="; }; - vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; + vendorHash = "sha256-oXhq+s5gDKPVClZpOzYi7BaYwcDqbCLBEO5BNGy9LJA="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; From 4d262e749fd045962e76efca4a3b5fc8f3a3a52e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 4 Sep 2024 12:11:57 +0200 Subject: [PATCH 240/481] prometheus-pgbouncer-exporter: 0.8.0 -> 0.9.0 ChangeLog: https://github.com/prometheus-community/pgbouncer_exporter/blob/v0.9.0/CHANGELOG.md#090--2024-08-01 --- pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix index 970d63ec0f2e..90ffdb48f0d1 100644 --- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pgbouncer-exporter"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "pgbouncer_exporter"; rev = "v${version}"; - hash = "sha256-QnA9H4qedCPZKqJQ1I2OJO42mCWcWqYxLmeF3+JXzTw="; + hash = "sha256-fKoyRHYLwVefsZ014eazVCD5B9eV8/CUkuHE4mbUqVo="; }; - vendorHash = "sha256-NYiVW+CNrxFrEUl1nsTeNNgy7SmTYgqs1d50rCvyBcw="; + vendorHash = "sha256-IxmxfF9WsF0Hbym4G0UecyW8hAvucoaCFUE1kXUljJs="; meta = with lib; { description = "Prometheus exporter for PgBouncer"; From 4980a7d93826dc96621c6306b1e4b2cdd076f2ab Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 5 Sep 2024 12:05:54 +0200 Subject: [PATCH 241/481] nixos/prometheus-exporters: fix assertions declared in exporter modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And it turns out, the test was using a removed option all along 🙃 --- nixos/modules/services/monitoring/prometheus/exporters.nix | 1 + nixos/tests/prometheus-exporters.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index 1471f97f1c24..b504cc032d67 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -230,6 +230,7 @@ let in mkIf conf.enable { warnings = conf.warnings or []; + assertions = conf.assertions or []; users.users."${name}-exporter" = (mkIf (conf.user == "${name}-exporter" && !enableDynamicUser) { description = "Prometheus ${name} exporter service user"; isSystemUser = true; diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 3ce296c0cacf..13a7ca3ce615 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -482,7 +482,6 @@ let json = { exporterConfig = { enable = true; - url = "http://localhost"; configFile = pkgs.writeText "json-exporter-conf.json" (builtins.toJSON { modules = { default = { From 862ecd674f4beced1fff1d5b91527b564eb41182 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 5 Sep 2024 12:09:05 +0200 Subject: [PATCH 242/481] nixos/prometheus-exporters/pgbouncer: don't leak DB password into cmdline Since `connectionStringFile` reads the file and puts it into the invocation of the exporter, it's part of the cmdline and thus effectively world-readable. Added a new `connectionEnvFile` which is supposed to be an environment file of the form PGBOUNCER_EXPORTER_CONNECTION_STRING=... that will be added to the systemd service. The exporter will read the connection string from that value. --- .../manual/release-notes/rl-2411.section.md | 6 ++ .../monitoring/prometheus/exporters.nix | 24 ++++---- .../prometheus/exporters/pgbouncer.nix | 60 +++++++++++-------- nixos/tests/prometheus-exporters.nix | 4 +- 4 files changed, 54 insertions(+), 40 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index a3042b88bf5f..a3a1e2ebed33 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -396,6 +396,12 @@ - The `services.trust-dns` module has been renamed to `services.hickory-dns`. +- The option `services.prometheus.exporters.pgbouncer.connectionStringFile` has been removed since + it leaked the connection string (and thus potentially the DB password) into the cmdline + of process making it effectively world-readable. + + Use [`services.prometheus.exporters.pgbouncer.connectionEnvFile`](#opt-services.prometheus.exporters.pgbouncer.connectionEnvFile) instead. + - The `lsh` package and the `services.lshd` module have been removed as they had no maintainer in Nixpkgs and hadn’t seen an upstream release in over a decade. It is recommended to migrate to `openssh` and `services.openssh`. - `opencv2` and `opencv3` have been removed, as they are obsolete and diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index b504cc032d67..c698c9005aaf 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -3,7 +3,7 @@ let inherit (lib) concatStrings foldl foldl' genAttrs literalExpression maintainers mapAttrs mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption - optional types mkOptionDefault flip attrNames; + optional types mkOptionDefault flip attrNames xor; cfg = config.services.prometheus.exporters; @@ -360,13 +360,6 @@ in Please specify either 'services.prometheus.exporters.nextcloud.passwordFile' or 'services.prometheus.exporters.nextcloud.tokenFile' ''; - } { - assertion = cfg.pgbouncer.enable -> ( - (cfg.pgbouncer.connectionStringFile != null || cfg.pgbouncer.connectionString != "") - ); - message = '' - PgBouncer exporter needs either connectionStringFile or connectionString configured" - ''; } { assertion = cfg.sql.enable -> ( (cfg.sql.configFile == null) != (cfg.sql.configuration == null) @@ -406,7 +399,15 @@ in Please ensure you have either `services.prometheus.exporters.deluge.delugePassword' or `services.prometheus.exporters.deluge.delugePasswordFile' set! ''; - } ] ++ (flip map (attrNames exporterOpts) (exporter: { + } { + assertion = cfg.pgbouncer.enable -> ( + xor (cfg.pgbouncer.connectionEnvFile == null) (cfg.pgbouncer.connectionString == null) + ); + message = '' + Options `services.prometheus.exporters.pgbouncer.connectionEnvFile` and + `services.prometheus.exporters.pgbouncer.connectionString` are mutually exclusive! + ''; + }] ++ (flip map (attrNames exporterOpts) (exporter: { assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall; message = '' The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless @@ -420,11 +421,6 @@ in Consider using `services.prometheus.exporters.idrac.configuration` instead. '' ) - (mkIf - (cfg.pgbouncer.enable && cfg.pgbouncer.connectionString != "") '' - config.services.prometheus.exporters.pgbouncer.connectionString is insecure. Use connectionStringFile instead. - '' - ) ] ++ config.services.prometheus.exporters.warnings; }] ++ [(mkIf config.services.prometheus.exporters.rtl_433.enable { hardware.rtl-sdr.enable = mkDefault true; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix index 9cd261099a95..5c111687c1d7 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix @@ -7,11 +7,8 @@ let mkPackageOption types optionals - optionalString getExe - getExe' escapeShellArg - escapeShellArgs concatStringsSep ; in @@ -29,8 +26,8 @@ in }; connectionString = mkOption { - type = types.str; - default = ""; + type = types.nullOr types.str; + default = null; example = "postgres://admin:@localhost:6432/pgbouncer?sslmode=require"; description = '' Connection string for accessing pgBouncer. @@ -43,26 +40,28 @@ in auth_file if auth_type other than "any" is used. WARNING: this secret is stored in the world-readable Nix store! - Use {option}`connectionStringFile` instead. + Use [](#opt-services.prometheus.exporters.pgbouncer.connectionEnvFile) if the + URL contains a secret. ''; }; - connectionStringFile = mkOption { - type = types.nullOr types.path; + connectionEnvFile = mkOption { + type = types.nullOr types.str; default = null; - example = "/run/keys/pgBouncer-connection-string"; description = '' - File that contains pgBouncer connection string in format: - postgres://admin:@localhost:6432/pgbouncer?sslmode=require + File that must contain the environment variable + `PGBOUNCER_EXPORTER_CONNECTION_STRING` which is set to the connection + string used by pgbouncer. I.e. the format is supposed to look like this: - NOTE: You MUST keep pgbouncer as database name (special internal db)!!! + ``` + PGBOUNCER_EXPORTER_CONNECTION_STRING="postgres://admin@localhost:6432/pgbouncer?sslmode=require" + ``` - NOTE: ignore_startup_parameters MUST contain "extra_float_digits". + NOTE: You MUST keep pgbouncer as database name (special internal db)! + NOTE: `services.pgbouncer.settings.pgbouncer.ignore_startup_parameters` + MUST contain "extra_float_digits". - NOTE: Admin user (with password or passwordless) MUST exist in the - auth_file if auth_type other than "any" is used. - - {option}`connectionStringFile` takes precedence over {option}`connectionString` + Mutually exclusive with [](#opt-services.prometheus.exporters.pgbouncer.connectionString). ''; }; @@ -126,16 +125,11 @@ in serviceOpts = { after = [ "pgbouncer.service" ]; - script = optionalString (cfg.connectionStringFile != null) '' - connectionString=$(${escapeShellArgs [ - (getExe' pkgs.coreutils "cat") "--" cfg.connectionStringFile - ]}) - '' + concatStringsSep " " ([ + script = concatStringsSep " " ([ "exec -- ${escapeShellArg (getExe cfg.package)}" "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}" - "--pgBouncer.connectionString ${if cfg.connectionStringFile != null - then "\"$connectionString\"" - else "${escapeShellArg cfg.connectionString}"}" + ] ++ optionals (cfg.connectionString != null) [ + "--pgBouncer.connectionString ${escapeShellArg cfg.connectionString}" ] ++ optionals (cfg.telemetryPath != null) [ "--web.telemetry-path ${escapeShellArg cfg.telemetryPath}" ] ++ optionals (cfg.pidFile != null) [ @@ -151,5 +145,21 @@ in ] ++ cfg.extraFlags); serviceConfig.RestrictAddressFamilies = [ "AF_INET" "AF_INET6" "AF_UNIX" ]; + serviceConfig.EnvironmentFile = lib.mkIf (cfg.connectionEnvFile != null) [ + cfg.connectionEnvFile + ]; }; + + imports = [ + (lib.mkRemovedOptionModule [ "connectionStringFile" ] '' + As replacement, the option `services.prometheus.exporters.pgbouncer.connectionEnvFile` + has been added. In contrast to `connectionStringFile` it must be an environment file + with the connection string being set to `PGBOUNCER_EXPORTER_CONNECTION_STRING`. + + The change was necessary since the former option wrote the contents of the file + into the cmdline of the exporter making the connection string effectively + world-readable. + '') + ({ options.warnings = options.warnings; options.assertions = options.assertions; }) + ]; } diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 13a7ca3ce615..71eef72df6f3 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -931,7 +931,9 @@ let pgbouncer = { exporterConfig = { enable = true; - connectionStringFile = pkgs.writeText "connection.conf" "postgres://admin:@localhost:6432/pgbouncer?sslmode=disable"; + connectionEnvFile = "${pkgs.writeText "connstr-env" '' + PGBOUNCER_EXPORTER_CONNECTION_STRING=postgres://admin@localhost:6432/pgbouncer?sslmode=disable + ''}"; }; metricProvider = { From 713cbd6fa047a5269148d9dfd1f51beb68c2b286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 19:26:26 +0000 Subject: [PATCH 243/481] lefthook: 1.7.14 -> 1.7.15 --- pkgs/by-name/le/lefthook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 947fbaace104..3d4fc68dbef9 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -6,7 +6,7 @@ let pname = "lefthook"; - version = "1.7.14"; + version = "1.7.15"; in buildGoModule { inherit pname version; @@ -15,10 +15,10 @@ buildGoModule { owner = "evilmartians"; repo = "lefthook"; rev = "v${version}"; - hash = "sha256-yGxEeNn6YnzivvQW+HXMAkSaKZ5mmAflyDlNYfjqguc="; + hash = "sha256-N79unpeeOwcdHJo9IbsGa/gmTyg+QQCJF599cshV3sc="; }; - vendorHash = "sha256-YrBFcRQoqZPe/USZj3oJK5KR7y0LimCVGS9w4uNMG6M="; + vendorHash = "sha256-rJdtax3r5Nwew+ptY4kIAUtxqPguwrFMMRk78zrZUcU="; nativeBuildInputs = [ installShellFiles ]; From b9a93e0c2b12327801e3d741ec7e19394d0f5dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:42:36 -0400 Subject: [PATCH 244/481] python312Packages.geoparquet: fix typo --- pkgs/development/python-modules/geoparquet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geoparquet/default.nix b/pkgs/development/python-modules/geoparquet/default.nix index ce50e2484c2d..d4b54610c506 100644 --- a/pkgs/development/python-modules/geoparquet/default.nix +++ b/pkgs/development/python-modules/geoparquet/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = "geoparquet"; + pythonImportsCheck = [ "geoparquet" ]; doCheck = false; # no tests From d9a8ce569d12cac39565d57d77223473ff5fee97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:42:50 -0400 Subject: [PATCH 245/481] python312Packages.pyaiports: fix typo --- pkgs/development/python-modules/pyairports/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyairports/default.nix b/pkgs/development/python-modules/pyairports/default.nix index b6c8b2a8a4c4..3803d9549218 100644 --- a/pkgs/development/python-modules/pyairports/default.nix +++ b/pkgs/development/python-modules/pyairports/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; - pythonImportChecks = [ "pyairports" ]; + pythonImportsCheck = [ "pyairports" ]; meta = with lib; { description = "pyairports is a package which enables airport lookup by 3-letter IATA code."; From 3a512f25b895ee1f1c530691e450e0ac3c15180a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:43:02 -0400 Subject: [PATCH 246/481] python312Packages.pyfunctional: fix typo --- pkgs/development/python-modules/pyfunctional/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyfunctional/default.nix b/pkgs/development/python-modules/pyfunctional/default.nix index 843eebd17399..1e4039cc5452 100644 --- a/pkgs/development/python-modules/pyfunctional/default.nix +++ b/pkgs/development/python-modules/pyfunctional/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ pytestCheckHook ]; - pythonImportCheck = "pyfunctional"; + pythonImportsCheck = [ "functional" ]; meta = { description = "Python library for creating data pipelines with chain functional programming"; From 1f8f36129384bcecf7cac73f398aeaf308976652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:43:10 -0400 Subject: [PATCH 247/481] python312Packages.python-ffmpeg: fix typo --- pkgs/development/python-modules/python-ffmpeg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-ffmpeg/default.nix b/pkgs/development/python-modules/python-ffmpeg/default.nix index 12b734c37700..3eba0ddb1d22 100644 --- a/pkgs/development/python-modules/python-ffmpeg/default.nix +++ b/pkgs/development/python-modules/python-ffmpeg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyee ]; nativeBuildInputs = [ setuptools-scm ]; - pythonImportCheck = [ "ffmpeg" ]; + pythonImportsCheck = [ "ffmpeg" ]; meta = { homepage = "https://github.com/jonghwanhyeon/python-ffmpeg"; From 56ba562feb21fa93dd48b4e17864cae98fee7b59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 19:54:01 +0000 Subject: [PATCH 248/481] n8n: 1.55.3 -> 1.57.0 --- pkgs/by-name/n8/n8n/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 11f59068bd55..87a6a64ea9d4 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -18,18 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "1.55.3"; + version = "1.57.0"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; rev = "n8n@${finalAttrs.version}"; - hash = "sha256-SgDw0je16Qf0ohzrVUjJM6FFovWxM2mvZjvfKkEESos="; + hash = "sha256-0ShG/9Hj132mbNC06HzduMCosAefufbI1M/KJUYK1TQ="; }; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-KvSsWf1EHCQ46M4Z4wqyYb4mW9y9kNwB9e090YC1ZWs="; + hash = "sha256-EfK8cmfkVebc/kIYaW+Eje1oPW1EpVpa2/jMs+KE5wg="; }; nativeBuildInputs = [ From e4973c6bdf33c2924bc186b06dd0db6074382feb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Aug 2024 13:31:24 +0000 Subject: [PATCH 249/481] ocamlPackages.mccs: 1.1+17 -> 1.1+18 --- pkgs/development/ocaml-modules/mccs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 2c0fa7186e84..cb77d21479ca 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "mccs"; - version = "1.1+17"; + version = "1.1+18"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; rev = version; - hash = "sha256-0NZF2W/eWwZRXnMJh9LmOdbE/CRDYeLUUx6ty4irP6U="; + hash = "sha256-Swfqq7O5KASf1nkK/lgIO9byWDUv1FiWh8cNULF7wfI="; }; propagatedBuildInputs = [ From d6e2708f7fdfc1f6e1c094aa98ab76912466078b Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Mon, 9 Sep 2024 22:25:21 +0200 Subject: [PATCH 250/481] stalwart-mail: 0.9.3 -> 0.9.4 --- pkgs/by-name/st/stalwart-mail/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index c2a1d339caea..959b4d2c2fe5 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -26,7 +26,7 @@ let # See upstream issue for rocksdb 9.X support # https://github.com/stalwartlabs/mail-server/issues/407 rocksdb = rocksdb_8_11; - version = "0.9.3"; + version = "0.9.4"; in rustPlatform.buildRustPackage { pname = "stalwart-mail"; @@ -36,11 +36,11 @@ rustPlatform.buildRustPackage { owner = "stalwartlabs"; repo = "mail-server"; rev = "refs/tags/v${version}"; - hash = "sha256-XjHm9jBpBQcf1qaZJLDSSrPK9Nqi3olG0pMXHdNUjbg="; + hash = "sha256-GDi7kRwI0GujQBJXItQpYZT1I1Hz3DUMyTixJ/lQySY="; fetchSubmodules = true; }; - cargoHash = "sha256-sFYvEKZVTS5v37CpIl/KjoOY0iWCHLgIJFUdht5SjJY="; + cargoHash = "sha256-7gJi6sykmKRuZZ8svXWlktHnwr78zaE2jxVIt+sZPHg="; patches = [ # Remove "PermissionsStartOnly" from systemd service files, From d649d30d9e5d31f83b1ac9b3275a214e15cf66ef Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jul 2024 17:48:24 +0300 Subject: [PATCH 251/481] python312Packages.numpy_1: add a coreIncludeDir passthru attribute --- pkgs/development/python-modules/numpy/1.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/numpy/1.nix b/pkgs/development/python-modules/numpy/1.nix index f20bd095cf97..ade66d14b829 100644 --- a/pkgs/development/python-modules/numpy/1.nix +++ b/pkgs/development/python-modules/numpy/1.nix @@ -3,6 +3,7 @@ stdenv, fetchPypi, python, + numpy_1, pythonAtLeast, pythonOlder, buildPythonPackage, @@ -185,6 +186,7 @@ buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + coreIncludeDir = "${numpy_1}/${python.sitePackages}/numpy/core/include"; tests = { inherit sage; }; From bc87f99ce43a540d4c259da13582777da430486c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 22 Jul 2024 17:48:17 +0300 Subject: [PATCH 252/481] python312Packages.numpy_2: add a coreIncludeDir passthru attribute --- pkgs/development/python-modules/numpy/2.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix index af9549ee0874..5b71602d72c2 100644 --- a/pkgs/development/python-modules/numpy/2.nix +++ b/pkgs/development/python-modules/numpy/2.nix @@ -3,6 +3,7 @@ stdenv, fetchPypi, python, + numpy_2, pythonAtLeast, pythonOlder, buildPythonPackage, @@ -166,6 +167,7 @@ buildPythonPackage rec { blas = blas.provider; blasImplementation = blas.implementation; inherit cfg; + coreIncludeDir = "${numpy_2}/${python.sitePackages}/numpy/_core/include"; tests = { inherit sage; }; From a63b47478e75cc8703f7cf3ee30cf6c17fc69591 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 30 Aug 2024 09:29:40 +0300 Subject: [PATCH 253/481] python312Packages.scipy: use numpy.coreIncludeDir --- pkgs/development/python-modules/scipy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index c6daa99905d2..3f3fa288681e 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -58,7 +58,7 @@ let # Additional cross compilation related properties that scipy reads in scipy/meson.build crossFileScipy = writeText "cross-file-scipy.conf" '' [properties] - numpy-include-dir = '${numpy}/${python.sitePackages}/numpy/core/include' + numpy-include-dir = '${numpy.coreIncludeDir}' pythran-include-dir = '${pythran}/${python.sitePackages}/pythran' host-python-path = '${python.interpreter}' host-python-version = '${python.pythonVersion}' From c8017562c022b54dc067f68e6b4088eeeffcd512 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 23 Jul 2024 15:05:26 +0000 Subject: [PATCH 254/481] owntracks-recorder: 0.9.7 -> 0.9.8 --- pkgs/servers/owntracks-recorder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/owntracks-recorder/default.nix b/pkgs/servers/owntracks-recorder/default.nix index c0c28fac254e..98c97f833bde 100644 --- a/pkgs/servers/owntracks-recorder/default.nix +++ b/pkgs/servers/owntracks-recorder/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "owntracks-recorder"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "owntracks"; repo = "recorder"; rev = finalAttrs.version; - hash = "sha256-KDImoIUAkjCa4O++F9LdDN+i8VoC78g8644Rhbpy+mc="; + hash = "sha256-h+hjcaa+Ooa8gErjzfX+p+S24fbnCOtjfliFWVj73dI="; }; nativeBuildInputs = [ From d8b47467d299a474b4fb520fade91eb1920942ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Aug 2024 06:42:29 +0000 Subject: [PATCH 255/481] vegeta: 12.11.1 -> 12.12.0 --- pkgs/tools/networking/vegeta/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/vegeta/default.nix b/pkgs/tools/networking/vegeta/default.nix index a7b71272e9a2..17f0dcc37e55 100644 --- a/pkgs/tools/networking/vegeta/default.nix +++ b/pkgs/tools/networking/vegeta/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "vegeta"; - version = "12.11.1"; - rev = "6fbe391628eeeae1adf39522a55078797e6e7f2e"; + version = "12.12.0"; + rev = "03ca49e9b419c106db29d687827c4c823d8b8ece"; src = fetchFromGitHub { owner = "tsenart"; repo = "vegeta"; rev = "v${version}"; - sha256 = "sha256-09DowdlbCsBQsAuAqC2QyUYvZHz7QmttO8Q6KHQCqLo="; + hash = "sha256-nTtQ/BB5rU+0k4dPRCmukCRNI0iFTjHIJiSTN0cNR+Q="; }; - vendorHash = "sha256-5MvcZLg+NDDsqlpVV2FhTiEhXUJHq7eaP7Pba3iIipo="; + vendorHash = "sha256-0Ho1HYckFHaWEE6Ti3fIL/t0hBj5MnKOd4fOZx+LYiE="; subPackages = [ "." ]; From 207072fca31e08c45f21cf2a7c8a097521589283 Mon Sep 17 00:00:00 2001 From: Fea Date: Thu, 22 Aug 2024 20:01:28 +0200 Subject: [PATCH 256/481] fetchYarnDeps: fix by deduplicating requests --- pkgs/build-support/node/fetch-yarn-deps/index.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/node/fetch-yarn-deps/index.js b/pkgs/build-support/node/fetch-yarn-deps/index.js index 400b64d2e920..6bcc70837138 100755 --- a/pkgs/build-support/node/fetch-yarn-deps/index.js +++ b/pkgs/build-support/node/fetch-yarn-deps/index.js @@ -141,10 +141,20 @@ const performParallel = tasks => { return Promise.all(workers) } +// This could be implemented using [`Map.groupBy`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map/groupBy), +// but that method is only supported starting with Node 21 +const uniqueBy = (arr, callback) => { + const map = new Map() + for (const elem of arr) { + map.set(callback(elem), elem) + } + return [...map.values()] +} + const prefetchYarnDeps = async (lockContents, verbose) => { const lockData = lockfile.parse(lockContents) await performParallel( - Object.entries(lockData.object) + uniqueBy(Object.entries(lockData.object), ([_, value]) => value.resolved) .map(([key, value]) => () => downloadPkg({ key, ...value }, verbose)) ) await fs.promises.writeFile('yarn.lock', lockContents) From 1097d9001e19d49831df118fbd8bea498d289a0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 6 Aug 2024 15:14:15 +0000 Subject: [PATCH 257/481] grandorgue: 3.14.2-1 -> 3.15.1-1 --- pkgs/applications/audio/grandorgue/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/grandorgue/default.nix b/pkgs/applications/audio/grandorgue/default.nix index 9e519510eb72..4aa93b5f7090 100644 --- a/pkgs/applications/audio/grandorgue/default.nix +++ b/pkgs/applications/audio/grandorgue/default.nix @@ -21,14 +21,14 @@ stdenv.mkDerivation rec { pname = "grandorgue"; - version = "3.14.2-1"; + version = "3.15.1-1"; src = fetchFromGitHub { owner = "GrandOrgue"; - repo = pname; + repo = "grandorgue"; rev = version; fetchSubmodules = true; - hash = "sha256-FHM8fFUga9poGhojKBTF4gsJ6L4XEksueVxfMbngvks="; + hash = "sha256-5uAA878OBc04PkUgCwoRtc6lIASivq3YcfFffTae6uM="; }; postPatch = '' @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/{Applications,bin,lib} mv $out/GrandOrgue.app $out/Applications/ - for lib in $out/Applications/GrandOrgue.app/Contents/MacOS/lib*; do + for lib in $out/Applications/GrandOrgue.app/Contents/Frameworks/lib*; do ln -s $lib $out/lib/ done makeWrapper $out/{Applications/GrandOrgue.app/Contents/MacOS,bin}/GrandOrgue From 959c9e7b6bd1b34ccb2af9cba36666a38e61f0aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 22:24:33 +0000 Subject: [PATCH 258/481] dotenvx: 1.8.0 -> 1.14.0 --- pkgs/by-name/do/dotenvx/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index a285b546d75b..ca2c269d728b 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "dotenvx"; - version = "1.8.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; rev = "refs/tags/v${version}"; - hash = "sha256-j30ZEYO8OBMhEPn+LDipZ/aciWrI9QWStz6tHq0uX7E="; + hash = "sha256-UVev21LZ2y0C8BCSm6I8BTQziSDZUXP3A/ThOpKtsrQ="; }; - npmDepsHash = "sha256-ZSnrV1C9NX/Wq7cjKlM1w/m6T7snfnPru5g0pqFTGis="; + npmDepsHash = "sha256-ehWHIKYkSAkdTLGpBOU7lJoWNa5uv9Zy0+2qwnCv0m8="; dontNpmBuild = true; From 276a3f2a71cad6f38118715c96da5729c912824b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 22:25:35 +0000 Subject: [PATCH 259/481] sploitscan: 0.10.5 -> 0.11.0 --- pkgs/by-name/sp/sploitscan/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/sploitscan/package.nix b/pkgs/by-name/sp/sploitscan/package.nix index dcd8695e9365..63c2859408b0 100644 --- a/pkgs/by-name/sp/sploitscan/package.nix +++ b/pkgs/by-name/sp/sploitscan/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sploitscan"; - version = "0.10.5"; + version = "0.11.0"; pyproject = true; src = fetchFromGitHub { owner = "xaitax"; repo = "SploitScan"; - rev = "refs/tags/v${version}"; - hash = "sha256-41NR31x/pJttBxv66t5g3s2PwlSBgsk0ybiH7xFs18k="; + rev = "refs/tags/v.${version}"; + hash = "sha256-d9s0j/78arKnbDCgMJMdUVF/RPfnAl59WAiJ0UvCCUU="; }; pythonRelaxDeps = [ From 1d299c0503c2e196a3deca7fea59a8bb93a214b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 20:18:21 +0000 Subject: [PATCH 260/481] step-kms-plugin: 0.11.3 -> 0.11.4 --- pkgs/tools/security/step-kms-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index a64f86a31d1e..fd0521011757 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-Gl/5AExN2/MEoR2HKpw7mDfuc/1Wj0UGSdXPzHl2JdU="; + hash = "sha256-5ECiAUgRWZ7hti/gr/RrOO0NV2Cd1EPVHJ5/0F+fzsc="; }; - vendorHash = "sha256-O6orQYrupJdJbx23TXCP0qWyvn6Hv2iDeRYvIgLp1NM="; + vendorHash = "sha256-iobfA3I4/ckWdpjmxm4NfmxHzg0vUx9+rY8gBLcC+Ps="; proxyVendor = true; From 303b35d97e72f1988ea7bac9711f7d561bf82a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 10 Sep 2024 00:45:08 +0200 Subject: [PATCH 261/481] golangci-lint: 1.60.3 -> 1.61.0 Diff: https://github.com/golangci/golangci-lint/compare/v1.60.3...v1.61.0 Changelog: https://github.com/golangci/golangci-lint/blob/v1.61.0/CHANGELOG.md --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index f9977b1b4898..620dc94a8b03 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGo123Module rec { pname = "golangci-lint"; - version = "1.60.3"; + version = "1.61.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - hash = "sha256-0ScdJ5td2N8WF1dwHQ3dBSjyr1kqgrzCfBzbRg9cRrw="; + hash = "sha256-2YzVNOdasal27R92l6eVdeS81mAp0ZU6kYsC/Jfvkcg="; }; - vendorHash = "sha256-ixeswsfx36D0Tg103swbBD8UXXLNYbxSMYDE+JOm+uw="; + vendorHash = "sha256-mFDCRxbLq08yRd0ko3CCPJD2BZiCB0Gwd1g+/1oR6w8="; subPackages = [ "cmd/golangci-lint" ]; From 4a3a8d760e3991c546e32511d099f65abd65272c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 9 Sep 2024 23:01:05 +0000 Subject: [PATCH 262/481] goperf: 0-unstable-2024-08-06 -> 0-unstable-2024-09-05 --- pkgs/development/tools/goperf/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/goperf/default.nix b/pkgs/development/tools/goperf/default.nix index a27d3902dd6f..dc5ee3052a01 100644 --- a/pkgs/development/tools/goperf/default.nix +++ b/pkgs/development/tools/goperf/default.nix @@ -8,15 +8,15 @@ buildGoModule rec { pname = "goperf"; - version = "0-unstable-2024-08-06"; + version = "0-unstable-2024-09-05"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "3f62151e343cbb54ce6f792b9e1661c4e4845651"; - hash = "sha256-3JjutGKWSywXEHPw7YhH42EEIAh7PL09m37LokgTpuc="; + rev = "ce4811554b022ac27d024d355ad160e95079bec1"; + hash = "sha256-kJJod7Qma3++lrctezYltB9hV8/gH/CycHrk+GpOasE="; }; - vendorHash = "sha256-dCyw9b7ZZHN//4Nhriw3b4Q5AQ3RWs+H/MtqIq5BvpA="; + vendorHash = "sha256-VWywJ1LalYcfOQjrC0sLBfbQyIg8fYv4paMlIfa3RxI="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf From 4dc12820710caf520c73fc717f04e8fba53c3d3e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Thu, 5 Sep 2024 16:02:34 -0400 Subject: [PATCH 263/481] gitea: 1.22.1 -> 1.22.2 Diff: https://github.com/go-gitea/gitea/compare/v1.22.1...1.22.2 --- pkgs/by-name/gi/gitea/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index f9792f89c715..3b5e5ccdf579 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildGoModule , fetchFromGitHub , makeWrapper @@ -20,7 +19,7 @@ let pname = "gitea-frontend"; inherit (gitea) src version; - npmDepsHash = "sha256-gXBBiDIIS0aW6qK37HcF0AuJOliblinznRVXoo6DV1s="; + npmDepsHash = "sha256-Sp3xBe5IXys2Qro4x4HKs9dQOnlbstAmtIG6xOOktEk="; # use webpack directly instead of 'make frontend' as the packages are already installed buildPhase = '' @@ -34,16 +33,18 @@ let }; in buildGoModule rec { pname = "gitea"; - version = "1.22.1"; + version = "1.22.2"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${gitea.version}"; - hash = "sha256-s7su3gMdXv2sT1uYYtx29n7QDvmPU9QB3QR6ctOlE58="; + hash = "sha256-PwA23cbRgw5crzZmngDjAAIODMtguwBCqc9NqWMjF3o="; }; - vendorHash = "sha256-nzhjIfQMzSf1nuBMTIe0xn+NMDFbDZ9jRHu8Nwzmp4w="; + proxyVendor = true; + + vendorHash = "sha256-rMTKmztQNse/9CK1qFGWmSwqunwh918EvcuIHk6BSTY="; outputs = [ "out" "data" ]; From a1658a19e8445ab538cb0f277115ee38219e9e34 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:22:14 -0700 Subject: [PATCH 264/481] waycheck: 1.2.1 -> 1.3.1 --- pkgs/by-name/wa/waycheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 73eb3146664e..585346a7f310 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "waycheck"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "serebit"; repo = "waycheck"; rev = "v${finalAttrs.version}"; - hash = "sha256-82jOYWhgD9JNDn24eCAeMm63R5BTy20lQVpiAwhDIOk="; + hash = "sha256-ZNUORCSeU+AGQoiIIfPpgW2o1ElX+j5Pcn2X/8pSpRI="; }; nativeBuildInputs = [ From 9c622eb91dddd02ebeffdccee4d95c2dfd9c8cf3 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:24:41 -0700 Subject: [PATCH 265/481] waycheck: nixfmt --- pkgs/by-name/wa/waycheck/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 585346a7f310..7f5e112b4a62 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -1,13 +1,14 @@ -{ lib -, stdenv -, fetchFromGitLab -, meson -, ninja -, pkg-config -, qt6 -, wayland -, glib -, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitLab, + meson, + ninja, + pkg-config, + qt6, + wayland, + glib, + wrapGAppsHook3, }: stdenv.mkDerivation (finalAttrs: { From e39e305b25edd489ce024dc5e5a9aa60983fb4e3 Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:25:26 -0700 Subject: [PATCH 266/481] waycheck: add updateScript --- pkgs/by-name/wa/waycheck/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 7f5e112b4a62..2494407b165b 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -9,6 +9,7 @@ wayland, glib, wrapGAppsHook3, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -49,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; From 453c599b61b8ff4d614caedffa56f235ab631dee Mon Sep 17 00:00:00 2001 From: Gavin John Date: Mon, 9 Sep 2024 16:25:46 -0700 Subject: [PATCH 267/481] waycheck: add pandapip1 to maintainers --- pkgs/by-name/wa/waycheck/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/waycheck/package.nix b/pkgs/by-name/wa/waycheck/package.nix index 2494407b165b..b8dd02dabded 100644 --- a/pkgs/by-name/wa/waycheck/package.nix +++ b/pkgs/by-name/wa/waycheck/package.nix @@ -56,7 +56,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple GUI that displays the protocols implemented by a Wayland compositor"; homepage = "https://gitlab.freedesktop.org/serebit/waycheck"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ julienmalka ]; + maintainers = with lib.maintainers; [ + julienmalka + pandapip1 + ]; mainProgram = "waycheck"; platforms = lib.platforms.linux; }; From 5451a0b34cb1110656fb4f820edfbda3339e9d15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 00:43:14 +0000 Subject: [PATCH 268/481] cp2k: 2024.2 -> 2024.3 --- pkgs/applications/science/chemistry/cp2k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/cp2k/default.nix b/pkgs/applications/science/chemistry/cp2k/default.nix index f12dfda5d2c1..70d6c515d3d7 100644 --- a/pkgs/applications/science/chemistry/cp2k/default.nix +++ b/pkgs/applications/science/chemistry/cp2k/default.nix @@ -58,13 +58,13 @@ let in stdenv.mkDerivation rec { pname = "cp2k"; - version = "2024.2"; + version = "2024.3"; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; rev = "v${version}"; - hash = "sha256-KXxqzapdPZggFlxX1rkNcxEYb2+aQIPFclFspxII7aE="; + hash = "sha256-TeVQ0wVUx6d4knwMi9z3LjQZ4ELE6s1TnvwfFz8jbYk="; fetchSubmodules = true; }; From 4eee59973aedfc0a710b5d356ad600a8a5ae0864 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 10 Sep 2024 02:30:10 +0200 Subject: [PATCH 269/481] nixVersions.nix_2_24,git: mark vulnerable --- pkgs/tools/package-management/nix/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 35edaf2bef46..84b0f028a4bf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -184,7 +184,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_23"; }; - nix_2_24 = (common { + nix_2_24 = ((common { version = "2.24.5"; hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY="; self_attribute_name = "nix_2_24"; @@ -197,9 +197,13 @@ in lib.makeExtensible (self: ({ # allocation function Clang uses with this setting actually works # all the way back to 10.6. stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; + })).overrideAttrs (o: { + meta.knownVulnerabilities = [ + "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" + ]; }); - git = (common rec { + git = ((common rec { version = "2.25.0"; suffix = "pre20240807_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { @@ -218,9 +222,13 @@ in lib.makeExtensible (self: ({ # allocation function Clang uses with this setting actually works # all the way back to 10.6. stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; + })).overrideAttrs (o: { + meta.knownVulnerabilities = [ + "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" + ]; }); - latest = self.nix_2_24; + latest = self.nix_2_23; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From 757e0a34b78e7f1c0b440ee1e7af2b388a52bd1c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 10 Sep 2024 03:01:26 +0200 Subject: [PATCH 270/481] nixVersions.git: improve error message --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 84b0f028a4bf..65fdeb5446c0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -224,7 +224,7 @@ in lib.makeExtensible (self: ({ stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; })).overrideAttrs (o: { meta.knownVulnerabilities = [ - "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" + "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nixVersions.git to nixVersions.nix_2_23" ]; }); From 4cec81a9959ce612b653860dcca53101a36f328a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 10 Sep 2024 03:12:55 +0200 Subject: [PATCH 271/481] Revert "modules/virtualisation: add shared options, merge various diskSize options" (#340894) Breaks evaluation of all nixos tests, and is therefore a channel blocker. --- .../maintainers/scripts/ec2/amazon-image.nix | 229 +-- .../scripts/openstack/openstack-image-zfs.nix | 54 +- nixos/modules/profiles/macos-builder.nix | 103 +- nixos/modules/virtualisation/azure-image.nix | 44 +- .../virtualisation/digital-ocean-image.nix | 75 +- .../virtualisation/google-compute-image.nix | 44 +- nixos/modules/virtualisation/hyperv-image.nix | 40 +- nixos/modules/virtualisation/linode-image.nix | 35 +- nixos/modules/virtualisation/oci-image.nix | 17 +- nixos/modules/virtualisation/oci-options.nix | 30 +- .../modules/virtualisation/proxmox-image.nix | 345 ++-- nixos/modules/virtualisation/qemu-vm.nix | 1749 ++++++++--------- .../virtualisation/virtualbox-image.nix | 225 +-- .../virtualisation/virtualisation-options.nix | 60 - nixos/release.nix | 2 +- 15 files changed, 1293 insertions(+), 1759 deletions(-) delete mode 100644 nixos/modules/virtualisation/virtualisation-options.nix diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index b8a7526120aa..1b3724bfc170 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -1,50 +1,24 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let - inherit (lib) - mkOption - optionalString - types - versionAtLeast - ; + inherit (lib) mkOption optionalString types versionAtLeast; inherit (lib.options) literalExpression; cfg = config.amazonImage; amiBootMode = if config.ec2.efi then "uefi" else "legacy-bios"; - virtualisationOptions = import ../../../modules/virtualisation/virtualisation-options.nix; -in -{ - imports = [ - ../../../modules/virtualisation/amazon-image.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "amazonImage" - "sizeMB" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; +in { + + imports = [ ../../../modules/virtualisation/amazon-image.nix ]; # Amazon recommends setting this to the highest possible value for a good EBS # experience, which prior to 4.15 was 255. # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/nvme-ebs-volumes.html#timeout-nvme-ebs-volumes config.boot.kernelParams = - let - timeout = - if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" then "4294967295" else "255"; - in - [ "nvme_core.io_timeout=${timeout}" ]; + let timeout = + if versionAtLeast config.boot.kernelPackages.kernel.version "4.15" + then "4294967295" + else "255"; + in [ "nvme_core.io_timeout=${timeout}" ]; options.amazonImage = { name = mkOption { @@ -60,30 +34,30 @@ in } ] ''; - default = [ ]; + default = []; description = '' This option lists files to be copied to fixed locations in the generated image. Glob patterns work. ''; }; + sizeMB = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = 3072; + example = 8192; + description = "The size in MB of the image"; + }; + format = mkOption { - type = types.enum [ - "raw" - "qcow2" - "vpc" - ]; + type = types.enum [ "raw" "qcow2" "vpc" ]; default = "vpc"; description = "The image format to output"; }; }; - config.virtualisation.diskSize = lib.mkDefault (3 * 1024); - config.virtualisation.diskSizeAutoSupported = !config.ec2.zfs.enable; - - config.system.build.amazonImage = - let - configFile = pkgs.writeText "configuration.nix" '' + config.system.build.amazonImage = let + configFile = pkgs.writeText "configuration.nix" + '' { modulesPath, ... }: { imports = [ "''${modulesPath}/virtualisation/amazon-image.nix" ]; ${optionalString config.ec2.efi '' @@ -96,102 +70,91 @@ in } ''; - zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { - inherit - lib - config - configFile - pkgs - ; - inherit (cfg) contents format name; + zfsBuilder = import ../../../lib/make-multi-disk-zfs-image.nix { + inherit lib config configFile pkgs; + inherit (cfg) contents format name; - includeChannel = true; + includeChannel = true; - bootSize = 1000; # 1G is the minimum EBS volume + bootSize = 1000; # 1G is the minimum EBS volume - rootSize = config.virtualisation.diskSize; - rootPoolProperties = { - ashift = 12; - autoexpand = "on"; - }; - - datasets = config.ec2.zfs.datasets; - - postVM = '' - extension=''${rootDiskImage##*.} - friendlyName=$out/${cfg.name} - rootDisk="$friendlyName.root.$extension" - bootDisk="$friendlyName.boot.$extension" - mv "$rootDiskImage" "$rootDisk" - mv "$bootDiskImage" "$bootDisk" - - mkdir -p $out/nix-support - echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products - echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products - - ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_mode "${amiBootMode}" \ - --arg root "$rootDisk" \ - --arg boot "$bootDisk" \ - '{} - | .label = $system_label - | .boot_mode = $boot_mode - | .system = $system - | .disks.boot.logical_bytes = $boot_logical_bytes - | .disks.boot.file = $boot - | .disks.root.logical_bytes = $root_logical_bytes - | .disks.root.file = $root - ' > $out/nix-support/image-info.json - ''; + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; }; - extBuilder = import ../../../lib/make-disk-image.nix { - inherit - lib - config - configFile - pkgs - ; + datasets = config.ec2.zfs.datasets; - inherit (cfg) contents format name; + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" - fsType = "ext4"; - partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products - inherit (config.virtualisation) diskSize; + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '{} + | .label = $system_label + | .boot_mode = $boot_mode + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json + ''; + }; - postVM = '' - extension=''${diskImage##*.} - friendlyName=$out/${cfg.name}.$extension - mv "$diskImage" "$friendlyName" - diskImage=$friendlyName + extBuilder = import ../../../lib/make-disk-image.nix { + inherit lib config configFile pkgs; - mkdir -p $out/nix-support - echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + inherit (cfg) contents format name; - ${pkgs.jq}/bin/jq -n \ - --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg boot_mode "${amiBootMode}" \ - --arg file "$diskImage" \ - '{} - | .label = $system_label - | .boot_mode = $boot_mode - | .system = $system - | .logical_bytes = $logical_bytes - | .file = $file - | .disks.root.logical_bytes = $logical_bytes - | .disks.root.file = $file - ' > $out/nix-support/image-info.json - ''; - }; - in - if config.ec2.zfs.enable then zfsBuilder else extBuilder; + fsType = "ext4"; + partitionTableType = if config.ec2.efi then "efi" else "legacy+gpt"; + + diskSize = cfg.sizeMB; + + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName + + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu_kvm}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_mode "${amiBootMode}" \ + --arg file "$diskImage" \ + '{} + | .label = $system_label + | .boot_mode = $boot_mode + | .system = $system + | .logical_bytes = $logical_bytes + | .file = $file + | .disks.root.logical_bytes = $logical_bytes + | .disks.root.file = $file + ' > $out/nix-support/image-info.json + ''; + }; + in if config.ec2.zfs.enable then zfsBuilder else extBuilder; meta.maintainers = with lib.maintainers; [ arianvp ]; } diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix index 03895b9aa833..9799f333aec0 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix @@ -1,37 +1,18 @@ # nix-build '' -A config.system.build.openstackImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/openstack-image.nix ]; }" -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let inherit (lib) mkOption types; copyChannel = true; cfg = config.openstackImage; imageBootMode = if config.openstack.efi then "uefi" else "legacy-bios"; - virtualisationOptions = import ../../../modules/virtualisation/virtualisation-options.nix; in { imports = [ ../../../modules/virtualisation/openstack-config.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "openstackImage" - "sizeMB" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ] ++ (lib.optional copyChannel ../../../modules/installer/cd-dvd/channel.nix); + options.openstackImage = { name = mkOption { type = types.str; @@ -41,15 +22,18 @@ in ramMB = mkOption { type = types.int; - default = (3 * 1024); + default = 1024; description = "RAM allocation for build VM"; }; + sizeMB = mkOption { + type = types.int; + default = 8192; + description = "The size in MB of the image"; + }; + format = mkOption { - type = types.enum [ - "raw" - "qcow2" - ]; + type = types.enum [ "raw" "qcow2" ]; default = "qcow2"; description = "The image format to output"; }; @@ -70,26 +54,24 @@ in }; }; - virtualisation.diskSize = lib.mkDefault (8 * 1024); - virtualisation.diskSizeAutoSupported = false; - system.build.openstackImage = import ../../../lib/make-single-disk-zfs-image.nix { inherit lib config; inherit (cfg) contents format name; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - configFile = pkgs.writeText "configuration.nix" '' - { modulesPath, ... }: { - imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; - openstack.zfs.enable = true; - } - ''; + configFile = pkgs.writeText "configuration.nix" + '' + { modulesPath, ... }: { + imports = [ "''${modulesPath}/virtualisation/openstack-config.nix" ]; + openstack.zfs.enable = true; + } + ''; includeChannel = copyChannel; bootSize = 1000; memSize = cfg.ramMB; - rootSize = config.virtualisation.diskSize; + rootSize = cfg.sizeMB; rootPoolProperties = { ashift = 12; autoexpand = "on"; diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index 28832d2b7157..bf8414e1e108 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - options, - ... -}: +{ config, lib, options, ... }: let keysDirectory = "/var/keys"; @@ -20,19 +15,6 @@ in imports = [ ../virtualisation/qemu-vm.nix - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "darwin-builder" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - # Avoid a dependency on stateVersion { disabledModules = [ @@ -41,16 +23,17 @@ in ]; # swraid's default depends on stateVersion config.boot.swraid.enable = false; - options.boot.isContainer = lib.mkOption { - default = false; - internal = true; - }; + options.boot.isContainer = lib.mkOption { default = false; internal = true; }; } ]; - options.virtualisation.description = "The maximum disk space allocated to the runner in megabytes"; - options.virtualisation.darwin-builder = with lib; { + diskSize = mkOption { + default = 20 * 1024; + type = types.int; + example = 30720; + description = "The maximum disk space allocated to the runner in MB"; + }; memorySize = mkOption { default = 3 * 1024; type = types.int; @@ -76,13 +59,13 @@ in ''; }; workingDirectory = mkOption { - default = "."; - type = types.str; - example = "/var/lib/darwin-builder"; - description = '' - The working directory to use to run the script. When running - as part of a flake will need to be set to a non read-only filesystem. - ''; + default = "."; + type = types.str; + example = "/var/lib/darwin-builder"; + description = '' + The working directory to use to run the script. When running + as part of a flake will need to be set to a non read-only filesystem. + ''; }; hostPort = mkOption { default = 31022; @@ -175,34 +158,26 @@ in script = hostPkgs.writeShellScriptBin "create-builder" ( '' set -euo pipefail - '' - + - # When running as non-interactively as part of a DarwinConfiguration the working directory - # must be set to a writeable directory. - ( - if cfg.workingDirectory != "." then - '' - ${hostPkgs.coreutils}/bin/mkdir --parent "${cfg.workingDirectory}" - cd "${cfg.workingDirectory}" - '' - else - "" - ) - + '' - KEYS="''${KEYS:-./keys}" - ${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}" - PRIVATE_KEY="''${KEYS}/${user}_${keyType}" - PUBLIC_KEY="''${PRIVATE_KEY}.pub" - if [ ! -e "''${PRIVATE_KEY}" ] || [ ! -e "''${PUBLIC_KEY}" ]; then - ${hostPkgs.coreutils}/bin/rm --force -- "''${PRIVATE_KEY}" "''${PUBLIC_KEY}" - ${hostPkgs.openssh}/bin/ssh-keygen -q -f "''${PRIVATE_KEY}" -t ${keyType} -N "" -C 'builder@localhost' - fi - if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then - (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") - fi - KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} - '' - ); + '' + + # When running as non-interactively as part of a DarwinConfiguration the working directory + # must be set to a writeable directory. + (if cfg.workingDirectory != "." then '' + ${hostPkgs.coreutils}/bin/mkdir --parent "${cfg.workingDirectory}" + cd "${cfg.workingDirectory}" + '' else "") + '' + KEYS="''${KEYS:-./keys}" + ${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}" + PRIVATE_KEY="''${KEYS}/${user}_${keyType}" + PUBLIC_KEY="''${PRIVATE_KEY}.pub" + if [ ! -e "''${PRIVATE_KEY}" ] || [ ! -e "''${PUBLIC_KEY}" ]; then + ${hostPkgs.coreutils}/bin/rm --force -- "''${PRIVATE_KEY}" "''${PUBLIC_KEY}" + ${hostPkgs.openssh}/bin/ssh-keygen -q -f "''${PRIVATE_KEY}" -t ${keyType} -N "" -C 'builder@localhost' + fi + if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then + (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") + fi + KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} + ''); in script.overrideAttrs (old: { @@ -248,16 +223,12 @@ in ''; virtualisation = { - diskSize = lib.mkDefault (20 * 1024); + diskSize = cfg.diskSize; memorySize = cfg.memorySize; forwardPorts = [ - { - from = "host"; - guest.port = 22; - host.port = cfg.hostPort; - } + { from = "host"; guest.port = 22; host.port = cfg.hostPort; } ]; # Disable graphics for the builder since users will likely want to run it diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 4c321ad95fc8..ecb57483cce9 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -1,34 +1,22 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; let cfg = config.virtualisation.azureImage; - virtualisationOptions = import ./virtualisation-options.nix; in { - imports = [ - ./azure-common.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "azureImage" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; + imports = [ ./azure-common.nix ]; options.virtualisation.azureImage = { + diskSize = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 2048; + description = '' + Size of disk image. Unit is MB. + ''; + }; + bootSize = mkOption { type = types.int; default = 256; @@ -47,12 +35,7 @@ in }; vmGeneration = mkOption { - type = - with types; - enum [ - "v1" - "v2" - ]; + type = with types; enum [ "v1" "v2" ]; default = "v1"; description = '' VM Generation to use. @@ -74,8 +57,7 @@ in bootSize = "${toString cfg.bootSize}M"; partitionTableType = if cfg.vmGeneration == "v2" then "efi" else "legacy"; - inherit (cfg) contents; - inherit (config.virtualisation) diskSize; + inherit (cfg) diskSize contents; inherit config lib pkgs; }; }; diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix index 597f2c2f7a3f..53791e911406 100644 --- a/nixos/modules/virtualisation/digital-ocean-image.nix +++ b/nixos/modules/virtualisation/digital-ocean-image.nix @@ -1,35 +1,23 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; let cfg = config.virtualisation.digitalOceanImage; - virtualisationOptions = import ./virtualisation-options.nix; in { - imports = [ - ./digital-ocean-config.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "digitialOceanImage" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; + imports = [ ./digital-ocean-config.nix ]; options = { + virtualisation.digitalOceanImage.diskSize = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 4096; + description = '' + Size of disk image. Unit is MB. + ''; + }; + virtualisation.digitalOceanImage.configFile = mkOption { type = with types; nullOr path; default = null; @@ -43,10 +31,7 @@ in }; virtualisation.digitalOceanImage.compressionMethod = mkOption { - type = types.enum [ - "gzip" - "bzip2" - ]; + type = types.enum [ "gzip" "bzip2" ]; default = "gzip"; example = "bzip2"; description = '' @@ -59,35 +44,27 @@ in #### implementation config = { + system.build.digitalOceanImage = import ../../lib/make-disk-image.nix { name = "digital-ocean-image"; format = "qcow2"; - postVM = - let - compress = - { - "gzip" = "${pkgs.gzip}/bin/gzip"; - "bzip2" = "${pkgs.bzip2}/bin/bzip2"; - } - .${cfg.compressionMethod}; - in - '' - ${compress} $diskImage - ''; - configFile = - if cfg.configFile == null then - config.virtualisation.digitalOcean.defaultConfigFile - else - cfg.configFile; - inherit (config.virtualisation) diskSize; + postVM = let + compress = { + "gzip" = "${pkgs.gzip}/bin/gzip"; + "bzip2" = "${pkgs.bzip2}/bin/bzip2"; + }.${cfg.compressionMethod}; + in '' + ${compress} $diskImage + ''; + configFile = if cfg.configFile == null + then config.virtualisation.digitalOcean.defaultConfigFile + else cfg.configFile; + inherit (cfg) diskSize; inherit config lib pkgs; }; }; - meta.maintainers = with maintainers; [ - arianvp - eamsden - ]; + meta.maintainers = with maintainers; [ arianvp eamsden ]; } diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 200c512ecf66..8e7b31b439bf 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; let @@ -16,28 +11,21 @@ let ]; } ''; - virtualisationOptions = import ./virtualisation-options.nix; in { - imports = [ - ./google-compute-config.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "googleComputeImage" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; + imports = [ ./google-compute-config.nix ]; options = { + virtualisation.googleComputeImage.diskSize = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 1536; + description = '' + Size of disk image. Unit is MB. + ''; + }; + virtualisation.googleComputeImage.configFile = mkOption { type = with types; nullOr str; default = null; @@ -76,13 +64,7 @@ in system.build.googleComputeImage = import ../../lib/make-disk-image.nix { name = "google-compute-image"; postVM = '' - PATH=$PATH:${ - with pkgs; - lib.makeBinPath [ - gnutar - gzip - ] - } + PATH=$PATH:${with pkgs; lib.makeBinPath [ gnutar gzip ]} pushd $out mv $diskImage disk.raw tar -Sc disk.raw | gzip -${toString cfg.compressionLevel} > \ @@ -93,7 +75,7 @@ in format = "raw"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; partitionTableType = if cfg.efi then "efi" else "legacy"; - inherit (config.virtualisation) diskSize; + inherit (cfg) diskSize; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix index fe48ce632dcf..eb1bbe9f3a58 100644 --- a/nixos/modules/virtualisation/hyperv-image.nix +++ b/nixos/modules/virtualisation/hyperv-image.nix @@ -1,37 +1,21 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, pkgs, lib, ... }: with lib; let cfg = config.hyperv; - virtualisationOptions = import ./virtualisation-options.nix; - -in -{ - - imports = [ - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "hyperv" - "baseImageSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; +in { options = { hyperv = { + baseImageSize = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 2048; + description = '' + The size of the hyper-v base image in MiB. + ''; + }; vmDerivationName = mkOption { type = types.str; default = "nixos-hyperv-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}"; @@ -50,8 +34,6 @@ in }; config = { - virtualisation.diskSize = lib.mkDefault (4 * 1024); - system.build.hypervImage = import ../../lib/make-disk-image.nix { name = cfg.vmDerivationName; postVM = '' @@ -59,7 +41,7 @@ in rm $diskImage ''; format = "raw"; - inherit (config.virtualisation) diskSize; + diskSize = cfg.baseImageSize; partitionTableType = "efi"; inherit config lib pkgs; }; diff --git a/nixos/modules/virtualisation/linode-image.nix b/nixos/modules/virtualisation/linode-image.nix index 4725f0a2f9b7..51f793ac011d 100644 --- a/nixos/modules/virtualisation/linode-image.nix +++ b/nixos/modules/virtualisation/linode-image.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; let @@ -15,27 +10,19 @@ let ]; } ''; - virtualisationOptions = import ./virtualisation-options.nix; in { - imports = [ - ./linode-config.nix - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "linodeImage" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; + imports = [ ./linode-config.nix ]; options = { + virtualisation.linodeImage.diskSize = mkOption { + type = with types; either (enum (singleton "auto")) ints.positive; + default = "auto"; + example = 1536; + description = '' + Size of disk image in MB. + ''; + }; virtualisation.linodeImage.configFile = mkOption { type = with types; nullOr str; @@ -70,7 +57,7 @@ in format = "raw"; partitionTableType = "none"; configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile; - inherit (config.virtualisation) diskSize; + inherit (cfg) diskSize; inherit config lib pkgs; }; }; diff --git a/nixos/modules/virtualisation/oci-image.nix b/nixos/modules/virtualisation/oci-image.nix index 44a6ef7ef6f6..1e2b90bfd46e 100644 --- a/nixos/modules/virtualisation/oci-image.nix +++ b/nixos/modules/virtualisation/oci-image.nix @@ -1,9 +1,4 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: let cfg = config.oci; @@ -12,12 +7,9 @@ in imports = [ ./oci-common.nix ]; config = { - virtualisation.diskSize = lib.mkDefault (8 * 1024); - virtualisation.diskSizeAutoSupported = false; - system.build.OCIImage = import ../../lib/make-disk-image.nix { inherit config lib pkgs; - inherit (config.virtualisation) diskSize; + inherit (cfg) diskSize; name = "oci-image"; configFile = ./oci-config-user.nix; format = "qcow2"; @@ -33,10 +25,7 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; - path = [ - pkgs.coreutils - pkgs.curl - ]; + path = [ pkgs.coreutils pkgs.curl ]; script = '' mkdir -m 0700 -p /root/.ssh if [ -f /root/.ssh/authorized_keys ]; then diff --git a/nixos/modules/virtualisation/oci-options.nix b/nixos/modules/virtualisation/oci-options.nix index 8a1ac4e03446..76f3475a4281 100644 --- a/nixos/modules/virtualisation/oci-options.nix +++ b/nixos/modules/virtualisation/oci-options.nix @@ -1,27 +1,5 @@ +{ config, lib, pkgs, ... }: { - lib, - ... -}: -let - virtualisationOptions = import ./virtualisation-options.nix; -in -{ - imports = [ - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "oci" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; - options = { oci = { efi = lib.mkOption { @@ -31,6 +9,12 @@ in Whether the OCI instance is using EFI. ''; }; + diskSize = lib.mkOption { + type = lib.types.int; + default = 8192; + description = "Size of the disk image created in MB."; + example = "diskSize = 12 * 1024; # 12GiB"; + }; }; }; } diff --git a/nixos/modules/virtualisation/proxmox-image.nix b/nixos/modules/virtualisation/proxmox-image.nix index 2cfc7fa1b530..d390c78432ae 100644 --- a/nixos/modules/virtualisation/proxmox-image.nix +++ b/nixos/modules/virtualisation/proxmox-image.nix @@ -1,31 +1,8 @@ -{ - config, - pkgs, - lib, - ... -}: +{ config, pkgs, lib, ... }: with lib; -let - virtualisationOptions = import ./virtualisation-options.nix; -in -{ - imports = [ - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "proxmoxImage" - "diskSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; +{ options.proxmox = { qemuConf = { # essential configs @@ -77,10 +54,7 @@ in ''; }; bios = mkOption { - type = types.enum [ - "seabios" - "ovmf" - ]; + type = types.enum [ "seabios" "ovmf" ]; default = "seabios"; description = '' Select BIOS implementation (seabios = Legacy BIOS, ovmf = UEFI). @@ -113,6 +87,16 @@ in either "efi" or "hybrid". ''; }; + diskSize = mkOption { + type = types.str; + default = "auto"; + example = "20480"; + description = '' + The size of the disk, in megabytes. + if "auto" size is calculated based on the contents copied to it and + additionalSpace is taken into account. + ''; + }; net0 = mkOption { type = types.commas; default = "virtio=00:00:00:00:00:00,bridge=vmbr0,firewall=1"; @@ -140,13 +124,8 @@ in }; }; qemuExtraConf = mkOption { - type = - with types; - attrsOf (oneOf [ - str - int - ]); - default = { }; + type = with types; attrsOf (oneOf [ str int ]); + default = {}; example = literalExpression '' { cpu = "host"; @@ -158,12 +137,7 @@ in ''; }; partitionTableType = mkOption { - type = types.enum [ - "efi" - "hybrid" - "legacy" - "legacy+gpt" - ]; + type = types.enum [ "efi" "hybrid" "legacy" "legacy+gpt" ]; description = '' Partition table type to use. See make-disk-image.nix partitionTableType for details. Defaults to 'legacy' for 'proxmox.qemuConf.bios="seabios"' (default), other bios values defaults to 'efi'. @@ -211,163 +185,142 @@ in }; }; - config = - let - cfg = config.proxmox; - cfgLine = name: value: '' - ${name}: ${builtins.toString value} - ''; - virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0); - cfgFile = - fileName: properties: - pkgs.writeTextDir fileName '' - # generated by NixOS - ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} - #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw: - ''; + config = let + cfg = config.proxmox; + cfgLine = name: value: '' + ${name}: ${builtins.toString value} + ''; + virtio0Storage = builtins.head (builtins.split ":" cfg.qemuConf.virtio0); + cfgFile = fileName: properties: pkgs.writeTextDir fileName '' + # generated by NixOS + ${lib.concatStrings (lib.mapAttrsToList cfgLine properties)} + #qmdump#map:virtio0:drive-virtio0:${virtio0Storage}:raw: + ''; + inherit (cfg) partitionTableType; + supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; + supportBios = partitionTableType == "legacy" || partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; + hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; + hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; + in { + assertions = [ + { + assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; + message = "systemd-boot requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf"; + message = "'efi' disk partitioning requires 'ovmf' bios"; + } + { + assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy' disk partitioning requires 'seabios' bios"; + } + { + assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios"; + message = "'legacy+gpt' disk partitioning requires 'seabios' bios"; + } + ]; + system.build.VMA = import ../../lib/make-disk-image.nix { + name = "proxmox-${cfg.filenameSuffix}"; inherit (cfg) partitionTableType; - supportEfi = partitionTableType == "efi" || partitionTableType == "hybrid"; - supportBios = - partitionTableType == "legacy" - || partitionTableType == "hybrid" - || partitionTableType == "legacy+gpt"; - hasBootPartition = partitionTableType == "efi" || partitionTableType == "hybrid"; - hasNoFsPartition = partitionTableType == "hybrid" || partitionTableType == "legacy+gpt"; - in - { - assertions = [ - { - assertion = config.boot.loader.systemd-boot.enable -> config.proxmox.qemuConf.bios == "ovmf"; - message = "systemd-boot requires 'ovmf' bios"; - } - { - assertion = partitionTableType == "efi" -> config.proxmox.qemuConf.bios == "ovmf"; - message = "'efi' disk partitioning requires 'ovmf' bios"; - } - { - assertion = partitionTableType == "legacy" -> config.proxmox.qemuConf.bios == "seabios"; - message = "'legacy' disk partitioning requires 'seabios' bios"; - } - { - assertion = partitionTableType == "legacy+gpt" -> config.proxmox.qemuConf.bios == "seabios"; - message = "'legacy+gpt' disk partitioning requires 'seabios' bios"; - } - ]; - system.build.VMA = import ../../lib/make-disk-image.nix { - name = "proxmox-${cfg.filenameSuffix}"; - inherit (cfg) partitionTableType; - postVM = - let - # Build qemu with PVE's patch that adds support for the VMA format - vma = - (pkgs.qemu_kvm.override { - alsaSupport = false; - pulseSupport = false; - sdlSupport = false; - jackSupport = false; - gtkSupport = false; - vncSupport = false; - smartcardSupport = false; - spiceSupport = false; - ncursesSupport = false; - libiscsiSupport = false; - tpmSupport = false; - numaSupport = false; - seccompSupport = false; - guestAgentSupport = false; - }).overrideAttrs - (super: rec { - # Check https://github.com/proxmox/pve-qemu/tree/master for the version - # of qemu and patch to use - version = "9.0.0"; - src = pkgs.fetchurl { - url = "https://download.qemu.org/qemu-${version}.tar.xz"; - hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk="; - }; - patches = [ - # Proxmox' VMA tool is published as a particular patch upon QEMU - "${ - pkgs.fetchFromGitHub { - owner = "proxmox"; - repo = "pve-qemu"; - rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8"; - hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc="; - } - }/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch" - ]; + postVM = let + # Build qemu with PVE's patch that adds support for the VMA format + vma = (pkgs.qemu_kvm.override { + alsaSupport = false; + pulseSupport = false; + sdlSupport = false; + jackSupport = false; + gtkSupport = false; + vncSupport = false; + smartcardSupport = false; + spiceSupport = false; + ncursesSupport = false; + libiscsiSupport = false; + tpmSupport = false; + numaSupport = false; + seccompSupport = false; + guestAgentSupport = false; + }).overrideAttrs ( super: rec { + # Check https://github.com/proxmox/pve-qemu/tree/master for the version + # of qemu and patch to use + version = "9.0.0"; + src = pkgs.fetchurl { + url = "https://download.qemu.org/qemu-${version}.tar.xz"; + hash = "sha256-MnCKxmww2MiSYz6paMdxwcdtWX1w3erSGg0izPOG2mk="; + }; + patches = [ + # Proxmox' VMA tool is published as a particular patch upon QEMU + "${pkgs.fetchFromGitHub { + owner = "proxmox"; + repo = "pve-qemu"; + rev = "14afbdd55f04d250bd679ca1ad55d3f47cd9d4c8"; + hash = "sha256-lSJQA5SHIHfxJvMLIID2drv2H43crTPMNIlIT37w9Nc="; + }}/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch" + ]; - buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; - nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ]; + buildInputs = super.buildInputs ++ [ pkgs.libuuid ]; + nativeBuildInputs = super.nativeBuildInputs ++ [ pkgs.perl ]; - }); - in - '' - ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \ - -c ${ - cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf) - }/qemu-server.conf drive-virtio0=$diskImage - rm $diskImage - ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma" - mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/ + }); + in + '' + ${vma}/bin/vma create "vzdump-qemu-${cfg.filenameSuffix}.vma" \ + -c ${cfgFile "qemu-server.conf" (cfg.qemuConf // cfg.qemuExtraConf)}/qemu-server.conf drive-virtio0=$diskImage + rm $diskImage + ${pkgs.zstd}/bin/zstd "vzdump-qemu-${cfg.filenameSuffix}.vma" + mv "vzdump-qemu-${cfg.filenameSuffix}.vma.zst" $out/ - mkdir -p $out/nix-support - echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products - ''; - inherit (cfg.qemuConf) additionalSpace bootSize; - inherit (config.virtualisation) diskSize; - format = "raw"; - inherit config lib pkgs; - }; - - boot = { - growPartition = true; - kernelParams = [ "console=ttyS0" ]; - loader.grub = { - device = lib.mkDefault ( - if (hasNoFsPartition || supportBios) then - # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), - # which will be used the bootloader, do not set it as loader.grub.device. - # GRUB installation fails, unless the whole disk is selected. - "/dev/vda" - else - "nodev" - ); - efiSupport = lib.mkDefault supportEfi; - efiInstallAsRemovable = lib.mkDefault supportEfi; - }; - - loader.timeout = 0; - initrd.availableKernelModules = [ - "uas" - "virtio_blk" - "virtio_pci" - ]; - }; - - fileSystems."/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; - fileSystems."/boot" = lib.mkIf hasBootPartition { - device = "/dev/disk/by-label/ESP"; - fsType = "vfat"; - }; - - networking = mkIf cfg.cloudInit.enable { - hostName = mkForce ""; - useDHCP = false; - }; - - services = { - cloud-init = mkIf cfg.cloudInit.enable { - enable = true; - network.enable = true; - }; - sshd.enable = mkDefault true; - qemuGuest.enable = true; - }; - - proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom"; + mkdir -p $out/nix-support + echo "file vma $out/vzdump-qemu-${cfg.filenameSuffix}.vma.zst" > $out/nix-support/hydra-build-products + ''; + inherit (cfg.qemuConf) additionalSpace diskSize bootSize; + format = "raw"; + inherit config lib pkgs; }; + + boot = { + growPartition = true; + kernelParams = [ "console=ttyS0" ]; + loader.grub = { + device = lib.mkDefault (if (hasNoFsPartition || supportBios) then + # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), + # which will be used the bootloader, do not set it as loader.grub.device. + # GRUB installation fails, unless the whole disk is selected. + "/dev/vda" + else + "nodev"); + efiSupport = lib.mkDefault supportEfi; + efiInstallAsRemovable = lib.mkDefault supportEfi; + }; + + loader.timeout = 0; + initrd.availableKernelModules = [ "uas" "virtio_blk" "virtio_pci" ]; + }; + + fileSystems."/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + fileSystems."/boot" = lib.mkIf hasBootPartition { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + + networking = mkIf cfg.cloudInit.enable { + hostName = mkForce ""; + useDHCP = false; + }; + + services = { + cloud-init = mkIf cfg.cloudInit.enable { + enable = true; + network.enable = true; + }; + sshd.enable = mkDefault true; + qemuGuest.enable = true; + }; + + proxmox.qemuExtraConf.${cfg.cloudInit.device} = "${cfg.cloudInit.defaultStorage}:vm-9999-cloudinit,media=cdrom"; + }; } diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 7b9b5086dbb9..153dc877352a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -4,13 +4,7 @@ # `config'. By default, the Nix store is shared read-only with the # host, which makes (re)building VMs very efficient. -{ - config, - lib, - pkgs, - options, - ... -}: +{ config, lib, pkgs, options, ... }: with lib; @@ -28,262 +22,235 @@ let consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles; - driveOpts = - { ... }: - { + driveOpts = { ... }: { - options = { + options = { - file = mkOption { - type = types.str; - description = "The file image used for this drive."; - }; + file = mkOption { + type = types.str; + description = "The file image used for this drive."; + }; - driveExtraOpts = mkOption { - type = types.attrsOf types.str; - default = { }; - description = "Extra options passed to drive flag."; - }; + driveExtraOpts = mkOption { + type = types.attrsOf types.str; + default = {}; + description = "Extra options passed to drive flag."; + }; - deviceExtraOpts = mkOption { - type = types.attrsOf types.str; - default = { }; - description = "Extra options passed to device flag."; - }; - - name = mkOption { - type = types.nullOr types.str; - default = null; - description = "A name for the drive. Must be unique in the drives list. Not passed to qemu."; - }; + deviceExtraOpts = mkOption { + type = types.attrsOf types.str; + default = {}; + description = "Extra options passed to device flag."; + }; + name = mkOption { + type = types.nullOr types.str; + default = null; + description = "A name for the drive. Must be unique in the drives list. Not passed to qemu."; }; }; - selectPartitionTableLayout = - { useEFIBoot, useDefaultFilesystems }: - if useDefaultFilesystems then if useEFIBoot then "efi" else "legacy" else "none"; + }; - driveCmdline = - idx: - { - file, - driveExtraOpts, - deviceExtraOpts, - ... - }: + selectPartitionTableLayout = { useEFIBoot, useDefaultFilesystems }: + if useDefaultFilesystems then + if useEFIBoot then "efi" else "legacy" + else "none"; + + driveCmdline = idx: { file, driveExtraOpts, deviceExtraOpts, ... }: let drvId = "drive${toString idx}"; - mkKeyValue = generators.mkKeyValueDefault { } "="; + mkKeyValue = generators.mkKeyValueDefault {} "="; mkOpts = opts: concatStringsSep "," (mapAttrsToList mkKeyValue opts); - driveOpts = mkOpts ( - driveExtraOpts - // { - index = idx; - id = drvId; - "if" = "none"; - inherit file; - } - ); - deviceOpts = mkOpts ( - deviceExtraOpts - // { - drive = drvId; - } - ); + driveOpts = mkOpts (driveExtraOpts // { + index = idx; + id = drvId; + "if" = "none"; + inherit file; + }); + deviceOpts = mkOpts (deviceExtraOpts // { + drive = drvId; + }); device = if cfg.qemu.diskInterface == "scsi" then "-device lsi53c895a -device scsi-hd,${deviceOpts}" else "-device virtio-blk-pci,${deviceOpts}"; in - "-drive ${driveOpts} ${device}"; + "-drive ${driveOpts} ${device}"; drivesCmdLine = drives: concatStringsSep "\\\n " (imap1 driveCmdline drives); # Shell script to start the VM. - startVM = '' - #! ${hostPkgs.runtimeShell} + startVM = + '' + #! ${hostPkgs.runtimeShell} - export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH + export PATH=${makeBinPath [ hostPkgs.coreutils ]}''${PATH:+:}$PATH - set -e + set -e - # Create an empty ext4 filesystem image. A filesystem image does not - # contain a partition table but just a filesystem. - createEmptyFilesystemImage() { - local name=$1 - local size=$2 - local temp=$(mktemp) - ${qemu}/bin/qemu-img create -f raw "$temp" "$size" - ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp" - ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name" - rm "$temp" - } + # Create an empty ext4 filesystem image. A filesystem image does not + # contain a partition table but just a filesystem. + createEmptyFilesystemImage() { + local name=$1 + local size=$2 + local temp=$(mktemp) + ${qemu}/bin/qemu-img create -f raw "$temp" "$size" + ${hostPkgs.e2fsprogs}/bin/mkfs.ext4 -L ${rootFilesystemLabel} "$temp" + ${qemu}/bin/qemu-img convert -f raw -O qcow2 "$temp" "$name" + rm "$temp" + } - NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" + NIX_DISK_IMAGE=$(readlink -f "''${NIX_DISK_IMAGE:-${toString config.virtualisation.diskImage}}") || test -z "$NIX_DISK_IMAGE" - if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then - echo "Disk image do not exist, creating the virtualisation disk image..." + if test -n "$NIX_DISK_IMAGE" && ! test -e "$NIX_DISK_IMAGE"; then + echo "Disk image do not exist, creating the virtualisation disk image..." - ${ - if (cfg.useBootLoader && cfg.useDefaultFilesystems) then - '' - # Create a writable qcow2 image using the systemImage as a backing - # image. + ${if (cfg.useBootLoader && cfg.useDefaultFilesystems) then '' + # Create a writable qcow2 image using the systemImage as a backing + # image. - # CoW prevent size to be attributed to an image. - # FIXME: raise this issue to upstream. - ${qemu}/bin/qemu-img create \ - -f qcow2 \ - -b ${systemImage}/nixos.qcow2 \ - -F qcow2 \ - "$NIX_DISK_IMAGE" - '' - else if cfg.useDefaultFilesystems then - '' - createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" - '' - else - '' - # Create an empty disk image without a filesystem. - ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" - '' - } - echo "Virtualisation disk image created." - fi - - # Create a directory for storing temporary data of the running VM. - if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then - TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) - fi - - ${lib.optionalString (cfg.useNixStoreImage) '' - echo "Creating Nix store image..." - - ${hostPkgs.gnutar}/bin/tar --create \ - --absolute-names \ - --verbatim-files-from \ - --transform 'flags=rSh;s|/nix/store/||' \ - --files-from ${ - hostPkgs.closureInfo { - rootPaths = [ - config.system.build.toplevel - regInfo - ]; + # CoW prevent size to be attributed to an image. + # FIXME: raise this issue to upstream. + ${qemu}/bin/qemu-img create \ + -f qcow2 \ + -b ${systemImage}/nixos.qcow2 \ + -F qcow2 \ + "$NIX_DISK_IMAGE" + '' else if cfg.useDefaultFilesystems then '' + createEmptyFilesystemImage "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" + '' else '' + # Create an empty disk image without a filesystem. + ${qemu}/bin/qemu-img create -f qcow2 "$NIX_DISK_IMAGE" "${toString cfg.diskSize}M" + '' } - }/store-paths \ - | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ - --quiet \ - --force-uid=0 \ - --force-gid=0 \ - -L ${nixStoreFilesystemLabel} \ - -U eb176051-bd15-49b7-9e6b-462e0b467019 \ - -T 0 \ - --tar=f \ - "$TMPDIR"/store.img - - echo "Created Nix store image." - ''} - - # Create a directory for exchanging data with the VM. - mkdir -p "$TMPDIR/xchg" - - ${lib.optionalString cfg.useHostCerts '' - mkdir -p "$TMPDIR/certs" - if [ -e "$NIX_SSL_CERT_FILE" ]; then - cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt - else - echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled. + echo "Virtualisation disk image created." fi - ''} - ${lib.optionalString cfg.useEFIBoot '' - # Expose EFI variables, it's useful even when we are not using a bootloader (!). - # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence - # no guard against `useBootLoader`. Examples: - # - testing PXE boot or other EFI applications - # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows - NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}") - # VM needs writable EFI vars - if ! test -e "$NIX_EFI_VARS"; then - ${ - if cfg.efi.keepVariables then - # We still need the EFI var from the make-disk-image derivation - # because our "switch-to-configuration" process might - # write into it and we want to keep this data. - ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"'' + # Create a directory for storing temporary data of the running VM. + if [ -z "$TMPDIR" ] || [ -z "$USE_TMPDIR" ]; then + TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) + fi + + ${lib.optionalString (cfg.useNixStoreImage) '' + echo "Creating Nix store image..." + + ${hostPkgs.gnutar}/bin/tar --create \ + --absolute-names \ + --verbatim-files-from \ + --transform 'flags=rSh;s|/nix/store/||' \ + --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ + | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ + --quiet \ + --force-uid=0 \ + --force-gid=0 \ + -L ${nixStoreFilesystemLabel} \ + -U eb176051-bd15-49b7-9e6b-462e0b467019 \ + -T 0 \ + --tar=f \ + "$TMPDIR"/store.img + + echo "Created Nix store image." + '' + } + + # Create a directory for exchanging data with the VM. + mkdir -p "$TMPDIR/xchg" + + ${lib.optionalString cfg.useHostCerts + '' + mkdir -p "$TMPDIR/certs" + if [ -e "$NIX_SSL_CERT_FILE" ]; then + cp -L "$NIX_SSL_CERT_FILE" "$TMPDIR"/certs/ca-certificates.crt else - ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"'' - } - chmod 0644 "$NIX_EFI_VARS" - fi - ''} + echo \$NIX_SSL_CERT_FILE should point to a valid file if virtualisation.useHostCerts is enabled. + fi + ''} - ${lib.optionalString cfg.tpm.enable '' - NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}") - mkdir -p "$NIX_SWTPM_DIR" - ${lib.getExe cfg.tpm.package} \ - socket \ - --tpmstate dir="$NIX_SWTPM_DIR" \ - --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \ - --pid file="$NIX_SWTPM_DIR"/pid --daemon \ - --tpm2 \ - --log file="$NIX_SWTPM_DIR"/stdout,level=6 + ${lib.optionalString cfg.useEFIBoot + '' + # Expose EFI variables, it's useful even when we are not using a bootloader (!). + # We might be interested in having EFI variable storage present even if we aren't booting via UEFI, hence + # no guard against `useBootLoader`. Examples: + # - testing PXE boot or other EFI applications + # - directbooting LinuxBoot, which `kexec()s` into a UEFI environment that can boot e.g. Windows + NIX_EFI_VARS=$(readlink -f "''${NIX_EFI_VARS:-${config.system.name}-efi-vars.fd}") + # VM needs writable EFI vars + if ! test -e "$NIX_EFI_VARS"; then + ${if cfg.efi.keepVariables then + # We still need the EFI var from the make-disk-image derivation + # because our "switch-to-configuration" process might + # write into it and we want to keep this data. + ''cp ${systemImage}/efi-vars.fd "$NIX_EFI_VARS"'' + else + ''cp ${cfg.efi.variables} "$NIX_EFI_VARS"'' + } + chmod 0644 "$NIX_EFI_VARS" + fi + ''} - # Enable `fdflags` builtin in Bash - # We will need it to perform surgical modification of the file descriptor - # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor - # on exec. - # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec` - # at the end of this script. To work around that, we will just clear - # the `FD_CLOEXEC` bits as a first step. - enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags - # leave a dangling subprocess because the swtpm ctrl socket has - # "terminate" when the last connection disconnects, it stops swtpm. - # When qemu stops, or if the main shell process ends, the coproc will - # get signaled by virtue of the pipe between main and coproc ending. - # Which in turns triggers a socat connect-disconnect to swtpm which - # will stop it. - coproc waitingswtpm { - read || : - echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket - } - # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin. - fdflags -s-cloexec ''${waitingswtpm[1]} - ''} + ${lib.optionalString cfg.tpm.enable '' + NIX_SWTPM_DIR=$(readlink -f "''${NIX_SWTPM_DIR:-${config.system.name}-swtpm}") + mkdir -p "$NIX_SWTPM_DIR" + ${lib.getExe cfg.tpm.package} \ + socket \ + --tpmstate dir="$NIX_SWTPM_DIR" \ + --ctrl type=unixio,path="$NIX_SWTPM_DIR"/socket,terminate \ + --pid file="$NIX_SWTPM_DIR"/pid --daemon \ + --tpm2 \ + --log file="$NIX_SWTPM_DIR"/stdout,level=6 - cd "$TMPDIR" + # Enable `fdflags` builtin in Bash + # We will need it to perform surgical modification of the file descriptor + # passed in the coprocess to remove `FD_CLOEXEC`, i.e. close the file descriptor + # on exec. + # If let alone, it will trigger the coprocess to read EOF when QEMU is `exec` + # at the end of this script. To work around that, we will just clear + # the `FD_CLOEXEC` bits as a first step. + enable -f ${hostPkgs.bash}/lib/bash/fdflags fdflags + # leave a dangling subprocess because the swtpm ctrl socket has + # "terminate" when the last connection disconnects, it stops swtpm. + # When qemu stops, or if the main shell process ends, the coproc will + # get signaled by virtue of the pipe between main and coproc ending. + # Which in turns triggers a socat connect-disconnect to swtpm which + # will stop it. + coproc waitingswtpm { + read || : + echo "" | ${lib.getExe hostPkgs.socat} STDIO UNIX-CONNECT:"$NIX_SWTPM_DIR"/socket + } + # Clear `FD_CLOEXEC` on the coprocess' file descriptor stdin. + fdflags -s-cloexec ''${waitingswtpm[1]} + ''} - ${lib.optionalString (cfg.emptyDiskImages != [ ]) "idx=0"} - ${flip concatMapStrings cfg.emptyDiskImages (size: '' - if ! test -e "empty$idx.qcow2"; then - ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" - fi - idx=$((idx + 1)) - '')} + cd "$TMPDIR" + + ${lib.optionalString (cfg.emptyDiskImages != []) "idx=0"} + ${flip concatMapStrings cfg.emptyDiskImages (size: '' + if ! test -e "empty$idx.qcow2"; then + ${qemu}/bin/qemu-img create -f qcow2 "empty$idx.qcow2" "${toString size}M" + fi + idx=$((idx + 1)) + '')} + + # Start QEMU. + exec ${qemu-common.qemuBinary qemu} \ + -name ${config.system.name} \ + -m ${toString config.virtualisation.memorySize} \ + -smp ${toString config.virtualisation.cores} \ + -device virtio-rng-pci \ + ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ + ${concatStringsSep " \\\n " + (mapAttrsToList + (tag: share: "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}") + config.virtualisation.sharedDirectories)} \ + ${drivesCmdLine config.virtualisation.qemu.drives} \ + ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ + $QEMU_OPTS \ + "$@" + ''; - # Start QEMU. - exec ${qemu-common.qemuBinary qemu} \ - -name ${config.system.name} \ - -m ${toString config.virtualisation.memorySize} \ - -smp ${toString config.virtualisation.cores} \ - -device virtio-rng-pci \ - ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ - ${ - concatStringsSep " \\\n " ( - mapAttrsToList ( - tag: share: - "-virtfs local,path=${share.source},security_model=${share.securityModel},mount_tag=${tag}" - ) config.virtualisation.sharedDirectories - ) - } \ - ${drivesCmdLine config.virtualisation.qemu.drives} \ - ${concatStringsSep " \\\n " config.virtualisation.qemu.options} \ - $QEMU_OPTS \ - "$@" - ''; regInfo = hostPkgs.closureInfo { rootPaths = config.virtualisation.additionalPaths; }; @@ -325,243 +292,215 @@ let OVMF = cfg.efi.OVMF; }; - virtualisationOptions = import ./virtualisation-options.nix; - in { imports = [ - ./virtualisation-options.nix ../profiles/qemu-guest.nix - virtualisationOptions.diskSize - (mkRenamedOptionModule - [ - "virtualisation" - "pathsInNixDB" - ] - [ - "virtualisation" - "additionalPaths" - ] - ) - (mkRemovedOptionModule - [ - "virtualisation" - "bootDevice" - ] - "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues." - ) - (mkRemovedOptionModule - [ - "virtualisation" - "efiVars" - ] - "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue" - ) - (mkRemovedOptionModule - [ - "virtualisation" - "persistBootDevice" - ] - "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`" - ) + (mkRenamedOptionModule [ "virtualisation" "pathsInNixDB" ] [ "virtualisation" "additionalPaths" ]) + (mkRemovedOptionModule [ "virtualisation" "bootDevice" ] "This option was renamed to `virtualisation.rootDevice`, as it was incorrectly named and misleading. Take the time to review what you want to do and look at the new options like `virtualisation.{bootLoaderDevice, bootPartition}`, open an issue in case of issues.") + (mkRemovedOptionModule [ "virtualisation" "efiVars" ] "This option was removed, it is possible to provide a template UEFI variable with `virtualisation.efi.variables` ; if this option is important to you, open an issue") + (mkRemovedOptionModule [ "virtualisation" "persistBootDevice" ] "Boot device is always persisted if you use a bootloader through the root disk image ; if this does not work for your usecase, please examine carefully what `virtualisation.{bootDevice, rootDevice, bootPartition}` options offer you and open an issue explaining your need.`") ]; options = { virtualisation.fileSystems = options.fileSystems; - virtualisation.memorySize = mkOption { - type = types.ints.positive; - default = 1024; - description = '' - The memory size in megabytes of the virtual machine. - ''; - }; - - virtualisation.msize = mkOption { - type = types.ints.positive; - default = 16384; - description = '' - The msize (maximum packet size) option passed to 9p file systems, in - bytes. Increasing this should increase performance significantly, - at the cost of higher RAM usage. - ''; - }; - - virtualisation.diskImage = mkOption { - type = types.nullOr types.str; - default = "./${config.system.name}.qcow2"; - defaultText = literalExpression ''"./''${config.system.name}.qcow2"''; - description = '' - Path to the disk image containing the root filesystem. - The image will be created on startup if it does not - exist. - - If null, a tmpfs will be used as the root filesystem and - the VM's state will not be persistent. - ''; - }; - - virtualisation.bootLoaderDevice = mkOption { - type = types.path; - default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; - defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; - example = "/dev/disk/by-id/virtio-boot-loader-device"; - description = '' - The path (inside th VM) to the device to boot from when legacy booting. - ''; - }; - - virtualisation.bootPartition = mkOption { - type = types.nullOr types.path; - default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null; - defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null''; - example = "/dev/disk/by-label/esp"; - description = '' - The path (inside the VM) to the device containing the EFI System Partition (ESP). - - If you are *not* booting from a UEFI firmware, this value is, by - default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`. - ''; - }; - - virtualisation.rootDevice = mkOption { - type = types.nullOr types.path; - default = "/dev/disk/by-label/${rootFilesystemLabel}"; - defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; - example = "/dev/disk/by-label/nixos"; - description = '' - The path (inside the VM) to the device containing the root filesystem. - ''; - }; - - virtualisation.emptyDiskImages = mkOption { - type = types.listOf types.ints.positive; - default = [ ]; - description = '' - Additional disk images to provide to the VM. The value is - a list of size in megabytes of each disk. These disks are - writeable by the VM. - ''; - }; - - virtualisation.graphics = mkOption { - type = types.bool; - default = true; - description = '' - Whether to run QEMU with a graphics window, or in nographic mode. - Serial console will be enabled on both settings, but this will - change the preferred console. - ''; - }; - - virtualisation.resolution = mkOption { - type = options.services.xserver.resolutions.type.nestedTypes.elemType; - default = { - x = 1024; - y = 768; + virtualisation.memorySize = + mkOption { + type = types.ints.positive; + default = 1024; + description = '' + The memory size in megabytes of the virtual machine. + ''; }; - description = '' - The resolution of the virtual machine display. - ''; - }; - virtualisation.cores = mkOption { - type = types.ints.positive; - default = 1; - description = '' - Specify the number of cores the guest is permitted to use. - The number can be higher than the available cores on the - host system. - ''; - }; + virtualisation.msize = + mkOption { + type = types.ints.positive; + default = 16384; + description = '' + The msize (maximum packet size) option passed to 9p file systems, in + bytes. Increasing this should increase performance significantly, + at the cost of higher RAM usage. + ''; + }; - virtualisation.sharedDirectories = mkOption { - type = types.attrsOf ( - types.submodule { - options.source = mkOption { - type = types.str; - description = "The path of the directory to share, can be a shell variable"; - }; - options.target = mkOption { - type = types.path; - description = "The mount point of the directory inside the virtual machine"; - }; - options.securityModel = mkOption { - type = types.enum [ - "passthrough" - "mapped-xattr" - "mapped-file" - "none" - ]; - default = "mapped-xattr"; - description = '' - The security model to use for this share: + virtualisation.diskSize = + mkOption { + type = types.ints.positive; + default = 1024; + description = '' + The disk size in megabytes of the virtual machine. + ''; + }; - - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root) - - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes - - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools - - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership - ''; - }; - } - ); - default = { }; - example = { - my-share = { - source = "/path/to/be/shared"; - target = "/mnt/shared"; + virtualisation.diskImage = + mkOption { + type = types.nullOr types.str; + default = "./${config.system.name}.qcow2"; + defaultText = literalExpression ''"./''${config.system.name}.qcow2"''; + description = '' + Path to the disk image containing the root filesystem. + The image will be created on startup if it does not + exist. + + If null, a tmpfs will be used as the root filesystem and + the VM's state will not be persistent. + ''; + }; + + virtualisation.bootLoaderDevice = + mkOption { + type = types.path; + default = "/dev/disk/by-id/virtio-${rootDriveSerialAttr}"; + defaultText = literalExpression ''/dev/disk/by-id/virtio-${rootDriveSerialAttr}''; + example = "/dev/disk/by-id/virtio-boot-loader-device"; + description = '' + The path (inside th VM) to the device to boot from when legacy booting. + ''; }; + + virtualisation.bootPartition = + mkOption { + type = types.nullOr types.path; + default = if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null; + defaultText = literalExpression ''if cfg.useEFIBoot then "/dev/disk/by-label/${espFilesystemLabel}" else null''; + example = "/dev/disk/by-label/esp"; + description = '' + The path (inside the VM) to the device containing the EFI System Partition (ESP). + + If you are *not* booting from a UEFI firmware, this value is, by + default, `null`. The ESP is mounted to `boot.loader.efi.efiSysMountpoint`. + ''; }; - description = '' - An attributes set of directories that will be shared with the - virtual machine using VirtFS (9P filesystem over VirtIO). - The attribute name will be used as the 9P mount tag. - ''; - }; - virtualisation.additionalPaths = mkOption { - type = types.listOf types.path; - default = [ ]; - description = '' - A list of paths whose closure should be made available to - the VM. + virtualisation.rootDevice = + mkOption { + type = types.nullOr types.path; + default = "/dev/disk/by-label/${rootFilesystemLabel}"; + defaultText = literalExpression ''/dev/disk/by-label/${rootFilesystemLabel}''; + example = "/dev/disk/by-label/nixos"; + description = '' + The path (inside the VM) to the device containing the root filesystem. + ''; + }; - When 9p is used, the closure is registered in the Nix - database in the VM. All other paths in the host Nix store - appear in the guest Nix store as well, but are considered - garbage (because they are not registered in the Nix - database of the guest). + virtualisation.emptyDiskImages = + mkOption { + type = types.listOf types.ints.positive; + default = []; + description = '' + Additional disk images to provide to the VM. The value is + a list of size in megabytes of each disk. These disks are + writeable by the VM. + ''; + }; - When {option}`virtualisation.useNixStoreImage` is - set, the closure is copied to the Nix store image. - ''; - }; + virtualisation.graphics = + mkOption { + type = types.bool; + default = true; + description = '' + Whether to run QEMU with a graphics window, or in nographic mode. + Serial console will be enabled on both settings, but this will + change the preferred console. + ''; + }; + + virtualisation.resolution = + mkOption { + type = options.services.xserver.resolutions.type.nestedTypes.elemType; + default = { x = 1024; y = 768; }; + description = '' + The resolution of the virtual machine display. + ''; + }; + + virtualisation.cores = + mkOption { + type = types.ints.positive; + default = 1; + description = '' + Specify the number of cores the guest is permitted to use. + The number can be higher than the available cores on the + host system. + ''; + }; + + virtualisation.sharedDirectories = + mkOption { + type = types.attrsOf + (types.submodule { + options.source = mkOption { + type = types.str; + description = "The path of the directory to share, can be a shell variable"; + }; + options.target = mkOption { + type = types.path; + description = "The mount point of the directory inside the virtual machine"; + }; + options.securityModel = mkOption { + type = types.enum [ "passthrough" "mapped-xattr" "mapped-file" "none" ]; + default = "mapped-xattr"; + description = '' + The security model to use for this share: + + - `passthrough`: files are stored using the same credentials as they are created on the guest (this requires QEMU to run as root) + - `mapped-xattr`: some of the file attributes like uid, gid, mode bits and link target are stored as file attributes + - `mapped-file`: the attributes are stored in the hidden .virtfs_metadata directory. Directories exported by this security model cannot interact with other unix tools + - `none`: same as "passthrough" except the sever won't report failures if it fails to set file attributes like ownership + ''; + }; + }); + default = { }; + example = { + my-share = { source = "/path/to/be/shared"; target = "/mnt/shared"; }; + }; + description = '' + An attributes set of directories that will be shared with the + virtual machine using VirtFS (9P filesystem over VirtIO). + The attribute name will be used as the 9P mount tag. + ''; + }; + + virtualisation.additionalPaths = + mkOption { + type = types.listOf types.path; + default = []; + description = '' + A list of paths whose closure should be made available to + the VM. + + When 9p is used, the closure is registered in the Nix + database in the VM. All other paths in the host Nix store + appear in the guest Nix store as well, but are considered + garbage (because they are not registered in the Nix + database of the guest). + + When {option}`virtualisation.useNixStoreImage` is + set, the closure is copied to the Nix store image. + ''; + }; virtualisation.forwardPorts = mkOption { - type = types.listOf ( - types.submodule { + type = types.listOf + (types.submodule { options.from = mkOption { - type = types.enum [ - "host" - "guest" - ]; + type = types.enum [ "host" "guest" ]; default = "host"; description = '' - Controls the direction in which the ports are mapped: + Controls the direction in which the ports are mapped: - - `"host"` means traffic from the host ports - is forwarded to the given guest port. - - `"guest"` means traffic from the guest ports - is forwarded to the given host port. - ''; + - `"host"` means traffic from the host ports + is forwarded to the given guest port. + - `"guest"` means traffic from the guest ports + is forwarded to the given host port. + ''; }; options.proto = mkOption { - type = types.enum [ - "tcp" - "udp" - ]; + type = types.enum [ "tcp" "udp" ]; default = "tcp"; description = "The protocol to forward."; }; @@ -583,10 +522,10 @@ in type = types.port; description = "The guest port to be mapped."; }; - } - ); - default = [ ]; - example = lib.literalExpression '' + }); + default = []; + example = lib.literalExpression + '' [ # forward local port 2222 -> 22, to ssh into the VM { from = "host"; host.port = 2222; guest.port = 22; } @@ -596,121 +535,122 @@ in host.address = "127.0.0.1"; host.port = 80; } ] - ''; + ''; description = '' - When using the SLiRP user networking (default), this option allows to - forward ports to/from the host/guest. + When using the SLiRP user networking (default), this option allows to + forward ports to/from the host/guest. - ::: {.warning} - If the NixOS firewall on the virtual machine is enabled, you also - have to open the guest ports to enable the traffic between host and - guest. - ::: + ::: {.warning} + If the NixOS firewall on the virtual machine is enabled, you also + have to open the guest ports to enable the traffic between host and + guest. + ::: - ::: {.note} - Currently QEMU supports only IPv4 forwarding. - ::: - ''; + ::: {.note} + Currently QEMU supports only IPv4 forwarding. + ::: + ''; }; - virtualisation.restrictNetwork = mkOption { - type = types.bool; - default = false; - example = true; - description = '' - If this option is enabled, the guest will be isolated, i.e. it will - not be able to contact the host and no guest IP packets will be - routed over the host to the outside. This option does not affect - any explicitly set forwarding rules. - ''; - }; + virtualisation.restrictNetwork = + mkOption { + type = types.bool; + default = false; + example = true; + description = '' + If this option is enabled, the guest will be isolated, i.e. it will + not be able to contact the host and no guest IP packets will be + routed over the host to the outside. This option does not affect + any explicitly set forwarding rules. + ''; + }; - virtualisation.vlans = mkOption { - type = types.listOf types.ints.unsigned; - default = if config.virtualisation.interfaces == { } then [ 1 ] else [ ]; - defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; - example = [ - 1 - 2 - ]; - description = '' - Virtual networks to which the VM is connected. Each - number «N» in this list causes - the VM to have a virtual Ethernet interface attached to a - separate virtual network on which it will be assigned IP - address - `192.168.«N».«M»`, - where «M» is the index of this VM - in the list of VMs. - ''; - }; + virtualisation.vlans = + mkOption { + type = types.listOf types.ints.unsigned; + default = if config.virtualisation.interfaces == {} then [ 1 ] else [ ]; + defaultText = lib.literalExpression ''if config.virtualisation.interfaces == {} then [ 1 ] else [ ]''; + example = [ 1 2 ]; + description = '' + Virtual networks to which the VM is connected. Each + number «N» in this list causes + the VM to have a virtual Ethernet interface attached to a + separate virtual network on which it will be assigned IP + address + `192.168.«N».«M»`, + where «M» is the index of this VM + in the list of VMs. + ''; + }; virtualisation.interfaces = mkOption { - default = { }; + default = {}; example = { enp1s0.vlan = 1; }; description = '' Network interfaces to add to the VM. ''; - type = - with types; - attrsOf (submodule { - options = { - vlan = mkOption { - type = types.ints.unsigned; - description = '' - VLAN to which the network interface is connected. - ''; - }; - - assignIP = mkOption { - type = types.bool; - default = false; - description = '' - Automatically assign an IP address to the network interface using the same scheme as - virtualisation.vlans. - ''; - }; + type = with types; attrsOf (submodule { + options = { + vlan = mkOption { + type = types.ints.unsigned; + description = '' + VLAN to which the network interface is connected. + ''; }; - }); + + assignIP = mkOption { + type = types.bool; + default = false; + description = '' + Automatically assign an IP address to the network interface using the same scheme as + virtualisation.vlans. + ''; + }; + }; + }); }; - virtualisation.writableStore = mkOption { - type = types.bool; - default = cfg.mountHostNixStore; - defaultText = literalExpression "cfg.mountHostNixStore"; - description = '' - If enabled, the Nix store in the VM is made writable by - layering an overlay filesystem on top of the host's Nix - store. + virtualisation.writableStore = + mkOption { + type = types.bool; + default = cfg.mountHostNixStore; + defaultText = literalExpression "cfg.mountHostNixStore"; + description = '' + If enabled, the Nix store in the VM is made writable by + layering an overlay filesystem on top of the host's Nix + store. - By default, this is enabled if you mount a host Nix store. - ''; - }; + By default, this is enabled if you mount a host Nix store. + ''; + }; - virtualisation.writableStoreUseTmpfs = mkOption { - type = types.bool; - default = true; - description = '' - Use a tmpfs for the writable store instead of writing to the VM's - own filesystem. - ''; - }; + virtualisation.writableStoreUseTmpfs = + mkOption { + type = types.bool; + default = true; + description = '' + Use a tmpfs for the writable store instead of writing to the VM's + own filesystem. + ''; + }; - networking.primaryIPAddress = mkOption { - type = types.str; - default = ""; - internal = true; - description = "Primary IP address used in /etc/hosts."; - }; + networking.primaryIPAddress = + mkOption { + type = types.str; + default = ""; + internal = true; + description = "Primary IP address used in /etc/hosts."; + }; - networking.primaryIPv6Address = mkOption { - type = types.str; - default = ""; - internal = true; - description = "Primary IPv6 address used in /etc/hosts."; - }; + networking.primaryIPv6Address = + mkOption { + type = types.str; + default = ""; + internal = true; + description = "Primary IPv6 address used in /etc/hosts."; + }; virtualisation.host.pkgs = mkOption { type = options.nixpkgs.pkgs.type; @@ -726,38 +666,31 @@ in }; virtualisation.qemu = { - package = mkOption { - type = types.package; - default = - if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then - hostPkgs.qemu_kvm - else - hostPkgs.qemu; - defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu"; - example = literalExpression "pkgs.qemu_test"; - description = "QEMU package to use."; - }; + package = + mkOption { + type = types.package; + default = if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then hostPkgs.qemu_kvm else hostPkgs.qemu; + defaultText = literalExpression "if hostPkgs.stdenv.hostPlatform.qemuArch == pkgs.stdenv.hostPlatform.qemuArch then config.virtualisation.host.pkgs.qemu_kvm else config.virtualisation.host.pkgs.qemu"; + example = literalExpression "pkgs.qemu_test"; + description = "QEMU package to use."; + }; - options = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "-vga std" ]; - description = '' - Options passed to QEMU. - See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list. - ''; - }; + options = + mkOption { + type = types.listOf types.str; + default = []; + example = [ "-vga std" ]; + description = '' + Options passed to QEMU. + See [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for a complete list. + ''; + }; consoles = mkOption { type = types.listOf types.str; - default = - let - consoles = [ - "${qemu-common.qemuSerialDevice},115200n8" - "tty0" - ]; - in - if cfg.graphics then consoles else reverseList consoles; + default = let + consoles = [ "${qemu-common.qemuSerialDevice},115200n8" "tty0" ]; + in if cfg.graphics then consoles else reverseList consoles; example = [ "console=tty1" ]; description = '' The output console devices to pass to the kernel command line via the @@ -770,158 +703,163 @@ in ''; }; - networkingOptions = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ - "-net nic,netdev=user.0,model=virtio" - "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" - ]; - description = '' - Networking-related command-line options that should be passed to qemu. - The default is to use userspace networking (SLiRP). - See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details. + networkingOptions = + mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "-net nic,netdev=user.0,model=virtio" + "-netdev user,id=user.0,\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + description = '' + Networking-related command-line options that should be passed to qemu. + The default is to use userspace networking (SLiRP). + See the [QEMU Wiki on Networking](https://wiki.qemu.org/Documentation/Networking) for details. - If you override this option, be advised to keep - `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example) - to keep the default runtime behaviour. - ''; - }; + If you override this option, be advised to keep + `''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}` (as seen in the example) + to keep the default runtime behaviour. + ''; + }; - drives = mkOption { - type = types.listOf (types.submodule driveOpts); - description = "Drives passed to qemu."; - }; + drives = + mkOption { + type = types.listOf (types.submodule driveOpts); + description = "Drives passed to qemu."; + }; - diskInterface = mkOption { - type = types.enum [ - "virtio" - "scsi" - "ide" - ]; - default = "virtio"; - example = "scsi"; - description = "The interface used for the virtual hard disks."; - }; + diskInterface = + mkOption { + type = types.enum [ "virtio" "scsi" "ide" ]; + default = "virtio"; + example = "scsi"; + description = "The interface used for the virtual hard disks."; + }; - guestAgent.enable = mkOption { + guestAgent.enable = + mkOption { + type = types.bool; + default = true; + description = '' + Enable the Qemu guest agent. + ''; + }; + + virtioKeyboard = + mkOption { + type = types.bool; + default = true; + description = '' + Enable the virtio-keyboard device. + ''; + }; + }; + + virtualisation.useNixStoreImage = + mkOption { type = types.bool; - default = true; + default = false; description = '' - Enable the Qemu guest agent. + Build and use a disk image for the Nix store, instead of + accessing the host's one through 9p. + + For applications which do a lot of reads from the store, + this can drastically improve performance, but at the cost of + disk space and image build time. + + The Nix store image is built just-in-time right before the VM is + started. Because it does not produce another derivation, the image is + not cached between invocations and never lands in the store or binary + cache. + + If you want a full disk image with a partition table and a root + filesystem instead of only a store image, enable + {option}`virtualisation.useBootLoader` instead. ''; }; - virtioKeyboard = mkOption { + virtualisation.mountHostNixStore = + mkOption { type = types.bool; - default = true; + default = !cfg.useNixStoreImage && !cfg.useBootLoader; + defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader"; description = '' - Enable the virtio-keyboard device. + Mount the host Nix store as a 9p mount. ''; }; - }; - - virtualisation.useNixStoreImage = mkOption { - type = types.bool; - default = false; - description = '' - Build and use a disk image for the Nix store, instead of - accessing the host's one through 9p. - - For applications which do a lot of reads from the store, - this can drastically improve performance, but at the cost of - disk space and image build time. - - The Nix store image is built just-in-time right before the VM is - started. Because it does not produce another derivation, the image is - not cached between invocations and never lands in the store or binary - cache. - - If you want a full disk image with a partition table and a root - filesystem instead of only a store image, enable - {option}`virtualisation.useBootLoader` instead. - ''; - }; - - virtualisation.mountHostNixStore = mkOption { - type = types.bool; - default = !cfg.useNixStoreImage && !cfg.useBootLoader; - defaultText = literalExpression "!cfg.useNixStoreImage && !cfg.useBootLoader"; - description = '' - Mount the host Nix store as a 9p mount. - ''; - }; virtualisation.directBoot = { - enable = mkOption { + enable = + mkOption { + type = types.bool; + default = !cfg.useBootLoader; + defaultText = "!cfg.useBootLoader"; + description = '' + If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader. + Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html) + + This is enabled by default. + If you want to test netboot, consider disabling this option. + Enable a bootloader with {option}`virtualisation.useBootLoader` if you need. + + Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU. + Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`. + They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details + For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`. + + This will not (re-)boot correctly into a system that has switched to a different configuration on disk. + ''; + }; + initrd = + mkOption { + type = types.str; + default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; + defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}"; + description = '' + In direct boot situations, you may want to influence the initrd to load + to use your own customized payload. + + This is useful if you want to test the netboot image without + testing the firmware or the loading part. + ''; + }; + }; + + virtualisation.useBootLoader = + mkOption { type = types.bool; - default = !cfg.useBootLoader; - defaultText = "!cfg.useBootLoader"; + default = false; description = '' - If enabled, the virtual machine will boot directly into the kernel instead of through a bootloader. - Read more about this feature in the [QEMU documentation on Direct Linux Boot](https://qemu-project.gitlab.io/qemu/system/linuxboot.html) + Use a boot loader to boot the system. + This allows, among other things, testing the boot loader. - This is enabled by default. - If you want to test netboot, consider disabling this option. - Enable a bootloader with {option}`virtualisation.useBootLoader` if you need. + If disabled, the kernel and initrd are directly booted, + forgoing any bootloader. - Relevant parameters such as those set in `boot.initrd` and `boot.kernelParams` are also passed to QEMU. - Additional parameters can be supplied on invocation through the environment variable `$QEMU_KERNEL_PARAMS`. - They are added to the `-append` option, see [QEMU User Documentation](https://www.qemu.org/docs/master/system/qemu-manpage) for details - For example, to let QEMU use the parent terminal as the serial console, set `QEMU_KERNEL_PARAMS="console=ttyS0"`. - - This will not (re-)boot correctly into a system that has switched to a different configuration on disk. - ''; + Check the documentation on {option}`virtualisation.directBoot.enable` for details. + ''; }; - initrd = mkOption { - type = types.str; - default = "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; - defaultText = "\${config.system.build.initialRamdisk}/\${config.system.boot.loader.initrdFile}"; + + virtualisation.useEFIBoot = + mkOption { + type = types.bool; + default = false; description = '' - In direct boot situations, you may want to influence the initrd to load - to use your own customized payload. - - This is useful if you want to test the netboot image without - testing the firmware or the loading part. - ''; - }; - }; - - virtualisation.useBootLoader = mkOption { - type = types.bool; - default = false; - description = '' - Use a boot loader to boot the system. - This allows, among other things, testing the boot loader. - - If disabled, the kernel and initrd are directly booted, - forgoing any bootloader. - - Check the documentation on {option}`virtualisation.directBoot.enable` for details. - ''; - }; - - virtualisation.useEFIBoot = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, the virtual machine will provide a EFI boot - manager. - useEFIBoot is ignored if useBootLoader == false. - ''; - }; + If enabled, the virtual machine will provide a EFI boot + manager. + useEFIBoot is ignored if useBootLoader == false. + ''; + }; virtualisation.efi = { OVMF = mkOption { type = types.package; - default = - (pkgs.OVMF.override { - secureBoot = cfg.useSecureBoot; - }).fd; - defaultText = '' - (pkgs.OVMF.override { - secureBoot = cfg.useSecureBoot; - }).fd''; + default = (pkgs.OVMF.override { + secureBoot = cfg.useSecureBoot; + }).fd; + defaultText = ''(pkgs.OVMF.override { + secureBoot = cfg.useSecureBoot; + }).fd''; description = "OVMF firmware package, defaults to OVMF configured with secure boot if needed."; }; @@ -930,8 +868,8 @@ in default = cfg.efi.OVMF.firmware; defaultText = literalExpression "cfg.efi.OVMF.firmware"; description = '' - Firmware binary for EFI implementation, defaults to OVMF. - ''; + Firmware binary for EFI implementation, defaults to OVMF. + ''; }; variables = mkOption { @@ -939,9 +877,9 @@ in default = cfg.efi.OVMF.variables; defaultText = literalExpression "cfg.efi.OVMF.variables"; description = '' - Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. - Defaults to OVMF. - ''; + Platform-specific flash binary for EFI variables, implementation-dependent to the EFI firmware. + Defaults to OVMF. + ''; }; keepVariables = mkOption { @@ -959,16 +897,13 @@ in deviceModel = mkOption { type = types.str; - default = ( - { - "i686-linux" = "tpm-tis"; - "x86_64-linux" = "tpm-tis"; - "ppc64-linux" = "tpm-spapr"; - "armv7-linux" = "tpm-tis-device"; - "aarch64-linux" = "tpm-tis-device"; - } - .${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU") - ); + default = ({ + "i686-linux" = "tpm-tis"; + "x86_64-linux" = "tpm-tis"; + "ppc64-linux" = "tpm-spapr"; + "armv7-linux" = "tpm-tis-device"; + "aarch64-linux" = "tpm-tis-device"; + }.${pkgs.stdenv.hostPlatform.system} or (throw "Unsupported system for TPM2 emulation in QEMU")); defaultText = '' Based on the guest platform Linux system: @@ -981,97 +916,97 @@ in }; }; - virtualisation.useDefaultFilesystems = mkOption { - type = types.bool; - default = true; - description = '' - If enabled, the boot disk of the virtual machine will be - formatted and mounted with the default filesystems for - testing. Swap devices and LUKS will be disabled. + virtualisation.useDefaultFilesystems = + mkOption { + type = types.bool; + default = true; + description = '' + If enabled, the boot disk of the virtual machine will be + formatted and mounted with the default filesystems for + testing. Swap devices and LUKS will be disabled. - If disabled, a root filesystem has to be specified and - formatted (for example in the initial ramdisk). - ''; - }; + If disabled, a root filesystem has to be specified and + formatted (for example in the initial ramdisk). + ''; + }; - virtualisation.useSecureBoot = mkOption { - type = types.bool; - default = false; - description = '' - Enable Secure Boot support in the EFI firmware. - ''; - }; + virtualisation.useSecureBoot = + mkOption { + type = types.bool; + default = false; + description = '' + Enable Secure Boot support in the EFI firmware. + ''; + }; - virtualisation.bios = mkOption { - type = types.nullOr types.package; - default = null; - description = '' - An alternate BIOS (such as `qboot`) with which to start the VM. - Should contain a file named `bios.bin`. - If `null`, QEMU's builtin SeaBIOS will be used. - ''; - }; + virtualisation.bios = + mkOption { + type = types.nullOr types.package; + default = null; + description = '' + An alternate BIOS (such as `qboot`) with which to start the VM. + Should contain a file named `bios.bin`. + If `null`, QEMU's builtin SeaBIOS will be used. + ''; + }; - virtualisation.useHostCerts = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, when `NIX_SSL_CERT_FILE` is set on the host, - pass the CA certificates from the host to the VM. - ''; - }; + virtualisation.useHostCerts = + mkOption { + type = types.bool; + default = false; + description = '' + If enabled, when `NIX_SSL_CERT_FILE` is set on the host, + pass the CA certificates from the host to the VM. + ''; + }; }; config = { assertions = - lib.concatLists ( - lib.flip lib.imap cfg.forwardPorts ( - i: rule: [ - { - assertion = rule.from == "guest" -> rule.proto == "tcp"; - message = '' + lib.concatLists (lib.flip lib.imap cfg.forwardPorts (i: rule: + [ + { assertion = rule.from == "guest" -> rule.proto == "tcp"; + message = + '' Invalid virtualisation.forwardPorts..proto: Guest forwarding supports only TCP connections. ''; - } - { - assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address; - message = '' + } + { assertion = rule.from == "guest" -> lib.hasPrefix "10.0.2." rule.guest.address; + message = + '' Invalid virtualisation.forwardPorts..guest.address: The address must be in the default VLAN (10.0.2.0/24). ''; - } - ] - ) - ) - ++ [ - { - assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047; - message = '' - virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. - ''; - } - { - assertion = - cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default; - message = '' - You changed the default of `virtualisation.directBoot.initrd` but you are not - using QEMU direct boot. This initrd will not be used in your current - boot configuration. + } + ])) ++ [ + { assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047; + message = '' + virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max. + ''; + } + { assertion = cfg.directBoot.enable || cfg.directBoot.initrd == options.virtualisation.directBoot.initrd.default; + message = + '' + You changed the default of `virtualisation.directBoot.initrd` but you are not + using QEMU direct boot. This initrd will not be used in your current + boot configuration. - Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot. + Either do not mutate `virtualisation.directBoot.initrd` or enable direct boot. - If you have a more advanced usecase, please open an issue or a pull request. - ''; - } - ]; + If you have a more advanced usecase, please open an issue or a pull request. + ''; + } + ]; - warnings = optional (cfg.directBoot.enable && cfg.useBootLoader) '' - You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering - `useBootLoader` useless. You might want to disable one of those options. - ''; + warnings = + optional (cfg.directBoot.enable && cfg.useBootLoader) + '' + You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering + `useBootLoader` useless. You might want to disable one of those options. + ''; # In UEFI boot, we use a EFI-only partition table layout, thus GRUB will fail when trying to install # legacy and UEFI. In order to avoid this, we have to put "nodev" to force UEFI-only installs. @@ -1089,11 +1024,12 @@ in # allow `system.build.toplevel' to be included. (If we had a direct # reference to ${regInfo} here, then we would get a cyclic # dependency.) - boot.postBootCommands = lib.mkIf config.nix.enable '' - if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then - ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} - fi - ''; + boot.postBootCommands = lib.mkIf config.nix.enable + '' + if [[ "$(cat /proc/cmdline)" =~ regInfo=([^ ]*) ]]; then + ${config.nix.package.out}/bin/nix-store --load-db < ''${BASH_REMATCH[1]} + fi + ''; boot.initrd.availableKernelModules = optional (cfg.qemu.diskInterface == "scsi") "sym53c8xx" @@ -1130,20 +1066,14 @@ in virtualisation.qemu.networkingOptions = let - forwardingOptions = flip concatMapStrings cfg.forwardPorts ( - { - proto, - from, - host, - guest, - }: - if from == "host" then - "hostfwd=${proto}:${host.address}:${toString host.port}-" - + "${guest.address}:${toString guest.port}," - else - "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" - + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," - ); + forwardingOptions = flip concatMapStrings cfg.forwardPorts + ({ proto, from, host, guest }: + if from == "host" + then "hostfwd=${proto}:${host.address}:${toString host.port}-" + + "${guest.address}:${toString guest.port}," + else "'guestfwd=${proto}:${guest.address}:${toString guest.port}-" + + "cmd:${pkgs.netcat}/bin/nc ${host.address} ${toString host.port}'," + ); restrictNetworkOption = lib.optionalString cfg.restrictNetwork "restrict=on,"; in [ @@ -1156,29 +1086,20 @@ in "-device virtio-keyboard" ]) (mkIf pkgs.stdenv.hostPlatform.isx86 [ - "-usb" - "-device usb-tablet,bus=usb-bus.0" + "-usb" "-device usb-tablet,bus=usb-bus.0" ]) (mkIf pkgs.stdenv.hostPlatform.isAarch [ - "-device virtio-gpu-pci" - "-device usb-ehci,id=usb0" - "-device usb-kbd" - "-device usb-tablet" + "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" + ]) + (let + alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); + # Replace all non-alphanumeric characters with underscores + sanitizeShellIdent = s: concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); + in mkIf cfg.directBoot.enable [ + "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" + "-initrd ${cfg.directBoot.initrd}" + ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' ]) - ( - let - alphaNumericChars = lowerChars ++ upperChars ++ (map toString (range 0 9)); - # Replace all non-alphanumeric characters with underscores - sanitizeShellIdent = - s: - concatMapStrings (c: if builtins.elem c alphaNumericChars then c else "_") (stringToCharacters s); - in - mkIf cfg.directBoot.enable [ - "-kernel \${NIXPKGS_QEMU_KERNEL_${sanitizeShellIdent config.system.name}:-${config.system.build.toplevel}/kernel}" - "-initrd ${cfg.directBoot.initrd}" - ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"'' - ] - ) (mkIf cfg.useEFIBoot [ "-drive if=pflash,format=raw,unit=0,readonly=on,file=${cfg.efi.firmware}" "-drive if=pflash,format=raw,unit=1,readonly=off,file=$NIX_EFI_VARS" @@ -1195,32 +1116,26 @@ in "-device ${cfg.tpm.deviceModel},tpmdev=tpm_dev_0" ]) (mkIf (pkgs.stdenv.hostPlatform.isx86 && cfg.efi.OVMF.systemManagementModeRequired) [ - "-machine" - "q35,smm=on" - "-global" - "driver=cfi.pflash01,property=secure,value=on" + "-machine" "q35,smm=on" + "-global" "driver=cfi.pflash01,property=secure,value=on" ]) ]; virtualisation.qemu.drives = mkMerge [ - (mkIf (cfg.diskImage != null) [ - { - name = "root"; - file = ''"$NIX_DISK_IMAGE"''; - driveExtraOpts.cache = "writeback"; - driveExtraOpts.werror = "report"; - deviceExtraOpts.bootindex = "1"; - deviceExtraOpts.serial = rootDriveSerialAttr; - } - ]) - (mkIf cfg.useNixStoreImage [ - { - name = "nix-store"; - file = ''"$TMPDIR"/store.img''; - deviceExtraOpts.bootindex = "2"; - driveExtraOpts.format = "raw"; - } - ]) + (mkIf (cfg.diskImage != null) [{ + name = "root"; + file = ''"$NIX_DISK_IMAGE"''; + driveExtraOpts.cache = "writeback"; + driveExtraOpts.werror = "report"; + deviceExtraOpts.bootindex = "1"; + deviceExtraOpts.serial = rootDriveSerialAttr; + }]) + (mkIf cfg.useNixStoreImage [{ + name = "nix-store"; + file = ''"$TMPDIR"/store.img''; + deviceExtraOpts.bootindex = "2"; + driveExtraOpts.format = "raw"; + }]) (imap0 (idx: _: { file = "$(pwd)/empty${toString idx}.qcow2"; driveExtraOpts.werror = "report"; @@ -1234,115 +1149,91 @@ in # override by setting `virtualisation.fileSystems = lib.mkForce { };`. fileSystems = lib.mkIf (cfg.fileSystems != { }) (mkVMOverride cfg.fileSystems); - virtualisation.diskSizeAutoSupported = false; - - virtualisation.fileSystems = - let - mkSharedDir = tag: share: { + virtualisation.fileSystems = let + mkSharedDir = tag: share: + { name = share.target; value.device = tag; value.fsType = "9p"; value.neededForBoot = true; - value.options = [ - "trans=virtio" - "version=9p2000.L" - "msize=${toString cfg.msize}" - ] ++ lib.optional (tag == "nix-store") "cache=loose"; + value.options = + [ "trans=virtio" "version=9p2000.L" "msize=${toString cfg.msize}" ] + ++ lib.optional (tag == "nix-store") "cache=loose"; }; - in - lib.mkMerge [ - (lib.mapAttrs' mkSharedDir cfg.sharedDirectories) - { - "/" = lib.mkIf cfg.useDefaultFilesystems ( - if cfg.diskImage == null then - { - device = "tmpfs"; - fsType = "tmpfs"; - } - else - { - device = cfg.rootDevice; - fsType = "ext4"; - } - ); - "/tmp" = lib.mkIf config.boot.tmp.useTmpfs { - device = "tmpfs"; - fsType = "tmpfs"; - neededForBoot = true; - # Sync with systemd's tmp.mount; - options = [ - "mode=1777" - "strictatime" - "nosuid" - "nodev" - "size=${toString config.boot.tmp.tmpfsSize}" - ]; + in lib.mkMerge [ + (lib.mapAttrs' mkSharedDir cfg.sharedDirectories) + { + "/" = lib.mkIf cfg.useDefaultFilesystems (if cfg.diskImage == null then { + device = "tmpfs"; + fsType = "tmpfs"; + } else { + device = cfg.rootDevice; + fsType = "ext4"; + }); + "/tmp" = lib.mkIf config.boot.tmp.useTmpfs { + device = "tmpfs"; + fsType = "tmpfs"; + neededForBoot = true; + # Sync with systemd's tmp.mount; + options = [ "mode=1777" "strictatime" "nosuid" "nodev" "size=${toString config.boot.tmp.tmpfsSize}" ]; + }; + "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) (if cfg.writableStore then { + overlay = { + lowerdir = [ "/nix/.ro-store" ]; + upperdir = "/nix/.rw-store/upper"; + workdir = "/nix/.rw-store/work"; }; - "/nix/store" = lib.mkIf (cfg.useNixStoreImage || cfg.mountHostNixStore) ( - if cfg.writableStore then - { - overlay = { - lowerdir = [ "/nix/.ro-store" ]; - upperdir = "/nix/.rw-store/upper"; - workdir = "/nix/.rw-store/work"; - }; - } - else - { - device = "/nix/.ro-store"; - options = [ "bind" ]; - } - ); - "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { - device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; - fsType = "erofs"; - neededForBoot = true; - options = [ "ro" ]; - }; - "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { - fsType = "tmpfs"; - options = [ "mode=0755" ]; - neededForBoot = true; - }; - "${config.boot.loader.efi.efiSysMountPoint}" = - lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) - { - device = cfg.bootPartition; - fsType = "vfat"; - }; - } - ]; + } else { + device = "/nix/.ro-store"; + options = [ "bind" ]; + }); + "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { + device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; + fsType = "erofs"; + neededForBoot = true; + options = [ "ro" ]; + }; + "/nix/.rw-store" = lib.mkIf (cfg.writableStore && cfg.writableStoreUseTmpfs) { + fsType = "tmpfs"; + options = [ "mode=0755" ]; + neededForBoot = true; + }; + "${config.boot.loader.efi.efiSysMountPoint}" = lib.mkIf (cfg.useBootLoader && cfg.bootPartition != null) { + device = cfg.bootPartition; + fsType = "vfat"; + }; + } + ]; swapDevices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) [ ]; - boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) { }; + boot.initrd.luks.devices = (if cfg.useDefaultFilesystems then mkVMOverride else mkDefault) {}; # Don't run ntpd in the guest. It should get the correct time from KVM. services.timesyncd.enable = false; services.qemuGuest.enable = cfg.qemu.guestAgent.enable; - system.build.vm = - hostPkgs.runCommand "nixos-vm" - { - preferLocalBuild = true; - meta.mainProgram = "run-${config.system.name}-vm"; - } - '' - mkdir -p $out/bin - ln -s ${config.system.build.toplevel} $out/system - ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm - ''; + system.build.vm = hostPkgs.runCommand "nixos-vm" { + preferLocalBuild = true; + meta.mainProgram = "run-${config.system.name}-vm"; + } + '' + mkdir -p $out/bin + ln -s ${config.system.build.toplevel} $out/system + ln -s ${hostPkgs.writeScript "run-nixos-vm" startVM} $out/bin/run-${config.system.name}-vm + ''; # When building a regular system configuration, override whatever # video driver the host uses. services.xserver.videoDrivers = mkVMOverride [ "modesetting" ]; services.xserver.defaultDepth = mkVMOverride 0; services.xserver.resolutions = mkVMOverride [ cfg.resolution ]; - services.xserver.monitorSection = '' - # Set a higher refresh rate so that resolutions > 800x600 work. - HorizSync 30-140 - VertRefresh 50-160 - ''; + services.xserver.monitorSection = + '' + # Set a higher refresh rate so that resolutions > 800x600 work. + HorizSync 30-140 + VertRefresh 50-160 + ''; # Wireless won't work in the VM. networking.wireless.enable = mkVMOverride false; @@ -1353,10 +1244,8 @@ in networking.usePredictableInterfaceNames = false; - system.requiredKernelConfig = - with config.lib.kernelConfig; - [ - (isEnabled "VIRTIO_BLK") + system.requiredKernelConfig = with config.lib.kernelConfig; + [ (isEnabled "VIRTIO_BLK") (isEnabled "VIRTIO_PCI") (isEnabled "VIRTIO_NET") (isEnabled "EXT4_FS") @@ -1368,12 +1257,10 @@ in (isYes "NET_CORE") (isYes "INET") (isYes "NETWORK_FILESYSTEMS") - ] - ++ optionals (!cfg.graphics) [ + ] ++ optionals (!cfg.graphics) [ (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") - ] - ++ optionals (cfg.writableStore) [ + ] ++ optionals (cfg.writableStore) [ (isEnabled "OVERLAY_FS") ]; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index de9be384a7fe..1c8b9b99c01c 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -1,37 +1,23 @@ -{ - config, - lib, - pkgs, - ... -}: +{ config, lib, pkgs, ... }: with lib; let cfg = config.virtualbox; - virtualisationOptions = import ./virtualisation-options.nix; -in -{ - imports = [ - virtualisationOptions.diskSize - (lib.mkRenamedOptionModuleWith { - sinceRelease = 2411; - from = [ - "virtualisation" - "virtualbox" - "baseImageSize" - ]; - to = [ - "virtualisation" - "diskSize" - ]; - }) - ]; +in { options = { virtualbox = { + baseImageSize = mkOption { + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 50 * 1024; + description = '' + The size of the VirtualBox base image in MiB. + ''; + }; baseImageFreeSpace = mkOption { type = with types; int; default = 30 * 1024; @@ -68,14 +54,7 @@ in ''; }; params = mkOption { - type = - with types; - attrsOf (oneOf [ - str - int - bool - (listOf str) - ]); + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); example = { audio = "alsa"; rtcuseutc = "on"; @@ -88,21 +67,11 @@ in ''; }; exportParams = mkOption { - type = - with types; - listOf (oneOf [ - str - int - bool - (listOf str) - ]); + type = with types; listOf (oneOf [ str int bool (listOf str) ]); example = [ - "--vsys" - "0" - "--vendor" - "ACME Inc." + "--vsys" "0" "--vendor" "ACME Inc." ]; - default = [ ]; + default = []; description = '' Parameters passed to the Virtualbox export command. @@ -120,25 +89,23 @@ in mountPoint = "/home/demo/storage"; size = 100 * 1024; }; - type = types.nullOr ( - types.submodule { - options = { - size = mkOption { - type = types.int; - description = "Size in MiB"; - }; - label = mkOption { - type = types.str; - default = "vm-extra-storage"; - description = "Label for the disk partition"; - }; - mountPoint = mkOption { - type = types.str; - description = "Path where to mount this disk."; - }; + type = types.nullOr (types.submodule { + options = { + size = mkOption { + type = types.int; + description = "Size in MiB"; }; - } - ); + label = mkOption { + type = types.str; + default = "vm-extra-storage"; + description = "Label for the disk partition"; + }; + mountPoint = mkOption { + type = types.str; + description = "Path where to mount this disk."; + }; + }; + }); }; postExportCommands = mkOption { type = types.lines; @@ -158,14 +125,7 @@ in ''; }; storageController = mkOption { - type = - with types; - attrsOf (oneOf [ - str - int - bool - (listOf str) - ]); + type = with types; attrsOf (oneOf [ str int bool (listOf str) ]); example = { name = "SCSI"; add = "scsi"; @@ -192,8 +152,6 @@ in config = { - virtualisation.diskSize = lib.mkDefault (50 * 1024); - virtualbox.params = mkMerge [ (mapAttrs (name: mkDefault) { acpi = "on"; @@ -217,83 +175,80 @@ in inherit pkgs lib config; partitionTableType = "legacy"; - inherit (config.virtualisation) diskSize; + diskSize = cfg.baseImageSize; additionalSpace = "${toString cfg.baseImageFreeSpace}M"; - postVM = '' - export HOME=$PWD - export PATH=${pkgs.virtualbox}/bin:$PATH + postVM = + '' + export HOME=$PWD + export PATH=${pkgs.virtualbox}/bin:$PATH - echo "converting image to VirtualBox format..." - VBoxManage convertfromraw $diskImage disk.vdi + echo "converting image to VirtualBox format..." + VBoxManage convertfromraw $diskImage disk.vdi - ${optionalString (cfg.extraDisk != null) '' - echo "creating extra disk: data-disk.raw" - dataDiskImage=data-disk.raw - truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage + ${optionalString (cfg.extraDisk != null) '' + echo "creating extra disk: data-disk.raw" + dataDiskImage=data-disk.raw + truncate -s ${toString cfg.extraDisk.size}M $dataDiskImage - parted --script $dataDiskImage -- \ - mklabel msdos \ - mkpart primary ext4 1MiB -1 - eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) - mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K - echo "creating extra disk: data-disk.vdi" - VBoxManage convertfromraw $dataDiskImage data-disk.vdi - ''} + parted --script $dataDiskImage -- \ + mklabel msdos \ + mkpart primary ext4 1MiB -1 + eval $(partx $dataDiskImage -o START,SECTORS --nr 1 --pairs) + mkfs.ext4 -F -L ${cfg.extraDisk.label} $dataDiskImage -E offset=$(sectorsToBytes $START) $(sectorsToKilobytes $SECTORS)K + echo "creating extra disk: data-disk.vdi" + VBoxManage convertfromraw $dataDiskImage data-disk.vdi + ''} - echo "creating VirtualBox VM..." - vmName="${cfg.vmName}"; - VBoxManage createvm --name "$vmName" --register \ - --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"} - VBoxManage modifyvm "$vmName" \ - --memory ${toString cfg.memorySize} \ - ${lib.cli.toGNUCommandLineShell { } cfg.params} - VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} - VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ - --medium disk.vdi - ${optionalString (cfg.extraDisk != null) '' - VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ - --medium data-disk.vdi - ''} + echo "creating VirtualBox VM..." + vmName="${cfg.vmName}"; + VBoxManage createvm --name "$vmName" --register \ + --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"} + VBoxManage modifyvm "$vmName" \ + --memory ${toString cfg.memorySize} \ + ${lib.cli.toGNUCommandLineShell { } cfg.params} + VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController} + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \ + --medium disk.vdi + ${optionalString (cfg.extraDisk != null) '' + VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 1 --device 0 --type hdd \ + --medium data-disk.vdi + ''} - echo "exporting VirtualBox VM..." - mkdir -p $out - fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} - ${cfg.postExportCommands} + echo "exporting VirtualBox VM..." + mkdir -p $out + fn="$out/${cfg.vmFileName}" + VBoxManage export "$vmName" --output "$fn" --options manifest ${escapeShellArgs cfg.exportParams} + ${cfg.postExportCommands} - rm -v $diskImage + rm -v $diskImage - mkdir -p $out/nix-support - echo "file ova $fn" >> $out/nix-support/hydra-build-products - ''; + mkdir -p $out/nix-support + echo "file ova $fn" >> $out/nix-support/hydra-build-products + ''; }; - fileSystems = - { - "/" = { - device = "/dev/disk/by-label/nixos"; - autoResize = true; - fsType = "ext4"; - }; - } - // (lib.optionalAttrs (cfg.extraDisk != null) { - ${cfg.extraDisk.mountPoint} = { - device = "/dev/disk/by-label/" + cfg.extraDisk.label; - autoResize = true; - fsType = "ext4"; - }; - }); + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + autoResize = true; + fsType = "ext4"; + }; + } // (lib.optionalAttrs (cfg.extraDisk != null) { + ${cfg.extraDisk.mountPoint} = { + device = "/dev/disk/by-label/" + cfg.extraDisk.label; + autoResize = true; + fsType = "ext4"; + }; + }); boot.growPartition = true; boot.loader.grub.device = "/dev/sda"; - swapDevices = [ - { - device = "/var/swap"; - size = 2048; - } - ]; + swapDevices = [{ + device = "/var/swap"; + size = 2048; + }]; virtualisation.virtualbox.guest.enable = true; diff --git a/nixos/modules/virtualisation/virtualisation-options.nix b/nixos/modules/virtualisation/virtualisation-options.nix deleted file mode 100644 index 5040a7916d84..000000000000 --- a/nixos/modules/virtualisation/virtualisation-options.nix +++ /dev/null @@ -1,60 +0,0 @@ -# This modules declares shared options for virtual machines, -# containers and anything else in `virtualisation`. -# -# This is useful to declare e.g. defaults for -# `virtualisation.diskSize` once, while building multiple -# different image formats of a NixOS configuration. -# -# Additional options can be migrated over time from -# `modules/virtualisation/qemu-vm.nix` and others. -# Please keep defaults and descriptions here generic -# and independent of i.e. hypervisor-specific notes -# and defaults where. -# Those can be added in the consuming modules where needed. -# needed. -let - _file = ./virtualisation-options.nix; - key = _file; -in -{ - diskSize = - { lib, config, ... }: - let - t = lib.types; - in - { - inherit _file key; - - options = { - virtualisation.diskSizeAutoSupported = lib.mkOption { - type = t.bool; - default = true; - description = '' - Whether the current image builder or vm runner supports `virtualisation.diskSize = "auto".` - ''; - internal = true; - }; - - virtualisation.diskSize = lib.mkOption { - type = t.either (t.enum [ "auto" ]) t.ints.positive; - default = "auto"; - description = '' - The disk size in megabytes of the virtual machine. - ''; - }; - }; - - config = - let - inherit (config.virtualisation) diskSize diskSizeAutoSupported; - in - { - assertions = [ - { - assertion = diskSize != "auto" || diskSizeAutoSupported; - message = "Setting virtualisation.diskSize to `auto` is not supported by the current image build or vm runner; use an explicit size."; - } - ]; - }; - }; -} diff --git a/nixos/release.nix b/nixos/release.nix index dc131dcba52c..eeca73ea4c55 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -312,7 +312,7 @@ in rec { [ configuration versionModule ./maintainers/scripts/ec2/amazon-image.nix - ({ ... }: { amazonImage.virtualisation.diskSize = "auto"; }) + ({ ... }: { amazonImage.sizeMB = "auto"; }) ]; }).config.system.build.amazonImage) From 5c53389d0c951cb1029729b068cb5fec59a7e507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 01:15:56 +0000 Subject: [PATCH 272/481] minikube: 1.33.1 -> 1.34.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 90f94c459742..ad018b0b5e61 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.33.1"; + version = "1.34.0"; - vendorHash = "sha256-VHl6CKPWqahX70GHbZE6SVa8XPfiC912DvsOteH2B0w="; + vendorHash = "sha256-gw5Ol7Gp26KyIaiMvwik8FJpABpMT86vpFnZnAJ6hhs="; doCheck = false; @@ -25,7 +25,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-z0wNngEzddxpeeLyQVA2yRC5SfYvU5G66V95sVmW6bA="; + sha256 = "sha256-Z7x3MOQUF3a19X4SSiIUfSJ3xl3482eKH700m/9pqcU="; }; postPatch = ( From c751311f1015e58c833a0fe9971068aa3448231b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 01:17:16 +0000 Subject: [PATCH 273/481] mpris-notifier: 0.1.7 -> 0.1.9 --- pkgs/by-name/mp/mpris-notifier/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mp/mpris-notifier/package.nix b/pkgs/by-name/mp/mpris-notifier/package.nix index 43f455a37b18..b48c5e6d7e43 100644 --- a/pkgs/by-name/mp/mpris-notifier/package.nix +++ b/pkgs/by-name/mp/mpris-notifier/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "mpris-notifier"; - version = "0.1.7"; + version = "0.1.9"; src = fetchFromGitHub { owner = "l1na-forever"; repo = "mpris-notifier"; rev = "v${version}"; - hash = "sha256-B1nfVsn95oe2FlHFjb9O4tfL/EqsZZ4JGF0mbJcCg2Y="; + hash = "sha256-s7/eN2gn8VmNtrI9zEBASs7jzxgfszJjNlXR7IVr3G4="; }; - cargoHash = "sha256-8WzG712/soPgooyR35L8aFIRfPC2MvV3vCcPbkTgoF0="; + cargoHash = "sha256-DTB1Ranz2oeuWVMuFNe+kjuQFnPqBoDeqxuYFU9svSs="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 8cc8761048be3f86fe18bf073a9632a697bec037 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 01:30:42 +0000 Subject: [PATCH 274/481] plantuml-server: 1.2024.6 -> 1.2024.7 --- pkgs/tools/misc/plantuml-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml-server/default.nix b/pkgs/tools/misc/plantuml-server/default.nix index 7a840caec143..0eed91bdb99e 100644 --- a/pkgs/tools/misc/plantuml-server/default.nix +++ b/pkgs/tools/misc/plantuml-server/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, nixosTests }: let - version = "1.2024.6"; + version = "1.2024.7"; in stdenv.mkDerivation rec { pname = "plantuml-server"; inherit version; src = fetchurl { url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war"; - sha256 = "sha256-5+2Qut9c/UrwfiJXMm2Ix+ABCDCM65L1jpJdamjZ4k4="; + sha256 = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8="; }; dontUnpack = true; From 3960718bd1a74ca0021900ece38b6b79a821da15 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 10 Sep 2024 10:47:22 +0900 Subject: [PATCH 275/481] python312Packages.icalevents: refactor - remove unused input - fix pname misuse - modernize attr names --- pkgs/development/python-modules/icalevents/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/icalevents/default.nix b/pkgs/development/python-modules/icalevents/default.nix index 6b988932ac96..bf89ca6938db 100644 --- a/pkgs/development/python-modules/icalevents/default.nix +++ b/pkgs/development/python-modules/icalevents/default.nix @@ -5,7 +5,6 @@ pythonOlder, pytestCheckHook, poetry-core, - datetime, httplib2, icalendar, python-dateutil, @@ -21,17 +20,16 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "jazzband"; - repo = pname; + repo = "icalevents"; rev = "refs/tags/v${version}"; hash = "sha256-JX4j2CsEY/bHrD7Rb9ru3C4T2e94mpC369nDN6Cv/I0="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ - datetime + dependencies = [ httplib2 icalendar python-dateutil @@ -39,7 +37,6 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - "datetime" "httplib2" "icalendar" "pytz" From 728096d788cfca7546330d5cef6e07f04371ee9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:04:30 +0000 Subject: [PATCH 276/481] python312Packages.django-anymail: 11.1 -> 12.0 --- pkgs/development/python-modules/django-anymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index ca5f881f3a3a..2c69453d7959 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "django-anymail"; - version = "11.1"; + version = "12.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "anymail"; repo = "django-anymail"; rev = "refs/tags/v${version}"; - hash = "sha256-gJrGrezaRY0htS+ouNj1sOBR7jMYvQC1oqn/smzExtc="; + hash = "sha256-TuEEwxwgZVv97Ns4sRWdQjaNymE03nj8CTiU9S6ynZ8="; }; build-system = [ hatchling ]; From 065aa2c8f71b5f115c95b0872585c0611e04774b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:06:58 +0000 Subject: [PATCH 277/481] python312Packages.elementpath: 4.4.0 -> 4.5.0 --- pkgs/development/python-modules/elementpath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index d8a89c437ade..9c2532d6132c 100644 --- a/pkgs/development/python-modules/elementpath/default.nix +++ b/pkgs/development/python-modules/elementpath/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "elementpath"; - version = "4.4.0"; + version = "4.5.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "refs/tags/v${version}"; - hash = "sha256-n1Ps0CybeLeDR5E4UnqmSkbFe0SXyplomEGDchAweSY="; + hash = "sha256-zyJ+UtPTGEziIlucIXN1dIzfN5sfLkeOia7tiqOGFjk="; }; build-system = [ setuptools ]; From c6409268aaf79f9d6902bcf39b4ef2cba6a3969b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:08:46 +0000 Subject: [PATCH 278/481] python312Packages.html2image: 2.0.4.3 -> 2.0.5 --- pkgs/development/python-modules/html2image/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix index 4d7252b1c305..c53b9280eb59 100644 --- a/pkgs/development/python-modules/html2image/default.nix +++ b/pkgs/development/python-modules/html2image/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "html2image"; - version = "2.0.4.3"; + version = "2.0.5"; pyproject = true; src = fetchFromGitHub { owner = "vgalin"; repo = "html2image"; - rev = version; - hash = "sha256-BDl2Kibp1WOAOYNlXa2aaEgQTitk+OZu72OgytciZYI="; + rev = "refs/tags/${version}"; + hash = "sha256-k5y89nUF+fhUj9uzTAPkkAdOb2TsTL2jm/ZXwHlxu/A="; }; postPatch = '' From 6b2772275bea06491cf54c87b375a50b575d811e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:24:01 +0000 Subject: [PATCH 279/481] python312Packages.google-cloud-pubsub: 2.23.0 -> 2.23.1 --- .../python-modules/google-cloud-pubsub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 94b11b4513fc..a564a85d45d6 100644 --- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.23.0"; + version = "2.23.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_pubsub"; inherit version; - hash = "sha256-zz1vKrEbXI38CqfUyuXuHWa0CNlmbxdiycF+JpzYtlg="; + hash = "sha256-4f3nm1tktyEpCvTAIpB6/LuDUS2S9OXDNMORz7sCKss="; }; build-system = [ setuptools ]; From d67593d858e1f759246089cde74592773974578e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 10 Sep 2024 10:05:15 +1000 Subject: [PATCH 280/481] terraform-providers: bump go to 1.23 --- .../networking/cluster/terraform-providers/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 9e4d3d824f7b..2b34e7c6d544 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , buildGoModule +, buildGo123Module , fetchFromGitHub , fetchFromGitLab , callPackage @@ -24,7 +25,7 @@ let , deleteVendor ? false , proxyVendor ? false , mkProviderFetcher ? fetchFromGitHub - , mkProviderGoModule ? buildGoModule + , mkProviderGoModule ? buildGo123Module # "https://registry.terraform.io/providers/vancluever/acme" , homepage ? "" # "registry.terraform.io/vancluever/acme" From fc7f6c316538918b6ff8df99f243f045f28df2bb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:33:21 +0000 Subject: [PATCH 281/481] terraform-providers.aiven: 4.20.0 -> 4.24.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f883b0ff82af..fa9fd569fdc7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,13 +27,13 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-X3KtT4Thsf7bYeZJEUphRiXAlNamabFE0rjS636dJSY=", + "hash": "sha256-cNcF8pyqRR1YEc2RuKhOtcpFDkdFU8OFCYHRhefdHHk=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.20.0", + "rev": "v4.24.0", "spdx": "MIT", - "vendorHash": "sha256-QzbtTp78tROVj8kPYzjP5kBRHASlvqK6xpmRnJF6jsw=" + "vendorHash": "sha256-ENH/TfC/Yv+jjn4giiThfj9SatFxkfwR/Xj3W+FT/Lg=" }, "akamai": { "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", From a05b61a42a8e1d794455ed780b231a62d5d40cf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:33:38 +0000 Subject: [PATCH 282/481] terraform-providers.akamai: 6.2.0 -> 6.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fa9fd569fdc7..61261eeb9232 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -36,13 +36,13 @@ "vendorHash": "sha256-ENH/TfC/Yv+jjn4giiThfj9SatFxkfwR/Xj3W+FT/Lg=" }, "akamai": { - "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", + "hash": "sha256-d4unurf1WYmVx5z698kAeqKslkVH+tM8G4hrCofDtUs=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.2.0", + "rev": "v6.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" + "vendorHash": "sha256-qnKpQpK/AoFOxPiGHkUMqcF5loc0hVbqOuPaDLzj1Es=" }, "alicloud": { "hash": "sha256-WaMvv/NqyblA2rrauZ7p4pHCND6S6/kfBKS/2xIrcjI=", From 8bb1d44ee597feeafae4a61caa2db9e9137abd2d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:35:18 +0000 Subject: [PATCH 283/481] terraform-providers.archive: 2.4.2 -> 2.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 61261eeb9232..ad8c7467d2db 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -63,13 +63,13 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "archive": { - "hash": "sha256-jkqbj7NGrTQeMQcg52JVurV3ce8iosxAJjBGdoQ3PLY=", + "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=", "homepage": "https://registry.terraform.io/providers/hashicorp/archive", "owner": "hashicorp", "repo": "terraform-provider-archive", - "rev": "v2.4.2", + "rev": "v2.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-buKYDNVCIcSDLCrCL4ZAKNQ7HqkH3+/7RHjyyR4dLmU=" + "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok=" }, "argocd": { "hash": "sha256-dHIvMFz5XIxxBvBFsEw8lqi6yVoYM9E4tLIoTY+mdiQ=", From de62478a36dd32d121f82a9dbfcbeadc46235a8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:37:25 +0000 Subject: [PATCH 284/481] terraform-providers.artifactory: 11.1.0 -> 11.9.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ad8c7467d2db..38ca57ce2177 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -81,13 +81,13 @@ "vendorHash": "sha256-yyTU+D4zMDcJPZ9j7a2ZuPjGBCHvED5R0rvevCEaoAI=" }, "artifactory": { - "hash": "sha256-j9TtO8dJltf7SZdlMZaiCWdJbcEPloPbDhYfWcCzgss=", + "hash": "sha256-m6eRhNPxMa08OYYkFDt+Ew2iCkJdI/5aQth9qiE0v4o=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v11.1.0", + "rev": "v11.9.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-nPEN1ee0RmNpgKIlz0jHcHkG6oYZn7LV/Gmmdd9krq8=" + "vendorHash": "sha256-+3EemRl+rKoCg2HpHvjMPvN6ajrDOnO5C98NVGkYdo4=" }, "auth0": { "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", From bb6cb708992278b24db97c0ee1110b3ac5b3e69b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:38:10 +0000 Subject: [PATCH 285/481] terraform-providers.alicloud: 1.226.0 -> 1.230.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 38ca57ce2177..cf30dfd5038d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -45,11 +45,11 @@ "vendorHash": "sha256-qnKpQpK/AoFOxPiGHkUMqcF5loc0hVbqOuPaDLzj1Es=" }, "alicloud": { - "hash": "sha256-WaMvv/NqyblA2rrauZ7p4pHCND6S6/kfBKS/2xIrcjI=", + "hash": "sha256-lVQAkdwrnZrSZlBqNj2BBpQwzI0d5c+NGaKJxVpgQPg=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.226.0", + "rev": "v1.230.0", "spdx": "MPL-2.0", "vendorHash": null }, From d70def76252574602e3d495ddba2ae0558da0796 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:41:57 +0000 Subject: [PATCH 286/481] terraform-providers.cloudscale: 4.3.0 -> 4.4.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cf30dfd5038d..2328b88dbba5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -262,11 +262,11 @@ "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" }, "cloudscale": { - "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", + "hash": "sha256-4RU1CD0WwLMd3NsnJWl2Smc8XBYlP9K8Iev16uqsetE=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MIT", "vendorHash": null }, From c0bf80038d8ad3fd0d917a52c4d325c58f011225 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:41:57 +0000 Subject: [PATCH 287/481] terraform-providers.cloudflare: 4.36.0 -> 4.41.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2328b88dbba5..8f18a74165c5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -234,13 +234,13 @@ "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-7MdXh5SIQwFPL5APmdrkrh++shZRbRUAYrVIHDGjM68=", + "hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.36.0", + "rev": "v4.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-og31UnUsXGgOm2dH0jlvEpvjOnxUlRy04s2TffiVX00=" + "vendorHash": "sha256-uLkoG0m3v1vohXO03nCrfxEhvJYfJOvYSIHsgYCjKtc=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", From b97a34f556d2b5f80eaf818ed404092067126804 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:43:17 +0000 Subject: [PATCH 288/481] terraform-providers.constellix: 0.4.5 -> 0.4.6 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8f18a74165c5..85f6d3478757 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -272,11 +272,11 @@ }, "constellix": { "deleteVendor": true, - "hash": "sha256-ecwXWYrs7XJM1web+kia2ccpvTjxAVFPzav6lLal4e4=", + "hash": "sha256-yDXZ+lizDK+Ds8/Z3jfNLjO7fvlfRhx5y88bMLZCaj0=", "homepage": "https://registry.terraform.io/providers/Constellix/constellix", "owner": "Constellix", "repo": "terraform-provider-constellix", - "rev": "v0.4.5", + "rev": "v0.4.6", "spdx": "MPL-2.0", "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, From 74a60f4ef7707f6d462434e4295178c023b53c03 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:43:19 +0000 Subject: [PATCH 289/481] terraform-providers.consul: 2.20.0 -> 2.21.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 85f6d3478757..d8269ef59620 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -281,13 +281,13 @@ "vendorHash": "sha256-UJHDX/vx3n/RTuQ50Y6TAhpEEFk9yBoaz8yK02E8Fhw=" }, "consul": { - "hash": "sha256-Glgig56QdXZ9VNZx25/60YPChg9MtLq/S95nuAco3m0=", + "hash": "sha256-QiVE1ezwViOjCNhTAfeR5G8hXAHCi19PqwWnBlwhPCc=", "homepage": "https://registry.terraform.io/providers/hashicorp/consul", "owner": "hashicorp", "repo": "terraform-provider-consul", - "rev": "v2.20.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OKKcyx5JAQGMoUMRxIbe3lg825vhwCcWcPNZqo+/gl4=" + "vendorHash": "sha256-hR20+dRvS3tZ6aoTKCHs4zkyE5jWHEh62uLBkVJPA4M=" }, "ct": { "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=", From 4bc1f3a3139f6916cd5297e29738ceaa0767e940 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:44:56 +0000 Subject: [PATCH 290/481] terraform-providers.datadog: 3.40.0 -> 3.44.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d8269ef59620..3854dfcfb1d3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -299,13 +299,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-sWcVMQiSRFyjwYIHUdKQm9sKX279pnA3FVLwUJ3kBKw=", + "hash": "sha256-s1JCno9cpXk0RdovXjTue77Gv9cLX3lB46jYy2xgOOk=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.40.0", + "rev": "v3.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GEZmpCyqZCxsS5aFxEznNscs5CcgQiiPvJweA3mKkRY=" + "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" }, "dexidp": { "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", From 09bf0462143f0722fa5301527a3881a34ea2ade4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:44:58 +0000 Subject: [PATCH 291/481] terraform-providers.digitalocean: 2.39.2 -> 2.40.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3854dfcfb1d3..294e41365bd4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -327,11 +327,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-66bG22xNzJEjCZJ7pHY4OW1vj8qTJIXd0CF/0zLiyug=", + "hash": "sha256-EpT0pL6JrQ9BKL7IyUmEYllRyIFbjJepVvVZdxQhFKs=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.39.2", + "rev": "v2.40.0", "spdx": "MPL-2.0", "vendorHash": null }, From d59bd9bdf0445353990aa975431d9769bbe0e1a0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:45:56 +0000 Subject: [PATCH 292/481] terraform-providers.dnsimple: 1.6.0 -> 1.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 294e41365bd4..65861b3340bc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -354,13 +354,13 @@ "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" }, "dnsimple": { - "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", + "hash": "sha256-19h4x+kxhFwlNUdTmTLjoLRQB7fNBh0CxxoQDGRPPiQ=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.6.0", + "rev": "v1.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Zl98s0+sgs+n/OkrJMsia0MxqO/AGWId8zzY+/n6LXM=" + "vendorHash": "sha256-5445cUKxjNlZcQ6opJKgXgT7I9XUmqbPMB/iKuEBPwg=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", From 72e01602b1e1ee1ccc297fa20cbde2976353ab61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:46:11 +0000 Subject: [PATCH 293/481] terraform-providers.doppler: 1.8.0 -> 1.10.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 65861b3340bc..537139cdec6a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -372,11 +372,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-jDCmIHdfHi+gp3+HGo8Wh+xYiHVU2Zy0lxETKW2rvGA=", + "hash": "sha256-yHWOMDhsqF+DXIKREyx8FftItZiWlWFoRhpub752UtU=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.8.0", + "rev": "v1.10.0", "spdx": "Apache-2.0", "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, From 9a5d30ef013c788b3166fdfe707c3989a97349e5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:47:13 +0000 Subject: [PATCH 294/481] terraform-providers.exoscale: 0.59.1 -> 0.59.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 537139cdec6a..5cd05ba1d118 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -399,11 +399,11 @@ "vendorHash": "sha256-oxtFq1tejyqsY2uEkMjiub1CwdkFpuSVRb1Z2u3CebQ=" }, "exoscale": { - "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", + "hash": "sha256-i7Lp3NhaxVR317vHfdE/2aXAxmKk7u7kETM7JTJr5BI=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.59.1", + "rev": "v0.59.2", "spdx": "MPL-2.0", "vendorHash": null }, From ec92744aff9df625825e650553ccf0832f7c7856 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:47:35 +0000 Subject: [PATCH 295/481] terraform-providers.equinix: 2.0.1 -> 2.4.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5cd05ba1d118..1f5373fdc27b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,13 +390,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-Ipl+POTZRKe9xKR08x/TPm2S7kv6w54im16pp56rWDE=", + "hash": "sha256-Wj/qrc18/wJekWZdNgzheT1hsIlAPTAf/tAIrpw6N9Y=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v2.0.1", + "rev": "v2.4.1", "spdx": "MIT", - "vendorHash": "sha256-oxtFq1tejyqsY2uEkMjiub1CwdkFpuSVRb1Z2u3CebQ=" + "vendorHash": "sha256-5M/ceHvcwAlIhjpYO1JTQVUmuBLa9pT5opwiC/tp6+8=" }, "exoscale": { "hash": "sha256-i7Lp3NhaxVR317vHfdE/2aXAxmKk7u7kETM7JTJr5BI=", From fc7afdd844b4f738e0a7d75826994d431c886c5a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:48:16 +0000 Subject: [PATCH 296/481] terraform-providers.fastly: 5.11.0 -> 5.13.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1f5373fdc27b..d9460d22651f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -417,11 +417,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-FfdXMrGfz+JFEyWfZytIt1R0M/v7JUmkvu4VohF1vSA=", + "hash": "sha256-NzuWXQtaobbkk4oKcs+aT6ONeIsmLZsyRhW3BP7+5Wg=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.11.0", + "rev": "v5.13.0", "spdx": "MPL-2.0", "vendorHash": null }, From 581aefbc62dabeec63b460aef32c65e097567752 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:49:01 +0000 Subject: [PATCH 297/481] terraform-providers.github: 6.2.2 -> 6.2.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d9460d22651f..1754820d27a1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -453,11 +453,11 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-6RAGc1UXebNm24d4+7S0LugvpSVgjIvqa7B6y+pozkA=", + "hash": "sha256-8TP3iw/NeVjq49HhurCULXbAOvP2ye6mZsVe62FxSAE=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.2", + "rev": "v6.2.3", "spdx": "MIT", "vendorHash": null }, From 9508716b02e85926ea9edd8a9d3d758027620462 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:52:44 +0000 Subject: [PATCH 298/481] terraform-providers.google: 5.36.0 -> 6.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1754820d27a1..be89a948eeba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -471,13 +471,13 @@ "vendorHash": "sha256-FrmQsuLinm5Z4+GHC1PV19lt1rfxv3TwQiEUxTvlTtk=" }, "google": { - "hash": "sha256-RJ01+OA3BXMNThRk9aGkYa2jrj3SYgOh9eA5al5wR/Q=", + "hash": "sha256-RIBSJc5wmBXvd+NWaz3oCOClAOqXEOpSXIR8+wYKfk0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.36.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-0SxftrOjmpYK4ud3RweYaW6qgdKwi43D1ZhN470rvVs=" + "vendorHash": "sha256-iRN3qqJHmpLuuAbmaFCj9wFXAHTXK+farkFlkWt1hyU=" }, "google-beta": { "hash": "sha256-r9ndcNxiocRHH++zvEtuIwJ8U2fE5cgndPcYjdhLpEA=", From 8966d1fec6ea19c11fa607563cfbff1070d96e0e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:53:31 +0000 Subject: [PATCH 299/481] terraform-providers.google-beta: 5.36.0 -> 6.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index be89a948eeba..a35c566cf939 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -480,13 +480,13 @@ "vendorHash": "sha256-iRN3qqJHmpLuuAbmaFCj9wFXAHTXK+farkFlkWt1hyU=" }, "google-beta": { - "hash": "sha256-r9ndcNxiocRHH++zvEtuIwJ8U2fE5cgndPcYjdhLpEA=", + "hash": "sha256-CxoWwoR4CVW5sVSOpOmfnn5xECKmbSuSpBWVAhW24D0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.36.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XkpLgFB/974WEbZe34uKrLSEWjinrkmpOFOG7uYDHhg=" + "vendorHash": "sha256-RgquPp7hJQcgXZndl9kojAxunGA3KxSneYACru23WUk=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From b8051616228f510f910ead07d28b04af15ac2862 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:54:38 +0000 Subject: [PATCH 300/481] terraform-providers.gridscale: 1.25.0 -> 1.26.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a35c566cf939..4f748c45df7d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -507,11 +507,11 @@ "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" }, "gridscale": { - "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", + "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": "MPL-2.0", "vendorHash": null }, From d948b79cec0c3c95210d14ebba6e58e5f587dd4f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:55:07 +0000 Subject: [PATCH 301/481] terraform-providers.grafana: 3.2.1 -> 3.7.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4f748c45df7d..c338a51a3ee7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -498,13 +498,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-VEg95n7S4PDWjGPbuADOQWymGDlS4jupQAHo2OCkfAA=", + "hash": "sha256-tUx6L+ESPsa9VWFztNoYAtspnPoNO8QX3AQk3i0VyNc=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v3.2.1", + "rev": "v3.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" + "vendorHash": "sha256-d7ugVKmKQovewfeZF5k5KHbELwCSY9Krknow7q/7HWo=" }, "gridscale": { "hash": "sha256-GVOjkena3zRaOxO3YRYf+gfM2/CRm8VajpuWGTU0F1Y=", From 747110d969369ce7c8e86f0ba859a0edc1e87771 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:55:31 +0000 Subject: [PATCH 302/481] terraform-providers.harbor: 3.10.12 -> 3.10.15 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c338a51a3ee7..d975705957eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -516,11 +516,11 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-dlAjbiSSgTuuZhTML66l4mSa3Rf14G86++RyXUJYbkw=", + "hash": "sha256-JdCBeUYB6rkSNhfTTIoRV8Bz4FnlHJFJxEZZbqyzAyc=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.12", + "rev": "v3.10.15", "spdx": "MIT", "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, From 0943570f1087b1c55a0263a464e5f6931b1c512e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:56:12 +0000 Subject: [PATCH 303/481] terraform-providers.hcloud: 1.47.0 -> 1.48.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d975705957eb..73687dc3fb2d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -525,13 +525,13 @@ "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-2eCHgHh6SVSHqjf+h4tRaD1orzh1LRUNVJdNsfLtZMc=", + "hash": "sha256-td1R2Xeo1QfsNJOwE7cCuzF5OjW4XUQJOVd0LPAXfuE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.47.0", + "rev": "v1.48.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" + "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" }, "helm": { "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", From ff375475f631f974e35b37ad6d9b533155b0c8d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:57:27 +0000 Subject: [PATCH 304/481] terraform-providers.helm: 2.14.0 -> 2.15.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 73687dc3fb2d..1c234e3d1301 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -534,13 +534,13 @@ "vendorHash": "sha256-t9nXq30jRSlx9gMR+s8irDVdSE5tg9ZvMp47HZwEm7w=" }, "helm": { - "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", + "hash": "sha256-82jM8XZF8X7tYbebMXPYNyhNGqQ51zl3WxYWX2ObD1g=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.14.0", + "rev": "v2.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-p6VUNSJKJtPrawdsi8Lgmu0uYjRmsdP4nsOl2L6h3JA=" + "vendorHash": "sha256-QERpwymuz45RiH9SMuAJPyl/z8r0a5Wd8NBMFKV6NjI=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", From 333994761fe9d29b409e965ac9ab6aad5f10bb04 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:58:02 +0000 Subject: [PATCH 305/481] terraform-providers.http: 3.4.3 -> 3.4.4 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1c234e3d1301..1e0bee057ab5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -570,13 +570,13 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-fGJBrgobtDAOPXnAIcmuepgCRVIdSCABQlP+dycAm+E=", + "hash": "sha256-fYbOfsKTah+5pgJdSftZvVlYmBp75o/6ByJO+ayXDhQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.3", + "rev": "v3.4.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" + "vendorHash": "sha256-+U6k+mAVdGWOKzopp0yfaMmKuhqG0Laut+jHap4hBWs=" }, "huaweicloud": { "hash": "sha256-p5vS7rnoBqE81Dhj35xeAs5ja/ekpeVEaNALtxw0/Tc=", From 9cf5a0f359df8bbccd3ddf2adca591666f65fd24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:59:29 +0000 Subject: [PATCH 306/481] terraform-providers.huaweicloud: 1.66.0 -> 1.68.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1e0bee057ab5..913a5bd2f613 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -579,11 +579,11 @@ "vendorHash": "sha256-+U6k+mAVdGWOKzopp0yfaMmKuhqG0Laut+jHap4hBWs=" }, "huaweicloud": { - "hash": "sha256-p5vS7rnoBqE81Dhj35xeAs5ja/ekpeVEaNALtxw0/Tc=", + "hash": "sha256-Qs5/bDIb2SkQn9oXYU0kgpHY2q2obf8h2bN4prsaNrs=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.66.0", + "rev": "v1.68.1", "spdx": "MPL-2.0", "vendorHash": null }, From 3e94cb7c3784a3abcdf242222414c1ac76083c5b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:01:06 +0000 Subject: [PATCH 307/481] terraform-providers.incus: 0.1.2 -> 0.1.4 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 913a5bd2f613..f8c4a94f5828 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -624,13 +624,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-nyL8sWFgTlJjuAYhBuzThCm89UHwYmb+x+A39z2FCj0=", + "hash": "sha256-VHoEUcFwsERC3EKfobTEoWOxuiOEBzEaWXL+mzlTe44=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.2", + "rev": "v0.1.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-81ykw34Qj5qAAa06p7br94bvlIM4uNiKNUI8d+Gw07g=" + "vendorHash": "sha256-7MQi9gJU0RAm9jTiY/YjkEU5QsxSX2lbUC7qvT20mes=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", From 7c404381bab025ed1864af9c4b493b0cc662de63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:02:36 +0000 Subject: [PATCH 308/481] terraform-providers.ibm: 1.67.1 -> 1.69.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f8c4a94f5828..cc42aea1ff89 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -606,13 +606,13 @@ "vendorHash": null }, "ibm": { - "hash": "sha256-91EXK/8Kovq2yqyF5lFgWV/AJMvU6eHCnIBnLpzsQws=", + "hash": "sha256-PgrC6k6xGfGR9DoTBLSbWDjfF5comrpLGxgUIeof1lI=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v1.67.1", + "rev": "v1.69.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ioyfsNgXoQOtzU1eBJkjMw4hgIo5ryFPIFKqOdn4fuk=" + "vendorHash": "sha256-Ve0qfeuDU59W3jCXpNvcZbnLt7OLAreBbGam2Wp/3Ig=" }, "icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", From f41d1c47db7a4713e307845b8e9160a9f333d14a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:03:07 +0000 Subject: [PATCH 309/481] terraform-providers.kafka: 0.7.1 -> 0.8.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc42aea1ff89..98ca73131dfb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -651,13 +651,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-bkZfgA/PgLWC3YXrIgoF2YRgOFQhoT+Seeifg1GvVFY=", + "hash": "sha256-CIA+0BMVPOpsB83QD6QEVOhohzeEFjFYTQ5UE+9MMIY=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.7.1", + "rev": "v0.8.1", "spdx": "MIT", - "vendorHash": "sha256-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" + "vendorHash": "sha256-wfN5tgW/Pqm6PqHLnuON4SQwd7U6DFj7e8HiTSrTGbo=" }, "kafka-connect": { "hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=", From 27a3bc0781b5633c662ff9968c23445deb10f69a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:04:45 +0000 Subject: [PATCH 310/481] terraform-providers.launchdarkly: 2.19.0 -> 2.20.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 98ca73131dfb..c89c593a9d7e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -696,13 +696,13 @@ "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, "launchdarkly": { - "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", + "hash": "sha256-ke7o4I6d1JSsk+/6hk0EXUatnyCnXzb8xdgPX/cr4eM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.19.0", + "rev": "v2.20.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-pO9QTtqA+YG0i+o1+p3PYg8E/mUpzIV3II++CxQcuHE=" + "vendorHash": "sha256-v9N7lj7bEgR5HZm1SO0+DSCmQFVnsRvHPMycYMfpYwo=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", From d4e577f81c734ad0ac6083ae8451c44c579dd0ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:05:03 +0000 Subject: [PATCH 311/481] terraform-providers.kubernetes: 2.31.0 -> 2.32.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c89c593a9d7e..e685c639014f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -687,11 +687,11 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-MlM7OEpzDOmM8BaaGYn6ZSDaIO8IswreOIkLOkbqQHo=", + "hash": "sha256-SXHi6iW946P7EjNOtci2b0ioftxMHtqTIZmTBnHvmU4=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, From 2ab8acee2731c953100c2179972af1e51d5f9152 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:06:49 +0000 Subject: [PATCH 312/481] terraform-providers.lxd: 2.1.0 -> 2.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e685c639014f..bf4fa20efcc1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -741,13 +741,13 @@ "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { - "hash": "sha256-z7AjOKMSf2XnyCQiBcjFY0V9mDLF6Fj54Ck7971Ehio=", + "hash": "sha256-LGho9iCjKn0OR8sbnkduZtLIxcnVwpedvVinA78791c=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.1.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" + "vendorHash": "sha256-J1KWnU0IspjoosI5wIAc8ygOImXlc3tFkhV3yDXoDl4=" }, "mailgun": { "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", From f4ccc6f0f2417c5dcee7e270022486867b9b720e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:06:50 +0000 Subject: [PATCH 313/481] terraform-providers.linode: 2.23.1 -> 2.27.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bf4fa20efcc1..72188bd5c1e5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -714,13 +714,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-X7Uslu8HjJg/Ikz48hg1aIaDNNcr3Xz4gBTPB+y949k=", + "hash": "sha256-4uRKers66pbuft7lWKzBbsE3fFWTfyozWvGjmDke210=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.23.1", + "rev": "v2.27.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lQ1+MVErv0g2Q7PSrO95Qzs0o/0hpL6JKK9E5J1EGic=" + "vendorHash": "sha256-bWyHzN+W3G83V8sjqn1bfLBuB71/O5DuUWsro58A2xs=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From cb6250f5bc834219c78cb4e01d96ed62a3b89f69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:08:02 +0000 Subject: [PATCH 314/481] terraform-providers.migadu: 2024.6.6 -> 2024.9.5 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 72188bd5c1e5..8782f1678311 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -777,13 +777,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-EGVIk828DwYGMkRBGs3Lnt9goYb+biWoZcXmfuy/OPg=", + "hash": "sha256-/VR2pko5ctH/Gz3zUMhmwlZOpxQPu1AgZ3wRddndf6c=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.6.6", + "rev": "2024.9.5", "spdx": "0BSD", - "vendorHash": "sha256-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" + "vendorHash": "sha256-3pPRgmoC0eYFyu/kNpJty45MfIjBMN5uV8l7iQErAns=" }, "minio": { "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", From 377e756024b01cfe1e74f24c0ac1670b21f6df2d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:08:16 +0000 Subject: [PATCH 315/481] terraform-providers.minio: 2.3.2 -> 2.5.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8782f1678311..045e3e79c499 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -786,11 +786,11 @@ "vendorHash": "sha256-3pPRgmoC0eYFyu/kNpJty45MfIjBMN5uV8l7iQErAns=" }, "minio": { - "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", + "hash": "sha256-1f6T5sfrBPgwxKKZMknd3JJd7mv90zuGtXInDPKAg0M=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.3.2", + "rev": "v2.5.0", "spdx": "AGPL-3.0", "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, From 93a905a9d26541254666bf43870dad9a87af0e14 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:09:57 +0000 Subject: [PATCH 316/481] terraform-providers.newrelic: 3.39.1 -> 3.45.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 045e3e79c499..c80230f35a61 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -822,13 +822,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-hJKYz95+i1j1KhDuh5Jcm8cZzBAD3cK5+a5B1vCYBXM=", + "hash": "sha256-Q1wY613U8cdAlHd+mVTKVNO4KBqVm2/HcKp66DTzbII=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.39.1", + "rev": "v3.45.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-EHO78DEZ92WRDP8ZA0M9zdZ8KsPWMA2ljgFY6dX29YM=" + "vendorHash": "sha256-C3dDWWmV7YrorPps0m0V9DQDraID57+vXWg8pBIYXIE=" }, "nomad": { "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", From eaa4c7426eb5538aeec5e158edd51a12b87218f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:09:59 +0000 Subject: [PATCH 317/481] terraform-providers.mongodbatlas: 1.17.3 -> 1.18.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c80230f35a61..934ba7f57a68 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -795,13 +795,13 @@ "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-8A2csdDMS5W0SzVRy7QATWUEDEZqR7gLRDpVAeROsZk=", + "hash": "sha256-ZAgoC6HNBIQP3tCo3+kZh7TyMDi+caPstqB5HpjTa5g=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.17.3", + "rev": "v1.18.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-idXan9/OGEKY+VT2dwWwj+P1fFQIrIs2ghkthz53j/g=" + "vendorHash": "sha256-llbYJi3ghgh9y97ri03a7ZBXSUPMs7f3FLd4iLRRmmk=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", From e62aa6ab30693f1625d84f18afabe97b167d756b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:10:54 +0000 Subject: [PATCH 318/481] terraform-providers.ns1: 2.3.1 -> 2.4.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 934ba7f57a68..d11349f03192 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -840,13 +840,13 @@ "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { - "hash": "sha256-96q68P+d7K4UycCZ0Z5w3HWIcKwsC4/UD6WPU6yyC7M=", + "hash": "sha256-3NDHEpvBlVb3IgkEjJ1g2Jpvy2MbgXSeabuCPlpKZmM=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.3.1", + "rev": "v2.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0RRZF7/NHo9y7SUKZbq8nNU+gFdCb0u4XJgsobNeWsk=" + "vendorHash": "sha256-jTsjVhVEgtI3B+tLl9xLqQsGI2piQc6QA2EHqfVhDxg=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", From 36a2b7daecc5804227b32366f8597ed45ea35f92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:11:04 +0000 Subject: [PATCH 319/481] terraform-providers.nomad: 2.3.0 -> 2.3.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d11349f03192..9a69f328c4d4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -831,13 +831,13 @@ "vendorHash": "sha256-C3dDWWmV7YrorPps0m0V9DQDraID57+vXWg8pBIYXIE=" }, "nomad": { - "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", + "hash": "sha256-OdttxZEY4fiLiK6ReoIFjN3VAvEgARQ9yBAqemVyheU=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.3.0", + "rev": "v2.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" + "vendorHash": "sha256-WTfhKSaSzXOsYH8Aso735y5fYCKEjwMtWto5oZ6lU4s=" }, "ns1": { "hash": "sha256-3NDHEpvBlVb3IgkEjJ1g2Jpvy2MbgXSeabuCPlpKZmM=", From 07293a769d5853bea1fbe7dc9e9551fe7b2e0d0b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:13:47 +0000 Subject: [PATCH 320/481] terraform-providers.okta: 4.9.1 -> 4.10.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9a69f328c4d4..a0b3dcf68e78 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -877,13 +877,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-GHC2HhpyPBQ5gPg/HPmP+Bms6O5mLhdAysKW58FWhwA=", + "hash": "sha256-lSZWAAZWkM2+fgLpbfsHLvu1m6R8LMrtc7hUPdwiioc=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.9.1", + "rev": "v4.10.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-71z33jsQmNQoCVSQCiyjHnfUMtwY+KB5Mn2MHItwGa0=" + "vendorHash": "sha256-8Wez4UkS0LsJTtgepdPpyZHhNZADxvGwOEVu6RLBI0o=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From bae76b713165297ebb7616b74e2edf88138085ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:15:34 +0000 Subject: [PATCH 321/481] terraform-providers.onepassword: 2.1.0 -> 2.1.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a0b3dcf68e78..20f4ef455e32 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -895,11 +895,11 @@ "vendorHash": null }, "onepassword": { - "hash": "sha256-rdS9Udzfc/U7E4CIyySnntOCVBBZL0/GuAiVCI5uMrc=", + "hash": "sha256-u2nSzEKD0o/e0AzeHdKQj3+h7mAt6r5cxaKsPn6nRGo=", "homepage": "https://registry.terraform.io/providers/1Password/onepassword", "owner": "1Password", "repo": "terraform-provider-onepassword", - "rev": "v2.1.0", + "rev": "v2.1.2", "spdx": "MIT", "vendorHash": null }, From 610636d8366b49d3476fc59476e6eddd45ddfc30 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:15:58 +0000 Subject: [PATCH 322/481] terraform-providers.oci: 6.1.0 -> 6.9.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 20f4ef455e32..43f284d41441 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -868,11 +868,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-yiHBWcOE2QxyhzKqjSPvgqAFu0hL13idWXbwkhAhNeE=", + "hash": "sha256-LlRy0i4JGjaeHMQMWUYtKgJOUqm0RFwtyDO+KtQcCRI=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v6.1.0", + "rev": "v6.9.0", "spdx": "MPL-2.0", "vendorHash": null }, From 092bda98a35d15881a64bb07f6d21784d404c917 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:16:46 +0000 Subject: [PATCH 323/481] terraform-providers.openstack: 2.0.0 -> 2.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 43f284d41441..ce393d9c57c6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -913,13 +913,13 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-NSfKyXTuPiEYFE8guWsRcJsKiccMrHJRK4I5REzzIZQ=", + "hash": "sha256-Vt6cFZBfM5sP62zWeyoCuEPU6vRucGG8z7zeQywDA40=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" + "vendorHash": "sha256-UH4LgC4UATpglZ2lYb92LvEeAgqXyDFzujNnaYCYN3g=" }, "opentelekomcloud": { "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", From 4d296f5bf64c7a56780e8ef7a2209b64bd6d948e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:17:20 +0000 Subject: [PATCH 324/481] terraform-providers.opentelekomcloud: 1.36.12 -> 1.36.18 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ce393d9c57c6..cc9e6954b69a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -922,13 +922,13 @@ "vendorHash": "sha256-UH4LgC4UATpglZ2lYb92LvEeAgqXyDFzujNnaYCYN3g=" }, "opentelekomcloud": { - "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", + "hash": "sha256-CXWaIISfDtT6jTdFKE67LiRPlGaq+9fRO77GqIMrZhs=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.12", + "rev": "v1.36.18", "spdx": "MPL-2.0", - "vendorHash": "sha256-PwYc9p8nRe0QkgLKLOeb7KYTLgFiT2JQGsmTfFLzBH4=" + "vendorHash": "sha256-vsK74qZ20VOID5sg7kHjxBXiu1dkyJ961zFf0+QkqH0=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", From 1eddba357050f307e52132d7ca18856cc4de20fb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:17:39 +0000 Subject: [PATCH 325/481] terraform-providers.opsgenie: 0.6.35 -> 0.6.37 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc9e6954b69a..e4e4e6659e3f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -931,11 +931,11 @@ "vendorHash": "sha256-vsK74qZ20VOID5sg7kHjxBXiu1dkyJ961zFf0+QkqH0=" }, "opsgenie": { - "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", + "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=", "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie", "owner": "opsgenie", "repo": "terraform-provider-opsgenie", - "rev": "v0.6.35", + "rev": "v0.6.37", "spdx": "MPL-2.0", "vendorHash": null }, From 601d7937bd9ca8472150d03c579105a9c8f8c947 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:18:28 +0000 Subject: [PATCH 326/481] terraform-providers.ovh: 0.45.0 -> 0.48.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e4e4e6659e3f..a490a67235f7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -940,11 +940,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-346lBl1AnEdZmLEfsPiTW7I6rhOv61t004DBx7gRkF8=", + "hash": "sha256-XVNinT1kjvjrVLB4NXELw1Rf6UZEkX4el+dKzOO0QjY=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.45.0", + "rev": "v0.48.0", "spdx": "MPL-2.0", "vendorHash": null }, From edbdbb031f4613b73dd014dd156067bd39424272 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:18:43 +0000 Subject: [PATCH 327/481] terraform-providers.pagerduty: 3.14.5 -> 3.15.6 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a490a67235f7..3a51745b1995 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -949,11 +949,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-sXFRN05mn5hMIqxhwIvYWlMgkrUGZqi+J29Sq9GRS90=", + "hash": "sha256-+8Ar/PDGSSe9Xs2BoNndrBCXZpgqKHNXz7HNVvok1Eo=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.14.5", + "rev": "v3.15.6", "spdx": "MPL-2.0", "vendorHash": null }, From 6c48acbe5fbbf731af5da7a52b62ec26ebec41bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:19:39 +0000 Subject: [PATCH 328/481] terraform-providers.postgresql: 1.22.0 -> 1.23.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3a51745b1995..d91716e68612 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -976,13 +976,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-UNnAe5alro4dEZ9x2ZDsjybOgHq2IVs8w9rMcMJBm8w=", + "hash": "sha256-v/88uUvILQT0uHRgfwMuLQWw0ma2ELT691kQ9GVjr/A=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.22.0", + "rev": "v1.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-omJjWeCLIdHIySQW8tcDPQ1XPmfWbPDOGwPUedrb8Bw=" + "vendorHash": "sha256-fHNXJGyOWGF7Dwfk14GWmLXSIENsshIHbxkF7iQJNuI=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", From 160172b29de54c62c02eb501ed70da9b1a979094 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:20:02 +0000 Subject: [PATCH 329/481] terraform-providers.project: 1.6.2 -> 1.7.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d91716e68612..c200a4a16c96 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -994,13 +994,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-CuUHTuq2ufSuolpvfkT4Q30tiIGkpuIoYCYqY9EOd9s=", + "hash": "sha256-rxv1owtlc9P9uZDReH0lKFUUTSL+X+HlkWL5FWz3bHw=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.6.2", + "rev": "v1.7.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-UcoTldBVqCPh1SVaZm2aKeRVCVfgE/zGOR7+feDEUM0=" + "vendorHash": "sha256-ld52rPoG4bCfU+qizliuwmz6ncxrhcoAYOEZo5mnCYI=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", From e8583f7c692945115541f2968a99c033146aa83d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:22:23 +0000 Subject: [PATCH 330/481] terraform-providers.rancher2: 4.1.0 -> 5.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c200a4a16c96..db463c15c820 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1021,13 +1021,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-w9oAeE8KuD7kdBFOkNgifaELrxr3X1yKYXFiQLyaGY8=", + "hash": "sha256-n4sEIew7C7tG19paaJjgtCwGt5KhUyoR/OGoLu4Kal8=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v4.1.0", + "rev": "v5.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" + "vendorHash": "sha256-uIyLOqabx8wQurxcG70LHm+jBga+bCNyf5XxGrt5OKA=" }, "random": { "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", From c2a386438bf31e15852a0e1b4e4efbc039881e65 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:22:30 +0000 Subject: [PATCH 331/481] terraform-providers.scaleway: 2.41.3 -> 2.44.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index db463c15c820..94d8a0342b1a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1057,13 +1057,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-VTtS5iqeMzcaVveMlnJZDrXUSf0Ts/FG7STVix08mQs=", + "hash": "sha256-h30SfKtx2l9zp9ZGy1KRoQRmb83B4e48R/URJ2I2J+U=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.41.3", + "rev": "v2.44.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eLQLozDXk83vjfTrsJHQqU3GMZToMwvjadqf+X7OeOU=" + "vendorHash": "sha256-crp1XJRsWBEhRFC1CzLTgBTrTLaM2Y39Mwx+l1mg0Ks=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From e193613b6be0f9e0e0180cc6e402b318f15baff7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:23:16 +0000 Subject: [PATCH 332/481] terraform-providers.selectel: 5.1.1 -> 5.3.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 94d8a0342b1a..7e92cb4548c3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1075,13 +1075,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-yIQdxwkcpFKm2+woHW7yClWAwQr82XaCDFHh6KAOaQI=", + "hash": "sha256-cLN0wNT8Yn+uiaGZFzdDg1ZN4pzm5VHriMgRGZv3ZpU=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v5.1.1", + "rev": "v5.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" + "vendorHash": "sha256-MP44e56j7rLyT4+TbFDfDb5GNc/LzZNLplm1/qqeGiw=" }, "sentry": { "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=", From f87bf47f13df93276eff0a94b046c84fe4c0a3ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:24:01 +0000 Subject: [PATCH 333/481] terraform-providers.signalfx: 9.1.5 -> 9.1.6 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7e92cb4548c3..6f67c05ad146 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1102,13 +1102,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-JPL2VjYIg8qW9kk6QaT3+alWtMvKHXRlqLD6AZ2+cQ0=", + "hash": "sha256-OmM3NvTnT/yZBgBYf15vITJSVOXQ7Vvqn6T6+LXOpbk=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.1.5", + "rev": "v9.1.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-uPAWL2BigYiazZQSScM/J39dLDtYheq2P6l4A9M3rOA=" + "vendorHash": "sha256-h+tusSFbu4jmfu0v1BwRrSoDEPYjXZwQ+YykRUoXlv4=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From 2e9221c178fcba2a7705dd47d8082c306dc48470 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:25:36 +0000 Subject: [PATCH 334/481] terraform-providers.sops: 1.0.0 -> 1.1.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6f67c05ad146..a5d764661ce3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1138,13 +1138,13 @@ "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" }, "sops": { - "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", + "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", "homepage": "https://registry.terraform.io/providers/carlpett/sops", "owner": "carlpett", "repo": "terraform-provider-sops", - "rev": "v1.0.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" + "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { "hash": "sha256-xDkOngj8wPsqZhyYh0oVA9YVwMY+bRnpXL2yjpkN38M=", From 122a6656a76f089b15bfbf9d39e8f49df4586ffb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:25:52 +0000 Subject: [PATCH 335/481] terraform-providers.snowflake: 0.92.0 -> 0.95.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a5d764661ce3..821081883e0b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1129,13 +1129,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-3vC246+XoCfmnEdNFHW8iy0fy5aN+kmaZzgJot4hKs0=", + "hash": "sha256-jIzLT2tQViOdNOQ462fM1SFt0E22QZbUdh33OjmUf+k=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.92.0", + "rev": "v0.95.0", "spdx": "MIT", - "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" + "vendorHash": "sha256-FPIqTXbGLui6QW1bFhwV4rGgo8IUw3XkmryqmjpM5Sw=" }, "sops": { "hash": "sha256-MdsWKV98kWpZpTK5qC7x6vN6cODxeeiVVc+gtlh1s88=", From 002929a52629bfc4760f755d2e5c3b064ace6131 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:26:24 +0000 Subject: [PATCH 336/481] terraform-providers.spacelift: 1.14.0 -> 1.15.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 821081883e0b..91280111b66c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1147,11 +1147,11 @@ "vendorHash": "sha256-YFV+qXD78eajSeagJPgPu+qIktx1Vh/ZT0fUPOBuZyo=" }, "spacelift": { - "hash": "sha256-xDkOngj8wPsqZhyYh0oVA9YVwMY+bRnpXL2yjpkN38M=", + "hash": "sha256-kEfZ1ErNMdUGw1eRiX4SphreCCGMQj1Wj0DLFikTfxI=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.14.0", + "rev": "v1.15.0", "spdx": "MIT", "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" }, From 7f37c505a115051665b0a892911f773cba14beaf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:27:13 +0000 Subject: [PATCH 337/481] terraform-providers.spotinst: 1.180.2 -> 1.190.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 91280111b66c..1b4594640f46 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1156,13 +1156,13 @@ "vendorHash": "sha256-m/J390su2nUpYMXrrYcOfKSjZb5Y23+g24rroLRss4U=" }, "spotinst": { - "hash": "sha256-SOzaTZIBEC9se942ofYHURH8btw38upJtnlDDWmLcTM=", + "hash": "sha256-ChtaZkztmyFPJvtoE+TUPzZyEEoZ6y3o1CgnKsnK6I4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.180.2", + "rev": "v1.190.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mgDWGimTq7AODC+ojipWUgCDKpC/EP/W8x8kbey05mQ=" + "vendorHash": "sha256-JGwBQMsMGxH5ceHOd5CbSQFQdL6u99lHpWFgJUyMYRQ=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", From 931797a4371b90761e9cf439802882de3908b46d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:28:01 +0000 Subject: [PATCH 338/481] terraform-providers.tailscale: 0.16.1 -> 0.16.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1b4594640f46..61d597b6eee1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1201,11 +1201,11 @@ "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, "tailscale": { - "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", + "hash": "sha256-GflanQbIPpS0mxmw7LXeTfPly+CmgpsoLHBIMe6f7xM=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.16.1", + "rev": "v0.16.2", "spdx": "MIT", "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, From 50aad7a50548e3984d73a43ad03e7cbfa145998d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:28:30 +0000 Subject: [PATCH 339/481] terraform-providers.sumologic: 2.31.1 -> 2.31.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 61d597b6eee1..16bb6562a886 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,11 +1192,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-LPJwJ6j/eZzOliHH7Ci49c5CqDckaqSm7ikLKTVhuew=", + "hash": "sha256-e/Vmu+odmn/IasHl6dSy5aYLRi/lTcVjpzJl+YYn1mg=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.31.1", + "rev": "v2.31.3", "spdx": "MPL-2.0", "vendorHash": "sha256-YdWs2orKhbwAZSQYC73t4e/vvVxk8LrBPG9ZC38VcZE=" }, From c8ac262dd2a1262b91ee8d255ee0f406c50a09d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:29:51 +0000 Subject: [PATCH 340/481] terraform-providers.temporalcloud: 0.0.9 -> 0.0.11 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 16bb6562a886..f329f126483f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1219,11 +1219,11 @@ "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-PIqsCdIaFob/C2b1Rem/JYl7bQVvdRecDQDkcAZutz0=", + "hash": "sha256-OD3cCNRZG9wQSu/aFmnVzcUbJyASusM1rt2PdpWKXkI=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.9", + "rev": "v0.0.11", "spdx": "MPL-2.0", "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, From baa896143826867f4612f39b8b251acbb4d04450 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:31:46 +0000 Subject: [PATCH 341/481] terraform-providers.tfe: 0.56.0 -> 0.58.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f329f126483f..de921dd173b8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1237,13 +1237,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-mfJtQs+fl7zfysWJO/EBM/DMYYOvR5nuOwDA6sei1PI=", + "hash": "sha256-lXwdNtdbCwiotVCGBIiAPHUjNdj+srpBaW30GUWW0ao=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.56.0", + "rev": "v0.58.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-heMfI1NLjOHSKondXY8mRCNWFedSYJqfn9nU2Ywj57c=" + "vendorHash": "sha256-eeVkzZ+ATTyZCEq4loEbIb0XO/Ir1jejUaWi4Jd6nMo=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", From e1268f65ddd98dad0b5166daead485fa68a07ce6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:33:29 +0000 Subject: [PATCH 342/481] terraform-providers.tencentcloud: 1.81.107 -> 1.81.120 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index de921dd173b8..a894b0c02bc3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1228,11 +1228,11 @@ "vendorHash": "sha256-/yXPJgwpUCKRs3Sf2BbuHp3pfQiheTAh7Auxk3qkTFg=" }, "tencentcloud": { - "hash": "sha256-PZWBVLUfWn13B7saz2XecMv6pWWqPMOfBzqr2pErnvs=", + "hash": "sha256-HgBC+C7z15cdVUBOAaPE3ddhEKMfp7Ow+lWqS/EkD98=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.107", + "rev": "v1.81.120", "spdx": "MPL-2.0", "vendorHash": null }, From d926de3cf8bba2a1a5d5eef3797da124afe50b7d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:34:21 +0000 Subject: [PATCH 343/481] terraform-providers.time: 0.11.2 -> 0.12.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a894b0c02bc3..1dcd51162750 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1255,13 +1255,13 @@ "vendorHash": null }, "time": { - "hash": "sha256-Uwe0VpY7CKXNy6RNS+yoIkyLmMQ2daJ5x7IhJV+KuxU=", + "hash": "sha256-mAGBcBMd00r2URY/jqZQBLjo0mN+IMG5ONVKj0AwXNs=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.11.2", + "rev": "v0.12.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dmBCjbVmK4Qa07bcgUxKch5Vj7nylgNA7rzx+7ag3CY=" + "vendorHash": "sha256-C40wkY1M9d5oPO6TOm/iu99Gcrnnin1ggn9mbOJ0YjY=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", From 95327b7c1103ba597c1e47e886e6e9e3a7b47772 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:34:49 +0000 Subject: [PATCH 344/481] terraform-providers.thunder: 1.4.1 -> 1.4.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1dcd51162750..23a51481c432 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1246,11 +1246,11 @@ "vendorHash": "sha256-eeVkzZ+ATTyZCEq4loEbIb0XO/Ir1jejUaWi4Jd6nMo=" }, "thunder": { - "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", + "hash": "sha256-2i1DSOSt/vbFs0QCPogEBvADhLJFKbrQzwZ20ChCQMk=", "homepage": "https://registry.terraform.io/providers/a10networks/thunder", "owner": "a10networks", "repo": "terraform-provider-thunder", - "rev": "v1.4.1", + "rev": "v1.4.2", "spdx": "BSD-2-Clause", "vendorHash": null }, From b54f3f96c924ee94f5edb279c68cf87ecd24d3a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:35:33 +0000 Subject: [PATCH 345/481] terraform-providers.turbot: 1.10.1 -> 1.11.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 23a51481c432..36c2443c1049 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1283,11 +1283,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-OmhNZZcCw6tGsL3Ha4cdg76GHqMjKeRB6aOXfqkIOjQ=", + "hash": "sha256-lVKJKMCAm8paXxfPo6YvJBnHdmV4iwaTYmwdN31s/e4=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.10.1", + "rev": "v1.11.1", "spdx": "MPL-2.0", "vendorHash": null }, From 98d072ec59c66e2efd8537bdd89be7cdba1db0bd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:36:53 +0000 Subject: [PATCH 346/481] terraform-providers.vault: 4.3.0 -> 4.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 36c2443c1049..fae1c5dd93ec 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1310,13 +1310,13 @@ "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" }, "vault": { - "hash": "sha256-tPRwdSwygypfgXAS3QmZNAb4GXe/8IFsRs8YGa4HDJg=", + "hash": "sha256-EiCLz5Z0ztwWrn8yHG9JnuIizicpi3WtvDSGyBtzgSY=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.3.0", + "rev": "v4.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" + "vendorHash": "sha256-z9qg6NVKYIU2OQTW8g72t6B69aTL/BeLCUFeoII75cE=" }, "vcd": { "hash": "sha256-4+7CblKeop9Uwpl7XxjmR33XE/mcmZfOuFJrJuqzZmw=", From 9d05d572275f7284d62977a1e7c4d70f1ce36d27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:37:52 +0000 Subject: [PATCH 347/481] terraform-providers.vsphere: 2.8.2 -> 2.9.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fae1c5dd93ec..6a3f78cf387f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1364,13 +1364,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-rF7gtZUPse6ewcawmxlIfCmVRKKNJMUwqVVEBaLvLbE=", + "hash": "sha256-V13LeUNJ4LbP18CMRphU/w/7eytg49j5//gl/sZSV04=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.8.2", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-TxaYIJtEIgy0Q56Gk1JXqIUuVyVJNVH0gKmdzzDWW/E=" + "vendorHash": "sha256-ozdbYuqz6ua1ubh48IkLxJZ6xAV2ho9mkhtnCTwzRIM=" }, "vultr": { "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", From 47e347ec0562cae2e37de444103bf3a04f479b0c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 13:39:10 +0000 Subject: [PATCH 348/481] terraform-providers.yandex: 0.123.0 -> 0.128.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6a3f78cf387f..5c50d7cadb10 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1391,12 +1391,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-FwwjHWwUUtOwZZh0YeUbSnSLFH1Q80ALFHhd0tCAZNQ=", + "hash": "sha256-47aAZuGLhiHLzk0mvHD48NfoSUs1Ec3R4DGEpbvPyj8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.123.0", + "rev": "v0.128.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-K6Khgg9sAG2S/onFUlVG5mZfMtvpvVJeU6YQOyA4Liw=" + "vendorHash": "sha256-4uHYcg+dJg1bJQRsJWDT9VEsPs5JOvGIdrw8cj0IkrE=" } } From 17106a965dcd8fde8e740abe266f922d8a4e7880 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:34:32 +0000 Subject: [PATCH 349/481] terraform-providers.auth0: 1.3.0 -> 1.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5c50d7cadb10..44495d964c4d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -90,13 +90,13 @@ "vendorHash": "sha256-+3EemRl+rKoCg2HpHvjMPvN6ajrDOnO5C98NVGkYdo4=" }, "auth0": { - "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", + "hash": "sha256-Yltf+s1gEgP/dbX8EuK45VPBAEzelP+CAcllUaqvnAQ=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.3.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-oc6ZI5j7pqiiFgfbaTARb6sn+Ma/rqrupv/RPN05mrc=" + "vendorHash": "sha256-76Uf6vQpQ6GlumPHd1uBi0gO5aGmm/HAhNY3I7WCr8k=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", From 16826a60946a3c4b8af5ab573f6f8a0c17b95786 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:35:18 +0000 Subject: [PATCH 350/481] terraform-providers.aviatrix: 3.1.4 -> 3.1.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 44495d964c4d..0bade482fd18 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -108,11 +108,11 @@ "vendorHash": "sha256-Sq304WOdKx4J1sD1+YA7uDi+uQtUiXa+BISs/j87dWw=" }, "aviatrix": { - "hash": "sha256-84MtHPrDVaLMQQYnAfuP/pZuzruWxUTLpziwn3ny1oU=", + "hash": "sha256-erBjyDX6xG8lpqcPq8iqgsanJKLuSgmiW/9PC8Xbyag=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.1.4", + "rev": "v3.1.5", "spdx": "MPL-2.0", "vendorHash": null }, From 43db517dfe44d32f30314326817be63dcd252e95 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:38:19 +0000 Subject: [PATCH 351/481] terraform-providers.azurerm: 3.111.0 -> 4.1.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0bade482fd18..8f0f89112b9d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -135,11 +135,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-3EHm4fpeYJYzwrwaQLMdgFq1dgmV755WwAhKBG3f10M=", + "hash": "sha256-tCZKDqMrmwAGqs4eoMWj4lty4aVOkzF16RpEl24GNPc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.111.0", + "rev": "v4.1.0", "spdx": "MPL-2.0", "vendorHash": null }, From b474c679732688e1eaea7a98b3128459a45790cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:38:49 +0000 Subject: [PATCH 352/481] terraform-providers.baiducloud: 1.21.8 -> 1.21.9 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8f0f89112b9d..20784b01a597 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -153,11 +153,11 @@ "vendorHash": null }, "baiducloud": { - "hash": "sha256-uKIBimMMTManwztb4vdMCpsRWMr6GB8O7vK850sVI2g=", + "hash": "sha256-kLEEbBQ1YdxJkvCCHzpGHBX2wC9JtLVY6chZEmAziSU=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.21.8", + "rev": "v1.21.9", "spdx": "MPL-2.0", "vendorHash": null }, From bf09deff5f4c0fd47c581482d85ad89f98d9327a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:39:19 +0000 Subject: [PATCH 353/481] terraform-providers.bigip: 1.22.2 -> 1.22.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 20784b01a597..96d76b769956 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -162,11 +162,11 @@ "vendorHash": null }, "bigip": { - "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", + "hash": "sha256-jCQgjxGBSy2d9DIJeshLVdj6N/SXWEPcd5EpJ5GAXe4=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.2", + "rev": "v1.22.3", "spdx": "MPL-2.0", "vendorHash": null }, From 2c37d614841cb04348f2d999f650bfb62dc5e303 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:39:45 +0000 Subject: [PATCH 354/481] terraform-providers.bitwarden: 0.8.0 -> 0.8.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 96d76b769956..92649ee5145a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -180,13 +180,13 @@ "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, "bitwarden": { - "hash": "sha256-+zuKZBwoOSp3HIdxmK1FInE33/1D5nX2N7zYBCtRvHA=", + "hash": "sha256-YB+9CWd3U6Yl33ZFbTxzjomrLCilpBPKLdn6Yv7LAUA=", "homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden", "owner": "maxlaverse", "repo": "terraform-provider-bitwarden", - "rev": "v0.8.0", + "rev": "v0.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-u9ICJtPZveRrK5BOthvFDGkNcUiA0/Hb39KM0eIhUVI=" + "vendorHash": "sha256-BZ1+D0JQrGb6qE25+eTLSHIQdCmzucMPKUY/6x2LwT8=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From ad3a59c0b4194b28fcec3aed1b589285c047893a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:40:14 +0000 Subject: [PATCH 355/481] terraform-providers.buildkite: 1.10.1 -> 1.10.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 92649ee5145a..c5b5eac86751 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -198,13 +198,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-QS+JCFLYPvxwLIVzCS/gKZkBZQhOOxRfn7Vudgiox+E=", + "hash": "sha256-kwrhIii1jGpIZBzT58UdgnDtX5279shW77HphLobaEI=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.10.1", + "rev": "v1.10.2", "spdx": "MIT", - "vendorHash": "sha256-gTJakGr9f9bzR5pbmgAMTJL54e2mS/h92TM4ft3ABdw=" + "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, "checkly": { "hash": "sha256-qPlXaw8J2J7DPKJvfiTLalgMIWpttqbdMg2UB3rvt14=", From 6d86201665faf1e034d4ea1f25b560270849008c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:40:43 +0000 Subject: [PATCH 356/481] terraform-providers.checkly: 1.8.0 -> 1.8.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c5b5eac86751..2cdde84115d1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -207,13 +207,13 @@ "vendorHash": "sha256-PFeWgDw1hkW/ekQfubRSYlaD4d4wJ4GOohOJ00QcEqQ=" }, "checkly": { - "hash": "sha256-qPlXaw8J2J7DPKJvfiTLalgMIWpttqbdMg2UB3rvt14=", + "hash": "sha256-4J7pwtlAa920RXF6ZoSoi03qA15NBzUlXQCZRErI2Co=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.8.0", + "rev": "v1.8.2", "spdx": null, - "vendorHash": "sha256-+GirqFNV0eIC9CzpW53UOi9cDUzXs8ozSLX7dKQnOQ8=" + "vendorHash": "sha256-DcRe3nBzKn8fC0Q8Dx/p0PXuUccX+4kmOMdZa3HuXNI=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", From 029b6c5e5f31b0364b4868b6718d185a6a717b8f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:41:08 +0000 Subject: [PATCH 357/481] terraform-providers.cloudamqp: 1.29.4 -> 1.32.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2cdde84115d1..b56b03bfbd42 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -225,13 +225,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-aEbGvGPYvW3NOO+Q89/ebcJWNrXIoNQkqAIbv9ikiI8=", + "hash": "sha256-0lqVHIq37CebSVDR5Ni4kFyXeZZ+tOqpj8gN4h7OaA0=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.29.4", + "rev": "v1.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" + "vendorHash": "sha256-j3qdi19dxJL+R8Xa6MDag6KHMuBnzEZ9lUhuSAEZOAQ=" }, "cloudflare": { "hash": "sha256-9M7PQEBg0qDmyz2B35krNUF9dDo0g28JomFor7b/Nsc=", From eaace95af23a43513debc1fe48fa8acd43980884 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:51:31 +0000 Subject: [PATCH 358/481] terraform-providers.acme: 2.24.2 -> 2.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b56b03bfbd42..8aa0fd6f0ce4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,13 +9,13 @@ "vendorHash": null }, "acme": { - "hash": "sha256-LlpPc3um4D2nNJFZRoXnw5ss0E0rrJN0wKKmuV0S6NU=", + "hash": "sha256-RboEWeTUgEZShZ9NrR9yuUzbGPq9wauTyoFiHXZS2oI=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.24.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ptZ14WWarYeKT8gIcUDi4LmCFkpoTwAhSwMXmLPlWxs=" + "vendorHash": "sha256-pJlt35kPV3CYOE4RiIjHLT9YEwSreQHgzRuY3ba9oBk=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", From aaf3f660ec2bfd46f776adb588b49c50381eeab4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:56:17 +0000 Subject: [PATCH 359/481] terraform-providers.aws: 5.57.0 -> 5.66.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8aa0fd6f0ce4..47193f96e3bd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -117,13 +117,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-DJ0mfqcWIs1iLSEfhlYEgHr1PKz8HchlgvHfEwIAnlA=", + "hash": "sha256-Fmhb3mKRviYsl3qQfXuQMI6KBpmDN0rtwJxDjSkj4EM=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.57.0", + "rev": "v5.66.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NlFP7cRE+6PiGMSz2y/SDQas/TNWAJk/EBEqIeG2INY=" + "vendorHash": "sha256-9DWxMDsyWl/bczvbPOmdRTwjIYAKTuNXyBzrCHExNUA=" }, "azuread": { "hash": "sha256-UOaEfmhGPrqQBkodNYybYb5rnB3X8wpXKHlpKqZnnXU=", From 2aaf174b47542124abcb00c5ae78fb1339ca7ab7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:57:42 +0000 Subject: [PATCH 360/481] terraform-providers.dexidp: 0.5.0 -> 0.6.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 47193f96e3bd..160ae44a41eb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -308,13 +308,13 @@ "vendorHash": "sha256-ZmOuk2uNnFQzXSfRp6Lz/1bplEm0AuB/M94+dRnqhHU=" }, "dexidp": { - "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", + "hash": "sha256-ommpazPlY4dMAOB1pgI7942aGH6YYPn6WtaowucQpZY=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.5.0", + "rev": "v0.6.1", "spdx": "MIT", - "vendorHash": "sha256-xW0sPt2TGmoQXc5a2lp6471amBbDDPZbyc9YIIHP+M0=" + "vendorHash": "sha256-3swcRmm+JZ4ZQX0hvXZosYDGwk0KSyZcqEdNGDYcyYE=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", From 25e413323d309d730ed4af4b7de0132de8151262 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 23:58:45 +0000 Subject: [PATCH 361/481] terraform-providers.gitlab: 17.1.0 -> 17.3.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 160ae44a41eb..e925b14d59ab 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -462,13 +462,13 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-F73eY0m+KdzfAFCFPOZ0a29OOfgOm87WZvi8+mHwPek=", + "hash": "sha256-F+ps7hpRm6+DHJwVOMe2qwVvKSL2o1JUl0Blgd8qFsA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v17.1.0", + "rev": "v17.3.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-FrmQsuLinm5Z4+GHC1PV19lt1rfxv3TwQiEUxTvlTtk=" + "vendorHash": "sha256-vIGqb5+e9vZkJFsH7f1UU13V80XtQVcsQ1hYu5laV70=" }, "google": { "hash": "sha256-RIBSJc5wmBXvd+NWaz3oCOClAOqXEOpSXIR8+wYKfk0=", From 5bf8cbcbeb05725a1c04e1e4ff264a74c8e9aabb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:03:02 +0000 Subject: [PATCH 362/481] terraform-providers.utils: 1.23.0 -> 1.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e925b14d59ab..35ba84a27c26 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1301,13 +1301,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-9a8K2Yl3hfmUG+/QgQJdXnW6lxkOJps1BskFto3tIwg=", + "hash": "sha256-bxjEdmPgKPFpRM9Jz9nichDhXY+7x74WS6VjZGf9VUE=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.23.0", + "rev": "v1.26.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" + "vendorHash": "sha256-zJtVKDaqOMQqyAzq4VtVv5MgXS999BwxeWhXQI6McC4=" }, "vault": { "hash": "sha256-EiCLz5Z0ztwWrn8yHG9JnuIizicpi3WtvDSGyBtzgSY=", From 6e235943c873659ba42826e9c5e832d51fb75623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:28:10 +0000 Subject: [PATCH 363/481] python312Packages.weatherflow4py: 0.2.23 -> 0.3.3 --- pkgs/development/python-modules/weatherflow4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index ac48a838ff5a..a149dfe3ff38 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "0.2.23"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "weatherflow4py"; rev = "refs/tags/v${version}"; - hash = "sha256-ghdjQyZPLFzgmrB2ppzNbqM/D2/zW872tw4emzInLBY="; + hash = "sha256-mJxRfjkkBruGjz+UthrzlMqz6Rlk9zrGHjzB4qYYlQ0="; }; build-system = [ poetry-core ]; From 4ad5bc4c012020ac88667c267cf43e25ad148296 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:44:18 +0000 Subject: [PATCH 364/481] python312Packages.google-nest-sdm: 5.0.0 -> 5.0.1 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index bf576a7e5423..699430682d4b 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "5.0.0"; + version = "5.0.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = "refs/tags/${version}"; - hash = "sha256-1jN3X7Cxh2yX58Hup89bW16mc8F/C3CsUcz91FZHo70="; + hash = "sha256-oooWPQ4O7+FjCzIoBwm+jgGTkG7eFwekbIAEbJh44I4="; }; build-system = [ setuptools ]; From 059be4391aa97e3f0341d5ce4b00b38e0fb02ea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:45:25 +0000 Subject: [PATCH 365/481] sirius: 7.6.0 -> 7.6.1 --- pkgs/by-name/si/sirius/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix index a962da0c865a..e286810bcc34 100644 --- a/pkgs/by-name/si/sirius/package.nix +++ b/pkgs/by-name/si/sirius/package.nix @@ -38,13 +38,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; stdenv.mkDerivation rec { pname = "SIRIUS"; - version = "7.6.0"; + version = "7.6.1"; src = fetchFromGitHub { owner = "electronic-structure"; repo = pname; rev = "v${version}"; - hash = "sha256-AdjqyHZRMl9zxwuTBzNXJkPi8EIhG/u98XJMEjHi/6k="; + hash = "sha256-JvI75AbthNThXep2jcriLTPC8GGiPgrg5nYCCbCi+EI="; }; From 674bc014109735235c2de2362cee56ce0e1876ae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 02:58:18 +0000 Subject: [PATCH 366/481] wit-bindgen: 0.30.0 -> 0.31.0 --- pkgs/by-name/wi/wit-bindgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix index 179b9e47e8b6..c9b5b498160c 100644 --- a/pkgs/by-name/wi/wit-bindgen/package.nix +++ b/pkgs/by-name/wi/wit-bindgen/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "wit-bindgen"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "wit-bindgen"; rev = "v${version}"; - hash = "sha256-MeozLpwtOFnYxK2H+9bd7nG6BL6jSVqfBCVg1t3lErQ="; + hash = "sha256-eTPP9G3t/P24ck9iZbXxoLV44wUWISb5RAjUPE7hsEA="; }; - cargoHash = "sha256-d6oMUAGyIFDWtjgXfIe0k3hx7QTFTfVuKnQ3XRux1HU="; + cargoHash = "sha256-CVtUvUnvCrI637H2QjUEE2Ad8ujvJLYlRuuu8SBbzyY="; # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target. # However, GitHub Actions ensures a proper build. From baa6137ad637cbb245bd926a7998d65d48995bef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 03:02:41 +0000 Subject: [PATCH 367/481] python312Packages.ollama: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 59d262c5eb2f..4f5266494e5c 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.3.2"; + version = "0.3.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-PFujhac1Y1q4sy/bhaPYw6cHuoiholaNoDNhtQW8IW4="; + hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A="; }; postPatch = '' From 5f97b1604d9c3a0fe5186d5f9c71cb6404e2907e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 03:06:19 +0000 Subject: [PATCH 368/481] yara-x: 0.7.0 -> 0.8.0 --- pkgs/by-name/ya/yara-x/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix index dad01808b4c6..3f2d74eabd8c 100644 --- a/pkgs/by-name/ya/yara-x/package.nix +++ b/pkgs/by-name/ya/yara-x/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "yara-x"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara-x"; rev = "refs/tags/v${version}"; - hash = "sha256-nzTksznwyLncQO2c2+ZI0Bn9kNXl6GthFCrkz3ihS3w="; + hash = "sha256-xCybcDRswxRHiPf0ultIahxSPqn0YonmR4Kah38wJuw="; }; - cargoHash = "sha256-+0aroLCmi2HPILCxLBFzjtHPpe6f6AMkoPdH5CjoyEo="; + cargoHash = "sha256-6CDzOxvktJc6AnFOm6OJp3cD2bZ0XCY5HLIoEmP59es="; nativeBuildInputs = [ cmake installShellFiles ]; From a4d7747b3bf1de5cd80e7ae134dcc27ed0557c98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 03:36:32 +0000 Subject: [PATCH 369/481] basedpyright: 1.17.2 -> 1.17.3 --- pkgs/by-name/ba/basedpyright/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 197b546e9c71..87b1544859e6 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -11,13 +11,13 @@ }: let - version = "1.17.2"; + version = "1.17.3"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "refs/tags/v${version}"; - hash = "sha256-6pksb2drjiZo1Hp6P/G06LAj3nW5WXJbVNGt5897jAA="; + hash = "sha256-cnhtge0ueveo70cYDpb/+ss5osHbO1Yyv74NrYBYZOM="; }; patchedPackageJSON = runCommand "package.json" { } '' From f96f0a212fa44d966a849c94a66175c8d5b5adf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 03:44:01 +0000 Subject: [PATCH 370/481] python312Packages.pulumi-aws: 6.50.1 -> 6.51.0 --- pkgs/development/python-modules/pulumi-aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pulumi-aws/default.nix b/pkgs/development/python-modules/pulumi-aws/default.nix index 9783c6a38de1..837c83854919 100644 --- a/pkgs/development/python-modules/pulumi-aws/default.nix +++ b/pkgs/development/python-modules/pulumi-aws/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pulumi-aws"; # Version is independant of pulumi's. - version = "6.50.1"; + version = "6.51.0"; pyproject = true; build-system = [ setuptools ]; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "pulumi"; repo = "pulumi-aws"; rev = "refs/tags/v${version}"; - hash = "sha256-n+uqEgo71wdfZT1Pu+I8gckAebrTPUd8qNmzFcG6xHY="; + hash = "sha256-aEyi4zFj0Q3KNBXjUX5J7nmmPCcnYn5w0mIC02gbGJc="; }; sourceRoot = "${src.name}/sdk/python"; From 4fad4c72af67ee8701a4be41e248c41ab5af30a9 Mon Sep 17 00:00:00 2001 From: John Shaffer Date: Mon, 9 Sep 2024 23:20:59 -0500 Subject: [PATCH 371/481] srvc: drop The upstream is unmaintained, and the build is currently broken due to Rust 1.80 changes. See https://github.com/NixOS/nixpkgs/issues/332957 --- .../version-management/srvc/default.nix | 34 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 pkgs/applications/version-management/srvc/default.nix diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix deleted file mode 100644 index c2dc0d8bd2be..000000000000 --- a/pkgs/applications/version-management/srvc/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, rustPlatform, fetchFromGitHub, stdenv, darwin, git }: - -rustPlatform.buildRustPackage rec { - pname = "srvc"; - version = "0.20.0"; - - src = fetchFromGitHub { - owner = "insilica"; - repo = "rs-srvc"; - rev = "v${version}"; - hash = "sha256-pnlbMU/uoP9ZK8kzTRYTMY9+X9VIKJHwW2qMXXD8Udg="; - }; - - cargoHash = "sha256-+m8WJMn1aq3FBDO5c/ZwbcK2G+UE5pSwHTgOl2s6pDw="; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - darwin.apple_sdk.frameworks.Security - ]; - - nativeCheckInputs = [ git ]; - - # remove timeouts in tests to make them less flaky - TEST_SRVC_DISABLE_TIMEOUT = 1; - - meta = with lib; { - description = "Sysrev version control"; - homepage = "https://github.com/insilica/rs-srvc"; - changelog = "https://github.com/insilica/rs-srvc/blob/v${version}/CHANGELOG.md"; - license = licenses.asl20; - maintainers = with maintainers; [ john-shaffer ]; - mainProgram = "sr"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 98a997e614bf..3ac307ad53b6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1466,6 +1466,7 @@ mapAliases ({ spotify-unwrapped = spotify; # added 2022-11-06 spring-boot = spring-boot-cli; # added 2020-04-24 squid4 = throw "'squid4' has been renamed to/replaced by 'squid'"; # Converted to throw 2023-09-10 + srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09 ssb = throw "'ssb' has been removed, as it was broken and unmaintained"; # Added 2023-12-21 ssm-agent = amazon-ssm-agent; # Added 2023-10-17 starboard-octant-plugin = throw "starboard-octant-plugin has been dropped due to needing octant which is archived"; # Added 2023-09-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6eb3e18594de..bfe7e8903b8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6004,8 +6004,6 @@ with pkgs; spacevim = callPackage ../applications/editors/spacevim { }; - srvc = callPackage ../applications/version-management/srvc { }; - ssmsh = callPackage ../tools/admin/ssmsh { }; stacs = callPackage ../tools/security/stacs { }; From d7423b75c9bc95adfa7547b13b482a0464f4a192 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Mon, 9 Sep 2024 20:59:54 +0800 Subject: [PATCH 372/481] clash-verge-rev: add meta for internal package --- pkgs/by-name/cl/clash-verge-rev/package.nix | 19 ++++++++++++++++++- pkgs/by-name/cl/clash-verge-rev/service.nix | 3 ++- pkgs/by-name/cl/clash-verge-rev/unwrapped.nix | 2 +- pkgs/by-name/cl/clash-verge-rev/webui.nix | 3 ++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index 7c912f2acd8a..5499a5e74270 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -27,6 +27,20 @@ let hash = "sha256-HyRTOqPj4SnV9gktqRegxOYz9c8mQHOX+IrdZlHhYpo="; }; + meta-unwrapped = { + description = "Clash GUI based on tauri"; + homepage = "https://github.com/clash-verge-rev/clash-verge-rev"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + Guanran928 + bot-wxt1221 + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; + service-cargo-hash = "sha256-NBeHR6JvdCp06Ug/UEtLY2tu3iCmlsCU0x8umRbJXLU="; service = callPackage ./service.nix { @@ -36,6 +50,7 @@ let service-cargo-hash pname ; + meta = meta-unwrapped; }; webui = callPackage ./webui.nix { @@ -44,6 +59,8 @@ let src pname ; + meta = meta-unwrapped; + }; sysproxy-hash = "sha256-TEC51s/viqXUoEH9rJev8LdC2uHqefInNcarxeogePk="; @@ -55,8 +72,8 @@ let src sysproxy-hash webui - meta ; + meta = meta-unwrapped; }; meta = { diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index dbf125829793..21baad40d3f7 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -7,10 +7,11 @@ pname, webkitgtk, service-cargo-hash, + meta, }: rustPlatform.buildRustPackage { pname = "${pname}-service"; - inherit version; + inherit version meta; src = src-service; sourceRoot = "${src-service.name}"; diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 7212ba2623ff..64386c552dce 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -13,7 +13,7 @@ openssl, }: rustPlatform.buildRustPackage { - inherit version src; + inherit version src meta; pname = "${pname}-unwrapped"; sourceRoot = "${src.name}/src-tauri"; diff --git a/pkgs/by-name/cl/clash-verge-rev/webui.nix b/pkgs/by-name/cl/clash-verge-rev/webui.nix index 355350d2d471..c35dca01a34c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/webui.nix +++ b/pkgs/by-name/cl/clash-verge-rev/webui.nix @@ -5,9 +5,10 @@ pnpm, nodejs, stdenv, + meta, }: stdenv.mkDerivation { - inherit version src; + inherit version src meta; pname = "${pname}-webui"; pnpmDeps = pnpm.fetchDeps { inherit pname version src; From 323f66e1e7b1127d5db4d5d3f6ae527a124f8064 Mon Sep 17 00:00:00 2001 From: aleksana Date: Tue, 10 Sep 2024 13:00:32 +0800 Subject: [PATCH 373/481] cameractrls: 0.6.6 -> 0.6.7 --- pkgs/by-name/ca/cameractrls/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix index 2b715397150c..d56b75124ddc 100644 --- a/pkgs/by-name/ca/cameractrls/package.nix +++ b/pkgs/by-name/ca/cameractrls/package.nix @@ -39,14 +39,14 @@ let in python3Packages.buildPythonApplication rec { pname = "cameractrls"; - version = "0.6.6"; + version = "0.6.7"; pyproject = false; src = fetchFromGitHub { owner = "soyersoyer"; repo = "cameractrls"; rev = "v${version}"; - hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU="; + hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw="; }; postPatch = '' @@ -125,7 +125,7 @@ python3Packages.buildPythonApplication rec { presets at device connection). ''; homepage = "https://github.com/soyersoyer/cameractrls"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.lgpl3Plus; mainProgram = mainExecutable; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.linux; From d7dc57b67310f06374e63d51860a6997a27ae4fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 05:00:56 +0000 Subject: [PATCH 374/481] python312Packages.clarifai-grpc: 10.8.0 -> 10.8.4 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 32c6fee45373..1210cc0cf353 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.8.0"; + version = "10.8.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-Jp5pH1KZY9JoRKGOLeBqF9CC7UoRHC9wFOBPD9t5AR8="; + hash = "sha256-5HDPEFn43JQyNTp9nJapBpoigoFtgyPZ5HXulMsjc8s="; }; build-system = [ setuptools ]; From 17aec19b9a03a646da4341fcf2e0a3672970f663 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 05:45:03 +0000 Subject: [PATCH 375/481] renovate: 38.62.0 -> 38.73.5 --- pkgs/by-name/re/renovate/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 02d4db11319b..8dbf447958d3 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -21,13 +21,13 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "renovate"; - version = "38.62.0"; + version = "38.73.5"; src = fetchFromGitHub { owner = "renovatebot"; repo = "renovate"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-Wv7kSKuiyqVpl0EQIygF0R8h9PMH6yI5ezXhz1hbzd8="; + hash = "sha256-+kracgelM8VOIgEtDfaXWokNZgiwl+s/k1yx6RxQk0c="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv'.mkDerivation (finalAttrs: { pnpmDeps = pnpm_9.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-n2CnyjabKQ9D72OBdEqeHoxOJsKlLD2rJPRs50AWCXU="; + hash = "sha256-J61fOjANS7WKd3HLaqJZE1m2jFrMTknW6SGdy/yVIKg="; }; env.COREPACK_ENABLE_STRICT = 0; From 28108159e3ac34437a49c74f59eb225549f08b4c Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 9 Sep 2024 15:30:05 -0400 Subject: [PATCH 376/481] telegram-desktop: 5.5.1 -> 5.5.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.5.1...v5.5.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.5.2 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 5cf73100ab56..78d6a1da58ef 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.1"; + version = "5.5.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-PTa79SbSsOyWlZJ0ad4w6YIiChLzqaSZGRmzyq5qVK0="; + hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY="; }; patches = [ From 1b449528cc56cbfa2be8383a847da43c4f281e4e Mon Sep 17 00:00:00 2001 From: Nicolas Goudry Date: Tue, 10 Sep 2024 08:59:40 +0200 Subject: [PATCH 377/481] gitkraken: 10.2.0 -> 10.3.0 --- .../applications/version-management/gitkraken/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 80c890046895..43db0277225c 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -59,24 +59,24 @@ with lib; let pname = "gitkraken"; - version = "10.2.0"; + version = "10.3.0"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - hash = "sha256-NY7IgUt6Q27Pz1K46xL4LYFBwTJdT+fvsFDM2OhoPWg="; + hash = "sha256-5WICLLuv+NL++fgm7p/ScyEvzwVqcXNI6eXGr4e9k20="; }; x86_64-darwin = fetchzip { url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip"; - hash = "sha256-e7zIMJNMdFy7/8zsV3nH1OT76xNznoSPRUVhoLfR6QI="; + hash = "sha256-zkQQR90pdYGIZf3OmAdKc1SlotgdSRGJaYsA1n74aZk="; }; aarch64-darwin = fetchzip { url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip"; - hash = "sha256-YjGH9tKbJaYc5qENBCCpJGWWFJIQTD8O2H3onhMwGrw="; + hash = "sha256-WYBXupyunpAaoHmA4dHfd/oruP20rYsIq5mO4/dDsoM="; }; }; From 926612cb5e1e15a2d84870084f4e3d1cc5f24acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 07:13:48 +0000 Subject: [PATCH 378/481] python312Packages.ydata-profiling: 4.9.0 -> 4.10.0 --- pkgs/development/python-modules/ydata-profiling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix index 2587e485b48b..d9e88875777e 100644 --- a/pkgs/development/python-modules/ydata-profiling/default.nix +++ b/pkgs/development/python-modules/ydata-profiling/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "ydata-profiling"; - version = "4.9.0"; + version = "4.10.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "ydataai"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OZCgtnsLXLJ0m1t/mWqQTbFL8DPKaR9Tr7QCGT2HpvE="; + hash = "sha256-uB8E7qp1xohAdcIIt1T2DxwSu93XhJoI8/qn54fSvGY="; }; preBuild = '' From 9bc2866b4efc47d6a423ab9cab5ebdbd16ac745b Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Tue, 10 Sep 2024 08:18:58 +0100 Subject: [PATCH 379/481] homepage-dashboard: 0.9.6 -> 0.9.8 --- pkgs/servers/homepage-dashboard/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index 788cd01d067a..71a610ecd9a5 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -16,8 +16,8 @@ let dashboardIcons = fetchFromGitHub { owner = "walkxcode"; repo = "dashboard-icons"; - rev = "a02a5999fe56948671721da8b0830cdd5b609ed7"; # Until 2024-02-25 - hash = "sha256-s0Doh4j6CH66fZoQKMt4yc7aLStNFGMVoDp5dvs7+pk="; + rev = "be82e22c418f5980ee2a13064d50f1483df39c8c"; # Until 2024-07-21 + hash = "sha256-z69DKzKhCVNnNHjRM3dX/DD+WJOL9wm1Im1nImhBc9Y="; }; installLocalIcons = '' @@ -29,16 +29,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.9.6"; + version = "0.9.8"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-jUKXAqq6Oj8CmOuBUlsf0zDIcK+3MX/czzNDmakN9VM="; + hash = "sha256-WfNUBjg/D3g6GE9ljZZ2lcHBx4XA2ObKjGgQ1VNanv8="; }; - npmDepsHash = "sha256-YjcF8FkURnTurcJ0Iq0ghv/bhu5sFA860jXrn3TkRds="; + npmDepsHash = "sha256-PKqOeTspwlnKhQz65Z2C+GmQu6YTMRyaROgF8dZOdV8="; preBuild = '' mkdir -p config From cb714bfbd4d1d791448e02177026d40f4c9eb266 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 10 Sep 2024 14:18:38 +0700 Subject: [PATCH 380/481] ubootOrangePi5Plus: init This adds the uboot version used for the Xunlong Orange Pi 5 Plus. --- pkgs/misc/uboot/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 295cb525a646..351c5788584a 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -389,6 +389,14 @@ in { filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; }; + ubootOrangePi5Plus = buildUBoot { + defconfig = "orangepi-5-plus-rk3588_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; + ROCKCHIP_TPL = rkbin.TPL_RK3588; + filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; + }; + ubootOrangePiPc = buildUBoot { defconfig = "orangepi_pc_defconfig"; extraMeta.platforms = ["armv7l-linux"]; From e13fbae7cb266182c0710c8257b5624646ce14d4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 10 Sep 2024 14:33:42 +0700 Subject: [PATCH 381/481] ubootOrangePi5Plus: expose Follow-up to #340945, I cherry-picked this from another worktree and forgot to add this too. uboot builds have to be explicitly also listed in all-packages.nix. --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7d7090ab678..f05250c36af9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27167,6 +27167,7 @@ with pkgs; ubootOlimexA64Teres1 ubootOrangePi3 ubootOrangePi5 + ubootOrangePi5Plus ubootOrangePiPc ubootOrangePiZeroPlus2H5 ubootOrangePiZero From dbbaa1cf6eeaa7822589e02bcf782a34ef455ad5 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Tue, 10 Sep 2024 10:40:42 +0300 Subject: [PATCH 382/481] pulumi-bin: 3.130.0 -> 3.131.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 322 +++++++++++++-------------- 1 file changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index 1362ca3e2ef8..3f4a4dcd880c 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,44 +1,44 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.130.0"; + version = "3.131.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-x64.tar.gz"; - sha256 = "1rnm2p7c52xzlf527ywpywbss1j43xl7mb0dxyyal5wh3vx5251d"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-x64.tar.gz"; + sha256 = "06gzn2vbjmv4gljm7ar90hxm47ap2izhlr6whff7jrsrkvf71n54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz"; sha256 = "1dd5s4d07qlcikcc7m4yh41085diciq25md4g2m1n6wfy629sllv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; - sha256 = "0ra89zi6ka0d9szgd0i4vlzw5wzvg9da5pi1ns3bf7kwv0mrxdmc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-linux-amd64.tar.gz"; + sha256 = "1ckk20g77lwgg5v4baai0w6cvw9zapf31jy42lm9l3qnzx61fm6r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-amd64.tar.gz"; - sha256 = "1mmsff6xmxhrd6ymbwzw2mirks3fczcdaw7hcn8nqx3n1vp62xsb"; + 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-artifactory-v7.7.1-linux-amd64.tar.gz"; - sha256 = "0pzl2d40lpr90vlr36nmsczdic91j74fm4x3517sdyzkhyb2zrmq"; + 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-auth0-v3.5.1-linux-amd64.tar.gz"; - sha256 = "0zmq1i31b7kyasw5za652j5kmfr7fqwzcjkgvpxz0yhkm33k2rcg"; + 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-aws-v6.50.1-linux-amd64.tar.gz"; - sha256 = "1v2imk3w74ayglys7pqs881wp01sbp749d4zaxa60kbxmjwx80nc"; + 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-azuread-v5.53.3-linux-amd64.tar.gz"; sha256 = "0yzv3xyijma1sxvilf1bgqcc3d0hdcx6pfpzw2s0fix7pi25qszn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-amd64.tar.gz"; - sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-amd64.tar.gz"; + sha256 = "1m7pif65wv083zvfxdyc3bpq7dyv4whpqi9k9p8d9gb7zn93piz8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-amd64.tar.gz"; @@ -53,12 +53,12 @@ sha256 = "1b5iyp0rld41mpin4w297p6q17kb3ya9sv5rsfg9iqwpbsz5c0vf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-amd64.tar.gz"; - sha256 = "14pmkyxlmqy7fpj305kp3khjs6r7zg12s0v9f1gl3gml9zfq5nhy"; + 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-digitalocean-v4.31.0-linux-amd64.tar.gz"; - sha256 = "0v5cj9gf63s79crbzs0a32wr8w450z2pzlm3m4njgxnklw3l57r3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-amd64.tar.gz"; + sha256 = "1fy4cykm8ad2933zgf085xdbbd3ifyf9hrf0dnb5j8yn27g4svn7"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz"; @@ -69,20 +69,20 @@ sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-amd64.tar.gz"; - sha256 = "1jxklrzfkig8b1snhr1jz341pqhp6q17bnhm3q3zvg0ql69sl7p8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-linux-amd64.tar.gz"; + sha256 = "1qjcw8hrn9q3k4dzfhbjychzvv3cklf33daq60rsfk62qny5rdva"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-amd64.tar.gz"; sha256 = "1knjxddn118zzcmn3srgq5a7qfxd49zdqg9ki4w6gg5qnpisdk0s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-amd64.tar.gz"; - sha256 = "17mfi8q10dvajh6dwahd05yral1mc5x5m2khy77mrmbxq4ivi219"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-linux-amd64.tar.gz"; + sha256 = "11d0fmh3r0j4zh4ps192zvbwpsln5alpra9nkxrfk8ksp8kvhcp7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-amd64.tar.gz"; - sha256 = "10cyc1zxl70wfyq9j15804wh1sn95jr248p5n0vmlikfq9j1qwrw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-amd64.tar.gz"; + sha256 = "0c454vzi55b272rbhpwy9bwrdlyip16fa5775rdlnp6zrwqxwzfs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -97,16 +97,16 @@ sha256 = "1zvspswy3lmjpwpw35xxpkssv28sapwcv52lxiam57vcr9rbyi5g"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-amd64.tar.gz"; - sha256 = "1hvknh3xsvnk19ihavi3b6pp33172bc60s1k0p11mr5v608xcgbi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-amd64.tar.gz"; + sha256 = "1y5a624zkig2n3hsdyrjb535npr8hcfxj6rifijk6m9zf4nywjni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-amd64.tar.gz"; - sha256 = "0jl1nnvnj647rk001gakwdc09a58jc6i9g3x7mp5b6ywg46gjvqy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-amd64.tar.gz"; + sha256 = "0nchp2xi6kbrkym16688dszihln68hnj5v1ilw027d40swj4xdv5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-amd64.tar.gz"; - sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-amd64.tar.gz"; + sha256 = "0p9lcq04nml7rcpd7kpciqcw2y1fb5igmq6k71mghz080y3d3s3y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-amd64.tar.gz"; @@ -117,28 +117,28 @@ sha256 = "13s88q8ibd2sb0ly4z4mbj785jv0hclvh0prccsvkq8zbyg91vv1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-amd64.tar.gz"; - sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd"; + 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-snowflake-v0.57.2-linux-amd64.tar.gz"; sha256 = "1h2kql44fjq6vv2a3pvvnx78sil6jgwm792qmrvh7gqrad0dd050"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-amd64.tar.gz"; - sha256 = "00vz0m84bpzqj0r50n0h5w896vhapf275rs8xd5kmmwfnaijgj4r"; + 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-sumologic-v0.23.2-linux-amd64.tar.gz"; - sha256 = "0h9hb51h5fjsnf3lcyik77sb1mw070h7p4drnm6f8rjkg5jy1q7i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-amd64.tar.gz"; + sha256 = "10d34620hkdqmflb24gs8hapf5apb45ribw695xz9pdwkhqrd3wp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-amd64.tar.gz"; sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-amd64.tar.gz"; - sha256 = "0rx05a9mdlv9yfsf6pi0ccdv7zfp7kgrj5zhfjagbk8x04cnygrz"; + 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-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.10.3-linux-amd64.tar.gz"; - sha256 = "1vz95rml45mbmrma6iaga9gfnnfixkyxkjsrp28l0nz9bqvknkkl"; + 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-wavefront-v3.1.3-linux-amd64.tar.gz"; @@ -163,40 +163,40 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-x64.tar.gz"; - sha256 = "1lm3xk68fpa420bj10jhp1nim5mnd263pqprchaz1racc0f2pq72"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-x64.tar.gz"; + sha256 = "0pl3wd2y7mkap7jq29bmbw1ipc2qf149xixriad2wk87sr6swgak"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz"; sha256 = "0338m5b1c2lffg6xx6zv1dnawwyq3vqvgfmm43c2pklrwwka89v6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; - sha256 = "1d1famsg3pg69300vl5rifjbcvf5linajgwn5hi3wiwrszk2fcg7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-darwin-amd64.tar.gz"; + sha256 = "0l34kaa1x2sbalx0dannmmysr1ai8bh2z6x0lzg1iwxhr6fdvl3a"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-amd64.tar.gz"; - sha256 = "0w8bhizga9fwvrl06yn1lp1vjwbscm65pr9md63vx0cabq9niz8g"; + 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-artifactory-v7.7.1-darwin-amd64.tar.gz"; - sha256 = "1fks67b7dc2qmxjiyai9sg8iryw27yn1ixs5kwjhk1ra077x52h0"; + 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-auth0-v3.5.1-darwin-amd64.tar.gz"; - sha256 = "02crpv9wdx4dim14lz1n8wqp9yzf8im8sfj85ynydjd8nv076a6s"; + 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-aws-v6.50.1-darwin-amd64.tar.gz"; - sha256 = "0x0slash3mmawjsjf9c33m85w27g1991a003k0zmns633n53ycwp"; + 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-azuread-v5.53.3-darwin-amd64.tar.gz"; sha256 = "16vkx1cnfzwyzsk7f9f794p6mg1ny8g5qxiy0825gd0prf8dzdm5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-amd64.tar.gz"; - sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-amd64.tar.gz"; + sha256 = "0zib88z73ha81isxajkwjbigl2f51dj1d7zwvk2ic9qwvrimvb2m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-amd64.tar.gz"; @@ -211,12 +211,12 @@ sha256 = "1bgq98jiaqhvgbywvydpkif154k6rlzk0sqn55bj0ng9f04vz2ka"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-amd64.tar.gz"; - sha256 = "1ps5439lxrm1jx4hancdnxks21d0yrkzj3g6y9i20z0pw1ssjpzp"; + 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-digitalocean-v4.31.0-darwin-amd64.tar.gz"; - sha256 = "049l8287a9rmrr2ypywycnc36g8jhkx37swqkklw1qp1az4cl2k8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-amd64.tar.gz"; + sha256 = "1wvzw476njjpa2k9rb8wsgng6xv3fc626zmc2zw318502y0r5h95"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz"; @@ -227,20 +227,20 @@ sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-amd64.tar.gz"; - sha256 = "18l2ppzkypfrghmj2y2jypp0wkry5myp5vmlr3ckfwbsd81z4w3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-darwin-amd64.tar.gz"; + sha256 = "0c77zq6dkcbwx41yg3ziknzgf4snb1xfy1q2hz3668virjwkxsli"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-amd64.tar.gz"; sha256 = "1gf871rl8kzxmfmmcnm6rzjx03gcv0w208jd80v8b5ic9k0wrxq9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-amd64.tar.gz"; - sha256 = "03bi0qigh3rxw1cd2lyp8gp865vrxif1w85nc46sjprsxk8a1dv4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-darwin-amd64.tar.gz"; + sha256 = "14mmh98wjlpkqdkcsqc58hixf2gkdlvqzjj6cx2gg1h8cyg6qnqj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-amd64.tar.gz"; - sha256 = "0dnfmprrhlqr5bapw7a09yd1c0npnsdmfy5v2aahm5pjmmj0labc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-amd64.tar.gz"; + sha256 = "1f4wspm6h1a7qwy8wf0akbjvjj7di9a38my4ni9x4dw4hv87bmyq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -255,16 +255,16 @@ sha256 = "170fh5nyjxc3ayk0yfpv0ypck65rmdgy8p4p90v2i7mq7b6fs53z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-amd64.tar.gz"; - sha256 = "14qd7r56q668w6qdb86cav2b56hc4vkg3sk7gc8av6zcg3wy7d8f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-amd64.tar.gz"; + sha256 = "1qdmzw9pnjc7inpfcqcsn4426dhwrl5x06bcnw9mcjkigli0cr22"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-amd64.tar.gz"; - sha256 = "1v5kblswsaqcj8d7i15nqqsrmcdv4kgg9l7v23s1ggipk4bwjzjg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-amd64.tar.gz"; + sha256 = "0w956b6hlacsnpi30frnxj5a389znj1bkryagv2mcmc0ci8zpy0m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-amd64.tar.gz"; - sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-amd64.tar.gz"; + sha256 = "0d4n0gg9qc5f4vpid3za3mzp8yd8saz8akjlli992cql278w10jl"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-amd64.tar.gz"; @@ -275,28 +275,28 @@ sha256 = "09bdp7khxcmary0jiis921hdrakdz1ywzmz9byn4hfx0r6iajbpl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-amd64.tar.gz"; - sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj"; + 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-snowflake-v0.57.2-darwin-amd64.tar.gz"; sha256 = "01g19rm8272n6yzm7a1dyj2xr6f6xvgi0d962aw66sjhq4jc0s1h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-amd64.tar.gz"; - sha256 = "07sgpj1aa6sfnsglfgh92hg5ai7mx9s6vhls2xsxxmqi0kyklx7c"; + 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-sumologic-v0.23.2-darwin-amd64.tar.gz"; - sha256 = "0di85gf7rjg7z1rckqp6ff5jsrc1ng1sihwkpgiv2w9wxhxrh333"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-amd64.tar.gz"; + sha256 = "0791x9j63kq8cbh2gmgsmbaim6067df3i164kiwpm4y1l38f8yf6"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-amd64.tar.gz"; sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-amd64.tar.gz"; - sha256 = "0zqc8iwzgg5aw03sbgcmpi3s0dffya7c8qx2ncxjvq1hcdhzsyj7"; + 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-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.10.3-darwin-amd64.tar.gz"; - sha256 = "1i2sb6nrglx1ixpg4l34zvblvs2sjzxsfzwb19d0v81lvadii1ck"; + 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-wavefront-v3.1.3-darwin-amd64.tar.gz"; @@ -321,40 +321,40 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-linux-arm64.tar.gz"; - sha256 = "05zhw333cmk5hqfk6q28ny9qc5jqyi5nxqfrhl1bd7vhnflnc7df"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-linux-arm64.tar.gz"; + sha256 = "1mvi1z851yzhdmxaxq03vg309x1hkniky3fkiz4k1qfwxrnqjpji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz"; sha256 = "1hzxmw420rzlka6wvr9b7gljyxdngbff4bcpdsaj6672isl2zy5v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; - sha256 = "0zpcz79ca84lhccg2ivr442hr2gfmx7826rmw0ppnyi5cna1wvkr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-linux-arm64.tar.gz"; + sha256 = "1ldlxsnpjkdqh2xdfl56wgq9y94vaigc5i3q6cz682094fwhmw42"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-linux-arm64.tar.gz"; - sha256 = "1s5240phmjcn2p4li5b45ngf3vh4fkdb3qj3357bys9pwxiv1hlj"; + 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-artifactory-v7.7.1-linux-arm64.tar.gz"; - sha256 = "01wmhkar9a8m8p16plz0cnb8m9fqb1kp1sjx2j655mmgg9y1v4rw"; + 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-auth0-v3.5.1-linux-arm64.tar.gz"; - sha256 = "19f2602l99ilvmfzp8vv1crq6i7zc0fjm83mm0wid8dbgqv0fsf5"; + 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-aws-v6.50.1-linux-arm64.tar.gz"; - sha256 = "0wch7d6zh7lsxpdc0aynqi5rj0bf41xv3dlbi3sj0p3ld24b5vgs"; + 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-azuread-v5.53.3-linux-arm64.tar.gz"; sha256 = "0p16833m7igpz7b6p05clcf6qk5jj10iqrdm8wkdj7zv9q1v60hk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-linux-arm64.tar.gz"; - sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-linux-arm64.tar.gz"; + sha256 = "08hd9b9vbbcx15bpb7vlrsjkw9ak7sjarqlxv4sx1fzys682nwra"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-linux-arm64.tar.gz"; @@ -369,12 +369,12 @@ sha256 = "0j53qafafq8s4rxds8anrsyylyjx6gd3jhrz16zqs4hcxwiimcfp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-linux-arm64.tar.gz"; - sha256 = "0b9mvqzd9zyz11ih3f1vlm96ijf0ij91y15qgsljplyi67kjsn2a"; + 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-digitalocean-v4.31.0-linux-arm64.tar.gz"; - sha256 = "10am0w1q60whmrzrm3hmyxgmg4i1b6m45syy3qhvr8xx0af3p9wi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-arm64.tar.gz"; + sha256 = "0m02qhcfddwkxpyvhn7m8gs3g7wbn6hv47ywkjifxs4wxq11b0vn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz"; @@ -385,20 +385,20 @@ sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-linux-arm64.tar.gz"; - sha256 = "0fx4rh8s8fdxllnk9i8yhwg8winh48ggw45px7jjxwnpd8g537fa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-linux-arm64.tar.gz"; + sha256 = "1rpcrwvs7c9h5g02j0lp8wfqxk2n2cizaa79l7vpnl1n2rm5fp37"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-arm64.tar.gz"; sha256 = "0rcj1lc5d65m36q712a4ic87443cpb5fvk04wqcnmicybgrfyhnl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-arm64.tar.gz"; - sha256 = "1n8ndwfb1ckarjd2wqgyyx7xxklxwglrvw473c4w8vpr2dmsrsyb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-linux-arm64.tar.gz"; + sha256 = "0kyalnvdvr8s7fpikrpngwjnajbvvsii9dw30wky1gcl0584zggn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-linux-arm64.tar.gz"; - sha256 = "06fs1jvyrqb7jbgc0b6vaqvbfc1s63py0llr46kvk6ynlb8m1apm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-arm64.tar.gz"; + sha256 = "1vrnss7x1bcvx5f4mirvhqvi15dw3w0bylbgpk7imsaazv6ylfyz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -413,16 +413,16 @@ sha256 = "07kv3nqbfdah4i82pb8q83swr726q0bkx8wr6wwy168nff6zs98l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-linux-arm64.tar.gz"; - sha256 = "05zy4chm6fs7h7szi23k8bi4ki4x0nai3zhfkxjpcm6b63dvvwgl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-arm64.tar.gz"; + sha256 = "0yibsz34larfka6m4lxbsgk9kwcai8x904aqhwfl9hhl54wklyhn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-linux-arm64.tar.gz"; - sha256 = "11a8sm8z9zih5i4kcw5mvh18qc3x4rzln1nyhgknymymyqc4wqyp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-arm64.tar.gz"; + sha256 = "1x3ayikdv1sdm72bmxhg55r4xbwmpjjhim30ajqid9fhq2c7zl1j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-linux-arm64.tar.gz"; - sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-linux-arm64.tar.gz"; + sha256 = "0g7fqm5z6msf7c0qh60f137qq7i1s103b64lbvjn06qms2xkd6x3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-linux-arm64.tar.gz"; @@ -433,28 +433,28 @@ sha256 = "1gmcqk0ddfa5zfmhqv32vl1x5shmr80pik8da2g96y3mvfjbicpp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-linux-arm64.tar.gz"; - sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw"; + 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-snowflake-v0.57.2-linux-arm64.tar.gz"; sha256 = "0ainz86d5bcslk4yyyw6qsqnjhw2myirlkb22l0ldfpg85j4gbnm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-linux-arm64.tar.gz"; - sha256 = "1libjf55fr78zb3c7krkp2azvnrxznml4chss7lhmgjl6fhbla4y"; + 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-sumologic-v0.23.2-linux-arm64.tar.gz"; - sha256 = "19mrlxyl63m9c7albhszd9ikklm29k8s465cp0bzkrwawy6nn3yy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-linux-arm64.tar.gz"; + sha256 = "14hsny87inyvays04khhan9kg0a0kfi2x085yrqs6cy8pnshx29w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-arm64.tar.gz"; sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-arm64.tar.gz"; - sha256 = "1868473rk41dhl2gxabg6bin8m9c1lzs52wmcbpjrn91wb8pyz7v"; + 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-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.10.3-linux-arm64.tar.gz"; - sha256 = "19ca2rcf3xmjsrii846lvgkhclgqk5mckwm6agvmfyl8qzlaqxyc"; + 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-wavefront-v3.1.3-linux-arm64.tar.gz"; @@ -479,40 +479,40 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.130.0-darwin-arm64.tar.gz"; - sha256 = "11afqpra94wcpj86ndk92m24s8z71bn4iwki82zmhwdc1im61h9w"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.131.0-darwin-arm64.tar.gz"; + sha256 = "01ysc776ng4gdi9vaa7am0a9n49wakkbwq6r2bj5avn0v95njrqa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz"; sha256 = "1jms955rhkw8babbbdkniic3qqc1g7jsddp322c5di2x4863qs2x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; - sha256 = "12954vrf9fjjynrzgj8qm34bl258v4fdvvzyi0m8wp92rsp4icjq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.4.0-darwin-arm64.tar.gz"; + sha256 = "0nwb4w5y5nyz8a9marqln338mhxgj49iw2br5p7rksfw0xcv3a4x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.61.0-darwin-arm64.tar.gz"; - sha256 = "042k66xnzgljy0kbjcrg71a61kgfy6cyh3x6b3llsmih17036fy4"; + 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-artifactory-v7.7.1-darwin-arm64.tar.gz"; - sha256 = "1y3ama1495zmnx3nyb0c8f9h59z9kcjkwm90wcxggvxl6bjgx9ld"; + 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-auth0-v3.5.1-darwin-arm64.tar.gz"; - sha256 = "151720nbxn6rrbvm1zawxc5xmlfadqgck2cmjgmj6z6qgd8zm6dv"; + 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-aws-v6.50.1-darwin-arm64.tar.gz"; - sha256 = "1rvx92x8d5qgwp5bvn03j2s424bd4yhhsivl1nbd5sd7wgzmfp3x"; + 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-azuread-v5.53.3-darwin-arm64.tar.gz"; sha256 = "13r7yzgj4lbsvsw9y1fxc5n6dhral0763ny8mahxhj3cl6mmxvi7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.2.0-darwin-arm64.tar.gz"; - sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.3.0-darwin-arm64.tar.gz"; + sha256 = "1f9zy9rl8vmnc40p6cvcz3d5wrf52y5a798ljp87kmjmra0mglg3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.89.0-darwin-arm64.tar.gz"; @@ -527,12 +527,12 @@ sha256 = "17f53cknsyqm5r9glxmwc396y8bbl1khvg9px5ixr43gfgq4vm91"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.32.1-darwin-arm64.tar.gz"; - sha256 = "0jwsaxfgsqk9hf35ciz1pr3f1n3s8i7k20yr0rry9hv1a73bpavi"; + 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-digitalocean-v4.31.0-darwin-arm64.tar.gz"; - sha256 = "1r9pnxwv0dp7ahw1gk7c89j9wqcfp0rpam3qwxq4x3xc5x1b8cg9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-arm64.tar.gz"; + sha256 = "0b09fpif0ild5lf9fvp2r6ivk0n5c14whc70d7v6v7xab1pfi0pj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz"; @@ -543,20 +543,20 @@ sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.10.0-darwin-arm64.tar.gz"; - sha256 = "00d6j85lmfk8alvbijvjnzg9jrc1a1rsg2cxs8szdzw81an25pk5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-darwin-arm64.tar.gz"; + sha256 = "0qdy46n9zh1l0cqa8jyd7z8hvksp6ylfp3rix6l9kq6lhd8iiggs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-arm64.tar.gz"; sha256 = "1i8cwbq01fdrlsx2r14q6f06ysq9gyb8c5ak377aihj8p3rkz224"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-arm64.tar.gz"; - sha256 = "1dfvzb6lh4ayxlg7m0mm7gb0j80nz5npyxrx41z9fy1x82i24130"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-darwin-arm64.tar.gz"; + sha256 = "0s5f8zsiqzc1bnf31c8m2alq62i5sbk6plkm58aahmsw28vky3li"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.0-darwin-arm64.tar.gz"; - sha256 = "0c4503nv94hdlza617zl7wqnfks661f4r9ddgw93728diqy38p0v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-arm64.tar.gz"; + sha256 = "0r4j9mvzqv62b6cf40hh4w5mgpkqq82khsmjzij8djjcd86gn7i0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -571,16 +571,16 @@ sha256 = "1rh428pj6yzqy40l9gcjaacfcxy5snsy642gavwr9raw3yxdh4br"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.25.0-darwin-arm64.tar.gz"; - sha256 = "06rbc5b87xpcb2w61d82sf5ir8ra9qqphj5kknh6j2s5wj10pwvb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-arm64.tar.gz"; + sha256 = "00x5jxb3adjym0qkamwz962r533c9zq4x6ijhhcsjv393326l8am"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.4-darwin-arm64.tar.gz"; - sha256 = "02mnm525kaxsd0mabpv7j92pj15sv972ikc9dr0vr5sd4dqmjj2k"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-arm64.tar.gz"; + sha256 = "04vsl43f00p0cdhjwlh816asyxlfn32x28q0vwnv0zm60nphwj34"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.5-darwin-arm64.tar.gz"; - sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.6-darwin-arm64.tar.gz"; + sha256 = "1260v26z9fyqc8jxxmxq14ph1c9jplv47gmnm7naw59giiqpd6fa"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.3-darwin-arm64.tar.gz"; @@ -591,28 +591,28 @@ sha256 = "1p1r5mn75mgshs9k9yjnzxism4b4nlyp84vz2l48bdgcbqzn1jin"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.16.3-darwin-arm64.tar.gz"; - sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x"; + 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-snowflake-v0.57.2-darwin-arm64.tar.gz"; sha256 = "09z5hdwn282xcxi4a2xsigcscnxykidm3a57r1s92jyxcvp9y2k8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.89.0-darwin-arm64.tar.gz"; - sha256 = "1103zs11ih71lq4nj0s2x3v35dj90zy4d0ka27h4lazf28qvmda5"; + 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-sumologic-v0.23.2-darwin-arm64.tar.gz"; - sha256 = "1jrccj0fkzqb88spl2v97sc2d7nwmkbi0f093f999av504qg0gg4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.3-darwin-arm64.tar.gz"; + sha256 = "0ij18wxlhy84hwjwh0h0yf0jl3zpky66a15v6y0gh9w9sn5ng47f"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-arm64.tar.gz"; sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-arm64.tar.gz"; - sha256 = "1az0h9xq7py2cn9qwnhndacla8bfayznv2zbghqqy5wnc3rwbdr7"; + 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-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.10.3-darwin-arm64.tar.gz"; - sha256 = "1pmppj5k7ix02bvv21wsh619qcxrhc54iszk9wh651s20j3m0vhn"; + 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-wavefront-v3.1.3-darwin-arm64.tar.gz"; From 215204e8d9c62c291894274fa47c8078314b8cfa Mon Sep 17 00:00:00 2001 From: Saturn <90934664+Saturn745@users.noreply.github.com> Date: Tue, 10 Sep 2024 08:04:17 +0000 Subject: [PATCH 383/481] klipperscreen: 0.3.2 -> 0.4.3 (#340939) * maintainers: add saturn745 * klipperscreen: 0.3.2 -> 0.4.3 --------- Co-authored-by: Saturn745 --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/applications/misc/klipperscreen/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 156f700c49a3..dfcbe955346b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18547,6 +18547,13 @@ githubId = 695473; name = "Sascha Grunert"; }; + saturn745 = { + email = "git-commits.rk7uq@aleeas.com"; + github = "saturn745"; + githubId = 90934664; + name = "Saturn745"; + matrix = "@galaxyyy:matrix.org"; + }; saulecabrera = { name = "Saúl Cabrera"; email = "saulecabrera@gmail.com"; diff --git a/pkgs/applications/misc/klipperscreen/default.nix b/pkgs/applications/misc/klipperscreen/default.nix index 5364d090f75d..fea8dbc80e23 100644 --- a/pkgs/applications/misc/klipperscreen/default.nix +++ b/pkgs/applications/misc/klipperscreen/default.nix @@ -6,14 +6,14 @@ , gitUpdater }: python3.pkgs.buildPythonApplication rec { pname = "KlipperScreen"; - version = "0.3.2"; + version = "0.4.3"; format = "other"; src = fetchFromGitHub { owner = "jordanruthe"; repo = "KlipperScreen"; rev = "v${version}"; - hash = "sha256-LweO5EVWr3OxziHrjtQDdWyUBCVUJ17afkw7RCZWgcg="; + hash = "sha256-6hMefH9VcNnWhKdQRs7cPVL86LEDRSLaxygmi15HdLI="; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ description = "Touchscreen GUI for the Klipper 3D printer firmware"; homepage = "https://github.com/jordanruthe/KlipperScreen"; license = licenses.agpl3Only; - maintainers = with maintainers; [ cab404 ]; + maintainers = with maintainers; [ cab404 saturn745 ]; mainProgram = "KlipperScreen"; }; } From 1166bb68ce1427d232df5bce79da63449f44b105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 3 Sep 2024 22:28:12 +0000 Subject: [PATCH 384/481] klipper: 0.12.0-unstable-2024-08-14 -> 0.12.0-unstable-2024-09-01 --- pkgs/servers/klipper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix index 5bca109ec16c..d2a772a17530 100644 --- a/pkgs/servers/klipper/default.nix +++ b/pkgs/servers/klipper/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "klipper"; - version = "0.12.0-unstable-2024-08-14"; + version = "0.12.0-unstable-2024-09-01"; src = fetchFromGitHub { owner = "KevinOConnor"; repo = "klipper"; - rev = "d81eb557d7f2aad5e22e3633fbcd53a4d60ac5d1"; - sha256 = "sha256-O6W2xiG5rZzD/40ytIFo4HovKq0ml0oCV6amcAQhoUs="; + rev = "08a1c9f12760ee6d89db2b82e76c7d93453212db"; + sha256 = "sha256-bVHSiWqswum4ykVpPTt11wJSGnSjJnMT8OUvbYGFopY="; }; sourceRoot = "${src.name}/klippy"; From 5ba4d9fc352bfd283233856e2443b55cb55a157d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 08:17:19 +0000 Subject: [PATCH 385/481] gotrue-supabase: 2.159.2 -> 2.160.0 --- pkgs/tools/security/gotrue/supabase.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotrue/supabase.nix b/pkgs/tools/security/gotrue/supabase.nix index e130e014a62d..90498544d0f0 100644 --- a/pkgs/tools/security/gotrue/supabase.nix +++ b/pkgs/tools/security/gotrue/supabase.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "auth"; - version = "2.159.2"; + version = "2.160.0"; src = fetchFromGitHub { owner = "supabase"; repo = "auth"; rev = "v${version}"; - hash = "sha256-5WRIDTbueAjAj9XhLltsFKk+9vul1WZ3htaasJLjhyw="; + hash = "sha256-29mTu3Cv3rFsm9q79g2BBzRLWfA9WlBip8xbBROCCzo="; }; vendorHash = "sha256-cxLN9bdtpZmnhhP9tIYHQXW+KVmKvbS5+j+0gN6Ml3s="; From f280f79715b09aa6a652aeaecd16ff97681cf0ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 08:19:25 +0000 Subject: [PATCH 386/481] marwaita-mint: 20.3.1 -> 21 --- pkgs/by-name/ma/marwaita-mint/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marwaita-mint/package.nix b/pkgs/by-name/ma/marwaita-mint/package.nix index d8fc37c332ee..432ad3dcea21 100644 --- a/pkgs/by-name/ma/marwaita-mint/package.nix +++ b/pkgs/by-name/ma/marwaita-mint/package.nix @@ -10,13 +10,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "marwaita-mint"; - version = "20.3.1"; + version = "21"; src = fetchFromGitHub { owner = "darkomarko42"; repo = "marwaita-mint"; rev = finalAttrs.version; - hash = "sha256-0IgQbBragalLO0zVU36ZWxF3Q47cfEQ15HxQ2j9QhIc="; + hash = "sha256-RzQmBD4nlnzZN1BCS6EOqbuSxmjHPAgf/uv99xgAUYU="; }; buildInputs = [ From e521ac602864c397b6afee82fa553dacae563c55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 10:34:15 +0200 Subject: [PATCH 387/481] python312Packages.html2image: refactor --- pkgs/development/python-modules/html2image/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/html2image/default.nix b/pkgs/development/python-modules/html2image/default.nix index c53b9280eb59..bcf78da3db8f 100644 --- a/pkgs/development/python-modules/html2image/default.nix +++ b/pkgs/development/python-modules/html2image/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace poetry.masonry.api poetry.core.masonry.api \ - --replace "poetry>=" "poetry-core>=" + --replace-fail poetry.masonry.api poetry.core.masonry.api \ + --replace-fail "poetry>=" "poetry-core>=" ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ requests websocket-client ]; From 11d2b2760bf73c20291c0e344798288734194d7c Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 8 Sep 2024 22:23:16 +0200 Subject: [PATCH 388/481] esphome: 2024.8.1 -> 2024.8.3 https://github.com/esphome/esphome/releases/tag/2024.8.3 https://github.com/esphome/esphome/releases/tag/2024.8.2 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 487cac6becda..59649a048e6d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -21,14 +21,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.8.1"; + version = "2024.8.3"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-wjvbnqlhg4AHJLQvjWysDXBjECc1sV5ilx1jk8IzILw="; + hash = "sha256-AeiEP1D2u2u8LMNKdBvoA2M3uO6Z9oSG2i5HwGin80M="; }; nativeBuildInputs = with python.pkgs; [ From 81663d25c2f989f23de5e88ee964cfdb1d8efa72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 10:45:00 +0200 Subject: [PATCH 389/481] python312Packages.yalexs: 8.6.3 -> 8.6.4 Diff: https://github.com/bdraco/yalexs/compare/refs/tags/v8.6.3...v8.6.4 Changelog: https://github.com/bdraco/yalexs/blob/refs/tags/v8.6.4/CHANGELOG.md --- pkgs/development/python-modules/yalexs/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index b29576d5f691..953f818e8337 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -10,12 +10,13 @@ freenub, poetry-core, pyjwt, + pytest-asyncio, + pytest-cov-stub, + pytest-freezegun, pytestCheckHook, python-dateutil, python-socketio, pythonOlder, - pytest-asyncio, - pytest-cov-stub, requests-mock, requests, typing-extensions, @@ -23,7 +24,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "8.6.3"; + version = "8.6.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-z01q+sUuj9BvcN56+c3vti8xUnWhYGuV/BTXhvcTl30="; + hash = "sha256-KUm+e/ZrfkrS4MA0Wb3VAo9URYmC0ucKw3L+yMMoMtU="; }; build-system = [ poetry-core ]; @@ -54,9 +55,10 @@ buildPythonPackage rec { nativeCheckInputs = [ aioresponses aiounittest - pytestCheckHook pytest-asyncio pytest-cov-stub + pytest-freezegun + pytestCheckHook requests-mock ]; From e7d5c84166f9814de252525091d701c30987a1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Tue, 10 Sep 2024 07:56:21 +0000 Subject: [PATCH 390/481] when-cli: init at 0.4.0 Co-authored-by: Callum Leslie Co-authored-by: Aleksana --- pkgs/by-name/wh/when-cli/package.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/by-name/wh/when-cli/package.nix diff --git a/pkgs/by-name/wh/when-cli/package.nix b/pkgs/by-name/wh/when-cli/package.nix new file mode 100644 index 000000000000..a15a99edf8e6 --- /dev/null +++ b/pkgs/by-name/wh/when-cli/package.nix @@ -0,0 +1,24 @@ +{ + lib, + fetchCrate, + rustPlatform, +}: +rustPlatform.buildRustPackage rec { + pname = "when-cli"; + version = "0.4.0"; + + src = fetchCrate { + inherit pname version; + hash = "sha256-LWssrLl2HKul24N3bJdf2ePqeR4PCROrTiVY5sqzB2M="; + }; + + cargoHash = "sha256-9emY0yhAKVzuk1Tlzi0kW8oR9jRqLdg8wbTcJMBrxMw="; + + meta = { + description = "Command line tool for converting between timezones"; + homepage = "https://github.com/mitsuhiko/when"; + mainProgram = "when"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ loicreynier ]; + }; +} From ba83562611efa8133c459ed6cb3cc5c4a79866e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 19:29:47 +0000 Subject: [PATCH 391/481] kics: 2.0.1 -> 2.1.2 --- pkgs/tools/admin/kics/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/kics/default.nix b/pkgs/tools/admin/kics/default.nix index 6db54ce50949..205e439c2271 100644 --- a/pkgs/tools/admin/kics/default.nix +++ b/pkgs/tools/admin/kics/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kics"; - version = "2.0.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "Checkmarx"; repo = "kics"; rev = "v${version}"; - hash = "sha256-4WYrKWkcf7AJjogWQcNsIZiCfxf4CmhLW/GJFUWfQzw="; + hash = "sha256-UTDqsTW/niTvSTYInM5UD9f7RU3f5R4etuLvoTmNn/M="; }; - vendorHash = "sha256-N3MJhuzMJW40aMrAyuBsNciwZaNq0K4IUd+0re17AOI="; + vendorHash = "sha256-nUNpiXta+Om0Lmd9z0uaCctv2uBrPDsZ1fhHcd8sSWs="; subPackages = [ "cmd/console" ]; @@ -26,8 +26,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/Checkmarx/kics/internal/constant.SCMCommits=${version}" - "-X github.com/Checkmarx/kics/internal/constants.Version=${version}" + "-X github.com/Checkmarx/kics/v2/internal/constants.SCMCommit=${version}" + "-X github.com/Checkmarx/kics/v2/internal/constants.Version=${version}" ]; passthru.tests.version = testers.testVersion { From fb4c581e410938fd39493f6428af8300a4965037 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 11:13:14 +0200 Subject: [PATCH 392/481] python312Packages.awsiotsdk: init at 1.22.0 Next generation AWS IoT Client SDK for Python using the AWS Common Runtime https://github.com/aws/aws-iot-device-sdk-python-v2 --- .../python-modules/awsiotsdk/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/awsiotsdk/default.nix diff --git a/pkgs/development/python-modules/awsiotsdk/default.nix b/pkgs/development/python-modules/awsiotsdk/default.nix new file mode 100644 index 000000000000..080efc5476da --- /dev/null +++ b/pkgs/development/python-modules/awsiotsdk/default.nix @@ -0,0 +1,51 @@ +{ + lib, + awscrt, + boto3, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "awsiotsdk"; + version = "1.22.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-iot-device-sdk-python-v2"; + rev = "refs/tags/v${version}"; + hash = "sha256-2ZMNG+6yshEvjEpyN6uV62m11LZUrUHAzpRbm1foif0="; + }; + + pythonRelaxDeps = [ "awscrt" ]; + + build-system = [ setuptools ]; + + dependencies = [ awscrt ]; + + nativeCheckInputs = [ + boto3 + pytestCheckHook + ]; + + disabledTestPaths = [ + # Those tests require a custom loader + "servicetests/" + ]; + + pythonImportsCheck = [ "awsiot" ]; + + meta = { + description = "Next generation AWS IoT Client SDK for Python using the AWS Common Runtime"; + homepage = "https://github.com/aws/aws-iot-device-sdk-python-v2"; + changelog = "https://github.com/aws/aws-iot-device-sdk-python-v2/releases/tag/v${version}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1390548108c6..6312d8dfd2db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1098,6 +1098,8 @@ self: super: with self; { awsiotpythonsdk = callPackage ../development/python-modules/awsiotpythonsdk { }; + awsiotsdk = callPackage ../development/python-modules/awsiotsdk { }; + awsipranges = callPackage ../development/python-modules/awsipranges { }; awslambdaric = callPackage ../development/python-modules/awslambdaric { }; From e2ad70f282c44765658d9601e5f1dc2249d9479b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 11:15:58 +0200 Subject: [PATCH 393/481] python312Packages.thinqconnect: init at 0.9.7-unstable-2024-09-09 Module to interacting with the LG ThinQ Connect Open API https://github.com/thinq-connect/pythinqconnect --- .../python-modules/thinqconnect/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/thinqconnect/default.nix diff --git a/pkgs/development/python-modules/thinqconnect/default.nix b/pkgs/development/python-modules/thinqconnect/default.nix new file mode 100644 index 000000000000..0b269d0ff3d7 --- /dev/null +++ b/pkgs/development/python-modules/thinqconnect/default.nix @@ -0,0 +1,46 @@ +{ + lib, + aiohttp, + awsiotsdk, + buildPythonPackage, + fetchFromGitHub, + pyopenssl, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "pythinqconnect"; + version = "0.9.7-unstable-2024-09-09"; + pyproject = true; + + disabled = pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "thinq-connect"; + repo = "pythinqconnect"; + # https://github.com/thinq-connect/pythinqconnect/issues/1 + rev = "39d535a2a5d1067a110eea37ae92002d0793b7e9"; + hash = "sha256-+nQAUqg5rB2eJgPBJJR8NsQ1O2Wb4UsbBQVPir1jyAU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + aiohttp + awsiotsdk + pyopenssl + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "thinqconnect" ]; + + meta = { + description = "Module to interacting with the LG ThinQ Connect Open API"; + homepage = "https://github.com/thinq-connect/pythinqconnect"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6312d8dfd2db..5b67720f4067 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15409,6 +15409,8 @@ self: super: with self; { inherit (pkgs.darwin.apple_sdk.frameworks) Accelerate CoreFoundation CoreGraphics CoreVideo; }; + thinqconnect = callPackage ../development/python-modules/thinqconnect { }; + thorlabspm100 = callPackage ../development/python-modules/thorlabspm100 { }; threadloop = callPackage ../development/python-modules/threadloop { }; From d8a0df68b1eb0d01ad009379cba8d2d75fd0cee3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 11:21:38 +0200 Subject: [PATCH 394/481] python312Packages.aioairzone: 0.9.0 -> 0.9.1 Diff: https://github.com/Noltari/aioairzone/compare/refs/tags/0.9.0...0.9.1 Changelog: https://github.com/Noltari/aioairzone/releases/tag/0.9.1 --- pkgs/development/python-modules/aioairzone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix index ba74e667dee2..d8032a0e2f00 100644 --- a/pkgs/development/python-modules/aioairzone/default.nix +++ b/pkgs/development/python-modules/aioairzone/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone"; rev = "refs/tags/${version}"; - hash = "sha256-32fd4+y3EICVesrtSZUf/jYUEIqvPPnSp4hrpgXZoxU="; + hash = "sha256-snZtM5iDaJjqRSTf4kZVjro2k2h/b6XiT4UUCw1gF1g="; }; build-system = [ setuptools ]; From 8ad7b18b207dd811650b1e201e6054c502181b0b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 11:22:14 +0200 Subject: [PATCH 395/481] python312Packages.aioautomower: 2024.8.0 -> 2024.9.0 Diff: https://github.com/Thomas55555/aioautomower/compare/refs/tags/2024.8.0...2024.9.0 Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/2024.9.0 --- pkgs/development/python-modules/aioautomower/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 3e19ea7cc31e..c6fe28fb0ea0 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.8.0"; + version = "2024.9.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; rev = "refs/tags/${version}"; - hash = "sha256-FrQpRz+HESmk837L4bLDiRpJOZXstMJQ8Ic58B9Ac10="; + hash = "sha256-M+RiO5XTiJ1Cpmf3wbQYzcjH/VAZUlLV9ZdWJCkF6HA="; }; postPatch = '' From a4be0b1a83ac86dc3880b5463cdec7685444df4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 09:27:52 +0000 Subject: [PATCH 396/481] spotdl: 4.2.7 -> 4.2.8 --- pkgs/tools/audio/spotdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index ab5cdd8ca399..e7ced0c1e9d4 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.7"; + version = "4.2.8"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-AZpTxfnUyOLcPJQJyk77eqw1EbN3s7/8QQMxcxyJVKE="; + hash = "sha256-1NPYMyiYWWpiGlr80IcILcC1nI8zkmf7+aA+mqwSAU0="; }; build-system = with python3.pkgs; [ poetry-core ]; From 5ee0e690f0c05b393edb731ed562dcb84e6bbf9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 09:38:47 +0000 Subject: [PATCH 397/481] arkade: 0.11.22 -> 0.11.24 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index aeccc7e8d472..246327a44364 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.11.22"; + version = "0.11.24"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - hash = "sha256-Qc8cQLLRcCNYouWfs8NzF9nrKIPrM1+1VA0wbP2iupQ="; + hash = "sha256-9g3SGfJLzn+WIkBGcCwgOaJSuSUSFSU8d/9NZlN0h8E="; }; CGO_ENABLED = 0; From e233e7d385036ee811e911fcf599ae9eb4274ddf Mon Sep 17 00:00:00 2001 From: eyjhb Date: Wed, 14 Aug 2024 12:14:48 +0200 Subject: [PATCH 398/481] nixos/teeworlds: add option `environmentFile` for injecting secrets --- nixos/modules/services/games/teeworlds.nix | 37 +++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index b21fe008896a..77942c46a083 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -368,6 +368,33 @@ in ''; }; }; + + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/var/lib/teeworlds/teeworlds.env"; + description = '' + Environment file as defined in {manpage}`systemd.exec(5)`. + + Secrets may be passed to the service without adding them to the world-readable + Nix store, by specifying placeholder variables as the option value in Nix and + setting these variables accordingly in the environment file. + + ``` + # snippet of teeworlds-related config + services.teeworlds.password = "$TEEWORLDS_PASSWORD"; + ``` + + ``` + # content of the environment file + TEEWORLDS_PASSWORD=verysecretpassword + ``` + + Note that this file needs to be available on the host on which + `teeworlds` is running. + ''; + }; + }; }; @@ -383,7 +410,15 @@ in serviceConfig = { DynamicUser = true; - ExecStart = "${cfg.package}/bin/teeworlds_srv -f ${teeworldsConf}"; + RuntimeDirectory = "teeworlds"; + RuntimeDirectoryMode = "0700"; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + ExecStartPre = '' + ${pkgs.envsubst}/bin/envsubst \ + -i ${teeworldsConf} \ + -o /run/teeworlds/teeworlds.yaml + ''; + ExecStart = "${cfg.package}/bin/teeworlds_srv -f /run/teeworlds/teeworlds.yaml"; # Hardening CapabilityBoundingSet = false; From a719f91a85a2c303f00fa72e98b6acdf3ee56528 Mon Sep 17 00:00:00 2001 From: eyjhb Date: Tue, 10 Sep 2024 11:40:24 +0200 Subject: [PATCH 399/481] nixos/teeworlds: use `lib.getExe` instead of hardcoded path --- nixos/modules/services/games/teeworlds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/games/teeworlds.nix b/nixos/modules/services/games/teeworlds.nix index 77942c46a083..f12647149573 100644 --- a/nixos/modules/services/games/teeworlds.nix +++ b/nixos/modules/services/games/teeworlds.nix @@ -418,7 +418,7 @@ in -i ${teeworldsConf} \ -o /run/teeworlds/teeworlds.yaml ''; - ExecStart = "${cfg.package}/bin/teeworlds_srv -f /run/teeworlds/teeworlds.yaml"; + ExecStart = "${lib.getExe cfg.package} -f /run/teeworlds/teeworlds.yaml"; # Hardening CapabilityBoundingSet = false; From 446599a6f8c58755e08f346a8c6d20899ab33039 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 09:41:03 +0000 Subject: [PATCH 400/481] yandex-music: 5.14.0 -> 5.15.0 --- pkgs/by-name/ya/yandex-music/info.json | 8 ++++---- pkgs/by-name/ya/yandex-music/package.nix | 4 ++-- pkgs/by-name/ya/yandex-music/ym_info.json | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ya/yandex-music/info.json b/pkgs/by-name/ya/yandex-music/info.json index abd8451dd321..7564f59339cc 100644 --- a/pkgs/by-name/ya/yandex-music/info.json +++ b/pkgs/by-name/ya/yandex-music/info.json @@ -1,7 +1,7 @@ { "branch": "master", - "commit_hash": "8d7a26f3f3095044dd08422d9bca5607aa173103", - "commit_message": "Merge pull request #105 from byBenPuls/master", - "date": "2024-09-02", - "tag": "v5.14.0" + "commit_hash": "98fed92683e2e5a49999d04b5559edd02eddf627", + "commit_message": "Update packages", + "date": "2024-09-10", + "tag": "v5.15.0" } diff --git a/pkgs/by-name/ya/yandex-music/package.nix b/pkgs/by-name/ya/yandex-music/package.nix index a4a450af0b4a..a26e729d7b16 100644 --- a/pkgs/by-name/ya/yandex-music/package.nix +++ b/pkgs/by-name/ya/yandex-music/package.nix @@ -14,13 +14,13 @@ }: stdenvNoCC.mkDerivation rec { pname = "yandex-music"; - version = "5.14.0"; + version = "5.15.0"; src = fetchFromGitHub { owner = "cucumber-sp"; repo = "yandex-music-linux"; rev = "v${version}"; - hash = "sha256-M0UcnrYtlrRY1sN65UPXcgEAzcdSpKWeHn4kbLDRRaw="; + hash = "sha256-c+OKyhbgpXMryc6QQH4b5cePlqyHeSfDh4kT2rU+Tpo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yandex-music/ym_info.json b/pkgs/by-name/ya/yandex-music/ym_info.json index 7ea7db9e9cda..49ff918d36a8 100644 --- a/pkgs/by-name/ya/yandex-music/ym_info.json +++ b/pkgs/by-name/ya/yandex-music/ym_info.json @@ -1,9 +1,9 @@ { "ym": { - "version": "5.14.0", - "exe_name": "Yandex_Music_x64_5.14.0.exe", - "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.14.0.exe", - "exe_sha256": "b7a0a974666e68b5ed324a72ca9f53dcbdb35271e2b48fe5adc6bc6c8876e03d" + "version": "5.15.0", + "exe_name": "Yandex_Music_x64_5.15.0.exe", + "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.15.0.exe", + "exe_sha256": "14396a25b35199f28175d3c15924ec75560cbae6f5fb6767ec7f326637723e36" }, "electron": { "version": "29.4.6", From 757fe30b6379b7fdc7b7de87fd4c8758f9979f47 Mon Sep 17 00:00:00 2001 From: Dionysis Grigoropoulos Date: Tue, 10 Sep 2024 12:47:25 +0300 Subject: [PATCH 401/481] CONTRIBUTING.md: Update link to committers issue --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d99e465cc0e..d13585fc144d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -354,7 +354,7 @@ The following paragraphs about how to deal with unactive contributors is just a Please note that contributors with commit rights unactive for more than three months will have their commit rights revoked. --> -Please see the discussion in [GitHub nixpkgs issue #50105](https://github.com/NixOS/nixpkgs/issues/50105) for information on how to proceed to be granted this level of access. +Please see the discussion in [GitHub nixpkgs issue #321665](https://github.com/NixOS/nixpkgs/issues/321665) for information on how to proceed to be granted this level of access. In a case a contributor definitively leaves the Nix community, they should create an issue or post on [Discourse](https://discourse.nixos.org) with references of packages and modules they maintain so the maintainership can be taken over by other contributors. From d571aab7c0e68ebfdab504757e7e618a59fc770b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 09:53:03 +0000 Subject: [PATCH 402/481] astartectl: 23.5.2 -> 24.5.0 --- pkgs/by-name/as/astartectl/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/as/astartectl/package.nix b/pkgs/by-name/as/astartectl/package.nix index 4e6f2af641ec..361f77ff763f 100644 --- a/pkgs/by-name/as/astartectl/package.nix +++ b/pkgs/by-name/as/astartectl/package.nix @@ -5,7 +5,7 @@ }: buildGoModule rec { pname = "astartectl"; - version = "23.5.2"; + version = "24.5.0"; # Workaround for go vendor failing # https://github.com/astarte-platform/astartectl/pull/244 @@ -15,7 +15,7 @@ buildGoModule rec { owner = "astarte-platform"; repo = "astartectl"; rev = "v${version}"; - hash = "sha256-EIyta/10K6WQ1vzQZryz+c3K2AwMOUUQCw5f4Wkp6Yk="; + hash = "sha256-4Iyd+1hLSatWyeV2J7RSqo2jVEc8dSp5JBObsn3RciI="; }; vendorHash = "sha256-NWPLHbUHrk/oJXCOJF8kKhQiZR8aqZChxuz73Acu1cM="; From 20f3238cd31c9b49cdebc140bf10d5c8058699ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 09:56:30 +0000 Subject: [PATCH 403/481] balena-cli: 19.0.1 -> 19.0.3 --- pkgs/tools/admin/balena-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 9494f9762a93..bb326f1f3aeb 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -19,16 +19,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "19.0.1"; + version = "19.0.3"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-RJFOYNzaYfx1pEaHYOOnXxG4S9ygI4LX1wcg0yt4JNw="; + hash = "sha256-6odzj7/twhSJFxX2kbKbEOjzyZHjrg6Dd8d3LDtSzNU="; }; - npmDepsHash = "sha256-Z6hAq1rdYlpNLhJ+JIU3Aqgv1yHhWeV2IHkP7h1AOpk="; + npmDepsHash = "sha256-IWd3E6bjy5cQ4VsDV/zHyehxxINUsDEy3pKVfSWVpKU="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From f5d40dac128fb0f77b2d73ec70f3673b465e02c6 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 28 Aug 2024 15:20:40 +0000 Subject: [PATCH 404/481] nitrokey-pro-firmware: init at 0.15 Co-authored-by: Simon Bruder Co-authored-by: Abdullah Imad Co-authored-by: Alberto Merino Co-authored-by: Enric Morales Co-authored-by: Jack Leightcap Co-authored-by: Roland Coeurjoly --- .../ni/nitrokey-pro-firmware/package.nix | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 pkgs/by-name/ni/nitrokey-pro-firmware/package.nix diff --git a/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix new file mode 100644 index 000000000000..8c14178fc744 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-pro-firmware/package.nix @@ -0,0 +1,61 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeShellScriptBin, + python3, + srecord, + gcc-arm-embedded, +}: + +let + version = "0.15"; + + # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program. + fakeGit = writeShellScriptBin "git" '' + echo "${version}.nitrokey" + ''; + +in + +stdenv.mkDerivation { + pname = "nitrokey-pro-firmware"; + inherit version; + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-pro-firmware"; + rev = "v${version}"; + hash = "sha256-q+kbEOLA05xR6weAWDA1hx4fVsaN9UNKiOXGxPRfXuI="; + fetchSubmodules = true; + }; + + postPatch = '' + patchShebangs dapboot/libopencm3/scripts + ''; + + nativeBuildInputs = [ + fakeGit + gcc-arm-embedded + python3 + srecord + ]; + + installPhase = '' + runHook preInstall + install -D build/gcc/bootloader.hex $out/bootloader.hex + install -D build/gcc/nitrokey-pro-firmware.hex $out/firmware.hex + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey Pro device"; + homepage = "https://github.com/Nitrokey/nitrokey-pro-firmware"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + imadnyc + kiike + amerino + ]; + platforms = lib.platforms.unix; + }; +} From 77693ec7c3b5e61953cfb923beac98a1fecea626 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Wed, 28 Aug 2024 15:05:38 +0000 Subject: [PATCH 405/481] nitrokey-fido2-firmware: init at 2.4.1 Co-authored-by: Simon Bruder Co-authored-by: Abdullah Imad Co-authored-by: Alberto Merino Co-authored-by: Enric Morales Co-authored-by: Jack Leightcap Co-authored-by: Roland Coeurjoly --- .../ni/nitrokey-fido2-firmware/package.nix | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix diff --git a/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix new file mode 100644 index 000000000000..843a3637a855 --- /dev/null +++ b/pkgs/by-name/ni/nitrokey-fido2-firmware/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + writeShellScriptBin, + gcc-arm-embedded, + pynitrokey, + python3, + + # The make target to run + makeTarget ? "release-buildv", + # Whether the firmware should include the production public key for the bootloader + release ? true, +}: + +let + # The latest release is found on the releases page; do not rely on the latest tag. + # They normally contain the suffix `.nitrokey`. + # https://github.com/Nitrokey/nitrokey-fido2-firmware/releases + version = "2.4.1"; + + # The firmware version is pulled from `git` so we stub it here to avoid pulling the whole program. + fakeGit = writeShellScriptBin "git" '' + echo "${version}.nitrokey" + ''; + +in +stdenv.mkDerivation { + pname = "nitrokey-fido2-firmware"; + inherit version; + + src = fetchFromGitHub { + owner = "Nitrokey"; + repo = "nitrokey-fido2-firmware"; + rev = "${version}.nitrokey"; + hash = "sha256-7AsnxRf8mdybI6Mup2mV01U09r5C/oUX6fG2ymkkOOo="; + fetchSubmodules = true; + }; + + postPatch = '' + # Remove a duplicate firmware_version definition. Without this, + # firmware_version is defined multiple times, triggering a build error. + substituteInPlace fido2/version.h \ + --replace-fail "const version_t firmware_version ;" "" + ''; + + nativeBuildInputs = [ + fakeGit + # only gcc-arm-embedded includes libc_nano.a + gcc-arm-embedded + pynitrokey + python3 + ]; + + preBuild = '' + cd targets/stm32l432 + ''; + + makeFlags = [ + "${makeTarget}" + "RELEASE=${toString release}" + ]; + + installPhase = '' + runHook preInstall + cp -r release $out + runHook postInstall + ''; + + meta = { + description = "Firmware for the Nitrokey FIDO2 device"; + homepage = "https://github.com/Nitrokey/nitrokey-fido2-firmware"; + maintainers = with lib.maintainers; [ + amerino + kiike + imadnyc + ]; + license = with lib.licenses; [ + asl20 + mit + ]; + platforms = lib.platforms.unix; + }; +} From a70eab343b1b5af03700d8e2312f3d89e1f85300 Mon Sep 17 00:00:00 2001 From: Alexandru Scvortov Date: Tue, 10 Sep 2024 11:24:15 +0100 Subject: [PATCH 406/481] livebook: 0.13.3 -> 0.14.0 --- pkgs/servers/web-apps/livebook/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/web-apps/livebook/default.nix b/pkgs/servers/web-apps/livebook/default.nix index 8e8e0b997464..b85e3d7420c2 100644 --- a/pkgs/servers/web-apps/livebook/default.nix +++ b/pkgs/servers/web-apps/livebook/default.nix @@ -1,7 +1,7 @@ { lib, beamPackages, makeWrapper, rebar3, elixir, erlang, fetchFromGitHub, nixosTests }: beamPackages.mixRelease rec { pname = "livebook"; - version = "0.13.3"; + version = "0.14.0"; inherit elixir; @@ -13,13 +13,13 @@ beamPackages.mixRelease rec { owner = "livebook-dev"; repo = "livebook"; rev = "v${version}"; - hash = "sha256-luvqH6fjovRhVQrsP00XLSQ/rjHZgUbUWmL2B5XCyKI="; + hash = "sha256-8z6t7AzOPS7zxNdS5+qGE1DpvhWNbHnDLCta7igA5vY="; }; mixFodDeps = beamPackages.fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version; - hash = "sha256-/U/UmNVtl7H0rdgXpibM/bYvRbio8WzVRTv4tQ7GQcY="; + hash = "sha256-7avxuqbZtNWgUfalbq/OtggmUI/4QK+S792iqcCjRHM="; }; postInstall = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac6998c1f8f2..c10a6cfe1c0a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3793,8 +3793,8 @@ with pkgs; lesspass-cli = callPackage ../tools/security/lesspass-cli { }; livebook = callPackage ../servers/web-apps/livebook { - elixir = elixir_1_16; - beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_16; }); + elixir = elixir_1_17; + beamPackages = beamPackages.extend (self: super: { elixir = elixir_1_17; }); }; lsix = callPackage ../tools/graphics/lsix { }; From 4637858ca04f703326e3929fc356a354b441231d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 10 Sep 2024 13:25:30 +0300 Subject: [PATCH 407/481] kdePackages: Plasma 6.1.4 -> 6.1.5 --- pkgs/kde/generated/sources/plasma.json | 384 ++++++++++++------------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 1dbb8340e05c..6d1081703184 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,322 +1,322 @@ { "bluedevil": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/bluedevil-6.1.4.tar.xz", - "hash": "sha256-cPjpXMm1kSBOgjJ4kkBHqeOWWwOFv5oSIgEy5sAMFA8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/bluedevil-6.1.5.tar.xz", + "hash": "sha256-KZWNoIsyQr2kJDiYnuPsuB04bKW+cjMlBuXPDe0LcHc=" }, "breeze": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-6.1.4.tar.xz", - "hash": "sha256-Imcm3zewPLyuFUCfy13Dtp9WCu5oVB5AHivXYIDaAaU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-6.1.5.tar.xz", + "hash": "sha256-VEkXfJBhP5e0dK53YoXM/G6Gc2kdEgM32VNwyefIPLI=" }, "breeze-grub": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-grub-6.1.4.tar.xz", - "hash": "sha256-kU++NVAJnd4PBufxsixTui7iF+7Dz+d3GntvbWxicAQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-grub-6.1.5.tar.xz", + "hash": "sha256-ezzwtCaAG9dLvWuPDcSvN7E3UPl7817c006moU0gCQk=" }, "breeze-gtk": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-gtk-6.1.4.tar.xz", - "hash": "sha256-Xlv86u28XdtpPxd17QAuWBmyYXgyGjHclNO/2NYQrsk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-gtk-6.1.5.tar.xz", + "hash": "sha256-lgw98EdCPoXh8zvbYLcb3HSGuZQdideFMQ3r5QG9RtE=" }, "breeze-plymouth": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/breeze-plymouth-6.1.4.tar.xz", - "hash": "sha256-6XdesIkZALeHBnBNjIpCY5cMrHUzmL8REcXkhzevL/4=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/breeze-plymouth-6.1.5.tar.xz", + "hash": "sha256-Z2H6s/bVdWhjWwfBwjRgqRaBLgSXk3IYAdd6xd+O1gs=" }, "discover": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/discover-6.1.4.tar.xz", - "hash": "sha256-ZOc+mQvr4TomFCRfA761HFAnwoX8eTMJos/3nmFW0oQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/discover-6.1.5.tar.xz", + "hash": "sha256-biz1n6wst5JCDtbfZT+AMH1uM9bmrpwa8oJ6k7rjy40=" }, "drkonqi": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/drkonqi-6.1.4.tar.xz", - "hash": "sha256-a5cXw7BrkHFLQLw/iyiNJM2uI5Bgk2JXfuDh6QHgOFs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/drkonqi-6.1.5.tar.xz", + "hash": "sha256-Dhsn5OjrUdEcO9SnyfA5my6qP6tr6H3fQNKL4N6ujb8=" }, "flatpak-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/flatpak-kcm-6.1.4.tar.xz", - "hash": "sha256-5Bt38ewwuLIkDLCQA0EOYB2s3VkhIuCFNeXFsVeCvhI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/flatpak-kcm-6.1.5.tar.xz", + "hash": "sha256-UI99mL0UEkIUdG8kSAT+3c0kWIyw63xYA5B7IlE9KQo=" }, "kactivitymanagerd": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kactivitymanagerd-6.1.4.tar.xz", - "hash": "sha256-mJZSw3G6gRw+ubFhswaH9Gyv/DvB+skXVUx5UUqYcMA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kactivitymanagerd-6.1.5.tar.xz", + "hash": "sha256-P4r9onN4eALVzUa/dvjxRn7OHyHIO7qmUTQ1d1UjgQ8=" }, "kde-cli-tools": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kde-cli-tools-6.1.4.tar.xz", - "hash": "sha256-1thK/HG6tr7EXKhzM7JhaUkgzCJGNFs2PMRp7a2uGuI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kde-cli-tools-6.1.5.tar.xz", + "hash": "sha256-wPM2Bir4AIBFTKOahatgvKHseoVOhMCdSSgwsRB5AxM=" }, "kdecoration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kdecoration-6.1.4.tar.xz", - "hash": "sha256-h/DgCGkHjhBIVRkqtC22PR1qTSul6QvzU2kIteS3u/E=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kdecoration-6.1.5.tar.xz", + "hash": "sha256-POFs6mWdhj9465PVZ7+VKz9mRAvs1CSwbSBB/wZ53vc=" }, "kde-gtk-config": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kde-gtk-config-6.1.4.tar.xz", - "hash": "sha256-s9TlyNoudSW9I8d6hUaOOnzzsanZyeiuaofiB6P5gBk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kde-gtk-config-6.1.5.tar.xz", + "hash": "sha256-Yx5Z9SYZ3alA0gWU3FUAjC8ZLacF5sXb+m0lF1CHti4=" }, "kdeplasma-addons": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kdeplasma-addons-6.1.4.tar.xz", - "hash": "sha256-izOaflDG+fOj0UyvEF2D5/OhW7yWdDF+OdVV+6G+mhI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kdeplasma-addons-6.1.5.tar.xz", + "hash": "sha256-Nrb54cA+UupOXQQJoHhhF8gkcWYWny0KIh8g8a6riGM=" }, "kgamma": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kgamma-6.1.4.tar.xz", - "hash": "sha256-vSCIKmZ2p2oGIGtCQ2irSu9yeYcepUYbvYUi2sFxinw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kgamma-6.1.5.tar.xz", + "hash": "sha256-L0Psa0q6wnJJsQFZTxnyIv5+WUcFT1JSwRqdnsIKtCw=" }, "kglobalacceld": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kglobalacceld-6.1.4.tar.xz", - "hash": "sha256-bLSTvqMxaskW6H9WAimal/HwL9wBZppS6iUiOmCFrag=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kglobalacceld-6.1.5.tar.xz", + "hash": "sha256-3A4Kl34Lrhd4jnAwvsONZVrvYMzgG3QOSPVXmkcx06o=" }, "kinfocenter": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kinfocenter-6.1.4.tar.xz", - "hash": "sha256-F539wiT/ZvHWkkVlYLHJ8N10tWjiMzRxgjFnCawlINk=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kinfocenter-6.1.5.tar.xz", + "hash": "sha256-CXauQ3Vrbdv05w51DLF/Qi2r52BMXi+CSrTx4BYa5dA=" }, "kmenuedit": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kmenuedit-6.1.4.tar.xz", - "hash": "sha256-xqLXReZAKEPbCrxjPv9jYtbk0tgO9OpbB9PZxdwK39A=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kmenuedit-6.1.5.tar.xz", + "hash": "sha256-/LJ6g6VVT7VlRjO+0Iy2CJhlcuMPXkJBYHo1TsidZVY=" }, "kpipewire": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kpipewire-6.1.4.tar.xz", - "hash": "sha256-qxFtVv2Kazbaa1lfWXz0OD2O0XH45iXcpnt6RkUzcTQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kpipewire-6.1.5.tar.xz", + "hash": "sha256-JbMs/K/zUvDErNpXRq3/0uOyi1/wZIUhvehijKcUWkk=" }, "krdp": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/krdp-6.1.4.tar.xz", - "hash": "sha256-dN6OGFvmfTW91mpBlMedf+TZh5SjPsm+kVQzyGvFkcs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/krdp-6.1.5.tar.xz", + "hash": "sha256-qR3iyOi2/oUu3u5QtyLyq+vDs4R31++TX55re3znxrc=" }, "kscreen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kscreen-6.1.4.tar.xz", - "hash": "sha256-mf5k7bCX/IKF7CvTIi0C/LXJVg0p/L5B9/S4mLHjMa8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kscreen-6.1.5.tar.xz", + "hash": "sha256-QWap9tWI7v3BntnZqeD4Jlq0mZviSLoRtI7jU+y8UR8=" }, "kscreenlocker": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kscreenlocker-6.1.4.tar.xz", - "hash": "sha256-HccK6N42XT7EH49aM7Rgma3VplDCNGn3pz9yyFs663M=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kscreenlocker-6.1.5.tar.xz", + "hash": "sha256-oOqDVBIqKOCsxuxgSnZY/uWwDxJcwJ6nWMm5G/PH8Pw=" }, "ksshaskpass": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ksshaskpass-6.1.4.tar.xz", - "hash": "sha256-W3Izf5OaqBRI6JK9PLYvWb120M0PnYBwAUYDP7vZZQw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ksshaskpass-6.1.5.tar.xz", + "hash": "sha256-NN1y8r94XdS2yYlEvU5ETb60a7Xy10xblbrtghxnGPE=" }, "ksystemstats": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ksystemstats-6.1.4.tar.xz", - "hash": "sha256-pBETmZ+QdzzYfy5u10solTu6fA9vnQ1xMWSF7jvAg5w=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ksystemstats-6.1.5.tar.xz", + "hash": "sha256-hCW7nwdiNNFn6vaJt09ynioFYcNnRz6KhPq0pMOcaJM=" }, "kwallet-pam": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwallet-pam-6.1.4.tar.xz", - "hash": "sha256-cySxPgMnz7c/20reiUjK0XuFTgIkHfqcF8urhY8vLjY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwallet-pam-6.1.5.tar.xz", + "hash": "sha256-swysTx4mY3dlR5U6YhCTcdX5tDRKjfkgeILx4d3koD8=" }, "kwayland": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwayland-6.1.4.tar.xz", - "hash": "sha256-hpHAbmWsLHOd5IQsDRIZV577SuGGS4YU3HSkZF3Vl3Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwayland-6.1.5.tar.xz", + "hash": "sha256-Z6PhVzC9o2Bz8wQivcIa7ie/IF++7BorgCDJ0al/jak=" }, "kwayland-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwayland-integration-6.1.4.tar.xz", - "hash": "sha256-XB4oE4Yh2AYd75CGQsahPqttMRkoUFL2oeF3lLOAzk4=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwayland-integration-6.1.5.tar.xz", + "hash": "sha256-I8YQID8b+qzMgnGOYK2qMz4x3UKDfU6E3/DPgOYUxog=" }, "kwin": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwin-6.1.4.tar.xz", - "hash": "sha256-/P/ORo3qI6ksrTOsGxJkxVwHmdSX9U9rjiNDnc2t6zo=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwin-6.1.5.tar.xz", + "hash": "sha256-ugqs4yMZW1itv94U7HTN1MKMIR14pWfESvcPM23Ks/c=" }, "kwrited": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/kwrited-6.1.4.tar.xz", - "hash": "sha256-z76mnrm3S33+/m1m8Jso3os0jMt8rF7sZUtKRlJFgUs=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/kwrited-6.1.5.tar.xz", + "hash": "sha256-oFnd8o7Oi0OYml6ofkR/o/Ajea7HmKHefLWaWqoqlhg=" }, "layer-shell-qt": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/layer-shell-qt-6.1.4.tar.xz", - "hash": "sha256-YjnS3GvvU4a5SOwhgCAqGPdeI/N5AsLXQQ+zgR37Mmg=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/layer-shell-qt-6.1.5.tar.xz", + "hash": "sha256-0Ry1X3XW64kE5IzQloVwQ6bamQCxw0t6xXFubkbw7TI=" }, "libkscreen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libkscreen-6.1.4.tar.xz", - "hash": "sha256-cwJivuy8YnC5avwNP7v+tUa044OIkiKzhdB67LQsZns=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libkscreen-6.1.5.tar.xz", + "hash": "sha256-WPUjqd/gely5dY1g9qfxyfQBICifg1UVpOLY1tbaTGU=" }, "libksysguard": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libksysguard-6.1.4.tar.xz", - "hash": "sha256-0qeuvJVxzoG0ynkJW3Sg2RgpwkkwPSJGIDggOkxWxbE=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libksysguard-6.1.5.tar.xz", + "hash": "sha256-rQH6LGZPgs4kt9YXvBmUIGN2Nz+b1krjE7Mof9WKArk=" }, "libplasma": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/libplasma-6.1.4.tar.xz", - "hash": "sha256-Kv4xTZlg6G4NF5mqwmkExWZb4pNNXZ1chTO6liprhBA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/libplasma-6.1.5.tar.xz", + "hash": "sha256-d8K4Ot5pmawOUmmk6HKEQ6fWGUbWjQu0EQarQpKnnMk=" }, "milou": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/milou-6.1.4.tar.xz", - "hash": "sha256-coA8zCCnhG7kWY/h6yyFobz+aKxeI3ZuS0tgelJyAII=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/milou-6.1.5.tar.xz", + "hash": "sha256-QFFIoS7n/siTiPmbxUhVB1SMhRLeIroDAlFURCc1OQo=" }, "ocean-sound-theme": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/ocean-sound-theme-6.1.4.tar.xz", - "hash": "sha256-ogAEz6y4sNzp5d63LXVe6Wv9GOtzB6ChuCnDL9ylb1w=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/ocean-sound-theme-6.1.5.tar.xz", + "hash": "sha256-ro+lnDo8PTekOOOrXtEcwAjqBFAZU3cL2euTJwBRKTU=" }, "oxygen": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/oxygen-6.1.4.tar.xz", - "hash": "sha256-A2AX2f33J2TLS7B4lypdlcYdYvhlEAxW71qBHjGrqdU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/oxygen-6.1.5.tar.xz", + "hash": "sha256-B0HWside8AtZPvXjHKJniZ1zvD8W0TLJKkLnZ+wCVzU=" }, "oxygen-sounds": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/oxygen-sounds-6.1.4.tar.xz", - "hash": "sha256-aHXpmEzhnHnsGZ9uju0f2FoIinhmlxCoj2ErWCqjQck=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/oxygen-sounds-6.1.5.tar.xz", + "hash": "sha256-ZpCkniLRWmpogrh/clqdo7xJYXe4mjlSsBVVqYu0RqU=" }, "plasma5support": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma5support-6.1.4.tar.xz", - "hash": "sha256-yZ/VDWSW988SPRHjdnkLy81sgGcK9+kD7gKVrULdRNY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma5support-6.1.5.tar.xz", + "hash": "sha256-BWNYUiLFMz4iee/agpw2oTl0HJ4M86024+gJaEDAF9E=" }, "plasma-activities": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-6.1.4.tar.xz", - "hash": "sha256-7LOVeSNL/+uPUYq30ZZAkbMW8Pl8JRyJCZLud7j1IoY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-6.1.5.tar.xz", + "hash": "sha256-s1P7564w9qBO9PgdPgJQZUoPmFmp70MhTInHi5JOKEs=" }, "plasma-activities-stats": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-activities-stats-6.1.4.tar.xz", - "hash": "sha256-kvrmvylZTF/pliUIa8lPW7q5knYPlta0Mk6Txex/IHc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-activities-stats-6.1.5.tar.xz", + "hash": "sha256-JiBQpTiU3gbxND+x1QtuAPeXo+NJMW7d/re1Fs3cDd8=" }, "plasma-browser-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-browser-integration-6.1.4.tar.xz", - "hash": "sha256-1r+a6v48iw5lzB78SEbQwhI20Elh3qjG1qezPi1MPFU=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-browser-integration-6.1.5.tar.xz", + "hash": "sha256-Q2JcNeo57uvtesyXWazGCHGrwdK4jcnnuQivpMAJiqo=" }, "plasma-desktop": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-desktop-6.1.4.tar.xz", - "hash": "sha256-g7iX9gL73LjVcZCMJ/IwPh+LqN3tM8GwN1JDfEEkh9E=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-desktop-6.1.5.tar.xz", + "hash": "sha256-2eI2yamjMti3tO3eRMZdCw7Djqda3Fu/ohpsTH9CYcI=" }, "plasma-disks": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-disks-6.1.4.tar.xz", - "hash": "sha256-eV9r2rov6XnVg2R5ER/D1vxrKgs1W0jIMz21q7XfTEc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-disks-6.1.5.tar.xz", + "hash": "sha256-XXZpwBnovmaLmF1z1/D9sxWYSpCsewzx45ibgJRubEo=" }, "plasma-firewall": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-firewall-6.1.4.tar.xz", - "hash": "sha256-yz8cmu0MZZ4KvKPIIEGGDr9ACfDnMQPrVlKZtIo3u2Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-firewall-6.1.5.tar.xz", + "hash": "sha256-TtMb3Y8CEScpR1GM8uvqVHu8RLfPxvbz50fsyRi0r0I=" }, "plasma-integration": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-integration-6.1.4.tar.xz", - "hash": "sha256-CKEoI/14574E4j8d0fXubrFTXKtWEjfW79Sw0DLcqnQ=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-integration-6.1.5.tar.xz", + "hash": "sha256-FatL93CRJOxP54QiggkByO+3+7kiRVdr5XyEdIKl7Js=" }, "plasma-mobile": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-mobile-6.1.4.tar.xz", - "hash": "sha256-lJsF1BwFpadOS3qqoFBg/B5AabOPT87AbCnLy/kjMNI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-mobile-6.1.5.tar.xz", + "hash": "sha256-z1vUSN34Lfw6Zh4I6va0al5wa+yzDuwYfppXTokILa0=" }, "plasma-nano": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-nano-6.1.4.tar.xz", - "hash": "sha256-hE59Cmt4GSgN85e6mcRNQsJ1A5N7/yoTpqxDrrjYiMI=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-nano-6.1.5.tar.xz", + "hash": "sha256-weZFmXGZ/l4kn7JKA4kkhlcL3kgVPVLUkDQ58wlLosY=" }, "plasma-nm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-nm-6.1.4.tar.xz", - "hash": "sha256-FK9HEIzzKvaMANDOb7NifztKkeLgV6bvW6j8/Lb1BeE=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-nm-6.1.5.tar.xz", + "hash": "sha256-ywTdrwDXKOoLS10QizOJ1GLOUHhyb4tlXzjeMw7rIfU=" }, "plasma-pa": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-pa-6.1.4.tar.xz", - "hash": "sha256-NEvUYKj2qf9E6/cT9kWfsdxcOrHD7aWs9m+8kfPkc00=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-pa-6.1.5.tar.xz", + "hash": "sha256-ckwFkdvr3l+WxBYxbJAOiPSmbXSJBe0cp05hUjV6dZE=" }, "plasma-sdk": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-sdk-6.1.4.tar.xz", - "hash": "sha256-8GZKIu6Z9BUFC8LtWD2KE3IUrLKCkwyw8eDZsX7Sc0o=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-sdk-6.1.5.tar.xz", + "hash": "sha256-jQ1OheR9KCSblR88mX9ghVoQyt7Ze+o0FAc5flUbjEY=" }, "plasma-systemmonitor": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-systemmonitor-6.1.4.tar.xz", - "hash": "sha256-JipI0p2gYbx2qnwkkE1IKLwt7AtmQKz/zjeZGUxL5Fc=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-systemmonitor-6.1.5.tar.xz", + "hash": "sha256-C17szwR1FiWfcgXBQ4FC1KglLq3gC7hhtm1IMbsDpwQ=" }, "plasma-thunderbolt": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-thunderbolt-6.1.4.tar.xz", - "hash": "sha256-gahEJUn8r3wA/VESR0jB1IhcUTrCSwq4nwSGbabtTGw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-thunderbolt-6.1.5.tar.xz", + "hash": "sha256-lAKt8+6u1MXvynGXVbWfLShk2prV/YHSKzqPX9bjrmA=" }, "plasma-vault": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-vault-6.1.4.tar.xz", - "hash": "sha256-NKT/TFub9v51xOqwIl2uohwlEpF53vyJsLkuyxp7yN8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-vault-6.1.5.tar.xz", + "hash": "sha256-ULE1v9sVmUd0QSJ4hwn4kSp2Ew0pIOqXdc5AL3p9xAQ=" }, "plasma-welcome": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-welcome-6.1.4.tar.xz", - "hash": "sha256-pK22ef6cdc3cUVOmMTgJoRtMRxndEFkNBE0pNcfVO34=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-welcome-6.1.5.tar.xz", + "hash": "sha256-Euzp59YcPsaiP+k1dmdBbiaAKrr9xp8kXMPZagXvnZY=" }, "plasma-workspace": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-6.1.4.tar.xz", - "hash": "sha256-yyCZ3TnAsj/0sFyM9leEUYcHXTH3X+QfD+Ae3OVsjVY=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-6.1.5.tar.xz", + "hash": "sha256-wp4Vo+1CRG+Ze34WlYZPhev/CE4uzlgckUoNio4mWuc=" }, "plasma-workspace-wallpapers": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plasma-workspace-wallpapers-6.1.4.tar.xz", - "hash": "sha256-iPZcI2CNeTMXzDaeqO792rJuYaIcptQ0oCDv7ppbQ8Q=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plasma-workspace-wallpapers-6.1.5.tar.xz", + "hash": "sha256-qOpCuZslRm1S0/5Vcsn7w4cJvxNwVEiOk3+HDzNU7gI=" }, "plymouth-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/plymouth-kcm-6.1.4.tar.xz", - "hash": "sha256-K1U6vuM4JPLWEtW2Qd3pkL746Qvw7L13zF6gSHwDNFw=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/plymouth-kcm-6.1.5.tar.xz", + "hash": "sha256-Bz4D+KhROOBdiGcqXB4GIjjjSz3t5BGPKRHCAMBVWHU=" }, "polkit-kde-agent-1": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/polkit-kde-agent-1-6.1.4.tar.xz", - "hash": "sha256-ePqZS3Eqq82+/e8MBfr9oEasPOTlBlfYGjzDD6Jd278=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/polkit-kde-agent-1-6.1.5.tar.xz", + "hash": "sha256-CWXl/61DKj5u6eNVQO/Le0CDIApIxp2R5SXAmke5IPY=" }, "powerdevil": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/powerdevil-6.1.4.tar.xz", - "hash": "sha256-oalm4uJJgwXjM5fvJ9+mjRAlX8twmbDZHF7ajUKQE+U=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/powerdevil-6.1.5.tar.xz", + "hash": "sha256-BQ4cb88H2izXv+IqYYqpFQS7KwC9MapoEhuQPN6dhF0=" }, "print-manager": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/print-manager-6.1.4.tar.xz", - "hash": "sha256-xXR79USAS6EhED0mRP/dblLtgEZWgpLMohdROnbQDt8=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/print-manager-6.1.5.tar.xz", + "hash": "sha256-pJRE4WoHlZUxU2UlF8ZlcamYujjc2IYWa4gjHpbIzhI=" }, "qqc2-breeze-style": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/qqc2-breeze-style-6.1.4.tar.xz", - "hash": "sha256-j7m8QVb53JIMY7DYr6pKrLcutlDpB8BtrN44v9VdUWg=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/qqc2-breeze-style-6.1.5.tar.xz", + "hash": "sha256-a0tsDwiy7OO12hyJ3mzhBiHY4mt/q+2/YBA6XyyK+EU=" }, "sddm-kcm": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/sddm-kcm-6.1.4.tar.xz", - "hash": "sha256-IE9gmeyxQOtYjOkHT/zBRCES4pHSzd7obDGYPJ9OFKA=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/sddm-kcm-6.1.5.tar.xz", + "hash": "sha256-AJI1F003IHnuOq31HgvX2ho4LRhSrmWwuWcQsiZpjpw=" }, "systemsettings": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/systemsettings-6.1.4.tar.xz", - "hash": "sha256-wOomYnfMt1mns7nFidYJlnTz4/YD56pHHtidxq0AfaM=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/systemsettings-6.1.5.tar.xz", + "hash": "sha256-B0J66nzuCzSrzD732q8D1ivfcgXKP5ccjT+u3AunT9c=" }, "wacomtablet": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/wacomtablet-6.1.4.tar.xz", - "hash": "sha256-Uy8DnsW7JltwxlyeDiiwNh39Tzt71Z4nj0nZ26szf4k=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/wacomtablet-6.1.5.tar.xz", + "hash": "sha256-IerMb3eC/fnKcYndlP2OyRAzAs9gWY91chY18N8MREo=" }, "xdg-desktop-portal-kde": { - "version": "6.1.4", - "url": "mirror://kde/stable/plasma/6.1.4/xdg-desktop-portal-kde-6.1.4.tar.xz", - "hash": "sha256-OMoV/YbV/vLMeayY9WtM09k879MugtOyJGu3dALcp7I=" + "version": "6.1.5", + "url": "mirror://kde/stable/plasma/6.1.5/xdg-desktop-portal-kde-6.1.5.tar.xz", + "hash": "sha256-CdE8DAb93AgySdH1vpB+Jx6jnwH1d9N9JnQ7Ad9aaXg=" } } \ No newline at end of file From b6dd5c248a4b2a3e2d651c186772adef59fcf13f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 10:41:12 +0000 Subject: [PATCH 408/481] python312Packages.rotary-embedding-torch: 0.7.0 -> 0.8.3 --- .../python-modules/rotary-embedding-torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 67cf461168a2..3f314290871d 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.7.0"; + version = "0.8.3"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-QxCSJNcyouK5FvCnKiyD1ZtIEQ5DaDB/n+lUCjwAk+4="; + hash = "sha256-oxlWx3cB+gsFwSre+e8e792Y012zOzhUrO0wxEwzrgI="; }; nativeBuildInputs = [ From 82f77adf9b59d38ef9feda98243dcc91f52dda8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 10:41:16 +0000 Subject: [PATCH 409/481] uv: 0.4.7 -> 0.4.8 --- pkgs/by-name/uv/uv/Cargo.lock | 34 ++++++++++++++++++++++++++++++---- pkgs/by-name/uv/uv/package.nix | 4 ++-- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 91fd47e6f44a..28a850fcf312 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -1040,6 +1040,7 @@ dependencies = [ "platform-tags", "pypi-types", "rkyv", + "rustc-hash", "schemars", "serde", "serde_json", @@ -1047,6 +1048,7 @@ dependencies = [ "tracing", "url", "urlencoding", + "uv-cache-info", "uv-fs", "uv-git", "uv-normalize", @@ -1779,6 +1781,7 @@ dependencies = [ "tempfile", "thiserror", "tracing", + "uv-cache-info", "uv-fs", "uv-normalize", "uv-warnings", @@ -2825,9 +2828,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "ea0a9b3a42929fad8a7c3de7f86ce0814cfa893328157672680e9fb1145549c5" dependencies = [ "bytes", "rand", @@ -4441,7 +4444,7 @@ checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" [[package]] name = "uv" -version = "0.4.7" +version = "0.4.8" dependencies = [ "anstream", "anyhow", @@ -4497,6 +4500,7 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cache-info", "uv-cli", "uv-client", "uv-configuration", @@ -4594,11 +4598,24 @@ dependencies = [ "tempfile", "tracing", "url", + "uv-cache-info", "uv-fs", "uv-normalize", "walkdir", ] +[[package]] +name = "uv-cache-info" +version = "0.0.1" +dependencies = [ + "fs-err", + "schemars", + "serde", + "thiserror", + "toml", + "tracing", +] + [[package]] name = "uv-cli" version = "0.0.1" @@ -4680,6 +4697,7 @@ name = "uv-configuration" version = "0.0.1" dependencies = [ "anyhow", + "cache-key", "clap", "distribution-types", "either", @@ -4695,6 +4713,7 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cache-info", "uv-normalize", ] @@ -4792,6 +4811,7 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-client", "uv-configuration", "uv-extract", @@ -4895,6 +4915,7 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-configuration", "uv-distribution", "uv-extract", @@ -4983,6 +5004,7 @@ dependencies = [ "tracing", "url", "uv-cache", + "uv-cache-info", "uv-client", "uv-extract", "uv-fs", @@ -5115,6 +5137,7 @@ dependencies = [ "thiserror", "toml", "tracing", + "uv-cache-info", "uv-configuration", "uv-fs", "uv-macros", @@ -5194,7 +5217,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.7" +version = "0.4.8" [[package]] name = "uv-virtualenv" @@ -5225,6 +5248,8 @@ dependencies = [ name = "uv-workspace" version = "0.0.1" dependencies = [ + "anyhow", + "assert_fs", "either", "fs-err", "glob", @@ -5238,6 +5263,7 @@ dependencies = [ "same-file", "schemars", "serde", + "tempfile", "thiserror", "tokio", "toml", diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 74d9b70ccfbc..b94a3ee1ed45 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.7"; + version = "0.4.8"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-81fxSvYRr0aSUlxYklA44emfa5E4SQBENkYAKoHAStc="; + hash = "sha256-Rdeq6M3uZhXMALHkHEtYUr5Q1ghkfQmaBUMQGduZ5Qw="; }; cargoDeps = rustPlatform.importCargoLock { From a09c9e044bde2d3dc076e914a6883b6ac3a02223 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 10:41:44 +0000 Subject: [PATCH 410/481] proton-ge-bin: GE-Proton9-12 -> GE-Proton9-13 --- pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix index 0c6f6888cfae..3541b7466af2 100644 --- a/pkgs/by-name/pr/proton-ge-bin/package.nix +++ b/pkgs/by-name/pr/proton-ge-bin/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "proton-ge-bin"; - version = "GE-Proton9-12"; + version = "GE-Proton9-13"; src = fetchzip { url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz"; - hash = "sha256-2/vxX5AT1qQ50jBrQkZIzlmzkOAX+qzINEeD3Lo1f40="; + hash = "sha256-/KaFYCLvojxH3coiJaArXMPIIwW5qzK+I0bGyt7oBNY="; }; outputs = [ From 511adb43d188a5bd321def5bc8ddfe1d0e018e6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:48:50 +0200 Subject: [PATCH 411/481] python312Packages.tencentcloud-sdk-python: 3.0.1227 -> 3.0.1228 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1227...3.0.1228 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1228/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 2eb746125351..dbbf81f588bd 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.1227"; + version = "3.0.1228"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-nHTsUYyGqM/4S4B8F8iz0A7MPpotTNp1S/yPL0KCkok="; + hash = "sha256-YNGehz2pTTJ6D2sZM95YLZ0Fr/rhcN+IsZT3mQCBgP0="; }; build-system = [ setuptools ]; From d202f9e76671ed2801ce1fd45d3ff8be03d0ab94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:52:50 +0200 Subject: [PATCH 412/481] python312Packages.mypy-boto3-appsync: 1.35.0 -> 1.35.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 10dc67bc1ff3..d658d0c0402d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -134,8 +134,8 @@ rec { "sha256-KuDlcfOuF3krMocvgR2LaP2+xKeYl2CMPKRewN8inj4="; mypy-boto3-appsync = - buildMypyBoto3Package "appsync" "1.35.0" - "sha256-q5NsdqNr0m34SVm+eBYVv2PlS18PaqBwMuzh6jttfFc="; + buildMypyBoto3Package "appsync" "1.35.12" + "sha256-mHIUStFvFUTvHYWdZUNcIIOI//vNACI0veXXNLAAOVY="; mypy-boto3-arc-zonal-shift = buildMypyBoto3Package "arc-zonal-shift" "1.35.0" From c63886f36dc533613547569d1eb18450dea83ae3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:53:30 +0200 Subject: [PATCH 413/481] python312Packages.mypy-boto3-codepipeline: 1.35.0 -> 1.35.13 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index d658d0c0402d..174a0dd2176c 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -294,8 +294,8 @@ rec { "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY="; mypy-boto3-codepipeline = - buildMypyBoto3Package "codepipeline" "1.35.0" - "sha256-UNpRlMoEg7RBZd+6V0XslPjGZsSe6VZBCFhKINOdyU0="; + buildMypyBoto3Package "codepipeline" "1.35.13" + "sha256-tLQEsxoPyDA5cFlsm3HAOQPCyZApCQOBJMxVPDH6Q+w="; mypy-boto3-codestar = buildMypyBoto3Package "codestar" "1.35.0" From fc77ecb162b8bda568daa91cacee0737cd2633c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:53:37 +0200 Subject: [PATCH 414/481] python312Packages.mypy-boto3-connect: 1.35.11 -> 1.35.13 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 174a0dd2176c..1365969ddae5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -338,8 +338,8 @@ rec { "sha256-1pS2EkJapoNVi5lUEftaxbdoN4fd7XSFjWyLXH1noL0="; mypy-boto3-connect = - buildMypyBoto3Package "connect" "1.35.11" - "sha256-PuoxctcTcV85ynhnq85s5QZK713Q4Sx1HU8c6lc/9eY="; + buildMypyBoto3Package "connect" "1.35.13" + "sha256-sL2WWzsUFA6dbKR3XUEoy+CbWT6TWVQCxfdQ8mZTmbo="; mypy-boto3-connect-contact-lens = buildMypyBoto3Package "connect-contact-lens" "1.35.0" From 9e5a44bcfc9b513413f71b3162fa56d4229dbc45 Mon Sep 17 00:00:00 2001 From: nicoo Date: Tue, 10 Sep 2024 10:53:46 +0000 Subject: [PATCH 415/481] nixos/podman: set `preferLocalBuild` on trivial `runCommand`s (#340980) --- nixos/modules/virtualisation/podman/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix index 5a1317f437a1..aa1d383738ad 100644 --- a/nixos/modules/virtualisation/podman/default.nix +++ b/nixos/modules/virtualisation/podman/default.nix @@ -21,6 +21,7 @@ let { outputs = [ "out" "man" ]; inherit (podmanPackage) meta; + preferLocalBuild = true; } '' mkdir -p $out/bin ln -s ${podmanPackage}/bin/podman $out/bin/docker @@ -235,7 +236,10 @@ in systemd.tmpfiles.packages = [ # The /run/podman rule interferes with our podman group, so we remove # it and let the systemd socket logic take care of it. - (pkgs.runCommand "podman-tmpfiles-nixos" { package = cfg.package; } '' + (pkgs.runCommand "podman-tmpfiles-nixos" { + package = cfg.package; + preferLocalBuild = true; + } '' mkdir -p $out/lib/tmpfiles.d/ grep -v 'D! /run/podman 0700 root root' \ <$package/lib/tmpfiles.d/podman.conf \ From 15f044691a611aec55aee1a557d147aa3f3b8848 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:53:48 +0200 Subject: [PATCH 416/481] python312Packages.mypy-boto3-dynamodb: 1.35.0 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 1365969ddae5..66e880be5ee5 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -434,8 +434,8 @@ rec { "sha256-B6fR0fPc1vTN+WtsHXyE8gbl87yVd/QdxmmLmtftlxQ="; mypy-boto3-dynamodb = - buildMypyBoto3Package "dynamodb" "1.35.0" - "sha256-dfIk2LePbTEm7q1kWupsCovCgoYU8wLBaN4dPa1JDRE="; + buildMypyBoto3Package "dynamodb" "1.35.15" + "sha256-epE4c+VCicXTkuGGJu83lxFTDUBu2ndmy36NARTCy8E="; mypy-boto3-dynamodbstreams = buildMypyBoto3Package "dynamodbstreams" "1.35.0" From ff528980c883b9d2dd4eeca4e44c1c6b4da26747 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:53:55 +0200 Subject: [PATCH 417/481] python312Packages.mypy-boto3-elbv2: 1.35.11 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 66e880be5ee5..a13361b98615 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -494,8 +494,8 @@ rec { "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI="; mypy-boto3-elbv2 = - buildMypyBoto3Package "elbv2" "1.35.11" - "sha256-QOoHzT9BocGag8TQS/PNoZuS737LytVeynCL67LJ/Z4="; + buildMypyBoto3Package "elbv2" "1.35.15" + "sha256-sSTP3nxvOX+CSgn+mAyfG+n7R1PibDXM9Xa4q8uFxTo="; mypy-boto3-emr = buildMypyBoto3Package "emr" "1.35.0" From 428fb2221892c2e61f07be1a155b083c4925cec2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:53:59 +0200 Subject: [PATCH 418/481] python312Packages.mypy-boto3-finspace: 1.35.0 -> 1.35.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index a13361b98615..784439147efb 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -526,8 +526,8 @@ rec { "sha256-C7hTVrCUdBpYj0y5cLGKnruJcgaHFMkeY6R0fZ/Zp78="; mypy-boto3-finspace = - buildMypyBoto3Package "finspace" "1.35.0" - "sha256-SkoLikHx3vjm2ZOhn9klsdb3mYx50ZmK0E1jxoCsPt8="; + buildMypyBoto3Package "finspace" "1.35.12" + "sha256-zO4rFI2pzAFhHHyRPYeeV0eC4daRJ57GeAnAqrOyQAQ="; mypy-boto3-finspace-data = buildMypyBoto3Package "finspace-data" "1.35.0" From 89b858517d88a04b90cdddd9f5882f0bbbe3c3ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:54:02 +0200 Subject: [PATCH 419/481] python312Packages.mypy-boto3-fis: 1.35.0 -> 1.35.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 784439147efb..f20b9b79dbd0 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -538,8 +538,8 @@ rec { "sha256-7ibqWrvc1mwCDzsm/tqha/2Y2EbfxTpsf7omIZg/EbM="; mypy-boto3-fis = - buildMypyBoto3Package "fis" "1.35.0" - "sha256-3Hf3TtHPpUHiuRMDiN56Og5YG5N65OSI+waiLytZado="; + buildMypyBoto3Package "fis" "1.35.12" + "sha256-rm0PB0oie7q+8pl+efohmHe8StLZVvSWYgLIajxd3Fo="; mypy-boto3-fms = buildMypyBoto3Package "fms" "1.35.0" From 384bf410f13747168026c4317ba385713d1492d4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:54:06 +0200 Subject: [PATCH 420/481] python312Packages.mypy-boto3-gamelift: 1.35.0 -> 1.35.13 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index f20b9b79dbd0..73b9abff610a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -562,8 +562,8 @@ rec { "sha256-GG3k2Lrl8zTgYcwxt2ccb30KE7Fm8o41zVxbvEeYIy0="; mypy-boto3-gamelift = - buildMypyBoto3Package "gamelift" "1.35.0" - "sha256-GtxGMKCKkwIZHROvHXx5C17dWXSV5+v8kEEuPe6iUsU="; + buildMypyBoto3Package "gamelift" "1.35.13" + "sha256-Xd0jrg/w4CPn5mDgHTaahyRAu5RZxdMcpci0cx7/1sQ="; mypy-boto3-glacier = buildMypyBoto3Package "glacier" "1.35.0" From 80a9ecb41915db94b2986dc6690158f7d0f7a774 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:54:59 +0200 Subject: [PATCH 421/481] python312Packages.mypy-boto3-ivs-realtime: 1.35.0 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 73b9abff610a..e1cf548dd414 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -702,8 +702,8 @@ rec { "sha256-MkWcD/B95hvrb7w8CkKNtL5mmZYcV+ROCBvTkRDthbk="; mypy-boto3-ivs-realtime = - buildMypyBoto3Package "ivs-realtime" "1.35.0" - "sha256-GGo1Bw8qXesTJMESq6hjCJuXzhsroGVMH56IN3yIygw="; + buildMypyBoto3Package "ivs-realtime" "1.35.15" + "sha256-pO8W60U+c56/1F7LECM4AcOMIW7sHifSd9Ov+HJ4TpQ="; mypy-boto3-ivschat = buildMypyBoto3Package "ivschat" "1.35.0" From 4f06227cb9807b35a778aff4622b98d6c42687fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:55:01 +0200 Subject: [PATCH 422/481] python312Packages.mypy-boto3-kafka: 1.35.0 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index e1cf548dd414..09a292f307d2 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -710,8 +710,8 @@ rec { "sha256-6DhfxgNqJftRnqipRT3v6RLDvz7lA8TqO/1gMMs702U="; mypy-boto3-kafka = - buildMypyBoto3Package "kafka" "1.35.0" - "sha256-2DwN3n429JIw3UvQAei+YteWSlE2wjwpC6/zsm2G5Bw="; + buildMypyBoto3Package "kafka" "1.35.15" + "sha256-mY1AapHaDKxJTZyP44wgZhRfJEGJubYMsV+PhKgFxIM="; mypy-boto3-kafkaconnect = buildMypyBoto3Package "kafkaconnect" "1.35.0" From 08efbe405ab549af1f997930eeb2735a3bd88e87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:55:08 +0200 Subject: [PATCH 423/481] python312Packages.mypy-boto3-kinesisanalyticsv2: 1.35.0 -> 1.35.13 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 09a292f307d2..2f657a299f8d 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -754,8 +754,8 @@ rec { "sha256-aKdkj9FTE3yDnyWySWx1xXAzzPypaGZ2IYg+6AwHHKQ="; mypy-boto3-kinesisanalyticsv2 = - buildMypyBoto3Package "kinesisanalyticsv2" "1.35.0" - "sha256-VSyu3d7y42ZO45OtP6ck6QdKgvujE94yWUz+DaBiHDs="; + buildMypyBoto3Package "kinesisanalyticsv2" "1.35.13" + "sha256-UoRFrbwA6QdFsO2z7R8If5/0Jf6ebMTJ91jqEh/Ys38="; mypy-boto3-kinesisvideo = buildMypyBoto3Package "kinesisvideo" "1.35.0" From 2cbd096ba5abd49e694e721a25a4352660d0757c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 12:55:27 +0200 Subject: [PATCH 424/481] python312Packages.mypy-boto3-logs: 1.35.10 -> 1.35.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2f657a299f8d..2b210c221c12 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -810,8 +810,8 @@ rec { "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM="; mypy-boto3-logs = - buildMypyBoto3Package "logs" "1.35.10" - "sha256-oR0BkgeM+MhSnsXnubozFH5O/glhruqgkD8GF89VeTQ="; + buildMypyBoto3Package "logs" "1.35.12" + "sha256-H+B1dxaGAAwAqWU5/WKKYz1HT9wKmvjVEg57kGvTDh0="; mypy-boto3-lookoutequipment = buildMypyBoto3Package "lookoutequipment" "1.35.0" From 6bf23634b2860fab241f71b9de76186b20b5ac7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93lafur=20Bjarki=20Bogason?= Date: Sat, 7 Sep 2024 22:50:28 +0100 Subject: [PATCH 425/481] fireplace: init at 0-unstable-2020-02-02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apply suggestions from code review Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/by-name/fi/fireplace/package.nix | 39 +++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/fi/fireplace/package.nix diff --git a/pkgs/by-name/fi/fireplace/package.nix b/pkgs/by-name/fi/fireplace/package.nix new file mode 100644 index 000000000000..16040a18d56d --- /dev/null +++ b/pkgs/by-name/fi/fireplace/package.nix @@ -0,0 +1,39 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, +}: +stdenv.mkDerivation { + pname = "fireplace"; + version = "0-unstable-2020-02-02"; + + buildInputs = [ ncurses ]; + + installPhase = '' + runHook preInstall + + install -Dm555 fireplace -t $out/bin + + runHook postInstall + ''; + + src = fetchFromGitHub { + owner = "Wyatt915"; + repo = "fireplace"; + rev = "aa2070b73be9fb177007fc967b066d88a37e3408"; + hash = "sha256-2NUE/zaFoGwkZxgvVCYXxToiL23aVUFwFNlQzEq9GEc="; + }; + + meta = { + description = "Cozy fireplace in your terminal"; + homepage = "https://github.com/Wyatt915/fireplace"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + multivac61 + eclairevoyant + ]; + mainProgram = "fireplace"; + platforms = lib.platforms.all; + }; +} From 8e008bae7fd5be75cfc83dbec8f182f4fc8f94ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 13:06:08 +0200 Subject: [PATCH 426/481] python312Packages.mypy-boto3-s3control: 1.35.0 -> 1.35.12 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 2b210c221c12..0faf4c00e806 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1166,8 +1166,8 @@ rec { "sha256-dNjzSS7v92j/b2msbUC/aLQKpuVOvhCo0Jj8PSSlSr8="; mypy-boto3-s3control = - buildMypyBoto3Package "s3control" "1.35.0" - "sha256-wHCB3nBLOQjDw/1zqjv9jVkY69U+QibTBDUgRUMvN6w="; + buildMypyBoto3Package "s3control" "1.35.12" + "sha256-GpZ3lr2WenLA+FNOBnot9X7DQKtmxWxvP85bTM5l1+g="; mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.35.0" From d505c7986e2e7ddb242d2151ae6b29ad3100f3cf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 13:06:15 +0200 Subject: [PATCH 427/481] python312Packages.mypy-boto3-sagemaker: 1.35.11 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 0faf4c00e806..645b47019335 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1174,8 +1174,8 @@ rec { "sha256-P2Yg3qvcdAcjY+uwPg2DpTgT6ZXb1XYCOeu4bVfgFKI="; mypy-boto3-sagemaker = - buildMypyBoto3Package "sagemaker" "1.35.11" - "sha256-FGE7iW5bbk38kn+fdgBOEor6ZaFlCsCEUkCm6USCgYk="; + buildMypyBoto3Package "sagemaker" "1.35.15" + "sha256-16P85xGM98ExA6Cphg2nTviTLu6CF/Hj3/sZ7P3OkJo="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.35.0" From 13387eeab79a917f579ca1fae616a04408fe6601 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 13:06:19 +0200 Subject: [PATCH 428/481] python312Packages.mypy-boto3-sagemaker-runtime: 1.35.0 -> 1.35.15 --- pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 645b47019335..ee7d56dc6519 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -1198,8 +1198,8 @@ rec { "sha256-zixUmBhFo3joSB0UUWRjNbbrpgt/21OyfOzDkn2Y7kg="; mypy-boto3-sagemaker-runtime = - buildMypyBoto3Package "sagemaker-runtime" "1.35.0" - "sha256-MP/jfdOOSre34FgPQA8bFIFy6TH14RGM3Hi5qsI+VZs="; + buildMypyBoto3Package "sagemaker-runtime" "1.35.15" + "sha256-2afZNIvBO29vNemskWbxx9X1PqL7j2knxHUSEap6lp4="; mypy-boto3-savingsplans = buildMypyBoto3Package "savingsplans" "1.35.0" From 432bfec0264157e5485768897a70b5193c2015a7 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Mon, 9 Sep 2024 15:20:59 +0200 Subject: [PATCH 429/481] nixos/gancio: use unix socket between nginx and gancio --- nixos/modules/services/web-apps/gancio.nix | 25 +++++++++++----------- nixos/tests/gancio.nix | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 893f5702518a..5f14ff46cb19 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -59,19 +59,12 @@ in description = "The URL path under which the server is reachable."; }; server = { - host = mkOption { - type = types.str; - default = "localhost"; - example = "::"; + socket = mkOption { + type = types.path; + readOnly = true; + default = "/run/gancio/socket"; description = '' - The address (IPv4, IPv6 or DNS) for the gancio server to listen on. - ''; - }; - port = mkOption { - type = types.port; - default = 13120; - description = '' - Port number of the gancio server to listen on. + The unix socket for the gancio server to listen on. ''; }; }; @@ -231,6 +224,10 @@ in serviceConfig = { ExecStart = "${getExe cfg.package} start ${configFile}"; + # set umask so that nginx can write to the server socket + # FIXME: upstream socket permission configuration in Nuxt + UMask = "0002"; + RuntimeDirectory = "gancio"; StateDirectory = "gancio"; WorkingDirectory = "/var/lib/gancio"; LogsDirectory = "gancio"; @@ -274,12 +271,14 @@ in }; "@proxy" = { proxyWebsockets = true; - proxyPass = "http://${cfg.settings.server.host}:${toString cfg.settings.server.port}"; + proxyPass = "http://unix:${cfg.settings.server.socket}"; recommendedProxySettings = true; }; }; } ]; }; + # for nginx to access gancio socket + users.users."${config.services.nginx.user}".extraGroups = [ config.users.users.${cfg.user}.group ]; }; } diff --git a/nixos/tests/gancio.nix b/nixos/tests/gancio.nix index 1dc5fd8b5606..8f4696d6f6cc 100644 --- a/nixos/tests/gancio.nix +++ b/nixos/tests/gancio.nix @@ -71,7 +71,7 @@ import ./make-test-python.nix ( server.wait_for_unit("postgresql") server.wait_for_unit("gancio") server.wait_for_unit("nginx") - server.wait_for_open_port(13120) + server.wait_for_file("/run/gancio/socket") server.wait_for_open_port(80) # Check can create user via cli From 3a33b6c3a846f3abca1e18d09563579b5081f6ac Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Giraudeau Date: Tue, 10 Sep 2024 09:31:35 +0200 Subject: [PATCH 430/481] nixos/gancio: set default value for settings.baseurl --- nixos/modules/services/web-apps/gancio.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-apps/gancio.nix b/nixos/modules/services/web-apps/gancio.nix index 5f14ff46cb19..fa55db762c46 100644 --- a/nixos/modules/services/web-apps/gancio.nix +++ b/nixos/modules/services/web-apps/gancio.nix @@ -54,9 +54,12 @@ in }; baseurl = mkOption { type = types.str; - default = ""; - example = "/gancio"; - description = "The URL path under which the server is reachable."; + default = "http${ + lib.optionalString config.services.nginx.virtualHosts."${cfg.settings.hostname}".enableACME "s" + }://${cfg.settings.hostname}"; + defaultText = lib.literalExpression ''"https://''${cfg.settings.hostname}"''; + example = "https://demo.gancio.org/gancio"; + description = "The full URL under which the server is reachable."; }; server = { socket = mkOption { From 7438ebd9431243aa0b01502fae89c022e4facb0c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Sep 2024 21:14:53 +1000 Subject: [PATCH 431/481] viddy: 1.1.0 -> 1.1.2 (#340972) --- pkgs/tools/misc/viddy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/viddy/default.nix b/pkgs/tools/misc/viddy/default.nix index 5c534a7b974f..c6e83e3c4b1e 100644 --- a/pkgs/tools/misc/viddy/default.nix +++ b/pkgs/tools/misc/viddy/default.nix @@ -6,21 +6,21 @@ rustPlatform.buildRustPackage rec { pname = "viddy"; - version = "1.1.0"; + version = "1.1.2"; src = fetchFromGitHub { owner = "sachaos"; repo = "viddy"; rev = "v${version}"; - hash = "sha256-dsvPNMNT1CXB6Wgq438wRHt9og+4uFWgiWPore4mRE0="; + hash = "sha256-vlPG7nYWCNfhZJOm6qmYNK5OwkckVZFRQWMhDX2vWTc="; }; - cargoHash = "sha256-18OEOV8kET+UcLd15YultkonbXBEY/AwBHFNw4YTAPk="; + cargoHash = "sha256-YM73+f/a1iE+lRots/CNfYcU8iZ7xiAKjDHOIywOo6o="; # requires nightly features env.RUSTC_BOOTSTRAP = 1; - env.VERGEN_BUILD_DATE = "2024-09-01"; # managed via the update script + env.VERGEN_BUILD_DATE = "2024-09-05"; # managed via the update script env.VERGEN_GIT_DESCRIBE = "Nixpkgs"; passthru.updateScript.command = [ ./update.sh ]; From 4111d41c0b2b86c5b935f2ba61cd1806a797a1a9 Mon Sep 17 00:00:00 2001 From: Hugh Mandalidis Date: Tue, 10 Sep 2024 21:19:31 +1000 Subject: [PATCH 432/481] maintainers: add hughmandalidis --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dfcbe955346b..41f9005cbc97 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8604,6 +8604,12 @@ githubId = 1592375; name = "Walter Huf"; }; + hughmandalidis = { + name = "Hugh Mandalidis"; + email = "mandalidis.hugh@gmail.com"; + github = "ThanePatrol"; + githubId = 23148089; + }; hughobrien = { email = "github@hughobrien.ie"; github = "hughobrien"; From c8c3f463563cceff6e950a2ffd4f300a19132f2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 11:25:34 +0000 Subject: [PATCH 433/481] xpipe: 11.1 -> 11.2 --- pkgs/applications/networking/xpipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/xpipe/default.nix b/pkgs/applications/networking/xpipe/default.nix index 652c0c4f6d66..15e46e291bd2 100644 --- a/pkgs/applications/networking/xpipe/default.nix +++ b/pkgs/applications/networking/xpipe/default.nix @@ -33,14 +33,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-DoN6I1lk4WpOZ+jC+od7jum3lxBHFppea5QFTuqY5nk="; + x86_64-linux = "sha256-25FFXrUE1NvIXlOFR9KZyjD3w8xuvPlpqz/KkUTt1TQ="; }.${system} or throwSystem; displayname = "XPipe"; in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "11.1"; + version = "11.2"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; From 3a238a1f8bb71f819f073b546bc1f0e756fbe300 Mon Sep 17 00:00:00 2001 From: Hugh Mandalidis Date: Tue, 10 Sep 2024 21:32:32 +1000 Subject: [PATCH 434/481] thrift-ls: change binary name to mimic upstream --- pkgs/by-name/th/thrift-ls/package.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/th/thrift-ls/package.nix b/pkgs/by-name/th/thrift-ls/package.nix index b41880c6a97d..9eba51c0b680 100644 --- a/pkgs/by-name/th/thrift-ls/package.nix +++ b/pkgs/by-name/th/thrift-ls/package.nix @@ -17,6 +17,10 @@ buildGoModule rec { vendorHash = "sha256-YoZ2dku84065Ygh9XU6dOwmCkuwX0r8a0Oo8c1HPsS4="; + postInstall = '' + mv $out/bin/thrift-ls $out/bin/thriftls + ''; + ldflags = [ "-s" "-w" @@ -26,7 +30,10 @@ buildGoModule rec { description = "Thrift Language Server"; homepage = "https://github.com/joyme123/thrift-ls"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ callumio ]; - mainProgram = "thrift-ls"; + maintainers = with lib.maintainers; [ + callumio + hughmandalidis + ]; + mainProgram = "thriftls"; }; } From 6f5b0ef20153916b202ad53450c10e2272d1d580 Mon Sep 17 00:00:00 2001 From: Lorenz Leutgeb Date: Tue, 10 Sep 2024 13:54:51 +0200 Subject: [PATCH 435/481] =?UTF-8?q?radicle-node:=201.0.0-rc.17=20=E2=86=92?= =?UTF-8?q?=201.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/ra/radicle-node/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicle-node/package.nix b/pkgs/by-name/ra/radicle-node/package.nix index e3f33c7132df..8482cf0b7ea5 100644 --- a/pkgs/by-name/ra/radicle-node/package.nix +++ b/pkgs/by-name/ra/radicle-node/package.nix @@ -18,7 +18,7 @@ , xdg-utils }: rustPlatform.buildRustPackage rec { pname = "radicle-node"; - version = "1.0.0-rc.17"; + version = "1.0.0"; env.RADICLE_VERSION = version; src = fetchgit { @@ -26,7 +26,7 @@ rev = "refs/namespaces/z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/refs/tags/v${version}"; hash = "sha256-sb0GroWfZWC9YCGby88eiPnhFCdDA9EUhVpoyuAA+Mk="; }; - cargoHash = "sha256-5xqoWW3pPU/vQs1ewPb24/fv/oKBF+ZZzbsYhC7LopM="; + cargoHash = "sha256-+VjYX1gGf5aIGSQRMtvK6JI118X50HaxFwg5H14Vq7g="; nativeBuildInputs = [ asciidoctor installShellFiles makeWrapper ]; nativeCheckInputs = [ git ]; From 04395d8b60ee5a60580f35139cd24d48fd9ab379 Mon Sep 17 00:00:00 2001 From: roblabla Date: Tue, 10 Sep 2024 13:52:14 +0200 Subject: [PATCH 436/481] ghidra: Fix build under gradle 8.9+ This is applying the recommended upstream fix from https://github.com/NationalSecurityAgency/ghidra/commit/30628db2d09d7b4ce46368b7522dc315e7b245c5 --- pkgs/tools/security/ghidra/build.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index e85b58cd57eb..994cee822a16 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: { preBuild = '' export JAVA_TOOL_OPTIONS="-Duser.home=$NIX_BUILD_TOP/home" - gradle -I gradle/support/fetchDependencies.gradle init + gradle -I gradle/support/fetchDependencies.gradle ''; gradleBuildTask = "buildGhidra"; From 61be0d8e27c71537bb543ee8ffb15863f7afae40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 10 Sep 2024 22:13:16 +1000 Subject: [PATCH 437/481] sby: 0.44 -> 0.45 (#340966) --- pkgs/by-name/sb/sby/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix index a3cfb4be0ac3..d623f732d2d6 100644 --- a/pkgs/by-name/sb/sby/package.nix +++ b/pkgs/by-name/sb/sby/package.nix @@ -20,13 +20,13 @@ in stdenv.mkDerivation rec { pname = "sby"; - version = "0.44"; + version = "0.45"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "sby"; rev = "yosys-${version}"; - hash = "sha256-/oDbbdZuWPdg0Xrh+c4i283vML9QTfyWVu8kryb4WaE="; + hash = "sha256-HRQ5ZL0w3GLUySTFekE/T/VlxJLFIQQr0bW8l7rp/zs="; }; nativeBuildInputs = [ bash ]; From cd117b3f4956ced7bdef5e73b8d74264b8479b3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 12:45:41 +0000 Subject: [PATCH 438/481] oh-my-posh: 23.4.0 -> 23.12.0 --- pkgs/by-name/oh/oh-my-posh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix index c212aaa2e32c..0ee6033cc8f1 100644 --- a/pkgs/by-name/oh/oh-my-posh/package.nix +++ b/pkgs/by-name/oh/oh-my-posh/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "23.4.0"; + version = "23.12.0"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-LvgK8h877jXXYWzuy2x1hiRC4YOhj+TeCRjT5nFy1gI="; + hash = "sha256-9Yyq0tssLBcRKWFboDzJ0p7Z5WgeDb880KhX6w56+DE="; }; - vendorHash = "sha256-ra0jec3ta8LcBpc6vXz8SEzweOLCTA+BPIFQEhUUHjI="; + vendorHash = "sha256-SXcBhjgANPi/eWkcYBUGmCKID/1jkdGq7Q8m/y1Euzc="; sourceRoot = "${src.name}/src"; From 26c4d6bc41b9204aa98480a5668de5a73203ed77 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 12:53:51 +0000 Subject: [PATCH 439/481] fastcdr: 2.2.3 -> 2.2.4 --- pkgs/by-name/fa/fastcdr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix index 438eac224aa4..4d342c6bbb29 100644 --- a/pkgs/by-name/fa/fastcdr/package.nix +++ b/pkgs/by-name/fa/fastcdr/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastcdr"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-CDR"; rev = "v${finalAttrs.version}"; - hash = "sha256-x+lkbssrNQQXmnlfYM2cGMVQZRiONNeImHj5EPm93ls="; + hash = "sha256-R+StDJVqT0ktbr4cQBwEAPmju+pmBvxonezsIsPwmgc="; }; patches = [ From 871a39f6943d2477f43c85862f7404fd02cc8f8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 12:59:47 +0000 Subject: [PATCH 440/481] gh-markdown-preview: 1.7.0 -> 1.8.0 --- pkgs/by-name/gh/gh-markdown-preview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix index 0690f3b36fec..7e829bd19f89 100644 --- a/pkgs/by-name/gh/gh-markdown-preview/package.nix +++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-yfl50izjjyPmyV0Er0al/PPd87Yizqc8PnFV/FMpfEU="; + hash = "sha256-y9AiHmBfDSJ6oCevUAUkg18qHe/oP7A6PLiz3MZqU0s="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; From 2681b012dac5733adfdb918d5486dc0e4f41640d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 13:00:53 +0000 Subject: [PATCH 441/481] gtk-layer-shell: 0.8.2 -> 0.9.0 --- pkgs/development/libraries/gtk-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index 417b8523df26..c977de194278 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk-layer-shell"; - version = "0.8.2"; + version = "0.9.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # for demo @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-8wpfoZcgusJdEbKGZ02UtOOcSogMTNP9Lm+ujo/eKdA="; + hash = "sha256-9hQE1NY5QCuj+5R5aSjJ0DaMUQuO7HPpZooj+1+96RY="; }; strictDeps = true; From b576c486ef2e94feba02f93a4544eb6f392223a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 15:06:51 +0200 Subject: [PATCH 442/481] Revert "nixVersions.git: improve error message" This reverts commit 757e0a34b78e7f1c0b440ee1e7af2b388a52bd1c. --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 65fdeb5446c0..84b0f028a4bf 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -224,7 +224,7 @@ in lib.makeExtensible (self: ({ stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; })).overrideAttrs (o: { meta.knownVulnerabilities = [ - "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nixVersions.git to nixVersions.nix_2_23" + "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" ]; }); From dfaef71403faaa8d79b487c26d980e051678c607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 15:07:00 +0200 Subject: [PATCH 443/481] Revert "nixVersions.nix_2_24,git: mark vulnerable" This reverts commit 4eee59973aedfc0a710b5d356ad600a8a5ae0864. --- pkgs/tools/package-management/nix/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 84b0f028a4bf..35edaf2bef46 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -184,7 +184,7 @@ in lib.makeExtensible (self: ({ self_attribute_name = "nix_2_23"; }; - nix_2_24 = ((common { + nix_2_24 = (common { version = "2.24.5"; hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY="; self_attribute_name = "nix_2_24"; @@ -197,13 +197,9 @@ in lib.makeExtensible (self: ({ # allocation function Clang uses with this setting actually works # all the way back to 10.6. stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; - })).overrideAttrs (o: { - meta.knownVulnerabilities = [ - "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" - ]; }); - git = ((common rec { + git = (common rec { version = "2.25.0"; suffix = "pre20240807_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { @@ -222,13 +218,9 @@ in lib.makeExtensible (self: ({ # allocation function Clang uses with this setting actually works # all the way back to 10.6. stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; }; - })).overrideAttrs (o: { - meta.knownVulnerabilities = [ - "Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23" - ]; }); - latest = self.nix_2_23; + latest = self.nix_2_24; # The minimum Nix version supported by Nixpkgs # Note that some functionality *might* have been backported into this Nix version, From 752666ae668deacae8df7af39c7d491530599501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 13:07:44 +0000 Subject: [PATCH 444/481] gtk4-layer-shell: 1.0.2 -> 1.0.3 --- pkgs/development/libraries/gtk4-layer-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gtk4-layer-shell/default.nix b/pkgs/development/libraries/gtk4-layer-shell/default.nix index 067bbad8dd24..35cbb026fbc3 100644 --- a/pkgs/development/libraries/gtk4-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk4-layer-shell/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtk4-layer-shell"; - version = "1.0.2"; + version = "1.0.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "wmww"; repo = "gtk4-layer-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-decjPkFkYy7kIjyozsB7BEmw33wzq1EQyIBrxO36984="; + hash = "sha256-oGtU1H1waA8ZAjaLMdb+x0KIIwgjhdn38ra/eFVWfFI="; }; strictDeps = true; From 94909c1166d3384c2bf7b04ff52cf009863baaaf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 13:08:26 +0000 Subject: [PATCH 445/481] rustic: 0.8.0 -> 0.8.1 --- pkgs/by-name/ru/rustic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/rustic/package.nix b/pkgs/by-name/ru/rustic/package.nix index d8f92de73f2a..2578991fc8f4 100644 --- a/pkgs/by-name/ru/rustic/package.nix +++ b/pkgs/by-name/ru/rustic/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "rustic"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "rustic-rs"; repo = "rustic"; rev = "refs/tags/v${version}"; - hash = "sha256-4DQNg/pYoIVQpdOp2Yx1AGUdsJbfGSL09Ll5yJTeJlU="; + hash = "sha256-SOXuQIdebzMHyO/r+0bvhZvdc09pNPiCXgYfzMoZUZo="; }; - cargoHash = "sha256-YFVxTJNzw/A0lz7mH6B+zKjeW5FYqyKHEWckCSVs4A8="; + cargoHash = "sha256-5tXaq/FPC3T+f1p4RtihQGgwAptcO58mOKQhiOpjacc="; # At the time of writing, upstream defaults to "self-update", "tui", and "webdav". # "self-update" is a self-updater, which we don't want in nixpkgs. From 3986d6976bd418f24737acd6938291e69ddfa43b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 15:09:24 +0200 Subject: [PATCH 446/481] nixVersions.nix_2_24: 2.24.5 -> 2.24.6 --- pkgs/tools/package-management/nix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 35edaf2bef46..ebcc664f0f11 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -185,8 +185,8 @@ in lib.makeExtensible (self: ({ }; nix_2_24 = (common { - version = "2.24.5"; - hash = "sha256-mYvdPwl4gcc17UAomkbbOJEgxBQpowmJDrRMWtlYzFY="; + version = "2.24.6"; + hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w="; self_attribute_name = "nix_2_24"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { # Fix the following error with the default x86_64-darwin SDK: From 76b5c3b2b5523994506758c1b9e32b116e01f9ba Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:11:32 +0200 Subject: [PATCH 447/481] snpguest: 0.6.0 -> 0.7.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/sn/snpguest/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sn/snpguest/package.nix b/pkgs/by-name/sn/snpguest/package.nix index a23964246f29..d40881045fbb 100644 --- a/pkgs/by-name/sn/snpguest/package.nix +++ b/pkgs/by-name/sn/snpguest/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "snpguest"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "virtee"; repo = "snpguest"; - rev = "v${version}"; - hash = "sha256-9TchRaZPQKAsncs+mlHvzeie9IIVZeea/LfBLXOLuNg="; + rev = "refs/tags/v${version}"; + hash = "sha256-qc7WooUJQa0+tzoS0z0GPV3N3WGM1WQ4ewZj8zUWHZE="; }; - cargoHash = "sha256-1UX5GiwH38W+IgZO+0EA3M86iWMylM8fgr48DRD187A="; + cargoHash = "sha256-GYLJGkEI7AYUxuE57fGz4NM9hZ+Z73tq8wnOzANtwnM="; nativeBuildInputs = [ pkg-config ]; From f482820efde4afdc15cd38efd8b75e06ddd339f0 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 10 Sep 2024 15:12:22 +0200 Subject: [PATCH 448/481] snphost: 0.4.0 -> 0.5.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/sn/snphost/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/sn/snphost/package.nix b/pkgs/by-name/sn/snphost/package.nix index fcee69dd5370..70911bedcc95 100644 --- a/pkgs/by-name/sn/snphost/package.nix +++ b/pkgs/by-name/sn/snphost/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "snphost"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "virtee"; repo = "snphost"; - rev = "v${version}"; - hash = "sha256-ChB745I+4CuN/qvWW5e5gPWBdTDJdrUMiHO3LkmTwtk="; + rev = "refs/tags/v${version}"; + hash = "sha256-GaeNoLx/fV/NNUS2b2auGvylhW6MOFp98Xi0sdDV3VM="; }; - cargoHash = "sha256-yXjrTxCRI+1IMRmBYLw9+uHr9BVVhRXx6zU2q3sYf9s="; + cargoHash = "sha256-fG3MTCHfIfYeFK03Ee9uzq8e7f5NN/h8LIye7Y3+0uI="; nativeBuildInputs = [ asciidoctor From 27e643cb3112568d1aee31735ace66183b1a7915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 10 Sep 2024 15:16:01 +0200 Subject: [PATCH 449/481] lua-language-server: 3.10.5 -> 3.10.6 --- .../tools/language-servers/lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index e0fc157f290b..0bbab7942e8a 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.10.5"; + version = "3.10.6"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; rev = finalAttrs.version; - hash = "sha256-lFNguQxrpldOE+6KrSC3QeDJzmG4Lwq92vFHjOGX9s4="; + hash = "sha256-K5+xGRGmd6X3eYF1BzhqFbbfVJXSduo/9930HxLGQCo="; fetchSubmodules = true; }; From e3edbdc2f4f17ad5e718aeb042053754a8261e75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 30 Aug 2024 14:42:49 +0000 Subject: [PATCH 450/481] test-drive: 0.4.0 -> 0.5.0 --- pkgs/development/libraries/test-drive/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/development/libraries/test-drive/default.nix index 639582c3b8ae..c31a249350ce 100644 --- a/pkgs/development/libraries/test-drive/default.nix +++ b/pkgs/development/libraries/test-drive/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "test-drive"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "fortran-lang"; repo = pname; rev = "v${version}"; - hash = "sha256-ObAnHFP1Hp0knf/jtGHynVF0CCqK47eqetePx4NLmlM="; + hash = "sha256-xRx8ErIN9xjxZt/nEsdIQkIGFRltuELdlI8lXA+M030="; }; nativeBuildInputs = [ From e295c34808e93670a5f0de13ed8642fe59b2c443 Mon Sep 17 00:00:00 2001 From: Phillip Seeber Date: Mon, 9 Sep 2024 20:22:52 +0200 Subject: [PATCH 451/481] test-drive: fix aarch64 build --- pkgs/development/libraries/test-drive/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/test-drive/default.nix b/pkgs/development/libraries/test-drive/default.nix index c31a249350ce..41fc83844287 100644 --- a/pkgs/development/libraries/test-drive/default.nix +++ b/pkgs/development/libraries/test-drive/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { mesonEmulatorHook ]; + mesonAutoFeatures = "auto"; + meta = with lib; { description = "Procedural Fortran testing framework"; homepage = "https://github.com/fortran-lang/test-drive"; From f7f5f2d6ebdd63219d01a973442f2424d88c80cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Sep 2024 15:39:45 +0200 Subject: [PATCH 452/481] aider-chat: 0.54.0 -> 0.56.0 Diff: https://github.com/paul-gauthier/aider/compare/refs/tags/v0.54.0...v0.56.0 Changelog: https://github.com/paul-gauthier/aider/blob/v0.56.0/HISTORY.md --- pkgs/by-name/ai/aider-chat/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ai/aider-chat/package.nix b/pkgs/by-name/ai/aider-chat/package.nix index c7f58b27a1bb..4317402281b1 100644 --- a/pkgs/by-name/ai/aider-chat/package.nix +++ b/pkgs/by-name/ai/aider-chat/package.nix @@ -12,7 +12,7 @@ let self = python3; packageOverrides = _: super: { tree-sitter = super.tree-sitter_0_21; }; }; - version = "0.54.0"; + version = "0.56.0"; in python3.pkgs.buildPythonApplication { pname = "aider-chat"; @@ -23,10 +23,12 @@ python3.pkgs.buildPythonApplication { owner = "paul-gauthier"; repo = "aider"; rev = "refs/tags/v${version}"; - hash = "sha256-ysNhfhFGSDhEQLQLP26Lv6qmZehmwtQTSlAqJVPD5O8="; + hash = "sha256-e0Fqj67vYt41Zbr1FN2fuLp6cHRius8RtacBHLgB9dM="; }; - build-system = with python3.pkgs; [ setuptools ]; + pythonRelaxDeps = true; + + build-system = with python3.pkgs; [ setuptools-scm ]; dependencies = with python3.pkgs; @@ -41,6 +43,7 @@ python3.pkgs.buildPythonApplication { gitpython grep-ast importlib-resources + json5 jsonschema jiter litellm @@ -70,32 +73,29 @@ python3.pkgs.buildPythonApplication { buildInputs = [ portaudio ]; - pythonRelaxDeps = true; - nativeCheckInputs = (with python3.pkgs; [ pytestCheckHook ]) ++ [ gitMinimal ]; disabledTestPaths = [ - # requires network + # Tests require network access "tests/scrape/test_scrape.py" - # Expected 'mock' to have been called once "tests/help/test_help.py" ]; disabledTests = [ - # requires network + # Tests require network "test_urls" "test_get_commit_message_with_custom_prompt" - # FileNotFoundError "test_get_commit_message" - # Expected 'launch_gui' to have been called once "test_browser_flag_imports_streamlit" + # AttributeError + "test_simple_send_with_retries" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - # fails on darwin + # Tests fails on darwin "test_dark_mode_sets_code_theme" "test_default_env_file_sets_automatic_variable" ]; @@ -107,8 +107,9 @@ python3.pkgs.buildPythonApplication { meta = { description = "AI pair programming in your terminal"; homepage = "https://github.com/paul-gauthier/aider"; + changelog = "https://github.com/paul-gauthier/aider/blob/v${version}/HISTORY.md"; license = lib.licenses.asl20; - mainProgram = "aider"; maintainers = with lib.maintainers; [ taha-yassine ]; + mainProgram = "aider"; }; } From 0b651402587d0b657567e588437520a739f164ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 1 Sep 2024 14:18:25 +0200 Subject: [PATCH 453/481] vmware-workstation: don't break patches, add runHook to installPhase, fix typo --- .../virtualization/vmware-workstation/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/vmware-workstation/default.nix b/pkgs/applications/virtualization/vmware-workstation/default.nix index e4d5673305f0..b60875c38129 100644 --- a/pkgs/applications/virtualization/vmware-workstation/default.nix +++ b/pkgs/applications/virtualization/vmware-workstation/default.nix @@ -142,7 +142,7 @@ stdenv.mkDerivation rec { ''} ''; - patchPhase = lib.optionalString enableMacOSGuests '' + postPatch = lib.optionalString enableMacOSGuests '' cp -R "${unlockerSrc}" unlocker/ substituteInPlace unlocker/unlocker.py --replace \ @@ -153,6 +153,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p \ $out/bin \ $out/etc/vmware \ @@ -324,7 +326,7 @@ stdenv.mkDerivation rec { sed -i -e "s,/sbin/modprobe,${kmod}/bin/modprobe," $out/bin/vmplayer sed -i -e "s,@@BINARY@@,$out/bin/vmplayer," $out/share/applications/vmware-player.desktop - ## VMware OVF Tool compoment + ## VMware OVF Tool component echo "Installing VMware OVF Tool for Linux" unpacked="unpacked/vmware-ovftool" mkdir -p $out/lib/vmware-ovftool/ @@ -390,7 +392,7 @@ stdenv.mkDerivation rec { chmod +x $out/bin/* $out/lib/vmware/bin/* $out/lib/vmware/setup/* - # Harcoded pkexec hack + # Hardcoded pkexec hack for lib in "lib/vmware/lib/libvmware-mount.so/libvmware-mount.so" "lib/vmware/lib/libvmwareui.so/libvmwareui.so" "lib/vmware/lib/libvmware-fuseUI.so/libvmware-fuseUI.so" do sed -i -e "s,/usr/local/sbin,/run/vmware/bin," "$out/$lib" @@ -405,6 +407,8 @@ stdenv.mkDerivation rec { wrapProgram $out/lib/vmware/bin/vmware-vmx rm $out/lib/vmware/bin/vmware-vmx ln -s /run/wrappers/bin/vmware-vmx $out/lib/vmware/bin/vmware-vmx + + runHook postInstall ''; meta = with lib; { From d8401340c1e89bc08f344d5302b55ab497ae8b5c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 14:06:08 +0000 Subject: [PATCH 454/481] gogup: 0.27.4 -> 0.27.5 --- pkgs/by-name/go/gogup/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix index af226e688c8e..a015caf4ef78 100644 --- a/pkgs/by-name/go/gogup/package.nix +++ b/pkgs/by-name/go/gogup/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gogup"; - version = "0.27.4"; + version = "0.27.5"; src = fetchFromGitHub { owner = "nao1215"; repo = "gup"; rev = "v${version}"; - hash = "sha256-vCp513WpB3kWMN0nkohtvpuMN1WBndg1E6pF0Cd5FgE="; + hash = "sha256-I4l/sDqafc/ZO8kKc4iOSMFLS0YZrAqRFOXn0N7Myo4="; }; vendorHash = "sha256-rtdbPwVZHwofpGccYU8NBiaikzNMIwSDggbRdnGTBu8="; From d6bedef965866cd2a7edb444a2aee577b054179f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 14:06:40 +0000 Subject: [PATCH 455/481] nfpm: 2.39.0 -> 2.40.0 --- pkgs/tools/package-management/nfpm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index e33d091d9345..621cd3327058 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "nfpm"; - version = "2.39.0"; + version = "2.40.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-0afwPA4OIIBYxXwkdm36JmVXDJ+gqESOPjEp5Tkxxa8="; + hash = "sha256-hBA15pHCYgBKTeHBVBZkhPqoMnDkd13wx9afygTDPWk="; }; - vendorHash = "sha256-LJM9F9NTAMvDwsaRvjnZyjKSI0AjZvVM4srOYuGLA7w="; + vendorHash = "sha256-d4MuoKc7LF5KCXhLxIwuqS2Xu7ClLhyJZH4/+/LYm3w="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 6474b22bd84afff32192b553e383200f09c4fc1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 14:23:21 +0000 Subject: [PATCH 456/481] python312Packages.backports-datetime-fromisoformat: 2.0.1 -> 2.0.2 --- .../backports-datetime-fromisoformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix index a9aa34ec01ac..103ee2561aaa 100644 --- a/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix +++ b/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "backports-datetime-fromisoformat"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchFromGitHub { owner = "movermeyer"; repo = "backports.datetime_fromisoformat"; rev = "refs/tags/v${version}"; - hash = "sha256-c3LCTOKva99+x96iLHNnL1e1Ft1M1CsjQX+nEqAlXUs="; + hash = "sha256-v9Njic7zN2bv1lQgdbJNeZLF3VXcC9A4UoE/znLF0gM="; }; nativeBuildInputs = [ setuptools ]; From cbc932ea753a850f4460de8ba4589da528c9a461 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 14:23:37 +0000 Subject: [PATCH 457/481] python312Packages.auth0-python: 4.7.1 -> 4.7.2 --- pkgs/development/python-modules/auth0-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index b292153e7d62..3958abba6de3 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "4.7.1"; + version = "4.7.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "auth0"; repo = "auth0-python"; rev = "refs/tags/${version}"; - hash = "sha256-udtrvAr8wfg1DbNbBEjA/tlrYhIiXtTFqi4bZCuKI0Q="; + hash = "sha256-g6sbxPglKDGbDMiB9crnua86y6TPIbLiFddeymrLAP0="; }; nativeBuildInputs = [ From 5a99fdf1ab833bd62edef737d52b915c8567db0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 11 Sep 2024 00:50:40 +1000 Subject: [PATCH 458/481] coursier: 2.1.10 -> 2.1.11 (#340930) --- pkgs/development/tools/coursier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 3732a1eec55f..8da4eb40b8d6 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - hash = "sha256-fiZwmDDuaafBbYQdOxPpTrleMLOSakCteizpKwcGStk="; + hash = "sha256-Gd5RM7QdFUmafr6ceQEvFjbQsWooHCiMDslG1MYFcrI="; }; dontUnpack = true; From 4aa2d69f55ac003d12a4c92f6fa7efb296a1086e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Mon, 9 Sep 2024 14:57:56 +0200 Subject: [PATCH 459/481] ladybird: 0-unstable-2024-08-12 -> 0-unstable-2024-09-08 --- pkgs/applications/networking/browsers/ladybird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index 2c610945e396..15ed027ded35 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -58,13 +58,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-08-12"; + version = "0-unstable-2024-09-08"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "7e57cc7b090455e93261c847064f12a61d686ff3"; - hash = "sha256-8rkgxEfRH8ERuC7iplQKOzKb1EJ4+SNGDX5gTGpOmQo="; + rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d"; + hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw="; }; postPatch = '' From 1f38ed70139f73474113a5ee04df2a94c99717b0 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Tue, 10 Sep 2024 16:54:34 +0200 Subject: [PATCH 460/481] nixos/tests: fix nixos-rebuild-specialisations test See https://hydra.nixos.org/build/272096143 --- nixos/tests/nixos-rebuild-specialisations.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/nixos-rebuild-specialisations.nix b/nixos/tests/nixos-rebuild-specialisations.nix index 9192b8a8a030..ab67bbaba676 100644 --- a/nixos/tests/nixos-rebuild-specialisations.nix +++ b/nixos/tests/nixos-rebuild-specialisations.nix @@ -21,6 +21,8 @@ import ./make-test-python.nix ({ pkgs, ... }: { pkgs.grub2 ]; + system.switch.enable = true; + virtualisation = { cores = 2; memorySize = 4096; From 55ff4178e82ec85588895c19dadb7cb7e6ff4cd0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 10 Sep 2024 19:04:35 +0400 Subject: [PATCH 461/481] ffcast: add awk to path --- pkgs/tools/X11/ffcast/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index c70ef9da2e3c..cdf94928033b 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, perl -, ffmpeg-full, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo +, ffmpeg-full, gawk, imagemagick, xdpyinfo, xprop, xrectsel, xwininfo }: stdenv.mkDerivation rec { @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { postInstall = let binPath = lib.makeBinPath [ ffmpeg-full + gawk imagemagick xdpyinfo xprop @@ -30,12 +31,12 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/ffcast --prefix PATH : ${binPath} ''; - meta = with lib; { + meta = { description = "Run commands on rectangular screen regions"; homepage = "https://github.com/ropery/FFcast"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sikmir ]; - platforms = platforms.linux; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ sikmir ]; + platforms = lib.platforms.linux; mainProgram = "ffcast"; }; } From 6e87226440bf24037fc7cbc36708ae3f00e5745c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 6 Sep 2024 03:55:06 +0000 Subject: [PATCH 462/481] recyclarr: 7.2.1 -> 7.2.3 --- pkgs/by-name/re/recyclarr/deps.nix | 71 +++++++++++++-------------- pkgs/by-name/re/recyclarr/package.nix | 4 +- 2 files changed, 35 insertions(+), 40 deletions(-) diff --git a/pkgs/by-name/re/recyclarr/deps.nix b/pkgs/by-name/re/recyclarr/deps.nix index 3009c268aacd..6e75f8850c4d 100644 --- a/pkgs/by-name/re/recyclarr/deps.nix +++ b/pkgs/by-name/re/recyclarr/deps.nix @@ -90,8 +90,8 @@ }) (fetchNuGet { pname = "dotnet-sonarscanner"; - version = "7.1.1"; - hash = "sha256-fMx2rfRlqpD7Urg+earDe5oDnQBn3zeItzXHxXDEkdA="; + version = "8.0.1"; + hash = "sha256-cdwdO7C79O0xZ5AovWq6A0g9H22bYTITmogcY0rKOtk="; }) (fetchNuGet { pname = "DynamicData"; @@ -135,13 +135,13 @@ }) (fetchNuGet { pname = "GitVersion.MsBuild"; - version = "6.0.0"; - hash = "sha256-Ve9Ys4u+p8uYBSvX7vT6Qpile6Fj7q3y0sHNIMaue90="; + version = "6.0.2"; + hash = "sha256-Xn1oMWSWGWuZpKnVwh6N40KOSNVkNYpzYYTu7TBQcgo="; }) (fetchNuGet { pname = "GitVersion.Tool"; - version = "6.0.0"; - hash = "sha256-aee5HFhFfkmJnkoDnP/rZJpn/7McS3PQIlrAJKSRqnk="; + version = "6.0.2"; + hash = "sha256-VPzU5WaDXFeaDkWPPqzZyOxYOrcocr2mJdawoZGl11M="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.Authorization"; @@ -200,8 +200,8 @@ }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; - version = "17.10.0"; - hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; + version = "17.11.0"; + hash = "sha256-XglInnx5GePUYHG7n2NLX+WfK7kJnornsWOW/5FnOXE="; }) (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; @@ -235,8 +235,8 @@ }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; - version = "8.0.0"; - hash = "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="; + version = "8.0.1"; + hash = "sha256-m8daXRK1Qn9y2c8SmtWu9ysLHwFJtEWiUQoAnMalw7s="; }) (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; @@ -310,8 +310,8 @@ }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; - version = "17.10.0"; - hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; + version = "17.11.0"; + hash = "sha256-WjyA78+PG9ZloWTt9Hf1ek3VVj2FfJ9fAjqklnN+fWw="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; @@ -338,10 +338,15 @@ version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; }) + (fetchNuGet { + pname = "Microsoft.TestPlatform.ObjectModel"; + version = "17.11.0"; + hash = "sha256-mCI3MCV6nyrGLrBat5VvK5LrXTEKlsdp9NkpZyJYwVg="; + }) (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; - version = "17.10.0"; - hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; + version = "17.11.0"; + hash = "sha256-gViDLobza22kuLvB4JdlGtbANqwBHRwf1wLmIHMw9Eo="; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; @@ -350,8 +355,8 @@ }) (fetchNuGet { pname = "MudBlazor"; - version = "7.3.0"; - hash = "sha256-EiHcGTTSi1ID9GpjyDGX3nqPc/fz4Xx5H6udqinRGHs="; + version = "7.6.0"; + hash = "sha256-hTeNrVykAm+YS/mNafM5HZ/3cfKBQb6rs8kEZ11h86M="; }) (fetchNuGet { pname = "NETStandard.Library"; @@ -375,13 +380,13 @@ }) (fetchNuGet { pname = "NUnit"; - version = "4.1.0"; - hash = "sha256-srzj0lf2ReKw41TnigZwf8rqKKNzGRRVrgN3hR/vRjo="; + version = "4.2.1"; + hash = "sha256-rR1Yk79bBH8pJaAoqBhkiDqnQfkcK1ggZqkuQF3s2mg="; }) (fetchNuGet { pname = "NUnit.Analyzers"; - version = "4.2.0"; - hash = "sha256-+YtDcIIWo1vOEXjQ/M6a+OrdzgTqinDKM2vVNmy4tSo="; + version = "4.3.0"; + hash = "sha256-L/agsdfGdIICWmBeD/dm3lHGnTDyOF0hArLd42n09SY="; }) (fetchNuGet { pname = "NUnit3TestAdapter"; @@ -680,8 +685,8 @@ }) (fetchNuGet { pname = "Serilog.AspNetCore"; - version = "8.0.1"; - hash = "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="; + version = "8.0.2"; + hash = "sha256-cRZHG2bqrESOxPVxq2v+mHx+oZBzZEPksrleGVXO1p0="; }) (fetchNuGet { pname = "Serilog.Expressions"; @@ -705,8 +710,8 @@ }) (fetchNuGet { pname = "Serilog.Settings.Configuration"; - version = "8.0.0"; - hash = "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="; + version = "8.0.2"; + hash = "sha256-iHRQt6vDk85/6HpMXiJluAwhkjgwEnL3IKavfDgFX0k="; }) (fetchNuGet { pname = "Serilog.Sinks.Console"; @@ -740,8 +745,8 @@ }) (fetchNuGet { pname = "Spectre.Console.Analyzer"; - version = "0.49.1"; - hash = "sha256-1HISNHRyzsNKTCimvJaYudsJm7lE+/pxcMdedqrtyWQ="; + version = "1.0.0"; + hash = "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE="; }) (fetchNuGet { pname = "Spectre.Console.Cli"; @@ -850,18 +855,8 @@ }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; - version = "4.3.0"; - hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; - }) - (fetchNuGet { - pname = "System.Diagnostics.DiagnosticSource"; - version = "7.0.2"; - hash = "sha256-8Uawe7mWOQsDzMSAAP16nuGD1FRSajyS8q+cA++MJ8E="; - }) - (fetchNuGet { - pname = "System.Diagnostics.DiagnosticSource"; - version = "8.0.0"; - hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; + version = "8.0.1"; + hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; }) (fetchNuGet { pname = "System.Diagnostics.EventLog"; diff --git a/pkgs/by-name/re/recyclarr/package.nix b/pkgs/by-name/re/recyclarr/package.nix index 2890f988870c..89d72680dc01 100644 --- a/pkgs/by-name/re/recyclarr/package.nix +++ b/pkgs/by-name/re/recyclarr/package.nix @@ -19,13 +19,13 @@ let in buildDotnetModule (finalAttrs: { pname = "recyclarr"; - version = "7.2.1"; + version = "7.2.3"; src = fetchFromGitHub { owner = "recyclarr"; repo = "recyclarr"; rev = "v${finalAttrs.version}"; - hash = "sha256-KXFGT1fprRKN+V+3k0hpjjaI/xpw6UDAk+jj9zMek7k="; + hash = "sha256-1jNXqyGIcaO2FVcC8i/vq+XTDCGuTGD4y0dDWIqb0K8="; }; projectFile = "Recyclarr.sln"; From 9103a4d978ddc60e165fa26b22a471b7d50840fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 15:13:11 +0200 Subject: [PATCH 463/481] nixVersions.git: 2.25.0pre20240807 -> 2.25.0pre20240910 --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ebcc664f0f11..214f3a47fc5a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -201,12 +201,12 @@ in lib.makeExtensible (self: ({ git = (common rec { version = "2.25.0"; - suffix = "pre20240807_${lib.substring 0 8 src.rev}"; + suffix = "pre20240910_${lib.substring 0 8 src.rev}"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147"; - hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g="; + rev = "b9d3cdfbd2b873cf34600b262247d77109dfd905"; + hash = "sha256-7zH8TU5g3Bsg6ES0O8RcTm6JGYOMuDCGlSI3AQKbKy8="; }; self_attribute_name = "git"; }).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) { From 74787857f812116406bf53c56b16ba2c1df55ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 10 Sep 2024 16:00:25 +0200 Subject: [PATCH 464/481] nixVersions.git: disable test on aarch64-linux --- pkgs/tools/package-management/nix/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 205cda250e21..6dc80efb4879 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -243,6 +243,9 @@ self = stdenv.mkDerivation { # See https://github.com/NixOS/nix/issues/5687 + lib.optionalString (atLeast25 && stdenv.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh + '' # TODO: investigate why this broken + + lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") '' + echo "exit 0" > tests/functional/flakes/show.sh '' + '' # nixStatic otherwise does not find its man pages in tests. export MANPATH=$man/share/man:$MANPATH From 951dc5a32597c41e2c6a10f6f9355c62aac3288d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Sep 2024 08:46:04 -0700 Subject: [PATCH 465/481] python312Packages.iottycloud: 0.1.3 -> 0.2.1 Diff: https://github.com/pburgio/iottyCloud/compare/c328cc497bf58a1da148ea88e309129177d69af0...v0.2.1 Changelog: https://github.com/pburgio/iottyCloud/releases/tag/v0.2.1 --- pkgs/development/python-modules/iottycloud/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix index bd710c5e3cb8..0f9b72bd9186 100644 --- a/pkgs/development/python-modules/iottycloud/default.nix +++ b/pkgs/development/python-modules/iottycloud/default.nix @@ -10,15 +10,14 @@ buildPythonPackage rec { pname = "iottycloud"; - version = "0.1.3"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "pburgio"; repo = "iottyCloud"; - # https://github.com/pburgio/iottyCloud/issues/1 - rev = "c328cc497bf58a1da148ea88e309129177d69af0"; - hash = "sha256-G06kvp4VG0OmZxDqvKnMJ+uD+6i5BFL/Iuke4vOdO/k="; + rev = "refs/tags/v${version}"; + hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo="; }; build-system = [ hatchling ]; From dcd22533a08494dec7dd7e6dcb0c5421ac46b9b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 16:38:35 +0000 Subject: [PATCH 466/481] python312Packages.dissect-shellitem: 3.9 -> 3.10 --- pkgs/development/python-modules/dissect-shellitem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dissect-shellitem/default.nix b/pkgs/development/python-modules/dissect-shellitem/default.nix index 8718b156a42b..e8fbec0f8b13 100644 --- a/pkgs/development/python-modules/dissect-shellitem/default.nix +++ b/pkgs/development/python-modules/dissect-shellitem/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "dissect-shellitem"; - version = "3.9"; + version = "3.10"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "fox-it"; repo = "dissect.shellitem"; rev = "refs/tags/${version}"; - hash = "sha256-bkh8eiq07cspRQfs1amiyDuFmoXSBwG/fS/6nn9KV/Y="; + hash = "sha256-BS+c9QbMMsaoZHyuv6jMxbQFQNJeLt3da8Fq/wwXesQ="; }; build-system = [ From 205451066098a5ada6b4335a62c5fb6994075c74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:17:18 +0000 Subject: [PATCH 467/481] systemfd: 0.4.3 -> 0.4.4 --- pkgs/development/tools/systemfd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix index f0e23b0ced47..041f88111b00 100644 --- a/pkgs/development/tools/systemfd/default.nix +++ b/pkgs/development/tools/systemfd/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.4.3"; + version = "0.4.4"; in rustPlatform.buildRustPackage { @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage { repo = "systemfd"; owner = "mitsuhiko"; rev = version; - sha256 = "sha256-Ypt9/dqDrurhiEhahVk8gG3QxP2ZKTeL7F0IVUGE8Kw="; + sha256 = "sha256-U+pBKuoMhyIOhLl1nzmxk5yFt9nOq/KZ6rx9JhalLmM="; }; - cargoHash = "sha256-1t+yYqPDMEI39kieGkm+EUVzDBsTlDWQ7iGyjepjc7s="; + cargoHash = "sha256-k8FgdNVjFYO/lflVzRQUwHvdy4+eCNTnTYImdfy1GaQ="; meta = { description = "Convenient helper for passing sockets into another process"; From c6fa7e48fee0dbd532213eb34e972286bc828f7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:17:45 +0000 Subject: [PATCH 468/481] keycloak: 25.0.4 -> 25.0.5 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 69aa61b92bf4..5abc811fc78a 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.4"; + version = "25.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-Pj8+0bfYnHhkYIDQkePpsmbYb6MN4BI+2VLLdZv3C1Q="; + hash = "sha256-2PEQjdz+r/qRJxlu0jI2watkNOUkf4bUCkcNPrLsaMg="; }; nativeBuildInputs = [ makeWrapper jre ]; From 4bc803e67d88bf80241523a73f19bc3e658d32f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:33:28 +0000 Subject: [PATCH 469/481] python312Packages.unstructured: 0.15.9 -> 0.15.10 --- pkgs/development/python-modules/unstructured/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unstructured/default.nix b/pkgs/development/python-modules/unstructured/default.nix index 3f1931ed6e68..70113a9ed04e 100644 --- a/pkgs/development/python-modules/unstructured/default.nix +++ b/pkgs/development/python-modules/unstructured/default.nix @@ -57,7 +57,7 @@ grpcio, }: let - version = "0.15.9"; + version = "0.15.10"; optional-dependencies = { huggingflace = [ langdetect @@ -100,7 +100,7 @@ buildPythonPackage { owner = "Unstructured-IO"; repo = "unstructured"; rev = "refs/tags/${version}"; - hash = "sha256-AJz7E/XBtsZtN0wQzA9Elk/gXPtkcrkN934OIc0MTYg="; + hash = "sha256-Wgv7IcyYuOICYZDmj/jdkpSHx53ZXCR06952GmVEGOY="; }; propagatedBuildInputs = [ From af48f8f0c69779b8074147cc7cf304c22901188b Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Thu, 18 Jul 2024 23:06:27 +0100 Subject: [PATCH 470/481] python312Packages.brother-ql: switch to maintained fork Switches upstream to https://github.com/LunarEclipse363/brother_ql_next, and make the appropriate changes to version, format, and dependencies to follow upstream's changes. This fork incorporates the pillow patch that was previously required, so it has been removed. --- .../python-modules/brother-ql/default.nix | 24 +++++++------------ 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index ccf512a05db2..045ca469daf2 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -1,7 +1,7 @@ { fetchPypi, - fetchpatch, buildPythonPackage, + setuptools, future, packbits, pillow, @@ -10,36 +10,30 @@ mock, click, attrs, + jsons, lib, }: buildPythonPackage rec { pname = "brother-ql"; - version = "0.9.4"; - format = "setuptools"; + version = "0.11.1"; + format = "pyproject"; src = fetchPypi { - pname = "brother_ql"; + pname = "brother_ql_next"; inherit version; - hash = "sha256-H1xXoDnwEsnCBDl/RwAB9267dINCHr3phdDLPGFOhmA="; + hash = "sha256-jG8OvzDy2+2OpdVVixNguLsSwRbSIyvVEbVvorcgxfU="; }; propagatedBuildInputs = [ + setuptools future packbits pillow pyusb click attrs - ]; - - patches = [ - (fetchpatch { - # Make compatible with Pillow>=10.0; https://github.com/pklaus/brother_ql/pull/143 - name = "brother-ql-pillow10-compat.patch"; - url = "https://github.com/pklaus/brother_ql/commit/a7e1b94b41f3a6e0f8b365598bc34fb47ca95a6d.patch"; - hash = "sha256-v3YhmsUWBwE/Vli1SbTQO8q1zbtWYI9iMlVFvz5sxmg="; - }) + jsons ]; meta = with lib; { @@ -48,7 +42,7 @@ buildPythonPackage rec { Python package for the raster language protocol of the Brother QL series label printers (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) ''; - homepage = "https://github.com/pklaus/brother_ql"; + homepage = "https://github.com/LunarEclipse363/brother_ql_next"; license = licenses.gpl3; maintainers = with maintainers; [ grahamc ]; mainProgram = "brother_ql"; From a2ca508592569366c94531bbd850b36a113228f6 Mon Sep 17 00:00:00 2001 From: Jessica Kay Date: Fri, 6 Sep 2024 15:18:57 +0100 Subject: [PATCH 471/481] python312Packages.brother-ql: 0.11.1 -> 0.11.2 --- pkgs/development/python-modules/brother-ql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 045ca469daf2..77988d86fa44 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "brother-ql"; - version = "0.11.1"; + version = "0.11.2"; format = "pyproject"; src = fetchPypi { pname = "brother_ql_next"; inherit version; - hash = "sha256-jG8OvzDy2+2OpdVVixNguLsSwRbSIyvVEbVvorcgxfU="; + hash = "sha256-3rTf+4W5KK7zSGIE3bBHXHE0hjyvpjB0IiEtbax6mkU="; }; propagatedBuildInputs = [ From fb8f922cc534153513ae96337e661649c1038d09 Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Fri, 6 Sep 2024 22:43:47 +0100 Subject: [PATCH 472/481] python312Packages.brother-ql: Correct license from gpl3 to gpl3only MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/development/python-modules/brother-ql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index 77988d86fa44..b1d27d882cdd 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { (QL-500, QL-550, QL-570, QL-700, QL-710W, QL-720NW, QL-800, QL-820NWB, QL-1050 and more) ''; homepage = "https://github.com/LunarEclipse363/brother_ql_next"; - license = licenses.gpl3; + license = licenses.gpl3Only; maintainers = with maintainers; [ grahamc ]; mainProgram = "brother_ql"; }; From 5bc1418a2b31c70a8c0b6f7aea8c8b8899c2b8ff Mon Sep 17 00:00:00 2001 From: Jess Kay Date: Fri, 6 Sep 2024 22:51:38 +0100 Subject: [PATCH 473/481] python312Packages.brother-ql: Use pypa infrastructure to build Co-authored-by: kirillrdy --- pkgs/development/python-modules/brother-ql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/brother-ql/default.nix b/pkgs/development/python-modules/brother-ql/default.nix index b1d27d882cdd..fe305d140960 100644 --- a/pkgs/development/python-modules/brother-ql/default.nix +++ b/pkgs/development/python-modules/brother-ql/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "brother-ql"; version = "0.11.2"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = "brother_ql_next"; From d14c5f66fc3700834eecb234ea28e02b685d8b63 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 10 Sep 2024 21:18:34 +0200 Subject: [PATCH 474/481] microcode-intel: 20240813 -> 20240910 https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/blob/fbfe741896c55b36fcbf0560a68be96286103556/releasenote.md Signed-off-by: Felix Singer --- pkgs/by-name/mi/microcode-intel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mi/microcode-intel/package.nix b/pkgs/by-name/mi/microcode-intel/package.nix index 0ba907bbf0de..26916216f437 100644 --- a/pkgs/by-name/mi/microcode-intel/package.nix +++ b/pkgs/by-name/mi/microcode-intel/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20240813"; + version = "20240910"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - hash = "sha256-O2UWa04MnU9ndzvWy8fruOTm85PexEd+i1McQNz6uFE="; + hash = "sha256-cn0qK81dwbamh5PBlPuC9KtDWyT2NwSxDD0XlCRAv6s="; }; nativeBuildInputs = [ From d244f9a98d206f596d7cc0a96c534c462d165899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 10 Sep 2024 12:31:06 -0700 Subject: [PATCH 475/481] home-assistant-custom-components.waste_collection_schedule: 2.1.0 -> 2.2.0 Diff: https://github.com/mampfes/hacs_waste_collection_schedule/compare/refs/tags/2.1.0...2.2.0 Changelog: https://github.com/mampfes/hacs_waste_collection_schedule/releases/tag/2.2.0 --- .../custom-components/waste_collection_schedule/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix index 9f87bf500737..7e911c14f1d0 100644 --- a/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix +++ b/pkgs/servers/home-assistant/custom-components/waste_collection_schedule/default.nix @@ -12,13 +12,13 @@ buildHomeAssistantComponent rec { owner = "mampfes"; domain = "waste_collection_schedule"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { inherit owner; repo = "hacs_${domain}"; rev = "refs/tags/${version}"; - hash = "sha256-BRxBZecOg8R4yF1lVEfOWMmuYK4JQ1ORsY4bclVYOow="; + hash = "sha256-XzHShFM0H8F/erc/XiCMDotCfN/JJoO5SWX+O9Fqxkw="; }; dependencies = [ From c7bb47aac18f30a4f1780089f189f47a65e283c4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 10 Sep 2024 15:31:48 -0400 Subject: [PATCH 476/481] makeInitrdNG: fixup `contents` documentation --- pkgs/build-support/kernel/make-initrd-ng.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/kernel/make-initrd-ng.nix b/pkgs/build-support/kernel/make-initrd-ng.nix index c70e9cc6dc2e..b0b0143c5ca9 100644 --- a/pkgs/build-support/kernel/make-initrd-ng.nix +++ b/pkgs/build-support/kernel/make-initrd-ng.nix @@ -37,9 +37,9 @@ in , extension ? _compressorMeta.extension or (throw "Unrecognised compressor ${_compressorName}, please specify filename extension") -# List of { object = path_or_derivation; symlink = "/path"; } +# List of { source = path_or_derivation; target = "/path"; } # The paths are copied into the initramfs in their nix store path -# form, then linked at the root according to `symlink`. +# form, then linked at the root according to `target`. , contents # List of uncompressed cpio files to prepend to the initramfs. This From c978371cc398210c6297e2fddcd6c6ac3ac27476 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:17:50 +0000 Subject: [PATCH 477/481] minio-client: 2024-08-26T10-49-58Z -> 2024-09-09T07-53-10Z --- pkgs/tools/networking/minio-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 93c05481c1a8..b56f0785497d 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2024-08-26T10-49-58Z"; + version = "2024-09-09T07-53-10Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-csaG54iwH0q8CHB0FFD0sY063uQ2WSlXDePo6yr5QbI="; + sha256 = "sha256-K0FuG7c8sD4ingJH/al7TBoTCHKGad7I2RYheTjqAR0="; }; - vendorHash = "sha256-wjMn9Xi4wd7fa1ay3mLRGl/USWCVtk/J9KiGpfcsRM4="; + vendorHash = "sha256-KNnYxE3kt/eemnhsRf29SZX0Q+ECzdMFVgcmd7uCsyY="; subPackages = [ "." ]; From 5456bfa9e72e0d3004d79c6046ba6ff088acbb10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 15:03:57 +0000 Subject: [PATCH 478/481] python312Packages.robotframework: 7.0.1 -> 7.1 --- pkgs/development/python-modules/robotframework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index b961d6ca0726..ddc6071451c5 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "robotframework"; - version = "7.0.1"; + version = "7.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "robotframework"; repo = "robotframework"; rev = "refs/tags/v${version}"; - hash = "sha256-pr7x40ja1DwMPffmXQ2W53g1wuD0p63f+6ATfXhqGvE="; + hash = "sha256-nzkgJdSWbFcAnAqRTq4+Wy1lqdz+Xxf2i4RKnj/A5SA="; }; nativeBuildInputs = [ setuptools ]; From 6c18083a43d3a8ab0b2f9726de0b1cfeab050fc3 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 10 Sep 2024 15:54:33 -0400 Subject: [PATCH 479/481] zed-editor: 0.151.2 -> 0.152.3 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 426 ++++++++++++++++--------- pkgs/by-name/ze/zed-editor/package.nix | 6 +- 2 files changed, 270 insertions(+), 162 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 7738d2b1c3f3..7b37eb85391b 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -71,7 +71,6 @@ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.15", "once_cell", "version_check", "zerocopy", @@ -244,13 +243,14 @@ version = "0.1.0" dependencies = [ "anyhow", "chrono", + "collections", "futures 0.3.30", "http_client", "isahc", "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", "thiserror", "tokio", "util", @@ -373,6 +373,7 @@ dependencies = [ "anyhow", "assets", "assistant_slash_command", + "assistant_tool", "async-watch", "cargo_toml", "chrono", @@ -413,6 +414,7 @@ dependencies = [ "proto", "rand 0.8.5", "regex", + "release_channel", "rope", "schemars", "search", @@ -424,6 +426,7 @@ dependencies = [ "similar", "smallvec", "smol", + "strum 0.25.0", "telemetry_events", "terminal", "terminal_view", @@ -452,6 +455,20 @@ dependencies = [ "workspace", ] +[[package]] +name = "assistant_tool" +version = "0.1.0" +dependencies = [ + "anyhow", + "collections", + "derive_more", + "gpui", + "parking_lot", + "serde", + "serde_json", + "workspace", +] + [[package]] name = "async-attributes" version = "1.1.2" @@ -837,9 +854,9 @@ dependencies = [ [[package]] name = "async-tar" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c49359998a76e32ef6e870dbc079ebad8f1e53e8441c5dd39d27b44493fe331" +checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8" dependencies = [ "async-std", "filetime", @@ -1512,13 +1529,16 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" [[package]] name = "bigdecimal" -version = "0.3.1" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" +checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" dependencies = [ + "autocfg", + "libm", "num-bigint", "num-integer", "num-traits", + "serde", ] [[package]] @@ -1530,29 +1550,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bindgen" -version = "0.65.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" -dependencies = [ - "bitflags 1.3.2", - "cexpr", - "clang-sys", - "lazy_static", - "lazycell", - "log", - "peeking_take_while", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash", - "shlex", - "syn 2.0.76", - "which 4.4.2", -] - [[package]] name = "bindgen" version = "0.69.4" @@ -1573,6 +1570,26 @@ dependencies = [ "syn 2.0.76", ] +[[package]] +name = "bindgen" +version = "0.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f" +dependencies = [ + "bitflags 2.6.0", + "cexpr", + "clang-sys", + "itertools 0.13.0", + "log", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.76", +] + [[package]] name = "bit-set" version = "0.5.3" @@ -1645,7 +1662,7 @@ dependencies = [ [[package]] name = "blade-graphics" version = "0.5.0" -source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "ash", "ash-window", @@ -1653,7 +1670,7 @@ dependencies = [ "block", "bytemuck", "codespan-reporting", - "core-graphics-types", + "core-graphics-types 0.1.3", "glow", "gpu-alloc", "gpu-alloc-ash", @@ -1675,7 +1692,7 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.3.0" -source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "proc-macro2", "quote", @@ -1685,7 +1702,7 @@ dependencies = [ [[package]] name = "blade-util" version = "0.1.0" -source = "git+https://github.com/kvark/blade?rev=bf40d4f91fb56031e8676376dba2fc021b3e8eaf#bf40d4f91fb56031e8676376dba2fc021b3e8eaf" +source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" dependencies = [ "blade-graphics", "bytemuck", @@ -1760,7 +1777,7 @@ version = "0.1.0" dependencies = [ "editor", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "outline", "theme", "ui", @@ -2068,20 +2085,20 @@ dependencies = [ [[package]] name = "cbindgen" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49" +checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "heck 0.4.1", - "indexmap 1.9.3", + "indexmap 2.4.0", "log", "proc-macro2", "quote", "serde", "serde_json", - "syn 1.0.109", + "syn 2.0.76", "tempfile", - "toml 0.5.11", + "toml 0.8.19", ] [[package]] @@ -2287,7 +2304,8 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "core-foundation", + "collections", + "core-foundation 0.9.4", "core-services", "exec", "fork", @@ -2355,7 +2373,7 @@ dependencies = [ "async-tungstenite", "chrono", "clock", - "cocoa", + "cocoa 0.26.0", "collections", "feature_flags", "fs", @@ -2414,9 +2432,25 @@ checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" dependencies = [ "bitflags 1.3.2", "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", + "cocoa-foundation 0.1.2", + "core-foundation 0.9.4", + "core-graphics 0.23.2", + "foreign-types 0.5.0", + "libc", + "objc", +] + +[[package]] +name = "cocoa" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" +dependencies = [ + "bitflags 2.6.0", + "block", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", + "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", "objc", @@ -2430,8 +2464,22 @@ checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "libc", + "objc", +] + +[[package]] +name = "cocoa-foundation" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" +dependencies = [ + "bitflags 2.6.0", + "block", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "libc", "objc", ] @@ -2525,7 +2573,7 @@ dependencies = [ "settings", "sha2", "sqlx", - "strum", + "strum 0.25.0", "subtle", "supermaven_api", "telemetry_events", @@ -2774,7 +2822,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "task", "theme", "ui", @@ -2792,6 +2840,16 @@ dependencies = [ "libc", ] +[[package]] +name = "core-foundation" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" version = "0.8.7" @@ -2805,8 +2863,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" dependencies = [ "bitflags 1.3.2", - "core-foundation", - "core-graphics-types", + "core-foundation 0.9.4", + "core-graphics-types 0.1.3", + "foreign-types 0.5.0", + "libc", +] + +[[package]] +name = "core-graphics" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", + "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", ] @@ -2818,7 +2889,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" +dependencies = [ + "bitflags 2.6.0", + "core-foundation 0.10.0", "libc", ] @@ -2828,7 +2910,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92567e81db522550ebaf742c5d875624ec7820c2c7ee5f8c60e4ce7c2ae3c0fd" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", ] [[package]] @@ -2837,8 +2919,8 @@ version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" dependencies = [ - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "foreign-types 0.5.0", "libc", ] @@ -3353,17 +3435,6 @@ dependencies = [ "serde", ] -[[package]] -name = "derivative" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "derive_more" version = "0.99.18" @@ -3597,7 +3668,7 @@ dependencies = [ "gpui", "http_client", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "language", "linkify", "log", @@ -3633,6 +3704,18 @@ dependencies = [ "workspace", ] +[[package]] +name = "educe" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4bd92664bf78c4d3dba9b7cdafce6fa15b13ed3ed16175218196942e99168a8" +dependencies = [ + "enum-ordinalize", + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "either" version = "1.13.0" @@ -3730,6 +3813,26 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" +[[package]] +name = "enum-ordinalize" +version = "4.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5" +dependencies = [ + "enum-ordinalize-derive", +] + +[[package]] +name = "enum-ordinalize-derive" +version = "4.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.76", +] + [[package]] name = "enumflags2" version = "0.7.10" @@ -4243,8 +4346,8 @@ source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c004 dependencies = [ "bitflags 2.6.0", "byteorder", - "core-foundation", - "core-graphics", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "core-text", "dirs 5.0.1", "dwrote", @@ -4336,9 +4439,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "fork" -version = "0.1.23" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e74d3423998a57e9d906e49252fb79eb4a04d5cdfe188fb1b7ff9fc076a8ed" +checksum = "05dc8b302e04a1c27f4fe694439ef0f29779ca4edc205b7b58f00db04e29656d" dependencies = [ "libc", ] @@ -4371,7 +4474,7 @@ dependencies = [ "ashpd", "async-tar", "async-trait", - "cocoa", + "cocoa 0.26.0", "collections", "fsevent", "futures 0.3.30", @@ -4410,7 +4513,7 @@ name = "fsevent" version = "0.1.0" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "fsevent-sys 3.1.0", "parking_lot", "tempfile", @@ -4829,7 +4932,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", ] [[package]] @@ -4871,7 +4974,7 @@ dependencies = [ "ashpd", "async-task", "backtrace", - "bindgen 0.65.1", + "bindgen 0.70.1", "blade-graphics", "blade-macros", "blade-util", @@ -4880,11 +4983,11 @@ dependencies = [ "calloop", "calloop-wayland-source", "cbindgen", - "cocoa", + "cocoa 0.26.0", "collections", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", - "core-graphics", + "core-graphics 0.23.2", "core-text", "cosmic-text", "ctor", @@ -4900,7 +5003,7 @@ dependencies = [ "gpui_macros", "http_client", "image", - "itertools 0.11.0", + "itertools 0.13.0", "linkme", "log", "media", @@ -4927,7 +5030,7 @@ dependencies = [ "slotmap", "smallvec", "smol", - "strum", + "strum 0.25.0", "sum_tree", "taffy", "thiserror", @@ -5062,9 +5165,9 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ "hashbrown 0.14.5", ] @@ -5553,8 +5656,10 @@ version = "0.1.0" dependencies = [ "anyhow", "db", + "file_icons", "gpui", "project", + "settings", "ui", "workspace", ] @@ -5593,7 +5698,7 @@ dependencies = [ "paths", "pretty_assertions", "serde", - "strum", + "strum 0.25.0", "util", ] @@ -5862,18 +5967,18 @@ dependencies = [ [[package]] name = "itertools" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" dependencies = [ "either", ] [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -6028,7 +6133,7 @@ dependencies = [ "gpui", "http_client", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "log", "lsp", "parking_lot", @@ -6098,7 +6203,7 @@ dependencies = [ "serde_json", "settings", "smol", - "strum", + "strum 0.25.0", "text", "theme", "tiktoken-rs", @@ -6305,9 +6410,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "0c10584274047cb335c23d3e61bcef8e323adae7c5c8c760540f73610177fc3f" dependencies = [ "cc", "pkg-config", @@ -6375,7 +6480,7 @@ dependencies = [ "async-broadcast", "async-trait", "collections", - "core-foundation", + "core-foundation 0.9.4", "futures 0.3.30", "gpui", "live_kit_server", @@ -6686,8 +6791,8 @@ name = "media" version = "0.1.0" dependencies = [ "anyhow", - "bindgen 0.65.1", - "core-foundation", + "bindgen 0.70.1", + "core-foundation 0.9.4", "foreign-types 0.5.0", "metal", "objc", @@ -6742,7 +6847,7 @@ checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" dependencies = [ "bitflags 2.6.0", "block", - "core-graphics-types", + "core-graphics-types 0.1.3", "foreign-types 0.5.0", "log", "objc", @@ -6851,7 +6956,7 @@ dependencies = [ "futures 0.3.30", "git", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "parking_lot", @@ -7410,7 +7515,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "strum", + "strum 0.25.0", ] [[package]] @@ -7572,7 +7677,7 @@ dependencies = [ "file_icons", "fuzzy", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "menu", @@ -7749,12 +7854,6 @@ dependencies = [ "hmac", ] -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pem" version = "3.0.4" @@ -8277,7 +8376,7 @@ dependencies = [ "globset", "gpui", "http_client", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "lsp", @@ -8311,6 +8410,7 @@ dependencies = [ "unindent", "util", "which 6.0.3", + "windows 0.58.0", "worktree", ] @@ -8441,6 +8541,8 @@ dependencies = [ "anyhow", "collections", "futures 0.3.30", + "gpui", + "parking_lot", "prost", "prost-build", "serde", @@ -8712,8 +8814,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e8caa82e31bb98fee12fa8f051c94a6aa36b07cddb03f0d4fc558988360ff1" dependencies = [ - "cocoa", - "core-graphics", + "cocoa 0.25.0", + "core-graphics 0.23.2", "objc", "raw-window-handle", ] @@ -8944,7 +9046,6 @@ dependencies = [ "shellexpand 2.1.2", "smol", "toml 0.8.19", - "util", "worktree", ] @@ -9211,7 +9312,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "strum", + "strum 0.25.0", "tracing", "util", "zstd", @@ -9548,9 +9649,9 @@ dependencies = [ [[package]] name = "sea-orm" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8814e37dc25de54398ee62228323657520b7f29713b8e238649385dbe473ee0" +checksum = "1ef282b794f7d3426f61f530854705963b1941e7584ea84fb98528e504fac7c7" dependencies = [ "async-stream", "async-trait", @@ -9566,7 +9667,7 @@ dependencies = [ "serde", "serde_json", "sqlx", - "strum", + "strum 0.26.3", "thiserror", "time", "tracing", @@ -9576,9 +9677,9 @@ dependencies = [ [[package]] name = "sea-orm-macros" -version = "0.12.15" +version = "1.1.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603" +checksum = "07aadcb2ee9fad78a3bf74f6430ba94865ab4d8ad237f978e99dafa97ee0df57" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -9590,13 +9691,13 @@ dependencies = [ [[package]] name = "sea-query" -version = "0.30.7" +version = "0.32.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4166a1e072292d46dc91f31617c2a1cdaf55a8be4b5c9f4bf2ba248e3ac4999b" +checksum = "6fba498acd58ce434669f273505cd07737065472eb541c3f813c7f4ce33993f5" dependencies = [ "bigdecimal", "chrono", - "derivative", + "educe", "inherent", "ordered-float 3.9.2", "rust_decimal", @@ -9607,9 +9708,9 @@ dependencies = [ [[package]] name = "sea-query-binder" -version = "0.5.0" +version = "0.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36bbb68df92e820e4d5aeb17b4acd5cc8b5d18b2c36a4dd6f4626aabfa7ab1b9" +checksum = "edc3296903e60ddc7c9f4601cd6ef31a4b1584bf22480587e00b9ef743071b57" dependencies = [ "bigdecimal", "chrono", @@ -9686,7 +9787,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ "bitflags 2.6.0", - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "libc", "security-framework-sys", @@ -10362,9 +10463,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" +checksum = "27144619c6e5802f1380337a209d2ac1c431002dd74c6e60aebff3c506dc4f0c" dependencies = [ "sqlx-core", "sqlx-macros", @@ -10375,11 +10476,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" +checksum = "a999083c1af5b5d6c071d34a708a19ba3e02106ad82ef7bbd69f5e48266b613b" dependencies = [ - "ahash 0.8.11", "atoi", "bigdecimal", "byteorder", @@ -10387,14 +10487,14 @@ dependencies = [ "chrono", "crc", "crossbeam-queue", - "dotenvy", "either", - "event-listener 2.5.3", + "event-listener 5.3.1", "futures-channel", "futures-core", "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap 2.4.0", @@ -10423,26 +10523,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" +checksum = "a23217eb7d86c584b8cbe0337b9eacf12ab76fe7673c513141ec42565698bb88" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.109", + "syn 2.0.76", ] [[package]] name = "sqlx-macros-core" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" +checksum = "1a099220ae541c5db479c6424bdf1b200987934033c2584f79a0e1693601e776" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -10454,7 +10554,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.109", + "syn 2.0.76", "tempfile", "tokio", "url", @@ -10462,12 +10562,12 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" +checksum = "5afe4c38a9b417b6a9a5eeffe7235d0a106716495536e7727d1c7f4b1ff3eba6" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10509,12 +10609,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" +checksum = "b1dbb157e65f10dbe01f729339c06d239120221c9ad9fa0ba8408c4cc18ecf21" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bigdecimal", "bitflags 2.6.0", "byteorder", @@ -10540,7 +10640,6 @@ dependencies = [ "rust_decimal", "serde", "serde_json", - "sha1", "sha2", "smallvec", "sqlx-core", @@ -10554,9 +10653,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" +checksum = "9b2cdd83c008a622d94499c0006d8ee5f821f36c89b7d625c900e5dc30b5c5ee" dependencies = [ "atoi", "chrono", @@ -10570,6 +10669,7 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "time", "tracing", @@ -10594,7 +10694,7 @@ name = "story" version = "0.1.0" dependencies = [ "gpui", - "itertools 0.10.5", + "itertools 0.13.0", "smallvec", ] @@ -10620,7 +10720,7 @@ dependencies = [ "settings", "simplelog", "story", - "strum", + "strum 0.25.0", "theme", "title_bar", "ui", @@ -10687,6 +10787,12 @@ dependencies = [ "strum_macros", ] +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.25.3" @@ -10944,7 +11050,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", - "core-foundation", + "core-foundation 0.9.4", "system-configuration-sys", ] @@ -11172,7 +11278,7 @@ dependencies = [ "editor", "futures 0.3.30", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "language", "project", "rand 0.8.5", @@ -11257,7 +11363,7 @@ dependencies = [ "serde_json", "serde_json_lenient", "simplelog", - "strum", + "strum 0.25.0", "theme", "vscode_theme", ] @@ -11374,7 +11480,7 @@ dependencies = [ name = "time_format" version = "0.1.0" dependencies = [ - "core-foundation", + "core-foundation 0.9.4", "core-foundation-sys", "sys-locale", "time", @@ -12132,13 +12238,13 @@ version = "0.1.0" dependencies = [ "chrono", "gpui", - "itertools 0.11.0", + "itertools 0.13.0", "menu", "serde", "settings", "smallvec", "story", - "strum", + "strum 0.25.0", "theme", "windows 0.58.0", ] @@ -12436,7 +12542,7 @@ dependencies = [ "futures 0.3.30", "gpui", "indoc", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "lsp", @@ -13095,12 +13201,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki", -] +checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "weezl" @@ -13805,9 +13908,10 @@ dependencies = [ "env_logger", "fs", "futures 0.3.30", + "git", "gpui", "http_client", - "itertools 0.11.0", + "itertools 0.13.0", "language", "log", "node_runtime", @@ -14093,7 +14197,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.151.2" +version = "0.152.3" dependencies = [ "activity_indicator", "anyhow", @@ -14113,6 +14217,7 @@ dependencies = [ "collab_ui", "collections", "command_palette", + "command_palette_hooks", "copilot", "db", "dev_server_projects", @@ -14121,6 +14226,7 @@ dependencies = [ "env_logger", "extension", "extensions_ui", + "feature_flags", "feedback", "file_finder", "file_icons", @@ -14174,6 +14280,7 @@ dependencies = [ "smol", "snippet_provider", "supermaven", + "sysinfo", "tab_switcher", "task", "tasks_ui", @@ -14191,6 +14298,7 @@ dependencies = [ "uuid", "vim", "welcome", + "windows 0.58.0", "winresource", "workspace", "zed_actions", @@ -14354,7 +14462,7 @@ dependencies = [ [[package]] name = "zed_ruby" -version = "0.1.0" +version = "0.2.0" dependencies = [ "zed_extension_api 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 11c6520c02b2..d3e5ac0cba5d 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -85,13 +85,13 @@ let in rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.151.2"; + version = "0.152.3"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-wIozmr3GKi4VdP+P5J2j3Fa/rIjfzpPQDHv8X3WBHZA="; + hash = "sha256-0goeDz0mrZGPxsU51WGJz0mG5hdbY/75l/1Dyg2JLl4="; fetchSubmodules = true; }; @@ -106,7 +106,7 @@ rustPlatform.buildRustPackage rec { outputHashes = { "alacritty_terminal-0.24.1-dev" = "sha256-b4oSDhsAAYjpYGfFgA1Q1642JoJQ9k5RTsPgFUpAFmc="; "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.5.0" = "sha256-LDUxtl6qVYcZj/+ifc6aXKDriDL+AQ3gsEAL9Un9hec="; + "blade-graphics-0.5.0" = "sha256-j/JI34ZPD7RAHNHu3krgDLnIq4QmmZaZaU1FwD7f2FM="; "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM="; "font-kit-0.14.1" = "sha256-qUKvmi+RDoyhMrZ7T6SoVAyMc/aasQ9Y/okzre4SzXo="; "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js="; From a99c3349650f6a79ee58fd520a9844631f4b08b9 Mon Sep 17 00:00:00 2001 From: Axel Karjalainen Date: Wed, 11 Sep 2024 01:06:52 +0300 Subject: [PATCH 480/481] treewide: Fix remaining Android sdkVer and ndkVer references (#341106) Fix remaining sdkVer and ndkVer references 1144d46 renamed sdkVer and ndkVer, but forgot one reference and incorrectly replaced another --- pkgs/build-support/cc-wrapper/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index a51c009fff13..5fcd8d694f44 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -688,7 +688,7 @@ stdenvNoCC.mkDerivation { '' + optionalString targetPlatform.isAndroid '' - echo "-D__ANDROID_API__=${targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags + echo "-D__ANDROID_API__=${targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags '' # There are a few tools (to name one libstdcxx5) which do not work diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbdbc2d00bcc..a6bbd69898f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19448,7 +19448,7 @@ with pkgs; # TODO(@Ericson2314): Build bionic libc from source bionic = if stdenv.hostPlatform.useAndroidPrebuilt - then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries + then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVersion}".libraries else callPackage ../os-specific/linux/bionic-prebuilt { }; boolstuff = callPackage ../development/libraries/boolstuff { }; From 0206930c80f517e01b2745061f134b3601c4ffa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 10 Sep 2024 23:38:53 +0100 Subject: [PATCH 481/481] devenv: 1.0.8 -> 1.1 --- pkgs/by-name/de/devenv/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/de/devenv/package.nix b/pkgs/by-name/de/devenv/package.nix index 68ebc9ff536e..5b0e64169e91 100644 --- a/pkgs/by-name/de/devenv/package.nix +++ b/pkgs/by-name/de/devenv/package.nix @@ -17,19 +17,19 @@ let devenv_nix = nix.overrideAttrs (old: { - version = "2.21-devenv"; + version = "2.24-devenv"; src = fetchFromGitHub { owner = "domenkozar"; repo = "nix"; - rev = "b24a9318ea3f3600c1e24b4a00691ee912d4de12"; - hash = "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794="; + rev = "1e61e9f40673f84c3b02573145492d8af581bec5"; + hash = "sha256-uDwWyizzlQ0HFzrhP6rVp2+2NNA+/TM5zT32dR8GUlg="; }; buildInputs = old.buildInputs ++ [ libgit2 ]; doCheck = false; doInstallCheck = false; }); - version = "1.0.8"; + version = "1.1"; in rustPlatform.buildRustPackage { pname = "devenv"; inherit version; @@ -38,10 +38,10 @@ in rustPlatform.buildRustPackage { owner = "cachix"; repo = "devenv"; rev = "v${version}"; - hash = "sha256-q/ERT4Ui315opFz4h4+BsJ/zrTYdXkwq13vvrpL+KzM="; + hash = "sha256-7o2OBUwE51ZNMCBB4rg5LARc8S6C9vuzRXnqk3d/lN4="; }; - cargoHash = "sha256-fCXAFVmKns8uglbzyCznoVFGCU+Veq0t1h8T7i1P5XQ="; + cargoHash = "sha256-Yos8iOWfRJcOqbanskUg75cX05dvxWnq42NhmQt/jf4="; buildAndTestSubdir = "devenv";