From dff96ae65dd83bb5a49637edfd1fee8e3d0a7c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABlys=20Bras=20de=20fer?= Date: Fri, 21 Jul 2023 17:51:48 +0200 Subject: [PATCH 001/300] nixos/kmscon: use upstream service file --- nixos/modules/services/ttys/kmscon.nix | 40 +++++++++----------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 1d98e7ddacc8..b12fb908e266 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -67,36 +67,24 @@ in { }; config = mkIf cfg.enable { - # Largely copied from unit provided with kmscon source - systemd.units."kmsconvt@.service".text = '' - [Unit] - Description=KMS System Console on %I - Documentation=man:kmscon(1) - After=systemd-user-sessions.service - After=plymouth-quit-wait.service - After=systemd-logind.service - After=systemd-vconsole-setup.service - Requires=systemd-logind.service - Before=getty.target - Conflicts=getty@%i.service - OnFailure=getty@%i.service - IgnoreOnIsolate=yes - ConditionPathExists=/dev/tty0 + systemd.packages = [ pkgs.kmscon ]; - [Service] - ExecStart= - ExecStart=${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} - UtmpIdentifier=%I - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes - TTYVTDisallocate=yes + systemd.services."kmsconvt@" = { + after = [ "systemd-logind.service" "systemd-vconsole-setup.service" ]; + requires = [ "systemd-logind.service" ]; - X-RestartIfChanged=false - ''; + serviceConfig.ExecStart = [ + "" + '' + ${pkgs.kmscon}/bin/kmscon "--vt=%I" ${cfg.extraOptions} --seats=seat0 --no-switchvt --configdir ${configDir} --login -- ${pkgs.shadow}/bin/login -p ${autologinArg} + '' + ]; + + restartIfChanged = false; + aliases = [ "autovt@.service" ]; + }; systemd.suppressedSystemUnits = [ "autovt@.service" ]; - systemd.units."kmsconvt@.service".aliases = [ "autovt@.service" ]; systemd.services.systemd-vconsole-setup.enable = false; systemd.services.reload-systemd-vconsole-setup.enable = false; From d4ebb89ef02670f5b34f5d27f7b09982197971ec Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Thu, 11 Jan 2024 09:06:46 +0000 Subject: [PATCH 002/300] openresty: 1.21.4.3 -> 1.25.3.1 --- pkgs/servers/http/openresty/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 87cd8e4c53e3..cd28667331de 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -10,12 +10,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.21.4"; - version = "${nginxVersion}.3"; + nginxVersion = "1.25.3"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "sha256-M6hMY8/Z5GsOXGLrLdx7gGi9ouFoYxQ0O4n8P/0kzdM="; + sha256 = "sha256-MuwaJTpaEyUDVaB1/mW31j7EXFYLviEzUPCZKlfNed8="; }; # generic.nix applies fixPatch on top of every patch defined there. @@ -40,7 +40,8 @@ callPackage ../nginx/generic.nix args rec { configureFlags = [ "--with-http_postgres_module" ]; postInstall = '' - ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty + ln -s $out/luajit/bin/luajit-2.1.ROLLING $out/bin/luajit-openresty + ln -sf $out/nginx/bin/nginx $out/bin/openresty ln -s $out/nginx/bin/nginx $out/bin/nginx ln -s $out/nginx/conf $out/conf ln -s $out/nginx/html $out/html From cb2b1427ef4df2514f38d18a2a6ad992aecacc2f Mon Sep 17 00:00:00 2001 From: Tommimon <37435103+Tommimon@users.noreply.github.com> Date: Sun, 5 May 2024 17:10:46 +0200 Subject: [PATCH 003/300] mantainers: add Tommimon --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff48ec64b1ed..bb2879f18940 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -20484,6 +20484,12 @@ email = "tomaszierl@outlook.com"; name = "Tomkoid"; }; + Tommimon = { + name = "Tommaso Montanari"; + email = "sefymw7q8@mozmail.com"; + github = "Tommimon"; + githubId = 37435103; + }; tomodachi94 = { email = "tomodachi94+nixpkgs@protonmail.com"; matrix = "@tomodachi94:matrix.org"; From d41922a01688da4470fd461243e59ee798bd6a33 Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Sun, 5 May 2024 21:32:44 +0200 Subject: [PATCH 004/300] ddnet 18.1 -> 18.2 (plus one patch to workaround a libcurl problem) https://ddnet.org/downloads/#18.2 https://github.com/ddnet/ddnet/compare/18.1...18.2 --- .../ddnet-18.2-nixos-libcurl-brotli-disable.patch | 13 +++++++++++++ pkgs/games/ddnet/default.nix | 10 +++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch diff --git a/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch b/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch new file mode 100644 index 000000000000..577cfa3811e1 --- /dev/null +++ b/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch @@ -0,0 +1,13 @@ +diff -ur ddnet-18.2/src/engine/shared/http.cpp ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp +--- ddnet-18.2/src/engine/shared/http.cpp 2024-04-30 20:27:51.000000000 +0200 ++++ ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp 2024-05-05 21:17:33.792870233 +0200 +@@ -146,7 +146,8 @@ + curl_easy_setopt(pH, CURLOPT_URL, m_aUrl); + curl_easy_setopt(pH, CURLOPT_NOSIGNAL, 1L); + curl_easy_setopt(pH, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")"); +- curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl. ++ // curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl. ++ curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, "gzip, deflate"); // NixOS libcurl workaround: don't use brotli + + curl_easy_setopt(pH, CURLOPT_HEADERDATA, this); + curl_easy_setopt(pH, CURLOPT_HEADERFUNCTION, HeaderCallback); diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index e21325198de2..eaf6a5e08b78 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -35,21 +35,25 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.1"; + version = "18.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-kAMKeYYMCFMgG3+G/05DwA3mj4JkJdrXadjFUMPDAbM="; + hash = "sha256-KerV174GPF2htfaQo5gRFLgpnGf9UoS0zQ/yd/SDFkQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-8mUo2I5FsA3ym/hrlGaUW8yltLuh/0H6wetCbzvRga0="; + hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg="; }; + patches = [ + ./ddnet-18.2-nixos-libcurl-brotli-disable.patch + ]; + nativeBuildInputs = [ cmake ninja From 1a3afdf8526d7c30a64900d2041ebc5d1276488c Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Thu, 16 May 2024 16:08:57 +0200 Subject: [PATCH 005/300] doc: migrate lib.derivations to doc-comment format --- lib/derivations.nix | 102 +++++++++++++++++++++++++++++--------------- 1 file changed, 67 insertions(+), 35 deletions(-) diff --git a/lib/derivations.nix b/lib/derivations.nix index 6867458f9e87..79e896e012c3 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -17,7 +17,7 @@ let else ""; in { - /* + /** Restrict a derivation to a predictable set of attribute names, so that the returned attrset is not strict in the actual derivation, saving a lot of computation when the derivation is non-trivial. @@ -61,26 +61,37 @@ in (lazyDerivation { inherit derivation }).passthru (lazyDerivation { inherit derivation }).pythonPath + # Inputs + structured function argument + + : derivation + : The derivation to be wrapped. + + : meta + : Optional meta attribute. + + While this function is primarily about derivations, it can improve + the `meta` package attribute, which is usually specified through + `mkDerivation`. + + : passthru + : Optional list of assumed outputs. Default: ["out"] + + This must match the set of outputs that the returned derivation has. + You must use this when the derivation has multiple outputs. + + : outputs + : Optional list of assumed outputs. Default: ["out"] + + This must match the set of outputs that the returned derivation has. + You must use this when the derivation has multiple outputs. */ lazyDerivation = args@{ - # The derivation to be wrapped. - derivation - , # Optional meta attribute. - # - # While this function is primarily about derivations, it can improve - # the `meta` package attribute, which is usually specified through - # `mkDerivation`. - meta ? null - , # Optional extra values to add to the returned attrset. - # - # This can be used for adding package attributes, such as `tests`. - passthru ? { } - , # Optional list of assumed outputs. Default: ["out"] - # - # This must match the set of outputs that the returned derivation has. - # You must use this when the derivation has multiple outputs. + derivation, + meta ? null, + passthru ? { }, outputs ? [ "out" ] }: let @@ -149,29 +160,50 @@ in // genAttrs outputs (outputName: checked.${outputName}) // passthru; - /* Conditionally set a derivation attribute. + /** + Conditionally set a derivation attribute. - Because `mkDerivation` sets `__ignoreNulls = true`, a derivation - attribute set to `null` will not impact the derivation output hash. - Thus, this function passes through its `value` argument if the `cond` - is `true`, but returns `null` if not. + Because `mkDerivation` sets `__ignoreNulls = true`, a derivation + attribute set to `null` will not impact the derivation output hash. + Thus, this function passes through its `value` argument if the `cond` + is `true`, but returns `null` if not. - Type: optionalDrvAttr :: Bool -> a -> a | Null - Example: - (stdenv.mkDerivation { - name = "foo"; - x = optionalDrvAttr true 1; - y = optionalDrvAttr false 1; - }).drvPath == (stdenv.mkDerivation { - name = "foo"; - x = 1; - }).drvPath - => true + # Inputs + + `cond` + + : Condition + + `value` + + : Attribute value + + # Type + + ``` + optionalDrvAttr :: Bool -> a -> a | Null + ``` + + # Examples + :::{.example} + ## `lib.derivations.optionalDrvAttr` usage example + + ```nix + (stdenv.mkDerivation { + name = "foo"; + x = optionalDrvAttr true 1; + y = optionalDrvAttr false 1; + }).drvPath == (stdenv.mkDerivation { + name = "foo"; + x = 1; + }).drvPath + => true + ``` + + ::: */ optionalDrvAttr = - # Condition cond: - # Attribute value value: if cond then value else null; } From 450931d09355aa4b1a13f87bd2df0d086149879a Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Fri, 17 May 2024 11:51:33 +0200 Subject: [PATCH 006/300] doc: migrate lib.gvariant to doc-comment format --- lib/gvariant.nix | 405 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 314 insertions(+), 91 deletions(-) diff --git a/lib/gvariant.nix b/lib/gvariant.nix index 54aa4ea80571..d542df4d7b9a 100644 --- a/lib/gvariant.nix +++ b/lib/gvariant.nix @@ -1,4 +1,4 @@ -/* +/** A partial and basic implementation of GVariant formatted strings. See [GVariant Format Strings](https://docs.gtk.org/glib/gvariant-format-strings.html) for details. @@ -41,17 +41,28 @@ let variant = "v"; }; - /* Check if a value is a GVariant value - - Type: - isGVariant :: Any -> Bool - */ - isGVariant = v: v._type or "" == "gvariant"; - in rec { - inherit type isGVariant; + inherit type; + + /** + Check if a value is a GVariant value + + + # Inputs + + `v` + + : value to check + + # Type + + ``` + isGVariant :: Any -> Bool + ``` + */ + isGVariant = v: v._type or "" == "gvariant"; intConstructors = [ { @@ -100,11 +111,22 @@ rec { } ]; - /* Returns the GVariant value that most closely matches the given Nix value. - If no GVariant value can be found unambiguously then error is thrown. + /** + Returns the GVariant value that most closely matches the given Nix value. + If no GVariant value can be found unambiguously then error is thrown. - Type: - mkValue :: Any -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkValue :: Any -> gvariant + ``` */ mkValue = v: if builtins.isBool v then @@ -132,14 +154,32 @@ rec { else throw "The GVariant type of “${builtins.typeOf v}” can't be inferred."; - /* Returns the GVariant array from the given type of the elements and a Nix list. + /** + Returns the GVariant array from the given type of the elements and a Nix list. - Type: - mkArray :: [Any] -> gvariant - Example: - # Creating a string array - lib.gvariant.mkArray [ "a" "b" "c" ] + # Inputs + + `elems` + + : 1\. Function argument + + # Type + + ``` + mkArray :: [Any] -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkArray` usage example + + ```nix + # Creating a string array + lib.gvariant.mkArray [ "a" "b" "c" ] + ``` + + ::: */ mkArray = elems: let @@ -153,31 +193,67 @@ rec { "@${self.type} [${concatMapStringsSep "," toString self.value}]"; }; - /* Returns the GVariant array from the given empty Nix list. + /** + Returns the GVariant array from the given empty Nix list. - Type: - mkEmptyArray :: gvariant.type -> gvariant - Example: - # Creating an empty string array - lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + # Inputs + + `elemType` + + : 1\. Function argument + + # Type + + ``` + mkEmptyArray :: gvariant.type -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkEmptyArray` usage example + + ```nix + # Creating an empty string array + lib.gvariant.mkEmptyArray (lib.gvariant.type.string) + ``` + + ::: */ mkEmptyArray = elemType: mkPrimitive (type.arrayOf elemType) [ ] // { __toString = self: "@${self.type} []"; }; - /* Returns the GVariant variant from the given Nix value. Variants are containers - of different GVariant type. + /** + Returns the GVariant variant from the given Nix value. Variants are containers + of different GVariant type. - Type: - mkVariant :: Any -> gvariant - Example: - lib.gvariant.mkArray [ - (lib.gvariant.mkVariant "a string") - (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) - ] + # Inputs + + `elem` + + : 1\. Function argument + + # Type + + ``` + mkVariant :: Any -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkVariant` usage example + + ```nix + lib.gvariant.mkArray [ + (lib.gvariant.mkVariant "a string") + (lib.gvariant.mkVariant (lib.gvariant.mkInt32 1)) + ] + ``` + + ::: */ mkVariant = elem: let gvarElem = mkValue elem; @@ -185,23 +261,43 @@ rec { __toString = self: "<${toString self.value}>"; }; - /* Returns the GVariant dictionary entry from the given key and value. + /** + Returns the GVariant dictionary entry from the given key and value. - Type: - mkDictionaryEntry :: String -> Any -> gvariant - Example: - # A dictionary describing an Epiphany’s search provider - [ - (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) - (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) - (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) - ] + # Inputs + + `name` + + : The key of the entry + + `value` + + : The value of the entry + + # Type + + ``` + mkDictionaryEntry :: String -> Any -> gvariant + ``` + + # Examples + :::{.example} + ## `lib.gvariant.mkDictionaryEntry` usage example + + ```nix + # A dictionary describing an Epiphany’s search provider + [ + (lib.gvariant.mkDictionaryEntry "url" (lib.gvariant.mkVariant "https://duckduckgo.com/?q=%s&t=epiphany")) + (lib.gvariant.mkDictionaryEntry "bang" (lib.gvariant.mkVariant "!d")) + (lib.gvariant.mkDictionaryEntry "name" (lib.gvariant.mkVariant "DuckDuckGo")) + ] + ``` + + ::: */ mkDictionaryEntry = - # The key of the entry name: - # The value of the entry value: let name' = mkValue name; @@ -212,10 +308,25 @@ rec { __toString = self: "@${self.type} {${name'},${value'}}"; }; - /* Returns the GVariant maybe from the given element type. + /** + Returns the GVariant maybe from the given element type. - Type: - mkMaybe :: gvariant.type -> Any -> gvariant + + # Inputs + + `elemType` + + : 1\. Function argument + + `elem` + + : 2\. Function argument + + # Type + + ``` + mkMaybe :: gvariant.type -> Any -> gvariant + ``` */ mkMaybe = elemType: elem: mkPrimitive (type.maybeOf elemType) elem // { @@ -226,24 +337,57 @@ rec { "just ${toString self.value}"; }; - /* Returns the GVariant nothing from the given element type. + /** + Returns the GVariant nothing from the given element type. - Type: - mkNothing :: gvariant.type -> gvariant + + # Inputs + + `elemType` + + : 1\. Function argument + + # Type + + ``` + mkNothing :: gvariant.type -> gvariant + ``` */ mkNothing = elemType: mkMaybe elemType null; - /* Returns the GVariant just from the given Nix value. + /** + Returns the GVariant just from the given Nix value. - Type: - mkJust :: Any -> gvariant + + # Inputs + + `elem` + + : 1\. Function argument + + # Type + + ``` + mkJust :: Any -> gvariant + ``` */ mkJust = elem: let gvarElem = mkValue elem; in mkMaybe gvarElem.type gvarElem; - /* Returns the GVariant tuple from the given Nix list. + /** + Returns the GVariant tuple from the given Nix list. - Type: - mkTuple :: [Any] -> gvariant + + # Inputs + + `elems` + + : 1\. Function argument + + # Type + + ``` + mkTuple :: [Any] -> gvariant + ``` */ mkTuple = elems: let @@ -255,20 +399,42 @@ rec { "@${self.type} (${concatMapStringsSep "," toString self.value})"; }; - /* Returns the GVariant boolean from the given Nix bool value. + /** + Returns the GVariant boolean from the given Nix bool value. - Type: - mkBoolean :: Bool -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkBoolean :: Bool -> gvariant + ``` */ mkBoolean = v: mkPrimitive type.boolean v // { __toString = self: if self.value then "true" else "false"; }; - /* Returns the GVariant string from the given Nix string value. + /** + Returns the GVariant string from the given Nix string value. - Type: - mkString :: String -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkString :: String -> gvariant + ``` */ mkString = v: let sanitize = s: replaceStrings [ "\n" ] [ "\\n" ] (escape [ "'" "\\" ] s); @@ -276,72 +442,129 @@ rec { __toString = self: "'${sanitize self.value}'"; }; - /* Returns the GVariant object path from the given Nix string value. + /** + Returns the GVariant object path from the given Nix string value. - Type: - mkObjectpath :: String -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkObjectpath :: String -> gvariant + ``` */ mkObjectpath = v: mkPrimitive type.string v // { __toString = self: "objectpath '${escape [ "'" ] self.value}'"; }; - /* Returns the GVariant uchar from the given Nix int value. + /** + Returns the GVariant uchar from the given Nix int value. - Type: - mkUchar :: Int -> gvariant + # Type + + ``` + mkUchar :: Int -> gvariant + ``` */ mkUchar = mkPrimitive type.uchar; - /* Returns the GVariant int16 from the given Nix int value. + /** + Returns the GVariant int16 from the given Nix int value. - Type: - mkInt16 :: Int -> gvariant + # Type + + ``` + mkInt16 :: Int -> gvariant + ``` */ mkInt16 = mkPrimitive type.int16; - /* Returns the GVariant uint16 from the given Nix int value. + /** + Returns the GVariant uint16 from the given Nix int value. - Type: - mkUint16 :: Int -> gvariant + # Type + + ``` + mkUint16 :: Int -> gvariant + ``` */ mkUint16 = mkPrimitive type.uint16; - /* Returns the GVariant int32 from the given Nix int value. + /** + Returns the GVariant int32 from the given Nix int value. - Type: - mkInt32 :: Int -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkInt32 :: Int -> gvariant + ``` */ mkInt32 = v: mkPrimitive type.int32 v // { __toString = self: toString self.value; }; - /* Returns the GVariant uint32 from the given Nix int value. + /** + Returns the GVariant uint32 from the given Nix int value. - Type: - mkUint32 :: Int -> gvariant + # Type + + ``` + mkUint32 :: Int -> gvariant + ``` */ mkUint32 = mkPrimitive type.uint32; - /* Returns the GVariant int64 from the given Nix int value. + /** + Returns the GVariant int64 from the given Nix int value. - Type: - mkInt64 :: Int -> gvariant + # Type + + ``` + mkInt64 :: Int -> gvariant + ``` */ mkInt64 = mkPrimitive type.int64; - /* Returns the GVariant uint64 from the given Nix int value. + /** + Returns the GVariant uint64 from the given Nix int value. - Type: - mkUint64 :: Int -> gvariant + # Type + + ``` + mkUint64 :: Int -> gvariant + ``` */ mkUint64 = mkPrimitive type.uint64; - /* Returns the GVariant double from the given Nix float value. + /** + Returns the GVariant double from the given Nix float value. - Type: - mkDouble :: Float -> gvariant + + # Inputs + + `v` + + : 1\. Function argument + + # Type + + ``` + mkDouble :: Float -> gvariant + ``` */ mkDouble = v: mkPrimitive type.double v // { From 7f38a9ce115a87e42ac7f8afc3bd857801e26139 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 21 May 2024 09:42:39 +0200 Subject: [PATCH 007/300] Apply suggestions from code review Co-authored-by: Daniel Sidhion --- lib/derivations.nix | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/derivations.nix b/lib/derivations.nix index 79e896e012c3..9c3c4639a268 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -61,31 +61,31 @@ in (lazyDerivation { inherit derivation }).passthru (lazyDerivation { inherit derivation }).pythonPath + # Inputs - structured function argument + Takes an attribute set with the following attributes - : derivation - : The derivation to be wrapped. + `derivation` + : The derivation to be wrapped. - : meta - : Optional meta attribute. + `meta` + : Optional meta attribute. - While this function is primarily about derivations, it can improve - the `meta` package attribute, which is usually specified through - `mkDerivation`. + While this function is primarily about derivations, it can improve + the `meta` package attribute, which is usually specified through + `mkDerivation`. - : passthru - : Optional list of assumed outputs. Default: ["out"] + `passthru` + : Optional extra values to add to the returned attrset. - This must match the set of outputs that the returned derivation has. - You must use this when the derivation has multiple outputs. + This can be used for adding package attributes, such as `tests`. - : outputs - : Optional list of assumed outputs. Default: ["out"] + `outputs` + : Optional list of assumed outputs. Default: ["out"] - This must match the set of outputs that the returned derivation has. - You must use this when the derivation has multiple outputs. + This must match the set of outputs that the returned derivation has. + You must use this when the derivation has multiple outputs. */ lazyDerivation = args@{ From 8ee634f5a65b8bda919f12e95ed4a391fac6e171 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 21 May 2024 21:54:47 +0200 Subject: [PATCH 008/300] doc: init lib.generators reference documentation --- doc/default.nix | 1 + doc/functions/generators.section.md | 2 +- lib/generators.nix | 578 ++++++++++++++++++---------- 3 files changed, 387 insertions(+), 194 deletions(-) diff --git a/doc/default.nix b/doc/default.nix index ca4091dc222c..9cc06983445a 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -22,6 +22,7 @@ let { name = "fileset"; description = "file set functions"; } { name = "sources"; description = "source filtering functions"; } { name = "cli"; description = "command-line serialization functions"; } + { name = "generators"; description = "functions that create file formats from nix data structures"; } { name = "gvariant"; description = "GVariant formatted string serialization functions"; } { name = "customisation"; description = "Functions to customise (derivation-related) functions, derivatons, or attribute sets"; } { name = "meta"; description = "functions for derivation metadata"; } diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index dbfc302a3abf..9d71a0240108 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -54,4 +54,4 @@ merge:"diff3" Nix store paths can be converted to strings by enclosing a derivation attribute like so: `"${drv}"`. ::: -Detailed documentation for each generator can be found in `lib/generators.nix`. +Detailed documentation for each generator can be found [here](#sec-functions-library-generators) diff --git a/lib/generators.nix b/lib/generators.nix index 5f42a98de709..36891f9caedf 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -1,18 +1,23 @@ -/* Functions that generate widespread file - * formats from nix data structures. - * - * They all follow a similar interface: - * generator { config-attrs } data - * - * `config-attrs` are “holes” in the generators - * with sensible default implementations that - * can be overwritten. The default implementations - * are mostly generators themselves, called with - * their respective default values; they can be reused. - * - * Tests can be found in ./tests/misc.nix - * Documentation in the manual, #sec-generators - */ +/** + Functions that generate widespread file + formats from nix data structures. + + They all follow a similar interface: + + ```nix + generator { config-attrs } data + ``` + + `config-attrs` are “holes” in the generators + with sensible default implementations that + can be overwritten. The default implementations + are mostly generators themselves, called with + their respective default values; they can be reused. + + Tests can be found in ./tests/misc.nix + + Further Documentation can be found [here](#sec-generators). +*/ { lib }: let @@ -68,11 +73,20 @@ let ; ## -- HELPER FUNCTIONS & DEFAULTS -- +in rec { + /** + Convert a value to a sensible default string representation. + The builtin `toString` function has some strange defaults, + suitable for bash scripts but not much else. - /* Convert a value to a sensible default string representation. - * The builtin `toString` function has some strange defaults, - * suitable for bash scripts but not much else. - */ + # Inputs + + Options + : Empty set, there may be configuration options in the future + + `v` + : 2\. Function argument + */ mkValueStringDefault = {}: v: let err = t: v: abort ("generators.mkValueStringDefault: " + @@ -100,15 +114,36 @@ let else err "this value is" (toString v); - /* Generate a line of key k and value v, separated by - * character sep. If sep appears in k, it is escaped. - * Helper for synaxes with different separators. - * - * mkValueString specifies how values should be formatted. - * - * mkKeyValueDefault {} ":" "f:oo" "bar" - * > "f\:oo:bar" - */ + /** + Generate a line of key k and value v, separated by + character sep. If sep appears in k, it is escaped. + Helper for synaxes with different separators. + + mkValueString specifies how values should be formatted. + + ```nix + mkKeyValueDefault {} ":" "f:oo" "bar" + > "f\:oo:bar" + ``` + + # Inputs + + Structured function argument + : mkValueString (optional, default: `mkValueStringDefault {}`) + : Function to convert values to strings + + `sep` + + : 2\. Function argument + + `k` + + : 3\. Function argument + + `v` + + : 4\. Function argument + */ mkKeyValueDefault = { mkValueString ? mkValueStringDefault {} }: sep: k: v: @@ -118,10 +153,11 @@ let ## -- FILE FORMAT GENERATORS -- - /* Generate a key-value-style config file from an attrset. - * - * mkKeyValue is the same as in toINI. - */ + /** + Generate a key-value-style config file from an attrset. + * + * mkKeyValue is the same as in toINI. + */ toKeyValue = { mkKeyValue ? mkKeyValueDefault {} "=", listsAsDuplicateKeys ? false, @@ -134,32 +170,51 @@ let in attrs: concatStrings (concatLists (mapAttrsToList mkLines attrs)); - /* Generate an INI-style config file from an - * attrset of sections to an attrset of key-value pairs. - * - * generators.toINI {} { - * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; - * baz = { "also, integers" = 42; }; - * } - * - *> [baz] - *> also, integers=42 - *> - *> [foo] - *> ciao=bar - *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 - * - * The mk* configuration attributes can generically change - * the way sections and key-value strings are generated. - * - * For more examples see the test cases in ./tests/misc.nix. - */ + /** + Generate an INI-style config file from an + attrset of sections to an attrset of key-value pairs. + + # Inputs + + Structured function argument + + : mkSectionName (optional, default: `(name: escape [ "[" "]" ] name)`) + : apply transformations (e.g. escapes) to section names + + : mkKeyValue (optional, default: `{} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + # Examples + :::{.example} + ## `lib.generators.toINI` usage example + + ```nix + generators.toINI {} { + foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + baz = { "also, integers" = 42; }; + } + + > [baz] + > also, integers=42 + > + > [foo] + > ciao=bar + > hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + ``` + + The mk* configuration attributes can generically change + the way sections and key-value strings are generated. + + For more examples see the test cases in ./tests/misc.nix. + + ::: + */ toINI = { - # apply transformations (e.g. escapes) to section names mkSectionName ? (name: escape [ "[" "]" ] name), - # format a setting line from key and value mkKeyValue ? mkKeyValueDefault {} "=", - # allow lists as values for duplicate keys listsAsDuplicateKeys ? false }: attrsOfAttrs: let @@ -174,43 +229,70 @@ let # map input to ini sections mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; - /* Generate an INI-style config file from an attrset - * specifying the global section (no header), and an - * attrset of sections to an attrset of key-value pairs. - * - * generators.toINIWithGlobalSection {} { - * globalSection = { - * someGlobalKey = "hi"; - * }; - * sections = { - * foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; - * baz = { "also, integers" = 42; }; - * } - * - *> someGlobalKey=hi - *> - *> [baz] - *> also, integers=42 - *> - *> [foo] - *> ciao=bar - *> hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 - * - * The mk* configuration attributes can generically change - * the way sections and key-value strings are generated. - * - * For more examples see the test cases in ./tests/misc.nix. - * - * If you don’t need a global section, you can also use - * `generators.toINI` directly, which only takes - * the part in `sections`. - */ + /** + Generate an INI-style config file from an attrset + specifying the global section (no header), and an + attrset of sections to an attrset of key-value pairs. + + # Inputs + + 1\. Structured function argument + + : mkSectionName (optional, default: `(name: escape [ "[" "]" ] name)`) + : apply transformations (e.g. escapes) to section names + + : mkKeyValue (optional, default: `{} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + 2\. Structured function argument + + : globalSection (required) + : global section key-value pairs + + : sections (optional, default: `{}`) + : attrset of sections to key-value pairs + + # Examples + :::{.example} + ## `lib.generators.toINIWithGlobalSection` usage example + + ```nix + generators.toINIWithGlobalSection {} { + globalSection = { + someGlobalKey = "hi"; + }; + sections = { + foo = { hi = "${pkgs.hello}"; ciao = "bar"; }; + baz = { "also, integers" = 42; }; + } + + > someGlobalKey=hi + > + > [baz] + > also, integers=42 + > + > [foo] + > ciao=bar + > hi=/nix/store/y93qql1p5ggfnaqjjqhxcw0vqw95rlz0-hello-2.10 + ``` + + The mk* configuration attributes can generically change + the way sections and key-value strings are generated. + + For more examples see the test cases in ./tests/misc.nix. + + ::: + + If you don’t need a global section, you can also use + `generators.toINI` directly, which only takes + the part in `sections`. + */ toINIWithGlobalSection = { - # apply transformations (e.g. escapes) to section names mkSectionName ? (name: escape [ "[" "]" ] name), - # format a setting line from key and value mkKeyValue ? mkKeyValueDefault {} "=", - # allow lists as values for duplicate keys listsAsDuplicateKeys ? false }: { globalSection, sections ? {} }: ( if globalSection == {} @@ -219,24 +301,43 @@ let + "\n") + (toINI { inherit mkSectionName mkKeyValue listsAsDuplicateKeys; } sections); - /* Generate a git-config file from an attrset. - * - * It has two major differences from the regular INI format: - * - * 1. values are indented with tabs - * 2. sections can have sub-sections - * - * generators.toGitINI { - * url."ssh://git@github.com/".insteadOf = "https://github.com"; - * user.name = "edolstra"; - * } - * - *> [url "ssh://git@github.com/"] - *> insteadOf = "https://github.com" - *> - *> [user] - *> name = "edolstra" - */ + /** + Generate a git-config file from an attrset. + + It has two major differences from the regular INI format: + + 1. values are indented with tabs + 2. sections can have sub-sections + + Further: https://git-scm.com/docs/git-config#EXAMPLES + + # Examples + :::{.example} + ## `lib.generators.toGitINI` usage example + + ```nix + generators.toGitINI { + url."ssh://git@github.com/".insteadOf = "https://github.com"; + user.name = "edolstra"; + } + + > [url "ssh://git@github.com/"] + > insteadOf = "https://github.com" + > + > [user] + > name = "edolstra" + ``` + + ::: + + # Inputs + + `attrs` + + : Key-value pairs to be converted to a git-config file. + See: https://git-scm.com/docs/git-config#_variables for possible values. + + */ toGitINI = attrs: let mkSectionName = name: @@ -280,20 +381,40 @@ let in toINI_ (gitFlattenAttrs attrs); - # mkKeyValueDefault wrapper that handles dconf INI quirks. - # The main differences of the format is that it requires strings to be quoted. + /** + mkKeyValueDefault wrapper that handles dconf INI quirks. + The main differences of the format is that it requires strings to be quoted. + */ mkDconfKeyValue = mkKeyValueDefault { mkValueString = v: toString (gvariant.mkValue v); } "="; - # Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en - # for details. + /** + Generates INI in dconf keyfile style. See https://help.gnome.org/admin/system-admin-guide/stable/dconf-keyfiles.html.en + for details. + */ toDconfINI = toINI { mkKeyValue = mkDconfKeyValue; }; + /** + Recurses through a `Value` limited to a certain depth. (`depthLimit`) + + If the depth is exceeded, an error is thrown, unless `throwOnDepthLimit` is set to `false`. + + # Inputs + + Structured function argument + + : depthLimit (required) + : If this option is not null, the given value will stop evaluating at a certain depth + + : throwOnDepthLimit (optional, default: `true`) + : If this option is true, an error will be thrown, if a certain given depth is exceeded + + Value + : The value to be evaluated recursively + */ withRecursion = { - /* If this option is not null, the given value will stop evaluating at a certain depth */ - depthLimit - /* If this option is true, an error will be thrown, if a certain given depth is exceeded */ - , throwOnDepthLimit ? true + depthLimit, + throwOnDepthLimit ? true }: assert isInt depthLimit; let @@ -323,20 +444,33 @@ let in mapAny 0; - /* Pretty print a value, akin to `builtins.trace`. - * Should probably be a builtin as well. - * The pretty-printed string should be suitable for rendering default values - * in the NixOS manual. In particular, it should be as close to a valid Nix expression - * as possible. - */ + /** + Pretty print a value, akin to `builtins.trace`. + + Should probably be a builtin as well. + + The pretty-printed string should be suitable for rendering default values + in the NixOS manual. In particular, it should be as close to a valid Nix expression + as possible. + + # Inputs + + Structured function argument + : allowPrettyValues + : If this option is true, attrsets like { __pretty = fn; val = …; } + will use fn to convert val to a pretty printed representation. + (This means fn is type Val -> String.) + : multiline + : If this option is true, the output is indented with newlines for attribute sets and lists + : indent + : Initial indentation level + + Value + : The value to be pretty printed + */ toPretty = { - /* If this option is true, attrsets like { __pretty = fn; val = …; } - will use fn to convert val to a pretty printed representation. - (This means fn is type Val -> String.) */ allowPrettyValues ? false, - /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true, - /* Initial indentation level */ indent ? "" }: let @@ -397,7 +531,17 @@ let else abort "generators.toPretty: should never happen (v = ${v})"; in go indent; - # PLIST handling + /** + Translate a simple Nix expression to [Plist notation](https://en.wikipedia.org/wiki/Property_list). + + # Inputs + + Options + : Empty set, there may be configuration options in the future + + Value + : The value to be converted to Plist + */ toPlist = {}: v: let expr = ind: x: if x == null then "" else @@ -447,9 +591,21 @@ let ${expr "" v} ''; - /* Translate a simple Nix expression to Dhall notation. - * Note that integers are translated to Integer and never - * the Natural type. + /** + Translate a simple Nix expression to Dhall notation. + + Note that integers are translated to Integer and never + the Natural type. + + # Inputs + + Options + + : Empty set, there may be configuration options in the future + + Value + + : The value to be converted to Dhall */ toDhall = { }@args: v: let concatItems = concatStringsSep ", "; @@ -471,46 +627,71 @@ ${expr "" v} else toJSON v; - /* - Translate a simple Nix expression to Lua representation with occasional - Lua-inlines that can be constructed by mkLuaInline function. + /** + Translate a simple Nix expression to Lua representation with occasional + Lua-inlines that can be constructed by mkLuaInline function. - Configuration: - * multiline - by default is true which results in indented block-like view. - * indent - initial indent. - * asBindings - by default generate single value, but with this use attrset to set global vars. + Configuration: - Attention: - Regardless of multiline parameter there is no trailing newline. + * multiline - by default is true which results in indented block-like view. + * indent - initial indent. + * asBindings - by default generate single value, but with this use attrset to set global vars. - Example: - generators.toLua {} - { - cmd = [ "typescript-language-server" "--stdio" ]; - settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)''; - } - -> + Attention: + + Regardless of multiline parameter there is no trailing newline. + + + # Inputs + + Structured function argument + + : multiline (optional, default: `true`) + : If this option is true, the output is indented with newlines for attribute sets and lists + : indent (optional, default: `""`) + : Initial indentation level + : asBindings (optional, default: `false`) + : Interpret as variable bindings + + Value + + : The value to be converted to Lua + + # Type + + ``` + toLua :: AttrSet -> Any -> String + ``` + + # Examples + :::{.example} + ## `lib.generators.toLua` usage example + + ```nix + generators.toLua {} { - ["cmd"] = { - "typescript-language-server", - "--stdio" - }, - ["settings"] = { - ["workspace"] = { - ["library"] = (vim.api.nvim_get_runtime_file("", true)) - } - } + cmd = [ "typescript-language-server" "--stdio" ]; + settings.workspace.library = mkLuaInline ''vim.api.nvim_get_runtime_file("", true)''; } + -> + { + ["cmd"] = { + "typescript-language-server", + "--stdio" + }, + ["settings"] = { + ["workspace"] = { + ["library"] = (vim.api.nvim_get_runtime_file("", true)) + } + } + } + ``` - Type: - toLua :: AttrSet -> Any -> String + ::: */ toLua = { - /* If this option is true, the output is indented with newlines for attribute sets and lists */ multiline ? true, - /* Initial indentation level */ indent ? "", - /* Interpret as variable bindings */ asBindings ? false, }@args: v: let @@ -559,44 +740,55 @@ ${expr "" v} else abort "generators.toLua: type ${typeOf v} is unsupported"; - /* - Mark string as Lua expression to be inlined when processed by toLua. + /** + Mark string as Lua expression to be inlined when processed by toLua. - Type: - mkLuaInline :: String -> AttrSet + + # Inputs + + `expr` + + : 1\. Function argument + + # Type + + ``` + mkLuaInline :: String -> AttrSet + ``` */ mkLuaInline = expr: { _type = "lua-inline"; inherit expr; }; +} // { + /** + Generates JSON from an arbitrary (non-function) value. + For more information see the documentation of the builtin. -in + # Inputs -# Everything in this attrset is the public interface of the file. -{ - inherit - mkDconfKeyValue - mkKeyValueDefault - mkLuaInline - mkValueStringDefault - toDconfINI - toDhall - toGitINI - toINI - toINIWithGlobalSection - toKeyValue - toLua - toPlist - toPretty - withRecursion - ; + Options - /* Generates JSON from an arbitrary (non-function) value. - * For more information see the documentation of the builtin. - */ - toJSON = {}: toJSON; + : Empty set, there may be configuration options in the future - /* YAML has been a strict superset of JSON since 1.2, so we - * use toJSON. Before it only had a few differences referring - * to implicit typing rules, so it should work with older - * parsers as well. - */ - toYAML = {}: toJSON; + Value + + : The value to be converted to JSON + */ + toJSON = {}: lib.strings.toJSON; + + /** + YAML has been a strict superset of JSON since 1.2, so we + use toJSON. Before it only had a few differences referring + to implicit typing rules, so it should work with older + parsers as well. + + # Inputs + + Options + + : Empty set, there may be configuration options in the future + + Value + + : The value to be converted to YAML + */ + toYAML = {}: lib.strings.toJSON; } From 793ed729f2cfe0e387e1237d6aacd8770ce16509 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Tue, 21 May 2024 22:05:18 +0200 Subject: [PATCH 009/300] doc: add arguments for toKeyValue --- lib/generators.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/generators.nix b/lib/generators.nix index 36891f9caedf..4317e49c2538 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -155,8 +155,20 @@ in rec { /** Generate a key-value-style config file from an attrset. - * - * mkKeyValue is the same as in toINI. + + # Inputs + + Structured function argument + + : mkKeyValue (optional, default: `mkKeyValueDefault {} "="`) + : format a setting line from key and value + + : listsAsDuplicateKeys (optional, default: `false`) + : allow lists as values for duplicate keys + + : indent (optional, default: `""`) + : Initial indentation level + */ toKeyValue = { mkKeyValue ? mkKeyValueDefault {} "=", From 9b34b3f7379fd3fc8a7098949205f16401384c40 Mon Sep 17 00:00:00 2001 From: Tochiaha Date: Mon, 10 Jun 2024 19:49:25 +0100 Subject: [PATCH 010/300] eyewitness: init at 20230525.1 --- pkgs/by-name/ey/eyewitness/package.nix | 70 ++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 pkgs/by-name/ey/eyewitness/package.nix diff --git a/pkgs/by-name/ey/eyewitness/package.nix b/pkgs/by-name/ey/eyewitness/package.nix new file mode 100644 index 000000000000..7cda284f6be8 --- /dev/null +++ b/pkgs/by-name/ey/eyewitness/package.nix @@ -0,0 +1,70 @@ +{ lib +, fetchFromGitHub +, python3Packages +, cmake +, xvfb-run +, firefox-esr +, geckodriver +, makeWrapper +}: + +python3Packages.buildPythonApplication rec { + pname = "eye-witness"; + version = "20230525.1"; + format = "other"; + + src = fetchFromGitHub { + owner = "redsiege"; + repo = "EyeWitness"; + rev = "v${version}"; + hash = "sha256-nSPpPbwqagc5EadQ4AHgLhjQ0kDjmbdcwE/PL5FDL4I="; + }; + + build-system = with python3Packages; [ + setuptools + ] ++ [ + makeWrapper + ]; + + dependencies = with python3Packages; [ + selenium + fuzzywuzzy + pyvirtualdisplay + pylev + netaddr + pydevtool + ] ++ [ + firefox-esr + xvfb-run + geckodriver + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{bin,share/eyewitness} + cp -R * $out/share/eyewitness + + runHook postInstall + ''; + + fixupPhase = '' + runHook preFixup + + makeWrapper "${python3Packages.python.interpreter}" "$out/bin/eyewitness" \ + --set PYTHONPATH "$PYTHONPATH" \ + --add-flags "$out/share/eyewitness/Python/EyeWitness.py" + + runHook postFixup + ''; + + meta = with lib; { + description = "Take screenshots of websites, and identify admin interfaces"; + homepage = "https://github.com/redsiege/EyeWitness"; + changelog = "https://github.com/redsiege/EyeWitness/blob/${src.rev}/CHANGELOG"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ tochiaha ]; + mainProgram = "eye-witness"; + platforms = platforms.all; + }; +} From 8f530a144c85522877fc195c0e16a82b4b19644a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jun 2024 19:13:26 +0000 Subject: [PATCH 011/300] nixdoc: 3.0.5 -> 3.0.7 --- pkgs/tools/nix/nixdoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 29be34098181..da046f8afcea 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.5"; + version = "3.0.7"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-6aPfpkcUoAYaGYqBPFJJQvQ9dMGne9TWJ2HAx95JujY="; + sha256 = "sha256-9gBrFudzn75rzx7bTPgr+zzUpX2cLHOmE12xFtoH1eA="; }; - cargoHash = "sha256-5bWP8dhApnQyK/gQNkPrLeqFvRVbSlVNRG6pRDb/fdk="; + cargoHash = "sha256-/f67AhaNLHS/3veAzNZwYujMMM/Vmq/U4MHNHvfRoBE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; From 15d4c23f58c5b4ce3924111227580ba66ab3b5d9 Mon Sep 17 00:00:00 2001 From: Sergey Yakovlev Date: Mon, 10 Jun 2024 13:51:31 +0300 Subject: [PATCH 012/300] kclvm: init at 0.8.7 --- pkgs/by-name/kc/kclvm/Cargo.lock | 4375 +++++++++++++++++ pkgs/by-name/kc/kclvm/enable_protoc_env.patch | 37 + pkgs/by-name/kc/kclvm/package.nix | 41 + 3 files changed, 4453 insertions(+) create mode 100644 pkgs/by-name/kc/kclvm/Cargo.lock create mode 100644 pkgs/by-name/kc/kclvm/enable_protoc_env.patch create mode 100644 pkgs/by-name/kc/kclvm/package.nix diff --git a/pkgs/by-name/kc/kclvm/Cargo.lock b/pkgs/by-name/kc/kclvm/Cargo.lock new file mode 100644 index 000000000000..083baa87aaaa --- /dev/null +++ b/pkgs/by-name/kc/kclvm/Cargo.lock @@ -0,0 +1,4375 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +dependencies = [ + "getrandom", + "once_cell", + "version_check", +] + +[[package]] +name = "aho-corasick" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +dependencies = [ + "memchr", +] + +[[package]] +name = "always-assert" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4436e0292ab1bb631b42973c61205e704475fe8126af845c8d923c0996328127" +dependencies = [ + "log", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +dependencies = [ + "backtrace", +] + +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" + +[[package]] +name = "backtrace" +version = "0.3.71" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base-x" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + +[[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +[[package]] +name = "bitmaps" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "031043d04099746d8db04daf1fa424b2bc8bd69d92b25962dcde24da39ab64a2" +dependencies = [ + "typenum", +] + +[[package]] +name = "block-buffer" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +dependencies = [ + "block-padding", + "byte-tools", + "byteorder", + "generic-array 0.12.4", +] + +[[package]] +name = "block-buffer" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "block-padding" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" +dependencies = [ + "byte-tools", +] + +[[package]] +name = "bstr" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +dependencies = [ + "lazy_static", + "memchr", + "regex-automata 0.1.10", +] + +[[package]] +name = "bumpalo" +version = "3.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" + +[[package]] +name = "byte-tools" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" + +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + +[[package]] +name = "cc" +version = "1.0.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2678b2e3449475e95b0aa6f9b506a28e61b3dc8996592b983695e8ebb58a8b41" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half 2.4.1", +] + +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "bitflags 1.3.2", + "textwrap 0.11.0", + "unicode-width", +] + +[[package]] +name = "clap" +version = "3.2.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" +dependencies = [ + "bitflags 1.3.2", + "clap_lex 0.2.4", + "indexmap 1.9.3", + "textwrap 0.16.1", +] + +[[package]] +name = "clap" +version = "4.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +dependencies = [ + "clap_builder", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.7.0", + "strsim 0.11.1", +] + +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compiler_base_error" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32e6a143200e9657a565b093fde64a590af93884d1f820829db6461de1ff0086" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_span", + "fluent", + "pretty_assertions", + "rustc_errors", + "rustc_span", + "termcolor", + "unic-langid", + "walkdir", +] + +[[package]] +name = "compiler_base_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21900034f34b69f860a5ff66e0577b8e66d310090b04bf0334afea9a041e0cee" + +[[package]] +name = "compiler_base_session" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67411f0b5421d9c9f045ec08c4d01fe3861197d11215d1e2e448be663aff9ad9" +dependencies = [ + "anyhow", + "compiler_base_error", + "compiler_base_span", +] + +[[package]] +name = "compiler_base_span" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42aae2adfa4b418441ede52835f3c96e9ca63d595f0ac861d94935757e9cb2e" +dependencies = [ + "rustc_span", +] + +[[package]] +name = "console" +version = "0.15.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +dependencies = [ + "encode_unicode", + "lazy_static", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "const_fn" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "criterion" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +dependencies = [ + "atty", + "cast", + "clap 2.34.0", + "criterion-plot 0.4.5", + "csv", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_cbor", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap 3.2.25", + "criterion-plot 0.5.0", + "itertools", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools", +] + +[[package]] +name = "crossbeam-channel" +version = "0.5.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" +dependencies = [ + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array 0.14.7", + "typenum", +] + +[[package]] +name = "csv" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" +dependencies = [ + "csv-core", + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "csv-core" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" +dependencies = [ + "memchr", +] + +[[package]] +name = "dashmap" +version = "5.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" +dependencies = [ + "cfg-if 1.0.0", + "hashbrown 0.14.3", + "lock_api", + "once_cell", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] + +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + +[[package]] +name = "digest" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +dependencies = [ + "generic-array 0.12.4", +] + +[[package]] +name = "digest" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +dependencies = [ + "generic-array 0.14.7", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", +] + +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "dissimilar" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86e3bdc80eee6e16b2b6b0f87fbc98c04bee3455e35174c0de1a125d0688c632" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "ena" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +dependencies = [ + "log", +] + +[[package]] +name = "encode_unicode" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" + +[[package]] +name = "enquote" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06c36cb11dbde389f4096111698d8b567c0720e3452fd5ac3e6b4e47e1939932" +dependencies = [ + "thiserror", +] + +[[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] +name = "env_logger" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" +dependencies = [ + "anstream", + "anstyle", + "env_filter", + "humantime", + "log", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "erased-serde" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3" +dependencies = [ + "serde", +] + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "expect-test" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0" +dependencies = [ + "dissimilar", + "once_cell", +] + +[[package]] +name = "fancy-regex" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d6b8560a05112eb52f04b00e5d3790c0dd75d9d980eb8a122fb23b92a623ccf" +dependencies = [ + "bit-set", + "regex", +] + +[[package]] +name = "fastrand" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" + +[[package]] +name = "filetime" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", +] + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "fluent" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61f69378194459db76abd2ce3952b790db103ceb003008d3d50d97c41ff847a7" +dependencies = [ + "fluent-bundle", + "unic-langid", +] + +[[package]] +name = "fluent-bundle" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e242c601dec9711505f6d5bbff5bedd4b61b2469f2e8bb8e57ee7c9747a87ffd" +dependencies = [ + "fluent-langneg", + "fluent-syntax", + "intl-memoizer", + "intl_pluralrules", + "rustc-hash", + "self_cell 0.10.3", + "smallvec", + "unic-langid", +] + +[[package]] +name = "fluent-langneg" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c4ad0989667548f06ccd0e306ed56b61bd4d35458d54df5ec7587c0e8ed5e94" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "fluent-syntax" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0abed97648395c902868fee9026de96483933faa54ea3b40d652f7dfe61ca78" +dependencies = [ + "thiserror", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + +[[package]] +name = "fslock" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "fst" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a" + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generational-arena" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "877e94aff08e743b651baaea359664321055749b398adff8740a7399af7796e7" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "generic-array" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" +dependencies = [ + "typenum", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "1.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403" + +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if 1.0.0", + "crunchy", +] + +[[package]] +name = "handlebars" +version = "5.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "im-rc" +version = "15.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" +dependencies = [ + "bitmaps", + "rand_core", + "rand_xoshiro", + "sized-chunks", + "typenum", + "version_check", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "rustc-rayon 0.5.0", +] + +[[package]] +name = "indexmap" +version = "2.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indoc" +version = "2.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" + +[[package]] +name = "inkwell" +version = "0.2.0" +source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33" +dependencies = [ + "either", + "inkwell_internals", + "libc", + "llvm-sys", + "once_cell", + "parking_lot 0.12.1", +] + +[[package]] +name = "inkwell_internals" +version = "0.8.0" +source = "git+https://github.com/TheDan64/inkwell?branch=master#4030f764f1c889f36429ac02ef32e04fcfa8ce33" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + +[[package]] +name = "insta" +version = "1.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc" +dependencies = [ + "console", + "lazy_static", + "linked-hash-map", + "similar", +] + +[[package]] +name = "instant" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +dependencies = [ + "cfg-if 1.0.0", +] + +[[package]] +name = "intl-memoizer" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c310433e4a310918d6ed9243542a6b83ec1183df95dff8f23f87bb88a264a66f" +dependencies = [ + "type-map", + "unic-langid", +] + +[[package]] +name = "intl_pluralrules" +version = "7.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078ea7b7c29a2b4df841a7f6ac8775ff6074020c6776d48491ce2268e068f972" +dependencies = [ + "unic-langid", +] + +[[package]] +name = "inventory" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767" + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "jod-thread" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b23360e99b8717f20aaa4598f5a6541efbe30630039fbc7706cf954a87947ae" + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json-spanned-value" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb343fa4e3b1b22b344937deedac88da995abf139c2232cbeaa436c38380a210" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "jsonrpc-core" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" +dependencies = [ + "futures", + "futures-executor", + "futures-util", + "log", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "jsonrpc-stdio-server" +version = "18.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6878586767497326eb3d011bd6dbb583e9f008b11528f82fd47798ec46bb6c26" +dependencies = [ + "futures", + "jsonrpc-core", + "log", + "tokio", + "tokio-util", +] + +[[package]] +name = "kcl-language-server" +version = "0.8.7" +dependencies = [ + "anyhow", + "chrono", + "clap 4.5.4", + "compiler_base_session", + "crossbeam-channel", + "dashmap", + "env_logger", + "im-rc", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-sema", + "kclvm-span", + "kclvm-tools", + "kclvm-utils", + "kclvm-version", + "log", + "lsp-server", + "lsp-types", + "maplit", + "parking_lot 0.12.1", + "proc_macro_crate", + "ra_ap_vfs", + "ra_ap_vfs-notify", + "ropey", + "rustc-hash", + "rustc_lexer", + "salsa", + "serde", + "serde_json", + "threadpool", + "tokio", + "tokio-test", +] + +[[package]] +name = "kclvm" +version = "0.8.7" +dependencies = [ + "kclvm-api", + "kclvm-ast", + "kclvm-cmd", + "kclvm-compiler", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-evaluator", + "kclvm-loader", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-tools", + "kclvm-version", +] + +[[package]] +name = "kclvm-api" +version = "0.8.7" +dependencies = [ + "anyhow", + "criterion 0.4.0", + "futures", + "indexmap 1.9.3", + "jsonrpc-stdio-server", + "kcl-language-server", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-loader", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-tools", + "kclvm-utils", + "maplit", + "once_cell", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "prost-wkt-types", + "protoc-bin-vendored", + "serde", + "serde_json", + "serde_yaml", + "tempfile", + "tokio", +] + +[[package]] +name = "kclvm-ast" +version = "0.8.7" +dependencies = [ + "compiler_base_span", + "kclvm-error", + "kclvm-parser", + "kclvm-span", + "kclvm-utils", + "serde", + "serde_json", + "thread_local", + "uuid", +] + +[[package]] +name = "kclvm-ast-pretty" +version = "0.8.7" +dependencies = [ + "compiler_base_macros", + "compiler_base_session", + "fancy-regex", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-error", + "kclvm-parser", + "pretty_assertions", +] + +[[package]] +name = "kclvm-cmd" +version = "0.8.7" +dependencies = [ + "anyhow", + "clap 4.5.4", + "compiler_base_session", + "kclvm-api", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-runner", + "kclvm-runtime", + "kclvm-tools", + "kclvm-version", +] + +[[package]] +name = "kclvm-compiler" +version = "0.8.7" +dependencies = [ + "ahash", + "bit-set", + "bitflags 1.3.2", + "fancy-regex", + "indexmap 1.9.3", + "inkwell", + "kclvm-ast", + "kclvm-error", + "kclvm-runtime", + "kclvm-sema", + "once_cell", + "phf", + "time 0.2.27", + "unicode_names2", +] + +[[package]] +name = "kclvm-config" +version = "0.8.7" +dependencies = [ + "ahash", + "anyhow", + "chrono", + "dirs", + "glob", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-utils", + "kclvm-version", + "md-5 0.8.0", + "pathdiff", + "regex", + "ron", + "serde", + "serde_json", + "serde_yaml", + "toml", +] + +[[package]] +name = "kclvm-driver" +version = "0.8.7" +dependencies = [ + "anyhow", + "glob", + "kclvm-ast", + "kclvm-config", + "kclvm-parser", + "kclvm-runtime", + "kclvm-utils", + "notify 6.1.1", + "serde", + "serde_json", + "walkdir", +] + +[[package]] +name = "kclvm-error" +version = "0.8.7" +dependencies = [ + "annotate-snippets", + "anyhow", + "atty", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "indexmap 1.9.3", + "kclvm-runtime", + "kclvm-span", + "serde_json", + "termize", + "tracing", +] + +[[package]] +name = "kclvm-evaluator" +version = "0.8.7" +dependencies = [ + "anyhow", + "generational-arena", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-error", + "kclvm-loader", + "kclvm-parser", + "kclvm-runtime", + "kclvm-sema", +] + +[[package]] +name = "kclvm-lexer" +version = "0.8.7" +dependencies = [ + "expect-test", + "kclvm-error", + "rustc_lexer", + "unic-emoji-char", +] + +[[package]] +name = "kclvm-loader" +version = "0.8.7" +dependencies = [ + "anyhow", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-sema", + "maplit", +] + +[[package]] +name = "kclvm-macros" +version = "0.8.7" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "synstructure", +] + +[[package]] +name = "kclvm-parser" +version = "0.8.7" +dependencies = [ + "anyhow", + "bstr", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "either", + "enquote", + "expect-test", + "indexmap 1.9.3", + "insta", + "kclvm-ast", + "kclvm-config", + "kclvm-error", + "kclvm-lexer", + "kclvm-sema", + "kclvm-span", + "kclvm-utils", + "num-bigint", + "petgraph", + "regex", + "rustc_lexer", + "serde", + "serde_json", + "tracing", + "unicode_names2", +] + +[[package]] +name = "kclvm-query" +version = "0.8.7" +dependencies = [ + "anyhow", + "compiler_base_macros", + "compiler_base_session", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-sema", + "maplit", + "pretty_assertions", +] + +[[package]] +name = "kclvm-runner" +version = "0.8.7" +dependencies = [ + "anyhow", + "cc", + "chrono", + "compiler_base_macros", + "compiler_base_session", + "criterion 0.3.6", + "glob", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-compiler", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-evaluator", + "kclvm-parser", + "kclvm-query", + "kclvm-runtime", + "kclvm-sema", + "kclvm-utils", + "kclvm-version", + "libc", + "libloading", + "once_cell", + "serde", + "serde_json", + "tempfile", + "threadpool", + "uuid", + "walkdir", +] + +[[package]] +name = "kclvm-runtime" +version = "0.8.7" +dependencies = [ + "ahash", + "base64", + "bstr", + "chrono", + "fancy-regex", + "generational-arena", + "glob", + "handlebars", + "indexmap 1.9.3", + "itertools", + "kclvm_runtime_internal_macros", + "lazy_static", + "libc", + "md5", + "num-integer", + "phf", + "regex", + "serde", + "serde_json", + "serde_yaml", + "sha1", + "sha2 0.9.9", + "unic-ucd-bidi", + "unic-ucd-category", + "unicode-casing", + "uuid", +] + +[[package]] +name = "kclvm-sema" +version = "0.8.7" +dependencies = [ + "ahash", + "anyhow", + "bit-set", + "bitflags 1.3.2", + "compiler_base_error", + "compiler_base_macros", + "compiler_base_session", + "compiler_base_span", + "criterion 0.3.6", + "fancy-regex", + "generational-arena", + "indexmap 1.9.3", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-error", + "kclvm-parser", + "kclvm-runtime", + "kclvm-span", + "kclvm-utils", + "lazy_static", + "once_cell", + "petgraph", + "phf", + "regex", + "serde", + "serde_json", + "suggestions", + "unicode_names2", +] + +[[package]] +name = "kclvm-span" +version = "0.8.7" +dependencies = [ + "compiler_base_span", + "kclvm-macros", + "parking_lot 0.11.2", + "scoped-tls", +] + +[[package]] +name = "kclvm-tools" +version = "0.8.7" +dependencies = [ + "anyhow", + "compiler_base_session", + "compiler_base_span", + "criterion 0.3.6", + "fancy-regex", + "indexmap 1.9.3", + "insta", + "json-spanned-value", + "kclvm-ast", + "kclvm-ast-pretty", + "kclvm-config", + "kclvm-driver", + "kclvm-error", + "kclvm-parser", + "kclvm-query", + "kclvm-runner", + "kclvm-runtime", + "kclvm-sema", + "kclvm-utils", + "located_yaml", + "once_cell", + "pretty_assertions", + "regex", + "rustc_lexer", + "serde_json", + "serde_yaml", + "walkdir", +] + +[[package]] +name = "kclvm-utils" +version = "0.8.7" +dependencies = [ + "anyhow", + "fslock", + "regex", +] + +[[package]] +name = "kclvm-version" +version = "0.8.7" +dependencies = [ + "vergen", +] + +[[package]] +name = "kclvm_runtime_internal_macros" +version = "0.5.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", +] + +[[package]] +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" +dependencies = [ + "bitflags 1.3.2", + "libc", +] + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if 1.0.0", + "winapi", +] + +[[package]] +name = "libredox" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.5.0", + "libc", +] + +[[package]] +name = "linked-hash-map" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +dependencies = [ + "serde", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "llvm-sys" +version = "120.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "624f2692f436769c7eb85a13eeca3f6fb9705a4b2bd0473ac9577c90f19e21ef" +dependencies = [ + "cc", + "lazy_static", + "libc", + "regex", + "semver 0.11.0", +] + +[[package]] +name = "located_yaml" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bc68ee6f87a1be7fdba1dcfd854528371aa84a8390279b5d7a99d5da82add76" +dependencies = [ + "linked-hash-map", + "serde", + "yaml-rust", +] + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "lsp-server" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a9b4c78d1c3f35c5864c90e9633377b5f374a4a4983ac64c30b8ae898f9305" +dependencies = [ + "crossbeam-channel", + "log", + "serde", + "serde_json", +] + +[[package]] +name = "lsp-types" +version = "0.93.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" +dependencies = [ + "bitflags 1.3.2", + "serde", + "serde_json", + "serde_repr", + "url", +] + +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + +[[package]] +name = "matches" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + +[[package]] +name = "md-5" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "opaque-debug 0.2.3", +] + +[[package]] +name = "md-5" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +dependencies = [ + "cfg-if 1.0.0", + "digest 0.10.7", +] + +[[package]] +name = "md5" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" + +[[package]] +name = "memchr" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" + +[[package]] +name = "memmap2" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +dependencies = [ + "libc", +] + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "miow" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" +dependencies = [ + "windows-sys 0.42.0", +] + +[[package]] +name = "multimap" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" + +[[package]] +name = "notify" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "729f63e1ca555a43fe3efa4f3efdf4801c479da85b432242a7b726f353c88486" +dependencies = [ + "bitflags 1.3.2", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "mio", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.5.0", + "crossbeam-channel", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "num-bigint" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-conv" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.9", + "libc", +] + +[[package]] +name = "num_threads" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9" +dependencies = [ + "libc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "opaque-debug" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" + +[[package]] +name = "opaque-debug" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + +[[package]] +name = "os_str_bytes" +version = "6.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" + +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if 1.0.0", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pest" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "pest_meta" +version = "2.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca" +dependencies = [ + "once_cell", + "pest", + "sha2 0.10.8", +] + +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.2.6", +] + +[[package]] +name = "phf" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" +dependencies = [ + "phf_macros", + "phf_shared", + "proc-macro-hack", +] + +[[package]] +name = "phf_generator" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro-hack", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "phf_shared" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "pretty_assertions" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" +dependencies = [ + "diff", + "yansi", +] + +[[package]] +name = "prettyplease" +version = "0.1.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" +dependencies = [ + "proc-macro2", + "syn 1.0.109", +] + +[[package]] +name = "proc-macro-hack" +version = "0.5.20+deprecated" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "proc_macro_crate" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-build" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +dependencies = [ + "bytes", + "heck 0.4.1", + "itertools", + "lazy_static", + "log", + "multimap", + "petgraph", + "prettyplease", + "prost", + "prost-types", + "regex", + "syn 1.0.109", + "tempfile", + "which", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + +[[package]] +name = "prost-wkt" +version = "0.4.1" +dependencies = [ + "chrono", + "inventory", + "prost", + "serde", + "serde_derive", + "serde_json", + "typetag", +] + +[[package]] +name = "prost-wkt-build" +version = "0.4.1" +dependencies = [ + "heck 0.4.1", + "prost", + "prost-build", + "prost-types", + "quote", +] + +[[package]] +name = "prost-wkt-types" +version = "0.4.1" +dependencies = [ + "chrono", + "prost", + "prost-build", + "prost-types", + "prost-wkt", + "prost-wkt-build", + "protoc-bin-vendored", + "regex", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "protoc-bin-vendored" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "005ca8623e5633e298ad1f917d8be0a44bcf406bf3cde3b80e63003e49a3f27d" +dependencies = [ + "protoc-bin-vendored-linux-aarch_64", + "protoc-bin-vendored-linux-ppcle_64", + "protoc-bin-vendored-linux-x86_32", + "protoc-bin-vendored-linux-x86_64", + "protoc-bin-vendored-macos-x86_64", + "protoc-bin-vendored-win32", +] + +[[package]] +name = "protoc-bin-vendored-linux-aarch_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb9fc9cce84c8694b6ea01cc6296617b288b703719b725b8c9c65f7c5874435" + +[[package]] +name = "protoc-bin-vendored-linux-ppcle_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02d2a07dcf7173a04d49974930ccbfb7fd4d74df30ecfc8762cf2f895a094516" + +[[package]] +name = "protoc-bin-vendored-linux-x86_32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d54fef0b04fcacba64d1d80eed74a20356d96847da8497a59b0a0a436c9165b0" + +[[package]] +name = "protoc-bin-vendored-linux-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8782f2ce7d43a9a5c74ea4936f001e9e8442205c244f7a3d4286bd4c37bc924" + +[[package]] +name = "protoc-bin-vendored-macos-x86_64" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5de656c7ee83f08e0ae5b81792ccfdc1d04e7876b1d9a38e6876a9e09e02537" + +[[package]] +name = "protoc-bin-vendored-win32" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804" + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ra_ap_paths" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d780b450680460bd7ea3e2483dcf15a3ac0ce0ec028696caa342c577d65e5506" + +[[package]] +name = "ra_ap_stdx" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d776542bf771f4fdf40c21ced864bf213924d8a60d580c970715818471ebd74c" +dependencies = [ + "always-assert", + "libc", + "miow", + "winapi", +] + +[[package]] +name = "ra_ap_vfs" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8cd60adecd0947e1dd41a3077713381aa0cdcba6dc8777300d7d5b83b9fbe84" +dependencies = [ + "fst", + "indexmap 1.9.3", + "ra_ap_paths", + "ra_ap_stdx", + "rustc-hash", +] + +[[package]] +name = "ra_ap_vfs-notify" +version = "0.0.149" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a680f2dbd796844ebeaa2a4d01ae209f412ddc2981f6512ab8bc9b471156e6cd" +dependencies = [ + "crossbeam-channel", + "jod-thread", + "notify 5.2.0", + "ra_ap_paths", + "ra_ap_vfs", + "tracing", + "walkdir", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "rand_xoshiro" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" +dependencies = [ + "rand_core", +] + +[[package]] +name = "rayon" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" +dependencies = [ + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", +] + +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_users" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +dependencies = [ + "getrandom", + "libredox", + "thiserror", +] + +[[package]] +name = "regex" +version = "1.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata 0.4.6", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" + +[[package]] +name = "ron" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +dependencies = [ + "base64", + "bitflags 1.3.2", + "serde", +] + +[[package]] +name = "ropey" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93411e420bcd1a75ddd1dc3caf18c23155eda2c090631a85af21ba19e97093b5" +dependencies = [ + "smallvec", + "str_indices", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[package]] +name = "rustc-rayon" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9974ab223660e61c1b4e7b43b827379df286736ca988308ce7e16f59f2d89246" +dependencies = [ + "crossbeam-deque", + "either", + "rustc-rayon-core 0.3.2", +] + +[[package]] +name = "rustc-rayon" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb81aadc8837ca6ecebe0fe1353f15df83b3b3cc2cf7a8afd571bc22aa121710" +dependencies = [ + "either", + "rustc-rayon-core 0.5.0", +] + +[[package]] +name = "rustc-rayon-core" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "564bfd27be8db888d0fa76aa4335e7851aaed0c2c11ad1e93aeb9349f6b88500" +dependencies = [ + "crossbeam-deque", + "crossbeam-utils", + "lazy_static", + "num_cpus", +] + +[[package]] +name = "rustc-rayon-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67668daaf00e359c126f6dcb40d652d89b458a008c8afa727a42a2d20fca0b7f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "rustc_data_structures" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a38bae9c6afa27015bcaa2869e03bb111ecf0d0e0edc2da559a91d4057174c9a" +dependencies = [ + "arrayvec", + "bitflags 1.3.2", + "cfg-if 0.1.10", + "ena", + "indexmap 1.9.3", + "jobserver", + "libc", + "memmap2", + "parking_lot 0.12.1", + "rustc-hash", + "rustc-rayon 0.3.2", + "rustc-rayon-core 0.3.2", + "stable_deref_trait", + "tempfile", + "tracing", + "winapi", +] + +[[package]] +name = "rustc_errors" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00299b1841816d2c41129e6d4f86b0b446ee387e8203871c2551e1c405b1243c" +dependencies = [ + "termcolor", + "winapi", +] + +[[package]] +name = "rustc_lexer" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86aae0c77166108c01305ee1a36a1e77289d7dc6ca0a3cd91ff4992de2d16a5" +dependencies = [ + "unicode-xid", +] + +[[package]] +name = "rustc_span" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043e9cc06c53de1f6a125e41e4b915d23a130241610a114ad4fe4f654617eae4" +dependencies = [ + "cfg-if 0.1.10", + "md-5 0.10.6", + "rustc_data_structures", + "scoped-tls", + "sha-1", + "sha2 0.10.8", + "tracing", + "unicode-width", +] + +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.22", +] + +[[package]] +name = "rustix" +version = "0.38.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" +dependencies = [ + "bitflags 2.5.0", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "salsa" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b84d9f96071f3f3be0dc818eae3327625d8ebc95b58da37d6850724f31d3403" +dependencies = [ + "crossbeam-utils", + "indexmap 1.9.3", + "lock_api", + "log", + "oorandom", + "parking_lot 0.11.2", + "rustc-hash", + "salsa-macros", + "smallvec", +] + +[[package]] +name = "salsa-macros" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd3904a4ba0a9d0211816177fd34b04c7095443f8cdacd11175064fe541c8fe2" +dependencies = [ + "heck 0.3.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "self_cell" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" + +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser 0.7.0", +] + +[[package]] +name = "semver" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +dependencies = [ + "semver-parser 0.10.2", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +[[package]] +name = "semver-parser" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +dependencies = [ + "pest", +] + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_cbor" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +dependencies = [ + "half 1.8.3", + "serde", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "serde_json" +version = "1.0.115" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "serde_yaml" +version = "0.9.34+deprecated" +dependencies = [ + "anyhow", + "indexmap 2.2.6", + "indoc", + "itoa", + "ryu", + "serde", + "serde_derive", + "unsafe-libyaml", +] + +[[package]] +name = "sha-1" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" + +[[package]] +name = "sha2" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" +dependencies = [ + "block-buffer 0.9.0", + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.9.0", + "opaque-debug 0.3.1", +] + +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" +dependencies = [ + "libc", +] + +[[package]] +name = "similar" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "sized-chunks" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" +dependencies = [ + "bitmaps", + "typenum", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + +[[package]] +name = "standback" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +dependencies = [ + "version_check", +] + +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version 0.2.3", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn 1.0.109", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + +[[package]] +name = "str_indices" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9557cb6521e8d009c51a8666f09356f4b817ba9ba0981a305bd86aee47bd35c" + +[[package]] +name = "strsim" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "suggestions" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5441c382482e49aaac2c3ea9cbcd24290531246e879ee94af5dfc4b144f11e80" +dependencies = [ + "strsim 0.10.0", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "synstructure" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", + "unicode-xid", +] + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if 1.0.0", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "termize" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", +] + +[[package]] +name = "textwrap" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + +[[package]] +name = "threadpool" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" +version = "0.2.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +dependencies = [ + "const_fn", + "libc", + "standback", + "stdweb", + "time-macros 0.1.1", + "version_check", + "winapi", +] + +[[package]] +name = "time" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +dependencies = [ + "deranged", + "itoa", + "libc", + "num-conv", + "num_threads", + "powerfmt", + "serde", + "time-core", + "time-macros 0.2.17", +] + +[[package]] +name = "time-core" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "time-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +dependencies = [ + "num-conv", + "time-core", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn 1.0.109", +] + +[[package]] +name = "tinystr" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" +dependencies = [ + "displaydoc", +] + +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.37.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "num_cpus", + "parking_lot 0.12.1", + "pin-project-lite", + "signal-hook-registry", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "tokio-stream" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +dependencies = [ + "futures-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "tokio-test" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" +dependencies = [ + "async-stream", + "bytes", + "futures-core", + "tokio", + "tokio-stream", +] + +[[package]] +name = "tokio-util" +version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "log", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "toml" +version = "0.5.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +dependencies = [ + "serde", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "type-map" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d3364c5e96cb2ad1603037ab253ddd34d7fb72a58bdddf4b7350760fc69a46" +dependencies = [ + "rustc-hash", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "typetag" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "661d18414ec032a49ece2d56eee03636e43c4e8d577047ab334c0ba892e29aaf" +dependencies = [ + "erased-serde", + "inventory", + "once_cell", + "serde", + "typetag-impl", +] + +[[package]] +name = "typetag-impl" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", +] + +[[package]] +name = "ucd-trie" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" + +[[package]] +name = "unic-char-property" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8c57a407d9b6fa02b4795eb81c5b6652060a15a7903ea981f3d723e6c0be221" +dependencies = [ + "unic-char-range", +] + +[[package]] +name = "unic-char-range" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0398022d5f700414f6b899e10b8348231abf9173fa93144cbc1a43b9793c1fbc" + +[[package]] +name = "unic-common" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d7ff825a6a654ee85a63e80f92f054f904f21e7d12da4e22f9834a4aaa35bc" + +[[package]] +name = "unic-emoji-char" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b07221e68897210270a38bde4babb655869637af0f69407f96053a34f76494d" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-langid" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" +dependencies = [ + "unic-langid-impl", + "unic-langid-macros", +] + +[[package]] +name = "unic-langid-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" +dependencies = [ + "tinystr", +] + +[[package]] +name = "unic-langid-macros" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec" +dependencies = [ + "proc-macro-hack", + "tinystr", + "unic-langid-impl", + "unic-langid-macros-impl", +] + +[[package]] +name = "unic-langid-macros-impl" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4" +dependencies = [ + "proc-macro-hack", + "quote", + "syn 2.0.58", + "unic-langid-impl", +] + +[[package]] +name = "unic-ucd-bidi" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1d568b51222484e1f8209ce48caa6b430bf352962b877d592c29ab31fb53d8c" +dependencies = [ + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-category" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b8d4591f5fcfe1bd4453baaf803c40e1b1e69ff8455c47620440b46efef91c0" +dependencies = [ + "matches", + "unic-char-property", + "unic-char-range", + "unic-ucd-version", +] + +[[package]] +name = "unic-ucd-version" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96bd2f2237fe450fcd0a1d2f5f4e91711124f7857ba2e964247776ebeeb7b0c4" +dependencies = [ + "unic-common", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-casing" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "623f59e6af2a98bdafeb93fa277ac8e1e40440973001ca15cf4ae1541cd16d56" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unicode-xid" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" + +[[package]] +name = "unicode_names2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d6678d7916394abad0d4b19df4d3802e1fd84abd7d701f39b75ee71b9e8cf1" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "uuid" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +dependencies = [ + "getrandom", + "serde", +] + +[[package]] +name = "vergen" +version = "8.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525" +dependencies = [ + "anyhow", + "cfg-if 1.0.0", + "rustc_version 0.4.0", + "rustversion", + "time 0.3.34", +] + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.58", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "yaml-rust" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" +dependencies = [ + "linked-hash-map", +] + +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] diff --git a/pkgs/by-name/kc/kclvm/enable_protoc_env.patch b/pkgs/by-name/kc/kclvm/enable_protoc_env.patch new file mode 100644 index 000000000000..4d1f2c2cb9a8 --- /dev/null +++ b/pkgs/by-name/kc/kclvm/enable_protoc_env.patch @@ -0,0 +1,37 @@ +diff --git a/api/build.rs b/api/build.rs +index 617c1b9a..20d728e3 100644 +--- a/api/build.rs ++++ b/api/build.rs +@@ -5,10 +5,10 @@ use prost_wkt_build::{FileDescriptorSet, Message}; + /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate + /// the corresponding rust source file to the directory src/model + fn main() { +- std::env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); ++ // std::env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); + + let out = PathBuf::from(env::var("OUT_DIR").unwrap()); + let descriptor_file = out.join("kclvm_service_descriptor.bin"); +diff --git b/third-party/prost-wkt/wkt-types/build.rs a/third-party/prost-wkt/wkt-types/build.rs +index e49222d5..a933ddf4 100644 +--- a/third-party/prost-wkt/wkt-types/build.rs ++++ b/third-party/prost-wkt/wkt-types/build.rs +@@ -13,10 +13,10 @@ use regex::Regex; + + fn main() { + //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC +- std::env::set_var( +- "PROTOC", +- protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +- ); ++ // std::env::set_var( ++ // "PROTOC", ++ // protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), ++ // ); + let dir = PathBuf::from(env::var("OUT_DIR").unwrap()); + process_prost_pbtime(&dir); diff --git a/pkgs/by-name/kc/kclvm/package.nix b/pkgs/by-name/kc/kclvm/package.nix new file mode 100644 index 000000000000..549de0066ce0 --- /dev/null +++ b/pkgs/by-name/kc/kclvm/package.nix @@ -0,0 +1,41 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, protobuf +, pkg-config +, +}: +rustPlatform.buildRustPackage rec { + pname = "kclvm"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kcl"; + rev = "v${version}"; + hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + }; + + sourceRoot = "source/kclvm"; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM="; + }; + }; + + nativeBuildInputs = [ pkg-config protobuf ]; + + patches = [ ./enable_protoc_env.patch ]; + + PROTOC = "${protobuf}/bin/protoc"; + PROTOC_INCLUDE = "${protobuf}/include"; + + meta = with lib; { + description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + homepage = "https://github.com/kcl-lang/kcl"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + }; +} From e95ac7643cbf3c92e558583d27d967f956ab7958 Mon Sep 17 00:00:00 2001 From: Sergey Yakovlev Date: Mon, 10 Jun 2024 13:52:16 +0300 Subject: [PATCH 013/300] kclvm_cli: init at 0.8.7 --- pkgs/by-name/kc/kclvm_cli/Cargo.lock | 7 +++++ pkgs/by-name/kc/kclvm_cli/cargo_lock.patch | 10 +++++++ pkgs/by-name/kc/kclvm_cli/package.nix | 31 ++++++++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/by-name/kc/kclvm_cli/Cargo.lock create mode 100644 pkgs/by-name/kc/kclvm_cli/cargo_lock.patch create mode 100644 pkgs/by-name/kc/kclvm_cli/package.nix diff --git a/pkgs/by-name/kc/kclvm_cli/Cargo.lock b/pkgs/by-name/kc/kclvm_cli/Cargo.lock new file mode 100644 index 000000000000..2cc4275a3b8a --- /dev/null +++ b/pkgs/by-name/kc/kclvm_cli/Cargo.lock @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "kclvm_cli" +version = "0.8.7" diff --git a/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch b/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch new file mode 100644 index 000000000000..7e8b91d02b3d --- /dev/null +++ b/pkgs/by-name/kc/kclvm_cli/cargo_lock.patch @@ -0,0 +1,10 @@ +--- /dev/null 2024-03-29 17:01:59.989114590 +0100 ++++ cli/Cargo.lock 2024-04-17 13:27:32.243365234 +0200 +@@ -0,0 +1,7 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "kclvm_cli" ++version = "0.8.7" diff --git a/pkgs/by-name/kc/kclvm_cli/package.nix b/pkgs/by-name/kc/kclvm_cli/package.nix new file mode 100644 index 000000000000..ad1aecafaffd --- /dev/null +++ b/pkgs/by-name/kc/kclvm_cli/package.nix @@ -0,0 +1,31 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, kclvm +}: +rustPlatform.buildRustPackage rec { + pname = "kclvm_cli"; + version = "0.8.7"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "kcl"; + rev = "v${version}"; + hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; + }; + + sourceRoot = "source/cli"; + cargoLock.lockFile = ./Cargo.lock; + cargoPatches = [ ./cargo_lock.patch ]; + + buildInputs = [ kclvm ]; + + meta = with lib; { + description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; + homepage = "https://github.com/kcl-lang/kcl"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + mainProgram = "kclvm_cli"; + }; +} From e92c574d1e39a029c9ed373a51f659d7d0f540b3 Mon Sep 17 00:00:00 2001 From: Sergey Yakovlev Date: Mon, 10 Jun 2024 13:53:29 +0300 Subject: [PATCH 014/300] kcl: rename kcl-cli to kcl --- pkgs/by-name/kc/kcl-cli/package.nix | 27 -------------- pkgs/by-name/kc/kcl/package.nix | 56 +++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 27 deletions(-) delete mode 100644 pkgs/by-name/kc/kcl-cli/package.nix create mode 100644 pkgs/by-name/kc/kcl/package.nix diff --git a/pkgs/by-name/kc/kcl-cli/package.nix b/pkgs/by-name/kc/kcl-cli/package.nix deleted file mode 100644 index f289d19e3eff..000000000000 --- a/pkgs/by-name/kc/kcl-cli/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -}: - -buildGoModule rec { - pname = "kcl-cli"; - version = "0.8.9"; - src = fetchFromGitHub { - owner = "kcl-lang"; - repo = "cli"; - rev = "v${version}"; - hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; - }; - vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; - ldflags = [ - "-X=kcl-lang.io/cli/pkg/version.version=${version}" - ]; - subPackages = [ "cmd/kcl" ]; - meta = with lib; { - description = "Command line interface for KCL programming language"; - homepage = "https://github.com/kcl-lang/cli"; - license = licenses.asl20; - maintainers = with maintainers; [ peefy ]; - mainProgram = "kcl"; - }; -} diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix new file mode 100644 index 000000000000..6c02da1f986f --- /dev/null +++ b/pkgs/by-name/kc/kcl/package.nix @@ -0,0 +1,56 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, kclvm_cli +, kclvm +, makeWrapper +, installShellFiles +, +}: +buildGoModule rec { + pname = "kcl"; + version = "0.8.9"; + + src = fetchFromGitHub { + owner = "kcl-lang"; + repo = "cli"; + rev = "v${version}"; + hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; + }; + + vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; + + ldflags = [ + "-w -s" + "-X=kcl-lang.io/cli/pkg/version.version=v${version}" + ]; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + buildInputs = [ kclvm kclvm_cli ]; + + subPackages = [ "cmd/kcl" ]; + + # env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29 + postFixup = '' + wrapProgram $out/bin/kcl \ + --set PATH ${lib.makeBinPath [kclvm_cli]} \ + --set KCL_LIB_HOME ${lib.makeLibraryPath [kclvm]} \ + --set KCL_GO_DISABLE_INSTALL_ARTIFACT false \ + ''; + + postInstall = '' + installShellCompletion --cmd kcl \ + --bash <($out/bin/kcl completion bash) \ + --fish <($out/bin/kcl completion fish) \ + --zsh <($out/bin/kcl completion zsh) + ''; + + meta = with lib; { + description = "A command line interface for KCL programming language"; + homepage = "https://github.com/kcl-lang/cli"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ selfuryon peefy ]; + mainProgram = "kcl"; + }; +} From 8d0312a07ee6bc408580d07d001f503144b717b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 19:17:27 +0000 Subject: [PATCH 015/300] devpod: 0.5.12 -> 0.5.15 --- pkgs/development/tools/devpod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix index 2a1133bce774..eb45a4b82e7a 100644 --- a/pkgs/development/tools/devpod/default.nix +++ b/pkgs/development/tools/devpod/default.nix @@ -23,13 +23,13 @@ let pname = "devpod"; - version = "0.5.12"; + version = "0.5.15"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5JdA5isU4TNqOX8b2mLHLfVBkLNkh6SdaRUXdZHjEM0="; + sha256 = "sha256-fGCCPLj7C5yn8DPJdx6ixUFz9KXhBRAUOrFeTsQkXEM="; }; meta = with lib; { From cf77d47c83270103be226a7175a2bcd2508be10d Mon Sep 17 00:00:00 2001 From: Tommimon <37435103+Tommimon@users.noreply.github.com> Date: Sun, 16 Jun 2024 23:37:20 +0200 Subject: [PATCH 016/300] mcontrolcenter: init at 0.4.1 Co-authored-by: Nadim Kobeissi --- pkgs/by-name/mc/mcontrolcenter/package.nix | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 pkgs/by-name/mc/mcontrolcenter/package.nix diff --git a/pkgs/by-name/mc/mcontrolcenter/package.nix b/pkgs/by-name/mc/mcontrolcenter/package.nix new file mode 100644 index 000000000000..1b128387f2b6 --- /dev/null +++ b/pkgs/by-name/mc/mcontrolcenter/package.nix @@ -0,0 +1,62 @@ +{ lib, stdenv, libsForQt5, makeDesktopItem, copyDesktopItems, fetchFromGitHub, cmake, kmod }: + +stdenv.mkDerivation (finalAttrs: { + pname = "mcontrolcenter"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "dmitry-s93"; + repo = "MControlCenter"; + rev = finalAttrs.version; + hash = "sha256-SV78OVRGzy2zFLT3xqeUtbjlh81Z97PVao18P3h/8dI="; + }; + + postPatch = '' + substituteInPlace src/helper/helper.cpp \ + --replace-fail "/usr/sbin/modprobe" "${kmod}/bin/modprobe" + substituteInPlace src/helper/mcontrolcenter.helper.service \ + --replace-fail "/usr" "$out" + ''; + + desktopItems = [ + (makeDesktopItem { + name = "MControlCenter"; + exec = "mcontrolcenter"; + icon = "mcontrolcenter"; + comment = finalAttrs.meta.description; + desktopName = "MControlCenter"; + categories = [ "System" ]; + }) + ]; + + nativeBuildInputs = [ + libsForQt5.wrapQtAppsHook + libsForQt5.qttools + copyDesktopItems + cmake + ]; + + buildInputs = [ + libsForQt5.qtbase + kmod + ]; + + installPhase = '' + runHook preInstall + install -Dm755 mcontrolcenter $out/bin/mcontrolcenter + install -Dm755 helper/mcontrolcenter-helper $out/libexec/mcontrolcenter-helper + install -Dm644 ../resources/mcontrolcenter.svg $out/share/icons/hicolor/scalable/apps/mcontrolcenter.svg + install -Dm644 ../src/helper/mcontrolcenter-helper.conf $out/share/dbus-1/system.d/mcontrolcenter-helper.conf + install -Dm644 ../src/helper/mcontrolcenter.helper.service $out/share/dbus-1/system-services/mcontrolcenter.helper.service + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/dmitry-s93/MControlCenter"; + description = "Tool to change the settings of MSI laptops running Linux"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.Tommimon ]; + mainProgram = "mcontrolcenter"; + }; +}) From e63e9271bb7eebfe6159d544bec875ecd64c96ba Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 7 Feb 2024 18:51:05 +0100 Subject: [PATCH 017/300] apacheKafka: 3.5.0 -> 3.5.2 --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index ef54be5bb71a..e33eb4fdcc85 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -4,9 +4,9 @@ let versionMap = { "3.5" = { - kafkaVersion = "3.5.0"; + kafkaVersion = "3.5.2"; scalaVersion = "2.13"; - sha256 = "sha256-KjpGjgab5XDxbWEqgZbC96kge36shlvpNNIM4SUusvg="; + sha256 = "sha256-vBryxHFLPFB8qpFFkMKOeBX2Zxp0MkvEd+HIOohUg8M="; jre = jdk17_headless; }; "3.4" = { From 1f45118e73e5fdcb28faf618952ef913d0aca8e5 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 7 Feb 2024 18:56:07 +0100 Subject: [PATCH 018/300] apacheKafka: init version 3.6.1, make default --- nixos/tests/kafka.nix | 1 + pkgs/servers/apache-kafka/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index f4f9827ab7b5..d5d82d06acb6 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -110,6 +110,7 @@ in with pkgs; { kafka_3_3 = makeKafkaTest "kafka_3_3" { kafkaPackage = apacheKafka_3_3; }; kafka_3_4 = makeKafkaTest "kafka_3_4" { kafkaPackage = apacheKafka_3_4; }; kafka_3_5 = makeKafkaTest "kafka_3_5" { kafkaPackage = apacheKafka_3_5; }; + kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; }; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index e33eb4fdcc85..ba5065feb4fe 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -3,6 +3,12 @@ let versionMap = { + "3.6" = { + kafkaVersion = "3.6.1"; + scalaVersion = "2.13"; + sha256 = "sha256-49tWjH+PzMf5gep7CUQmiukxBZLHPuDrV56/2/zy08o="; + jre = jdk17_headless; + }; "3.5" = { kafkaVersion = "3.5.2"; scalaVersion = "2.13"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f06962f5fad6..8278aaf59851 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17955,7 +17955,7 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; ant = apacheAnt; - apacheKafka = apacheKafka_3_5; + apacheKafka = apacheKafka_3_6; apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; @@ -17963,6 +17963,7 @@ with pkgs; apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; + apacheKafka_3_6 = callPackage ../servers/apache-kafka { majorVersion = "3.6"; }; apng2gif = callPackage ../tools/graphics/apng2gif { }; From 27a384a0ab5c65d15732ab721bf5703a3b79b6e9 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Wed, 7 Feb 2024 18:58:52 +0100 Subject: [PATCH 019/300] apacheKafka: drop 3.4 and older General cleanup -- following the logic that NixOS 23.11 contains Kafka 3.5, so there is a sensible upgrade path for everyone as long as we keep that around until after the next release. --- nixos/tests/kafka.nix | 6 ----- pkgs/servers/apache-kafka/default.nix | 37 --------------------------- pkgs/top-level/aliases.nix | 6 +++++ pkgs/top-level/all-packages.nix | 6 ----- 4 files changed, 6 insertions(+), 49 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index d5d82d06acb6..763143a965d6 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -103,12 +103,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_2_8 = makeKafkaTest "kafka_2_8" { kafkaPackage = apacheKafka_2_8; }; - kafka_3_0 = makeKafkaTest "kafka_3_0" { kafkaPackage = apacheKafka_3_0; }; - kafka_3_1 = makeKafkaTest "kafka_3_1" { kafkaPackage = apacheKafka_3_1; }; - kafka_3_2 = makeKafkaTest "kafka_3_2" { kafkaPackage = apacheKafka_3_2; }; - kafka_3_3 = makeKafkaTest "kafka_3_3" { kafkaPackage = apacheKafka_3_3; }; - kafka_3_4 = makeKafkaTest "kafka_3_4" { kafkaPackage = apacheKafka_3_4; }; kafka_3_5 = makeKafkaTest "kafka_3_5" { kafkaPackage = apacheKafka_3_5; }; kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index ba5065feb4fe..3b8b1856c191 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -15,43 +15,6 @@ let sha256 = "sha256-vBryxHFLPFB8qpFFkMKOeBX2Zxp0MkvEd+HIOohUg8M="; jre = jdk17_headless; }; - "3.4" = { - kafkaVersion = "3.4.1"; - scalaVersion = "2.13"; - sha256 = "sha256-p28XpSuPLNMd4RVx/zZqcUggtuTgKJOwFZ0J2w7a+Zg="; - jre = jdk17_headless; - }; - "3.3" = { - kafkaVersion = "3.3.2"; - scalaVersion = "2.13"; - sha256 = "sha256-Gv5XrpXnEajH8fSbcfIfURz+QPcqTrJ1oe3SGXYLNRc="; - jre = jdk17_headless; - }; - "3.2" = { - kafkaVersion = "3.2.3"; - scalaVersion = "2.13"; - sha256 = "sha256-tvkbwBP83M1zl31J4g6uu4/LEhqJoIA9Eam48fyT24A="; - jre = jdk17_headless; - }; - "3.1" = { - kafkaVersion = "3.1.2"; - scalaVersion = "2.13"; - sha256 = "sha256-SO1bTQkG3YQSv657QjwBeBCWbDlDqS3E5eUp7ciojnI="; - jre = jdk17_headless; - }; - "3.0" = { - kafkaVersion = "3.0.2"; - scalaVersion = "2.13"; - sha256 = "sha256-G8b6STGlwow+iDqMCeZkF3HTKd94TKccmyfZ7AT/7yE="; - jre = jdk17_headless; - }; - "2.8" = { - kafkaVersion = "2.8.2"; - scalaVersion = "2.13"; - sha256 = "sha256-inZXZJSs8ivtEqF6E/ApoyUHn8vg38wUG3KhowP8mfQ="; - jre = jdk11_headless; - }; - }; in diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d7cf6ef30692..0a326b4009bb 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -80,6 +80,12 @@ mapAliases ({ ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 + apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 antimicroX = antimicrox; # Added 2021-10-31 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8278aaf59851..05b4c5f8b0b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17956,12 +17956,6 @@ with pkgs; ant = apacheAnt; apacheKafka = apacheKafka_3_6; - apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; }; - apacheKafka_3_0 = callPackage ../servers/apache-kafka { majorVersion = "3.0"; }; - apacheKafka_3_1 = callPackage ../servers/apache-kafka { majorVersion = "3.1"; }; - apacheKafka_3_2 = callPackage ../servers/apache-kafka { majorVersion = "3.2"; }; - apacheKafka_3_3 = callPackage ../servers/apache-kafka { majorVersion = "3.3"; }; - apacheKafka_3_4 = callPackage ../servers/apache-kafka { majorVersion = "3.4"; }; apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; apacheKafka_3_6 = callPackage ../servers/apache-kafka { majorVersion = "3.6"; }; From ff5e9d2cd8dd559dd94c77bf123e102af9bdc97c Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Fri, 9 Feb 2024 07:36:46 +0100 Subject: [PATCH 020/300] apacheKafka: callPackages To please the by-name gods :-) --- pkgs/servers/apache-kafka/default.nix | 105 +++++++++++++------------- pkgs/top-level/all-packages.nix | 6 +- 2 files changed, 56 insertions(+), 55 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 3b8b1856c191..d575136f2a96 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -1,71 +1,70 @@ -{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps, - majorVersion ? "1.0" }: +{ lib, stdenv, fetchurl, jdk17_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps }: let versionMap = { - "3.6" = { + "3_6" = { kafkaVersion = "3.6.1"; scalaVersion = "2.13"; sha256 = "sha256-49tWjH+PzMf5gep7CUQmiukxBZLHPuDrV56/2/zy08o="; jre = jdk17_headless; }; - "3.5" = { + "3_5" = { kafkaVersion = "3.5.2"; scalaVersion = "2.13"; sha256 = "sha256-vBryxHFLPFB8qpFFkMKOeBX2Zxp0MkvEd+HIOohUg8M="; jre = jdk17_headless; }; }; -in -with versionMap.${majorVersion}; + build = versionInfo: with versionInfo; stdenv.mkDerivation rec { + version = "${scalaVersion}-${kafkaVersion}"; + pname = "apache-kafka"; -stdenv.mkDerivation rec { - version = "${scalaVersion}-${kafkaVersion}"; - pname = "apache-kafka"; + src = fetchurl { + url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; + inherit sha256; + }; - src = fetchurl { - url = "mirror://apache/kafka/${kafkaVersion}/kafka_${version}.tgz"; - inherit sha256; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jre bash gnugrep gnused coreutils ps ]; + + installPhase = '' + mkdir -p $out + cp -R config libs $out + + mkdir -p $out/bin + cp bin/kafka* $out/bin + cp bin/connect* $out/bin + + # allow us the specify logging directory using env + substituteInPlace $out/bin/kafka-run-class.sh \ + --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"' + + substituteInPlace $out/bin/kafka-server-stop.sh \ + --replace 'ps' '${ps}/bin/ps' + + for p in $out/bin\/*.sh; do + wrapProgram $p \ + --set JAVA_HOME "${jre}" \ + --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ + --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" + done + chmod +x $out/bin\/* + ''; + + passthru = { + inherit jre; # Used by the NixOS module to select the supported jre + }; + + meta = with lib; { + homepage = "https://kafka.apache.org"; + description = "High-throughput distributed messaging system"; + license = licenses.asl20; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = [ maintainers.ragge ]; + platforms = platforms.unix; + }; }; - - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre bash gnugrep gnused coreutils ps ]; - - installPhase = '' - mkdir -p $out - cp -R config libs $out - - mkdir -p $out/bin - cp bin/kafka* $out/bin - cp bin/connect* $out/bin - - # allow us the specify logging directory using env - substituteInPlace $out/bin/kafka-run-class.sh \ - --replace 'LOG_DIR="$base_dir/logs"' 'LOG_DIR="$KAFKA_LOG_DIR"' - - substituteInPlace $out/bin/kafka-server-stop.sh \ - --replace 'ps' '${ps}/bin/ps' - - for p in $out/bin\/*.sh; do - wrapProgram $p \ - --set JAVA_HOME "${jre}" \ - --set KAFKA_LOG_DIR "/tmp/apache-kafka-logs" \ - --prefix PATH : "${bash}/bin:${coreutils}/bin:${gnugrep}/bin:${gnused}/bin" - done - chmod +x $out/bin\/* - ''; - - passthru = { - inherit jre; # Used by the NixOS module to select the supported jre - }; - - meta = with lib; { - homepage = "https://kafka.apache.org"; - description = "High-throughput distributed messaging system"; - license = licenses.asl20; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ maintainers.ragge ]; - platforms = platforms.unix; - }; -} +in with lib; mapAttrs' + (majorVersion: versionInfo: nameValuePair "apacheKafka_${majorVersion}" (build versionInfo)) + versionMap diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05b4c5f8b0b9..57a38cd2bdd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17955,9 +17955,11 @@ with pkgs; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; ant = apacheAnt; + inherit (callPackages ../servers/apache-kafka { }) + apacheKafka_3_5 + apacheKafka_3_6; + apacheKafka = apacheKafka_3_6; - apacheKafka_3_5 = callPackage ../servers/apache-kafka { majorVersion = "3.5"; }; - apacheKafka_3_6 = callPackage ../servers/apache-kafka { majorVersion = "3.6"; }; apng2gif = callPackage ../tools/graphics/apng2gif { }; From 4e5d90435044118493fa59c4f3b82222ebbf1a76 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Jun 2024 15:01:49 +0100 Subject: [PATCH 021/300] apacheKafka: init 3.7.0. make default --- nixos/tests/kafka.nix | 1 + pkgs/servers/apache-kafka/default.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 763143a965d6..37947ab5c504 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -105,6 +105,7 @@ let in with pkgs; { kafka_3_5 = makeKafkaTest "kafka_3_5" { kafkaPackage = apacheKafka_3_5; }; kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; + kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; kafka_kraft = makeKafkaTest "kafka_kraft" { kafkaPackage = apacheKafka; mode = "kraft"; }; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index d575136f2a96..6cf4c6816eff 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -2,6 +2,12 @@ let versionMap = { + "3_7" = { + kafkaVersion = "3.7.0"; + scalaVersion = "2.13"; + sha256 = "sha256-ZfJuWTe7t23+eN+0FnMN+n4zeLJ+E/0eIE8aEJm/r5w="; + jre = jdk17_headless; + }; "3_6" = { kafkaVersion = "3.6.1"; scalaVersion = "2.13"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57a38cd2bdd5..2b3f976f9df5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17957,9 +17957,10 @@ with pkgs; inherit (callPackages ../servers/apache-kafka { }) apacheKafka_3_5 - apacheKafka_3_6; + apacheKafka_3_6 + apacheKafka_3_7; - apacheKafka = apacheKafka_3_6; + apacheKafka = apacheKafka_3_7; apng2gif = callPackage ../tools/graphics/apng2gif { }; From 03e0cf25d9bb0adb292bc8abfc9517f193288d71 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Jun 2024 15:03:21 +0100 Subject: [PATCH 022/300] =?UTF-8?q?apacheKafka:=203.6.1=20=E2=86=92=203.6.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/apache-kafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 6cf4c6816eff..7440f77ac883 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -9,9 +9,9 @@ let jre = jdk17_headless; }; "3_6" = { - kafkaVersion = "3.6.1"; + kafkaVersion = "3.6.2"; scalaVersion = "2.13"; - sha256 = "sha256-49tWjH+PzMf5gep7CUQmiukxBZLHPuDrV56/2/zy08o="; + sha256 = "sha256-wxfkf3cUHTFG6VY9nLodZIbIHmcLIR7OasRqn3Lkqqw="; jre = jdk17_headless; }; "3_5" = { From 412cce1388910d95980aa06f9fcb687f258240a0 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Thu, 13 Jun 2024 15:04:14 +0100 Subject: [PATCH 023/300] apacheKafka: Drop 3.5 series --- nixos/tests/kafka.nix | 1 - pkgs/servers/apache-kafka/default.nix | 6 ------ pkgs/top-level/aliases.nix | 13 +++++++------ pkgs/top-level/all-packages.nix | 1 - 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index 37947ab5c504..8f843e1fc37d 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -103,7 +103,6 @@ let }) { inherit system; }); in with pkgs; { - kafka_3_5 = makeKafkaTest "kafka_3_5" { kafkaPackage = apacheKafka_3_5; }; kafka_3_6 = makeKafkaTest "kafka_3_6" { kafkaPackage = apacheKafka_3_6; }; kafka_3_7 = makeKafkaTest "kafka_3_7" { kafkaPackage = apacheKafka_3_7; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 7440f77ac883..70445612115f 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -14,12 +14,6 @@ let sha256 = "sha256-wxfkf3cUHTFG6VY9nLodZIbIHmcLIR7OasRqn3Lkqqw="; jre = jdk17_headless; }; - "3_5" = { - kafkaVersion = "3.5.2"; - scalaVersion = "2.13"; - sha256 = "sha256-vBryxHFLPFB8qpFFkMKOeBX2Zxp0MkvEd+HIOohUg8M="; - jre = jdk17_headless; - }; }; build = versionInfo: with versionInfo; stdenv.mkDerivation rec { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0a326b4009bb..d0cefde3433d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -80,12 +80,13 @@ mapAliases ({ ansible_2_13 = throw "Ansible 2.13 goes end of life in 2023/11"; # Added 2023-12-30 ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11 apacheAnt_1_9 = throw "Ant 1.9 has been removed since it's not used in nixpkgs anymore"; # Added 2023-11-12 - apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 - apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_4 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_2_8 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_0 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_1 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_2 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_3 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_4 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-02-12 + apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_5 have been removed from nixpkgs as outdated"; # Added 2024-06-13 antimicroX = antimicrox; # Added 2021-10-31 appthreat-depscan = dep-scan; # Added 2024-04-10 arcanPackages = throw "arcanPackages was removed and its sub-attributes were promoted to top-level"; # Added 2023-11-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2b3f976f9df5..2a58624c60f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17956,7 +17956,6 @@ with pkgs; ant = apacheAnt; inherit (callPackages ../servers/apache-kafka { }) - apacheKafka_3_5 apacheKafka_3_6 apacheKafka_3_7; From 653397e1ab2236a47e786a48d561c5cbb53a8ccf Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Mon, 17 Jun 2024 19:48:23 +0400 Subject: [PATCH 024/300] =?UTF-8?q?paho-mqtt-cpp:=201.3.2=20=E2=86=92=201.?= =?UTF-8?q?4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libraries/paho-mqtt-cpp/default.nix | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/development/libraries/paho-mqtt-cpp/default.nix index 6f1b9b215e26..cf94f358cd24 100644 --- a/pkgs/development/libraries/paho-mqtt-cpp/default.nix +++ b/pkgs/development/libraries/paho-mqtt-cpp/default.nix @@ -1,19 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, paho-mqtt-c, enableStatic ? stdenv.hostPlatform.isStatic, enableShared ? !stdenv.hostPlatform.isStatic }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + openssl, + paho-mqtt-c, + enableStatic ? stdenv.hostPlatform.isStatic, + enableShared ? !stdenv.hostPlatform.isStatic, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "paho.mqtt.cpp"; - version = "1.3.2"; + version = "1.4.0"; src = fetchFromGitHub { owner = "eclipse"; repo = "paho.mqtt.cpp"; - rev = "v${version}"; - hash = "sha256-c2umToT4w+L7bgzp1bCEcb0ECHvxKZ2t6JI5SmUySPo="; + rev = "v${finalAttrs.version}"; + hash = "sha256-XAQSNjO34b2BPzAf7x4a+74UdKFH5lYNMJm4kE16nkA="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl paho-mqtt-c ]; + buildInputs = [ + openssl + paho-mqtt-c + ]; cmakeFlags = [ (lib.cmakeBool "PAHO_WITH_SSL" true) @@ -28,4 +40,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; -} +}) From ba59b79291e962d3d3a40546e4a34efdebaae82c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jun 2024 22:13:53 +0000 Subject: [PATCH 025/300] minify: 2.20.16 -> 2.20.34 --- pkgs/development/web/minify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 232f6dffaaa6..4df54b13a15a 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "minify"; - version = "2.20.16"; + version = "2.20.34"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-0RiSNRoRmN7X2udwgGaArXgIRTaxaGH4fo3usiCJNbA="; + hash = "sha256-x6xeAFy96Ur+Kc1ODQxpX/lgK2CJWn34HgZzGSmcwqE="; }; - vendorHash = "sha256-8OEF2sAJZuGX4z/OsXCAkRR82JO3rYCEJQbidIjGOJ8="; + vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; nativeBuildInputs = [ installShellFiles ]; From a92626dfa5d8c1bdc21c87b0d5c1c1bcdd0e82f5 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 18 Jun 2024 21:40:37 +0000 Subject: [PATCH 026/300] python311Packages.openai-triton: move postPatch up to src --- .../python-modules/openai-triton/default.nix | 61 ++++++++++--------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 1b4d713311ee..6869704a1bdb 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -57,36 +57,6 @@ buildPythonPackage rec { ./0001-ptxas-disable-version-key-for-non-cuda-targets.patch ]; - nativeBuildInputs = [ - setuptools - pythonRelaxDepsHook - # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: - cmake - ninja - - # Note for future: - # These *probably* should go in depsTargetTarget - # ...but we cannot test cross right now anyway - # because we only support cudaPackages on x86_64-linux atm - lit - llvm - ]; - - buildInputs = [ - gtest - libxml2.dev - ncurses - pybind11 - zlib - ]; - - propagatedBuildInputs = [ - filelock - # openai-triton uses setuptools at runtime: - # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 - setuptools - ]; - postPatch = let # Bash was getting weird without linting, @@ -123,6 +93,37 @@ buildPythonPackage rec { --replace '${oldStr}' '${newStr}' ''; + nativeBuildInputs = [ + setuptools + pythonRelaxDepsHook + # pytestCheckHook # Requires torch (circular dependency) and probably needs GPUs: + cmake + ninja + + # Note for future: + # These *probably* should go in depsTargetTarget + # ...but we cannot test cross right now anyway + # because we only support cudaPackages on x86_64-linux atm + lit + llvm + ]; + + buildInputs = [ + gtest + libxml2.dev + ncurses + pybind11 + zlib + ]; + + propagatedBuildInputs = [ + filelock + # openai-triton uses setuptools at runtime: + # https://github.com/NixOS/nixpkgs/pull/286763/#discussion_r1480392652 + setuptools + ]; + + # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' From 530d5769d57e88bde975c5fefb9ecfcddba89742 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 18 Jun 2024 22:03:08 +0000 Subject: [PATCH 027/300] python311Packages.torch: prevent libcuda_dirs() from running ldconfig --- .../python-modules/openai-triton/default.nix | 39 ++++++++++++------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/openai-triton/default.nix b/pkgs/development/python-modules/openai-triton/default.nix index 6869704a1bdb..d1aaed52052d 100644 --- a/pkgs/development/python-modules/openai-triton/default.nix +++ b/pkgs/development/python-modules/openai-triton/default.nix @@ -1,10 +1,10 @@ { lib, config, + addDriverRunpath, buildPythonPackage, fetchFromGitHub, fetchpatch, - addOpenGLRunpath, setuptools, pytestCheckHook, pythonRelaxDepsHook, @@ -59,19 +59,23 @@ buildPythonPackage rec { postPatch = let - # Bash was getting weird without linting, - # but basically upstream contains [cc, ..., "-lcuda", ...] - # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] - old = [ "-lcuda" ]; - new = [ - "-lcuda" - "-L${addOpenGLRunpath.driverLink}" - "-L${cudaPackages.cuda_cudart}/lib/stubs/" - ]; - quote = x: ''"${x}"''; - oldStr = lib.concatMapStringsSep ", " quote old; - newStr = lib.concatMapStringsSep ", " quote new; + subs.ldFlags = + let + # Bash was getting weird without linting, + # but basically upstream contains [cc, ..., "-lcuda", ...] + # and we replace it with [..., "-lcuda", "-L/run/opengl-driver/lib", "-L$stubs", ...] + old = [ "-lcuda" ]; + new = [ + "-lcuda" + "-L${addDriverRunpath.driverLink}" + "-L${cudaPackages.cuda_cudart}/lib/stubs/" + ]; + in + { + oldStr = lib.concatMapStringsSep ", " quote old; + newStr = lib.concatMapStringsSep ", " quote new; + }; in '' # Use our `cmakeFlags` instead and avoid downloading dependencies @@ -86,11 +90,17 @@ buildPythonPackage rec { substituteInPlace unittest/CMakeLists.txt \ --replace "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\ --replace "include(GoogleTest)" "find_package(GTest REQUIRED)" + + cat << \EOF > python/triton/common/build.py + + def libcuda_dirs(): + return [ "${addDriverRunpath.driverLink}/lib" ] + EOF '' + lib.optionalString cudaSupport '' # Use our linker flags substituteInPlace python/triton/common/build.py \ - --replace '${oldStr}' '${newStr}' + --replace '${subs.ldFlags.oldStr}' '${subs.ldFlags.newStr}' ''; nativeBuildInputs = [ @@ -123,7 +133,6 @@ buildPythonPackage rec { setuptools ]; - # Avoid GLIBCXX mismatch with other cuda-enabled python packages preConfigure = '' From 352bd9f79124d89aa24a7e067c1945a493e9e537 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 19 Jun 2024 19:29:43 +0400 Subject: [PATCH 028/300] =?UTF-8?q?python3Packages.pyogrio:=200.8.0=20?= =?UTF-8?q?=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/pyogrio/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyogrio/default.nix b/pkgs/development/python-modules/pyogrio/default.nix index 551fde29bafe..63f798d21d85 100644 --- a/pkgs/development/python-modules/pyogrio/default.nix +++ b/pkgs/development/python-modules/pyogrio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyogrio"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,15 +25,12 @@ buildPythonPackage rec { owner = "geopandas"; repo = "pyogrio"; rev = "v${version}"; - hash = "sha256-h4Rv5xOWSJSv0nLbosviz5EiF/IsZO5wzBel9YRd0Bg="; + hash = "sha256-HC7+dDehDwEIDQnCMYrsC1jE78AyfHqEhfOZLYSzTIw="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "versioneer[toml]==0.28" "versioneer[toml]" - '' + lib.optionalString (!pythonOlder "3.12") '' - substituteInPlace setup.py \ - --replace-fail "distutils" "setuptools._distutils" ''; nativeBuildInputs = [ From 71f06deb49afb59d50e7abb7f276a0981eae7a90 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 20 Jun 2024 00:53:53 +0200 Subject: [PATCH 029/300] esphome: 2024.5.4 -> 2024.6.1 https://github.com/esphome/esphome/releases/tag/2024.6.0 https://github.com/esphome/esphome/releases/tag/2024.6.1 --- pkgs/tools/misc/esphome/dashboard.nix | 7 ++++--- pkgs/tools/misc/esphome/default.nix | 14 +++++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/esphome/dashboard.nix b/pkgs/tools/misc/esphome/dashboard.nix index d8428e365fcd..0b485ad49e6a 100644 --- a/pkgs/tools/misc/esphome/dashboard.nix +++ b/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,13 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20240412.0"; + version = "20240620.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; - hash = "sha256-MT/EpZ8kDKHhJGF4njdh6Q+xe8GF4FYxaoIighSguiQ="; + pname = "esphome_dashboard"; + inherit version; + hash = "sha256-lx3i8Z2PUefyibCNiQ4zPEwfgXr6r/TVa9TBF0YE5fA="; }; # no tests diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 7dc67ba2ef70..f5f3c68a16ad 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.5.4"; + version = "2024.6.1"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UxNMHRQLrViK9ssFc0vHA/zqNw5yH8E6n+OAnq6vJdQ="; + hash = "sha256-bFQnAuyEBzFV9xiGOHLJrR4oTUU8ZRHjIa3ww0yCNRk="; }; nativeBuildInputs = with python.pkgs; [ @@ -38,9 +38,17 @@ python.pkgs.buildPythonApplication rec { pythonRelaxDeps = true; + pythonRemoveDeps = [ + "esptool" + "platformio" + ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + # drop coverage testing - sed -i '/--cov/d' pytest.ini + sed -i '/--cov/d' pyproject.toml # ensure component dependencies are available cat requirements_optional.txt >> requirements.txt From 7485d712188e2d4d6b6a2411e15b6d24afc8a835 Mon Sep 17 00:00:00 2001 From: qubitnano <146656568+qubitnano@users.noreply.github.com> Date: Tue, 7 May 2024 22:53:23 -0400 Subject: [PATCH 030/300] papermc: add udev to LD_LIBRARY_PATH Fixes error: [oshi.software.os.linux.LinuxOperatingSystem] Did not find udev library in operating system. Some features may not work. --- pkgs/games/papermc/derivation.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/derivation.nix b/pkgs/games/papermc/derivation.nix index 50796407c297..299248a64d08 100644 --- a/pkgs/games/papermc/derivation.nix +++ b/pkgs/games/papermc/derivation.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash }: +{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre, version, hash, udev }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "papermc"; @@ -21,7 +21,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { install -D $src $out/share/papermc/papermc.jar makeWrapper ${lib.getExe jre} "$out/bin/minecraft-server" \ - --append-flags "-jar $out/share/papermc/papermc.jar nogui" + --append-flags "-jar $out/share/papermc/papermc.jar nogui" \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ udev ]} runHook postInstall ''; From 4155ea3e4fd77c1a55d1ef86387026b5f1273b81 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 8 Jun 2024 19:31:05 +0400 Subject: [PATCH 031/300] =?UTF-8?q?python3Packages.osmnx:=201.9.1=20?= =?UTF-8?q?=E2=86=92=201.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../python-modules/osmnx/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index 97488f2810fd..673296d719f5 100644 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -21,21 +21,21 @@ buildPythonPackage rec { pname = "osmnx"; - version = "1.9.1"; + version = "1.9.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "gboeing"; repo = "osmnx"; rev = "refs/tags/v${version}"; - hash = "sha256-od/0IuiK2CvrD0lfcTzkImK/5hcm6m61ULYzEtv/YeA="; + hash = "sha256-Tn800wFoPi5VkZmu9wUVM+EmCj/xxU2EJ6iwnA1VKXo="; }; - nativeBuildInputs = [ hatchling ]; + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ geopandas matplotlib networkx @@ -56,11 +56,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "osmnx" ]; - meta = with lib; { + meta = { description = "Package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX"; homepage = "https://github.com/gboeing/osmnx"; - changelog = "https://github.com/gboeing/osmnx/blob/v${version}/CHANGELOG.md"; - license = licenses.mit; - maintainers = with maintainers; [ psyanticy ]; + changelog = "https://github.com/gboeing/osmnx/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ psyanticy ]; }; } From d993580d1c3ca0dff7633a2384535b3b9b71794b Mon Sep 17 00:00:00 2001 From: chiroptical Date: Thu, 20 Jun 2024 19:23:13 -0400 Subject: [PATCH 032/300] ex_doc: 0.32.1 -> 0.34.1 --- pkgs/development/beam-modules/ex_doc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix index d7057a6dd91c..b46d7fee6ef4 100644 --- a/pkgs/development/beam-modules/ex_doc/default.nix +++ b/pkgs/development/beam-modules/ex_doc/default.nix @@ -3,12 +3,12 @@ let pname = "ex_doc"; - version = "0.32.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "${pname}"; rev = "v${version}"; - hash = "sha256-nNUSx2Ywj04vgT/7BQEwoNtTl1NGmbvuIS4KbvUFYzs="; + hash = "sha256-OXIRippEDYAKD222XzNJkkZdXbUkDUauv5amr4oAU7c="; }; in mixRelease { @@ -19,7 +19,7 @@ mixRelease { mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; - hash = "sha256-e0lU4TXLY2geO6MI1h0kpdwsGbEyXjIRe0W43337mHk="; + hash = "sha256-fYINsATbw3M3r+IVoYS14aVEsg9OBuH6mNUqzQJuDQo="; }; configurePhase = '' From 99a01ed596ecfe3f401caed643cc239996a874da Mon Sep 17 00:00:00 2001 From: Amelia Keibler Date: Fri, 21 Jun 2024 09:53:32 -0400 Subject: [PATCH 033/300] licensure: enable darwin builds Licensure provides provides Mac builds, so they appear to intend to support Mac users and avoid Linux-specific dependencies that would limit their ability to run this program cross-platform. --- pkgs/by-name/li/licensure/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/licensure/package.nix b/pkgs/by-name/li/licensure/package.nix index 19e580df3d5b..9798bc0d8f36 100644 --- a/pkgs/by-name/li/licensure/package.nix +++ b/pkgs/by-name/li/licensure/package.nix @@ -1,10 +1,12 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config , openssl , git , gitls +, darwin }: rustPlatform.buildRustPackage rec { pname = "licensure"; @@ -19,7 +21,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-449p+y7qUcTxBOttyQPt+nRtK+s9HJBoVKGdMQaszLQ="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl git gitls ]; + buildInputs = [ openssl git gitls ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.SystemConfiguration + ]; checkFlags = [ # Checking for files in the git repo (git ls-files), @@ -33,6 +38,6 @@ rustPlatform.buildRustPackage rec { license = licenses.gpl3Plus; mainProgram = "licensure"; maintainers = [ maintainers.soispha ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 9d41fe6fcc4df838a56b1cfb2512b65e5e655958 Mon Sep 17 00:00:00 2001 From: Maxine Aubrey Date: Tue, 23 Apr 2024 18:58:49 +0200 Subject: [PATCH 034/300] nixos/gdm: add fingerprint pam rules Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com> --- .../services/x11/display-managers/gdm.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 107a2f164792..51ab08e74f86 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -321,6 +321,22 @@ in session include login ''; + login.fprintAuth = mkIf config.services.fprintd.enable false; + gdm-fingerprint.text = mkIf config.services.fprintd.enable '' + auth required pam_shells.so + auth requisite pam_nologin.so + auth requisite pam_faillock.so preauth + auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so + auth optional pam_permit.so + auth required pam_env.so + auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + + account include login + + password required pam_deny.so + + session include login + ''; }; }; From afa35b5e7a63b1c82a79591b06a7829308e7be9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 23 Jun 2024 00:22:28 +0000 Subject: [PATCH 035/300] wlx-overlay-s: 0.4.1 -> 0.4.2 --- pkgs/by-name/wl/wlx-overlay-s/Cargo.lock | 765 +++++++++++++++++----- pkgs/by-name/wl/wlx-overlay-s/package.nix | 6 +- 2 files changed, 610 insertions(+), 161 deletions(-) diff --git a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock index e81951449348..823bb7ba80da 100644 --- a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock +++ b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock @@ -78,9 +78,9 @@ dependencies = [ [[package]] name = "android-activity" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" +checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046" dependencies = [ "android-properties", "bitflags 2.5.0", @@ -90,9 +90,9 @@ dependencies = [ "jni-sys", "libc", "log", - "ndk", + "ndk 0.9.0", "ndk-context", - "ndk-sys", + "ndk-sys 0.6.0+11769913", "num_enum", "thiserror", ] @@ -160,9 +160,9 @@ dependencies = [ [[package]] name = "anstyle-query" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5" +checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" dependencies = [ "windows-sys 0.52.0", ] @@ -225,11 +225,11 @@ checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" [[package]] name = "ash" -version = "0.37.3+1.3.251" +version = "0.38.0+1.3.281" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +checksum = "0bb44936d800fea8f016d7f2311c6a4f97aebd5dc86f09906139ec848cf3a46f" dependencies = [ - "libloading 0.7.4", + "libloading 0.8.3", ] [[package]] @@ -372,9 +372,9 @@ dependencies = [ [[package]] name = "async-signal" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329972aa325176e89114919f2a80fdae4f4c040f66a370b1a1159c6c0f94e7aa" +checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d" dependencies = [ "async-io", "async-lock", @@ -539,9 +539,9 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -603,22 +603,12 @@ dependencies = [ "generic-array", ] -[[package]] -name = "block-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae85a0696e7ea3b835a453750bf002770776609115e6d25c6d2ff28a8200f7e7" -dependencies = [ - "objc-sys", -] - [[package]] name = "block2" -version = "0.3.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b55663a85f33501257357e6421bb33e769d5c9ffb5ba0921c975a123e35e68" +checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f" dependencies = [ - "block-sys", "objc2", ] @@ -701,9 +691,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.0.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" dependencies = [ "jobserver", "libc", @@ -747,6 +737,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chrono" version = "0.4.38" @@ -796,9 +792,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f" dependencies = [ "clap_builder", "clap_derive", @@ -806,9 +802,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f" dependencies = [ "anstream", "anstyle", @@ -818,9 +814,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -830,9 +826,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" [[package]] name = "cmake" @@ -1022,7 +1018,7 @@ dependencies = [ "js-sys", "libc", "mach2", - "ndk", + "ndk 0.8.0", "ndk-context", "oboe", "wasm-bindgen", @@ -1118,9 +1114,9 @@ checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" [[package]] name = "cxx" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb497fad022245b29c2a0351df572e2d67c1046bcef2260ebc022aec81efea82" +checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82" dependencies = [ "cc", "cxxbridge-flags", @@ -1130,9 +1126,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.122" +version = "0.7.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a476ac5d29b1957ad93669eef9a030e9fc139103f9bb1ff9f15504c3f21236b0" +checksum = "749d9ac61b735e0d15b041225ad97a6f74b4bdf9f9dc98469553ca6109f57a56" dependencies = [ "codespan-reporting", "proc-macro2", @@ -1142,15 +1138,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "688c799a4a846f1c0acb9f36bb9c6272d9b3d9457f3633c7753c6057270df13c" +checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd" [[package]] name = "cxxbridge-macro" -version = "1.0.122" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bc249a7e3cd554fd2e8e08a426e9670c50bbfc9a621653cfa9accc9641783" +checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877" dependencies = [ "proc-macro2", "quote", @@ -1221,15 +1217,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case 0.4.0", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.66", ] [[package]] @@ -1248,6 +1244,17 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" +[[package]] +name = "displaydoc" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "dlib" version = "0.5.2" @@ -1272,6 +1279,12 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" +[[package]] +name = "dpi" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53" + [[package]] name = "drm-fourcc" version = "2.2.0" @@ -1292,9 +1305,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" [[package]] name = "enumflags2" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d" dependencies = [ "enumflags2_derive", "serde", @@ -1302,9 +1315,9 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", @@ -1396,9 +1409,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flexi_logger" -version = "0.28.1" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "419c99d8fc346ea0eaeaac2cc3945024d8fe82aa435aefc2fb9fcda1065f8774" +checksum = "be7e34f5ab91a424df2053c5c047e2e25bd4ff9f87a7402ee6892d4e02afe492" dependencies = [ "chrono", "glob", @@ -1696,6 +1709,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -1747,14 +1766,121 @@ dependencies = [ ] [[package]] -name = "icrate" -version = "0.0.4" +name = "icu_collections" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d3aaff8a54577104bafdf686ff18565c3b6903ca5782a2026ef06e2c7aa319" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" dependencies = [ - "block2", - "dispatch", - "objc2", + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -1786,12 +1912,14 @@ dependencies = [ [[package]] name = "idna" -version = "0.5.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "icu_normalizer", + "icu_properties", + "smallvec", + "utf8_iter", ] [[package]] @@ -2069,6 +2197,12 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +[[package]] +name = "litemap" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" + [[package]] name = "lock_api" version = "0.4.12" @@ -2115,9 +2249,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2211,7 +2345,21 @@ dependencies = [ "bitflags 2.5.0", "jni-sys", "log", - "ndk-sys", + "ndk-sys 0.5.0+25.2.9519653", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" +dependencies = [ + "bitflags 2.5.0", + "jni-sys", + "log", + "ndk-sys 0.6.0+11769913", "num_enum", "raw-window-handle", "thiserror", @@ -2232,6 +2380,15 @@ dependencies = [ "jni-sys", ] +[[package]] +name = "ndk-sys" +version = "0.6.0+11769913" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873" +dependencies = [ + "jni-sys", +] + [[package]] name = "nix" version = "0.26.4" @@ -2265,7 +2422,7 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.1.1", "libc", ] @@ -2364,25 +2521,206 @@ checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310" [[package]] name = "objc2" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "559c5a40fdd30eb5e344fbceacf7595a81e242529fb4e21cf5f43fb4f11ff98d" +checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804" dependencies = [ "objc-sys", "objc2-encode", ] [[package]] -name = "objc2-encode" -version = "3.0.0" +name = "objc2-app-kit" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d079845b37af429bfe5dfa76e6d087d788031045b25cfc6fd898486fd9847666" +checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" +dependencies = [ + "bitflags 2.5.0", + "block2", + "libc", + "objc2", + "objc2-core-data", + "objc2-core-image", + "objc2-foundation", + "objc2-quartz-core", +] + +[[package]] +name = "objc2-cloud-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] + +[[package]] +name = "objc2-contacts" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-data" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-core-image" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-core-location" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781" +dependencies = [ + "block2", + "objc2", + "objc2-contacts", + "objc2-foundation", +] + +[[package]] +name = "objc2-encode" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8" + +[[package]] +name = "objc2-foundation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" +dependencies = [ + "bitflags 2.5.0", + "block2", + "dispatch", + "libc", + "objc2", +] + +[[package]] +name = "objc2-link-presentation" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398" +dependencies = [ + "block2", + "objc2", + "objc2-app-kit", + "objc2-foundation", +] + +[[package]] +name = "objc2-metal" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-quartz-core" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-foundation", + "objc2-metal", +] + +[[package]] +name = "objc2-symbols" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc" +dependencies = [ + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-cloud-kit", + "objc2-core-data", + "objc2-core-image", + "objc2-core-location", + "objc2-foundation", + "objc2-link-presentation", + "objc2-quartz-core", + "objc2-symbols", + "objc2-uniform-type-identifiers", + "objc2-user-notifications", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe" +dependencies = [ + "block2", + "objc2", + "objc2-foundation", +] + +[[package]] +name = "objc2-user-notifications" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3" +dependencies = [ + "bitflags 2.5.0", + "block2", + "objc2", + "objc2-core-location", + "objc2-foundation", +] [[package]] name = "object" -version = "0.35.0" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e" +checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434" dependencies = [ "memchr", ] @@ -2394,7 +2732,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ "jni 0.21.1", - "ndk", + "ndk 0.8.0", "ndk-context", "num-derive", "num-traits", @@ -2526,7 +2864,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -2641,6 +2979,26 @@ dependencies = [ "siphasher", ] +[[package]] +name = "pin-project" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +dependencies = [ + "pin-project-internal", +] + +[[package]] +name = "pin-project-internal" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2700,13 +3058,13 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "polling" -version = "3.7.1" +version = "3.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1" +checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" dependencies = [ "cfg-if", "concurrent-queue", - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "pin-project-lite", "rustix", "tracing", @@ -2865,15 +3223,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.4.1" @@ -2885,18 +3234,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ "bitflags 2.5.0", ] [[package]] name = "regex" -version = "1.10.4" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2906,9 +3255,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2917,18 +3266,19 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "rodio" -version = "0.17.3" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +checksum = "d1fceb9d127d515af1586d8d0cc601e1245bdb0af38e75c865a156290184f5b3" dependencies = [ "cpal", "hound", + "thiserror", ] [[package]] @@ -3050,9 +3400,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2eaf3a5b264a521b988b2e73042e742df700c4f962cde845d1541adb46550" +checksum = "7de61fa7334ee8ee1f5c3c58dcc414fb9361e7e8f5bff9d45f4d69eeb89a7169" dependencies = [ "ab_glyph", "log", @@ -3215,6 +3565,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "slabbin" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8305086044614627ed85432d27b87cf9fc047204eaa036a11de6cf0120f273" + [[package]] name = "slice-of-array" version = "0.3.2" @@ -3264,6 +3620,12 @@ dependencies = [ "serde", ] +[[package]] +name = "stable_deref_trait" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" + [[package]] name = "static_assertions" version = "1.1.0" @@ -3288,7 +3650,7 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" dependencies = [ - "strum_macros 0.26.3", + "strum_macros 0.26.4", ] [[package]] @@ -3306,9 +3668,9 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7993a8e3a9e88a00351486baae9522c91b123a088f76469e5bd5cc17198ea87" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -3339,6 +3701,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "sysinfo" version = "0.30.12" @@ -3459,20 +3832,15 @@ dependencies = [ ] [[package]] -name = "tinyvec" -version = "1.6.0" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "tinyvec_macros", + "displaydoc", + "zerovec", ] -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - [[package]] name = "toml" version = "0.8.2" @@ -3578,27 +3946,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - [[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -3607,9 +3960,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unsafe-libyaml" @@ -3619,9 +3972,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "url" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" dependencies = [ "form_urlencoded", "idna", @@ -3630,10 +3983,22 @@ dependencies = [ ] [[package]] -name = "utf8parse" -version = "0.2.1" +name = "utf16_iter" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "version-compare" @@ -3659,7 +4024,7 @@ dependencies = [ [[package]] name = "vulkano" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "ash", @@ -3670,15 +4035,16 @@ dependencies = [ "heck 0.4.1", "indexmap 2.2.6", "libloading 0.8.3", + "nom", "objc", "once_cell", "parking_lot", "proc-macro2", "quote", "raw-window-handle", - "regex", "serde", "serde_json", + "slabbin", "smallvec", "thread_local", "vk-parse", @@ -3688,7 +4054,7 @@ dependencies = [ [[package]] name = "vulkano-macros" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", @@ -3699,7 +4065,7 @@ dependencies = [ [[package]] name = "vulkano-shaders" version = "0.34.0" -source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +source = "git+https://github.com/vulkano-rs/vulkano?rev=b9f3e89#b9f3e893005078b5680cd1672037465a2b5f3133" dependencies = [ "ahash", "heck 0.4.1", @@ -3913,9 +4279,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -4005,9 +4371,9 @@ dependencies = [ [[package]] name = "windows-result" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "749f0da9cc72d82e600d8d2e44cadd0b9eedb9038f71a1c58556ac1c5791813b" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" dependencies = [ "windows-targets 0.52.5", ] @@ -4219,37 +4585,41 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" [[package]] name = "winit" -version = "0.29.15" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" +checksum = "1dc930d6cfbf53c4fe0b95689cdc2e17b8658c3f4214b9953298ccb5a1a15c90" dependencies = [ "ahash", "android-activity", "atomic-waker", "bitflags 2.5.0", + "block2", "bytemuck", "calloop", - "cfg_aliases", + "cfg_aliases 0.2.1", + "concurrent-queue", "core-foundation", "core-graphics", "cursor-icon", - "icrate", + "dpi", "js-sys", "libc", - "log", "memmap2 0.9.4", - "ndk", - "ndk-sys", + "ndk 0.9.0", "objc2", - "once_cell", + "objc2-app-kit", + "objc2-foundation", + "objc2-ui-kit", "orbclient", "percent-encoding", + "pin-project", "raw-window-handle", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", "sctk-adwaita", "smithay-client-toolkit", "smol_str", + "tracing", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", @@ -4259,7 +4629,7 @@ dependencies = [ "wayland-protocols-plasma", "web-sys", "web-time", - "windows-sys 0.48.0", + "windows-sys 0.52.0", "x11-dl", "x11rb", "xkbcommon-dl", @@ -4343,6 +4713,18 @@ dependencies = [ "xkbcommon", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + [[package]] name = "x11-dl" version = "2.21.0" @@ -4401,12 +4783,12 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "xdg-home" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" dependencies = [ "libc", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -4436,9 +4818,9 @@ dependencies = [ [[package]] name = "xkeysym" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" dependencies = [ "bytemuck", ] @@ -4485,6 +4867,30 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "yoke" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + [[package]] name = "zbus" version = "4.0.1" @@ -4569,6 +4975,49 @@ dependencies = [ "syn 2.0.66", ] +[[package]] +name = "zerofrom" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", +] + [[package]] name = "zvariant" version = "4.0.0" diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix index 6f614edc6c61..5667cecdca12 100644 --- a/pkgs/by-name/wl/wlx-overlay-s/package.nix +++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -22,20 +22,20 @@ rustPlatform.buildRustPackage rec { pname = "wlx-overlay-s"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "galister"; repo = "wlx-overlay-s"; rev = "v${version}"; - hash = "sha256-9ess8/H7cByNYFNHvCi0124xCBwXk+PTNhAZKBcS08A="; + hash = "sha256-4sW/WxoN5jAomA/aFAAH8z8CAB7zsevpBllSwaQWSmU="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8="; "ovr_overlay-0.0.0" = "sha256-d38LqhKOp9tHbiK4eU7OPdFvkExqaJN1tB6y2qqPm9U="; + "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc="; "wlx-capture-0.3.11" = "sha256-CmFnVfA3MAYXSejn9GpuaNCRu4HiX0CN0j3aN4Pxvjw="; }; }; From 04efc006a4ebb9641952976667edbe43dc3e6bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 23 Jun 2024 17:16:01 +0200 Subject: [PATCH 036/300] etc.overlay: fix cross-build --- nixos/modules/system/etc/etc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 80ca69e495e9..0411faee6ebb 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -64,9 +64,9 @@ let etcHardlinks = filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc'; - build-composefs-dump = pkgs.runCommand "build-composefs-dump.py" + build-composefs-dump = pkgs.buildPackages.runCommand "build-composefs-dump.py" { - buildInputs = [ pkgs.python3 ]; + buildInputs = [ pkgs.buildPackages.python3 ]; } '' install ${./build-composefs-dump.py} $out patchShebangs --host $out From 169fbf6464dbb6c98aabf70e7417dac8d610c4bb Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Sun, 23 Jun 2024 18:34:29 +0200 Subject: [PATCH 037/300] git-cola: 4.7.1 -> 4.8.0 --- pkgs/applications/version-management/git-cola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-cola/default.nix b/pkgs/applications/version-management/git-cola/default.nix index f51b9995746a..870479f11f82 100644 --- a/pkgs/applications/version-management/git-cola/default.nix +++ b/pkgs/applications/version-management/git-cola/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "git-cola"; - version = "4.7.1"; + version = "4.8.0"; pyproject = true; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - hash = "sha256-93aayGGMgkSghTpx8M5Cfbxf2szAwrSzuoWK6GCTqZ8="; + hash = "sha256-sm/a790PiSqGYbftxvLiLMifKbMyi3a5Rvlhr9plyrU="; }; buildInputs = lib.optionals stdenv.isLinux [ From d187d9b54a31710f4b457376f3188567049e7e86 Mon Sep 17 00:00:00 2001 From: Pavel Anpin Date: Mon, 3 Jun 2024 21:50:54 +0100 Subject: [PATCH 038/300] thin-provisioning-tools: add symlinks for compatability https://github.com/NixOS/nixpkgs/issues/317018 --- .../misc/thin-provisioning-tools/default.nix | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index f4699a9f37d9..5993f8f91733 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -25,6 +25,30 @@ rustPlatform.buildRustPackage rec { inherit (nixosTests.lvm2) lvm-thinpool-linux-latest; }; + # required for config compatibility with configs done pre 0.9.0 + # see https://github.com/NixOS/nixpkgs/issues/317018 + postInstall = '' + ln -s $out/bin/pdata_tools $out/bin/cache_check + ln -s $out/bin/pdata_tools $out/bin/cache_dump + ln -s $out/bin/pdata_tools $out/bin/cache_metadata_size + ln -s $out/bin/pdata_tools $out/bin/cache_repair + ln -s $out/bin/pdata_tools $out/bin/cache_restore + ln -s $out/bin/pdata_tools $out/bin/cache_writeback + ln -s $out/bin/pdata_tools $out/bin/era_check + ln -s $out/bin/pdata_tools $out/bin/era_dump + ln -s $out/bin/pdata_tools $out/bin/era_invalidate + ln -s $out/bin/pdata_tools $out/bin/era_restore + ln -s $out/bin/pdata_tools $out/bin/thin_check + ln -s $out/bin/pdata_tools $out/bin/thin_delta + ln -s $out/bin/pdata_tools $out/bin/thin_dump + ln -s $out/bin/pdata_tools $out/bin/thin_ls + ln -s $out/bin/pdata_tools $out/bin/thin_metadata_size + ln -s $out/bin/pdata_tools $out/bin/thin_repair + ln -s $out/bin/pdata_tools $out/bin/thin_restore + ln -s $out/bin/pdata_tools $out/bin/thin_rmap + ln -s $out/bin/pdata_tools $out/bin/thin_trim + ''; + meta = with lib; { homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; From 4be161f8c80e75edd65ef8708b2be93304b9f159 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 24 Jun 2024 11:56:51 +0000 Subject: [PATCH 039/300] python311Packages.plugwise: 0.37.4.1 -> 0.38.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index e40bea699f8b..75c281ae22b9 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.4.1"; + version = "0.38.3"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-4B/rnwrkeridIgMD8gUVYXYVbrmQhQqDOa8Ot1ae/Ls="; + hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY="; }; postPatch = '' From b61e0ff19bbda7b9962b30c912e1a789e0ced1c2 Mon Sep 17 00:00:00 2001 From: Artturin Date: Mon, 24 Jun 2024 17:50:31 +0300 Subject: [PATCH 040/300] nixos/polkit: Add package option Overlaying polkit results in a lot of rebuilds thus it makes sense to add a package option. Assists in using the patch needed to fix https://www.github.com/NixOS/nixpkgs/issues/18012 --- nixos/modules/security/polkit.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index f7ee4f0068dd..76f623096fb7 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -14,6 +14,8 @@ in security.polkit.enable = mkEnableOption "polkit"; + security.polkit.package = mkPackageOption pkgs "polkit" { }; + security.polkit.debug = mkEnableOption "debug logs from polkit. This is required in order to see log messages from rule definitions"; security.polkit.extraConfig = mkOption { @@ -57,13 +59,13 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ]; + environment.systemPackages = [ cfg.package.bin cfg.package.out ]; - systemd.packages = [ pkgs.polkit.out ]; + systemd.packages = [ cfg.package.out ]; systemd.services.polkit.serviceConfig.ExecStart = [ "" - "${pkgs.polkit.out}/lib/polkit-1/polkitd ${optionalString (!cfg.debug) "--no-debug"}" + "${cfg.package.out}/lib/polkit-1/polkitd ${optionalString (!cfg.debug) "--no-debug"}" ]; systemd.services.polkit.restartTriggers = [ config.system.path ]; @@ -82,7 +84,7 @@ in ${cfg.extraConfig} ''; #TODO: validation on compilation (at least against typos) - services.dbus.packages = [ pkgs.polkit.out ]; + services.dbus.packages = [ cfg.package.out ]; security.pam.services.polkit-1 = {}; @@ -91,13 +93,13 @@ in { setuid = true; owner = "root"; group = "root"; - source = "${pkgs.polkit.bin}/bin/pkexec"; + source = "${cfg.package.bin}/bin/pkexec"; }; polkit-agent-helper-1 = { setuid = true; owner = "root"; group = "root"; - source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1"; + source = "${cfg.package.out}/lib/polkit-1/polkit-agent-helper-1"; }; }; From 62f2c6eda108a321ef282acddab30323cc5e45a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Jun 2024 21:22:39 +0200 Subject: [PATCH 041/300] python312Packages.voluptuous: 0.14.2 -> 0.15.0 Diff: https://github.com/alecthomas/voluptuous/compare/refs/tags/0.14.2...0.15.0 Changelog: https://github.com/alecthomas/voluptuous/blob/0.15.0/CHANGELOG.md --- pkgs/development/python-modules/voluptuous/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/voluptuous/default.nix b/pkgs/development/python-modules/voluptuous/default.nix index fb86d84a9dcd..258f8512acf8 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "voluptuous"; - version = "0.14.2"; + version = "0.15.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "alecthomas"; repo = "voluptuous"; rev = "refs/tags/${version}"; - hash = "sha256-2a4lid9NibbvhHfs/fcyHgPRZ2HirIKuPYxMsl5oA4o="; + hash = "sha256-/K1r+YkiRq/p8kwPXr/RrE6h0c94rbmWITrRSM+COKQ="; }; nativeBuildInputs = [ setuptools ]; From 238dde3c3c23e7ecb91a3089e3a586d416e588f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jun 2024 23:57:00 +0200 Subject: [PATCH 042/300] icu68: drop --- pkgs/development/libraries/icu/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index bf595108baaf..d084bb56d7e3 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -30,10 +30,6 @@ in version = "69.1"; hash = "sha256-TLp7es0dPELES7DBS+ZjcJjH+vKzMM6Ha8XzuRXQl0U="; }; - icu68 = make-icu { - version = "68.2"; - hash = "sha256-x5GT3uOQeiGZuClqk7UsXLdDMsJvPRZyaUh2gNR51iU="; - }; icu67 = make-icu { version = "67.1"; hash = "sha256-lKgM1vJRpTvSqZf28bWsZlP+eR36tm4esCJ3QPuG1dw="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd6ca38ddd6c..95050e6589f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21379,7 +21379,6 @@ with pkgs; icu64 icu66 icu67 - icu68 icu69 icu70 icu71 From 4bfb0ba68f20d5649f6d5646662dbd1e2a08ac2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 24 Jun 2024 23:59:23 +0200 Subject: [PATCH 043/300] icu58: drop --- pkgs/development/libraries/icu/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 13 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index d084bb56d7e3..0e77aebd1486 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -58,16 +58,4 @@ in version = "60.2"; hash = "sha256-8HPqjzW5JtcLsz5ld1CKpkKosxaoA/Eb4grzhIEdtBg="; }; - icu58 = make-icu { - version = "58.2"; - hash = "sha256-KwpEEBU6myDeDiDH2LZgSacq7yRLU2g9DXUhNxaD2gw="; - patches = [ - (fetchurl { - url = "http://bugs.icu-project.org/trac/changeset/39484?format=diff"; - name = "icu-changeset-39484.diff"; - sha256 = "0hxhpgydalyxacaaxlmaddc1sjwh65rsnpmg0j414mnblq74vmm8"; - }) - ]; - patchFlags = [ "-p4" ]; - }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95050e6589f0..c445605d119f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21373,7 +21373,6 @@ with pkgs; icu-versions = callPackages ../development/libraries/icu { }; inherit (icu-versions) - icu58 icu60 icu63 icu64 From b38981c9ffac0cb5c193bc64a79a7efadb1173eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 03:31:53 +0000 Subject: [PATCH 044/300] c-blosc: 1.21.5 -> 1.21.6 --- pkgs/development/libraries/c-blosc/1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/1.nix b/pkgs/development/libraries/c-blosc/1.nix index 5c6c97ec015c..aac58606cf45 100644 --- a/pkgs/development/libraries/c-blosc/1.nix +++ b/pkgs/development/libraries/c-blosc/1.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "c-blosc"; - version = "1.21.5"; + version = "1.21.6"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-bz922lWiap3vMy8qS9dmXa8zUg5NJlg0bx3+/xz7QAk="; + sha256 = "sha256-YelKkEXAh27J0Mq1BExGuKNCYBgJCc3nwmmWLr4ZfVI="; }; # https://github.com/NixOS/nixpkgs/issues/144170 From 4429be0054239571d647c51865e2fb0f58f4d156 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 03:45:29 +0000 Subject: [PATCH 045/300] pict-rs: 0.5.13 -> 0.5.16 --- pkgs/servers/web-apps/pict-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 95e11dbdb527..6033db65bf30 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.13"; + version = "0.5.16"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zFsxX7pZc8Hm8XcKWZK5zE3XAYmFPT0IJKD0+zazaeI="; + sha256 = "sha256-q0h+H3260CSpZemVuyaiwSHDi8yKXUX8Df9ih3IzAWo="; }; - cargoHash = "sha256-NjNfMyNEliyJQuwWJ/owyKOz+P5gT8Ov0w298I6A/Bk="; + cargoHash = "sha256-lMnJyiKhO7fGrjHkyZjheN0w7GgVs7Jnszw1KXo7vTg="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; From a72dbc95cd1af736b2cda527de112ebd6c3c33e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jun 2024 11:47:38 +0200 Subject: [PATCH 046/300] python312Packages.boto3-stubs: 1.34.131 -> 1.34.132 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 0e7054683263..734e5d4cbb13 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.131"; + version = "1.34.132"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-AZ2CqKRJbAGGPWdqjU8q2DC/TLdSsRB+pFP+4w1QOmA="; + hash = "sha256-NHl+3LxgiiX6qb9a6nbXLWpdUExXVJJYYMlS5DHLRa4="; }; build-system = [ setuptools ]; From b6b7e21cb4b3322adf150a6371cc16a37100273f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jun 2024 11:47:45 +0200 Subject: [PATCH 047/300] python312Packages.botocore-stubs: 1.34.131 -> 1.34.132 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 0eac91a8f308..f19fa9a27145 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.131"; + version = "1.34.132"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-pS4FLPCKxwjCjh8wKtAxzXYELm+JUTcta+E1CKlYQwY="; + hash = "sha256-LCqam3eYIneIlUbkRTRJK6IH8VukH+7zYzngef89rHI="; }; nativeBuildInputs = [ poetry-core ]; From 187680cccb0f0102af3e6503029d705e40d28ccc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jun 2024 11:50:48 +0200 Subject: [PATCH 048/300] python312Packages.evohome-async: 0.4.19 -> 0.4.20 Diff: https://github.com/zxdavb/evohome-async/compare/refs/tags/0.4.19...0.4.20 --- pkgs/development/python-modules/evohome-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evohome-async/default.nix b/pkgs/development/python-modules/evohome-async/default.nix index 5544151686fb..09c108747b39 100644 --- a/pkgs/development/python-modules/evohome-async/default.nix +++ b/pkgs/development/python-modules/evohome-async/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "evohome-async"; - version = "0.4.19"; + version = "0.4.20"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "zxdavb"; repo = "evohome-async"; rev = "refs/tags/${version}"; - hash = "sha256-B7LvGXAZO1pd9iCuZjW/bRWdB5PEzfcQjZWokGzMN70="; + hash = "sha256-06ziExAcb9PZdtWjoksPIUiOuUZaSJnQi5CI0v6nla0="; }; nativeBuildInputs = [ hatchling ]; From 35f956b557725b73bf96307eea2c5fd96dcba535 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jun 2024 11:53:46 +0200 Subject: [PATCH 049/300] python312Packages.influxdb3-python: 0.5.0 -> 0.6.1 Diff: https://github.com/InfluxCommunity/influxdb3-python/compare/refs/tags/v0.5.0...v0.6.1 Changelog: https://github.com/InfluxCommunity/influxdb3-python/releases/tag/v0.6.1 --- pkgs/development/python-modules/influxdb3-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 86a774e916c3..2aa2705a8879 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.5.0"; + version = "0.6.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-vumKOvCLpcu0z1W/zmf3qsSo3a8FEbI+20/IMt6nCX4="; + hash = "sha256-xu1uWVhZCFIjyOjE144X0JFtYY/nIoBHp/eHtysARYc="; }; build-system = [ setuptools ]; From 2592654f75bef49564bdc8c33d436ea9af8e4c3c Mon Sep 17 00:00:00 2001 From: Alexander Linder Date: Tue, 25 Jun 2024 12:55:17 +0200 Subject: [PATCH 050/300] televido: 0.3.0 -> 0.4.0 --- pkgs/by-name/te/televido/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/te/televido/package.nix b/pkgs/by-name/te/televido/package.nix index 2b495600613b..f2c31bb94942 100644 --- a/pkgs/by-name/te/televido/package.nix +++ b/pkgs/by-name/te/televido/package.nix @@ -16,19 +16,19 @@ stdenv.mkDerivation rec { pname = "televido"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "d-k-bo"; repo = "televido"; rev = "v${version}"; - hash = "sha256-qfUwPyutBNEnplD3kmTJXffzcWkEcR6FTLnT5YDSysU="; + hash = "sha256-pMrMXRnfvpDLFkL2IqYJKRao/OF78mXUCBqBgT97+hc="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-CmQQH6a5xMq+v+P4/sbpQ7iDaGKtzV39FgufD5uxz4Y="; + hash = "sha256-wavxkhDS0hspGMw5ZKTxjZ07TiZ67OkbMhicB8h5y64="; }; nativeBuildInputs = [ From 210d7af01eed34b5bd8c57302a4a2b5451f39e6e Mon Sep 17 00:00:00 2001 From: Jeroen Wijenbergh Date: Tue, 25 Jun 2024 14:58:13 +0200 Subject: [PATCH 051/300] libeduvpn-common: 2.0.1 -> 2.0.2 --- pkgs/by-name/li/libeduvpn-common/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libeduvpn-common/package.nix b/pkgs/by-name/li/libeduvpn-common/package.nix index a0b559fa31e7..bc011a3410ea 100644 --- a/pkgs/by-name/li/libeduvpn-common/package.nix +++ b/pkgs/by-name/li/libeduvpn-common/package.nix @@ -5,11 +5,11 @@ buildGoModule rec { pname = "libeduvpn-common"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz"; - hash = "sha256-hTF9CSqU9c0+TOK+/oRGjY1fBCKpisiiTJnWZqcdvjA="; + hash = "sha256-cD2WqxKCQkDL4lNbFKcbKygvmmd5FT8mZe5DDw+kizg="; }; vendorHash = null; From 454c084fa123decea9e813d4d57832bc11b009ce Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:04:11 +0530 Subject: [PATCH 052/300] hyprutils: 0.1.4 -> 0.1.5 --- pkgs/by-name/hy/hyprutils/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index 1ad3a925ff32..cc3123cb94de 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -5,17 +5,18 @@ pkg-config, pixman, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60="; + hash = "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw="; }; nativeBuildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = "RelWithDebInfo"; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://github.com/hyprwm/hyprutils"; description = "Small C++ library for utilities used across the Hypr* ecosystem"; From 25cb8f71c487dd288cd29a7a6715fb7dde9fa461 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:00:27 +0530 Subject: [PATCH 053/300] hyprland: 0.41.1 -> 0.41.2 --- pkgs/by-name/hy/hyprland/info.json | 8 ++++---- pkgs/by-name/hy/hyprland/package.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index ef4aabbe6b03..f4a78b0e8bf0 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { "branch": "main", - "commit_hash": "9e781040d9067c2711ec2e9f5b47b76ef70762b3", - "commit_message": "props: bump version to 0.41.1", - "date": "2024-06-13", - "tag": "v0.41.1" + "commit_hash": "918d8340afd652b011b937d29d5eea0be08467f5", + "commit_message": "flake.lock: update", + "date": "2024-06-25", + "tag": "v0.41.2" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index ae3e38de9a6c..1044cf3ccb8d 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -64,14 +64,14 @@ assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been remov stdenv.mkDerivation (finalAttrs: { pname = "hyprland" + lib.optionalString debug "-debug"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "hyprwm"; repo = finalAttrs.pname; fetchSubmodules = true; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-hLnnNBWP1Qjs1I3fndMgp8rbWJruxdnGTq77A4Rv4R4="; + hash = "sha256-JmfnYz+9a4TjNl3mAus1VpoWtTI9d1xkW9MHbkcV0Po="; }; postPatch = '' From 77dc5171ec0135fca9dfffce9165a018a301b111 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jun 2024 15:41:31 +0200 Subject: [PATCH 054/300] python312Packages.seedir: 0.4.2 -> 0.5.0 Diff: https://github.com/earnestt1234/seedir/compare/refs/tags/v0.4.2...v0.5.0 Changelog: https://github.com/earnestt1234/seedir/releases/tag/v0.5.0 --- .../python-modules/seedir/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/seedir/default.nix b/pkgs/development/python-modules/seedir/default.nix index f6bf8c953e54..f0c1f25d1340 100644 --- a/pkgs/development/python-modules/seedir/default.nix +++ b/pkgs/development/python-modules/seedir/default.nix @@ -5,36 +5,37 @@ natsort, pytestCheckHook, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "seedir"; - version = "0.4.2"; - format = "setuptools"; + version = "0.5.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "earnestt1234"; - repo = pname; + repo = "seedir"; rev = "refs/tags/v${version}"; - hash = "sha256-ioez5lBNyiBK3poL2Px3KtCQeM+Gh2d4iD3SoAIHFAk="; + hash = "sha256-ilL2KKN5sJclVcStO/kZoacsPoMgcFW1/8M/PQjxw/U="; }; - propagatedBuildInputs = [ natsort ]; + build-system = [ setuptools ]; + + dependencies = [ natsort ]; nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "seedir" ]; - pytestFlagsArray = [ "tests/tests.py" ]; - meta = with lib; { description = "Module for for creating, editing, and reading folder tree diagrams"; - mainProgram = "seedir"; homepage = "https://github.com/earnestt1234/seedir"; changelog = "https://github.com/earnestt1234/seedir/releases/tag/v${version}"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "seedir"; }; } From b47308d815a81bd02570f65493c8adbe7be5f783 Mon Sep 17 00:00:00 2001 From: klchen0112 Date: Tue, 25 Jun 2024 22:04:42 +0800 Subject: [PATCH 055/300] tidgi: init at 0.9.6 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/ti/tidgi/package.nix | 50 +++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/by-name/ti/tidgi/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f062cf31d069..f730173269af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10628,6 +10628,12 @@ github = "kkoniuszy"; githubId = 120419423; }; + klchen0112 = { + name = "klchen0112"; + email = "klchen0112@gmail.com"; + github = "klchen0112"; + githubId = 32459567; + }; klden = { name = "Kenzyme Le"; email = "kl@kenzymele.com"; diff --git a/pkgs/by-name/ti/tidgi/package.nix b/pkgs/by-name/ti/tidgi/package.nix new file mode 100644 index 000000000000..538b157dbec3 --- /dev/null +++ b/pkgs/by-name/ti/tidgi/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + unzip, +}: +stdenv.mkDerivation rec { + pname = "tidgi"; + version = "0.9.6"; + + src = + if stdenv.isAarch64 + then + fetchurl + { + url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-arm64-${version}.zip"; + sha256 = "sha256-1Z9lxZZWrUVQEhBO/Kt2AS/uNs2XfihdL0iGrguPQ5g="; + } + else + fetchurl + { + url = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/download/v${version}/TidGi-darwin-x64-${version}.zip"; + sha256 = "sha256-5jHW/QrgzsGQfX4LvsRebdOJPzYTvhtC5mczxp2wPI8="; + }; + + dontBuild = true; + + nativeBuildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -r *.app "$out/Applications" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/tiddly-gittly/TidGi-Desktop/releases/tag/v${version}"; + description = "Customizable personal knowledge-base and blogging platform with git as backup manager"; + homepage = "https://github.com/tiddly-gittly/TidGi-Desktop"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [klchen0112]; + platforms = ["aarch64-darwin" "x86_64-darwin"]; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + }; +} From c85eb67ec10d2a84fdbb24ee6dd3dbc833201df8 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:31:52 -0300 Subject: [PATCH 056/300] libtorrent: move to pkgs/by-name --- .../libtorrent.nix => by-name/li/libtorrent/package.nix} | 0 pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 3 deletions(-) rename pkgs/{applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix => by-name/li/libtorrent/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix b/pkgs/by-name/li/libtorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix rename to pkgs/by-name/li/libtorrent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 42d96042bfeb..15392b74df88 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10210,9 +10210,7 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { - libtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent/libtorrent.nix { }; - }; + rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { }; jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; From 92f373e4a3a7ad27d43d6836d2f6bb6192217c3c Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:33:40 -0300 Subject: [PATCH 057/300] libtorrent: add updateScript --- pkgs/by-name/li/libtorrent/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 7217026dc805..40b3ba71dde0 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -10,6 +10,7 @@ , openssl , pkg-config , zlib +, unstableGitUpdater }: stdenv.mkDerivation rec { @@ -36,6 +37,8 @@ stdenv.mkDerivation rec { zlib ]; + passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; }; + enableParallelBuilding = true; meta = with lib; { From 5bcb428248d5235547141bc1e3da1a5c000b98bf Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:34:06 -0300 Subject: [PATCH 058/300] libtorrent: 0.13.8+date=2021-08-07 -> unstable-2023-03-16 --- pkgs/by-name/li/libtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 40b3ba71dde0..3f4c664baaa3 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -13,15 +13,15 @@ , unstableGitUpdater }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rakshasa-libtorrent"; - version = "0.13.8+date=2021-08-07"; + version = "0.13.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "libtorrent"; - rev = "53596afc5fae275b3fb5753a4bb2a1a7f7cf6a51"; - hash = "sha256-gyl/jfbptHz/gHkkVGWShhv1Z7o9fa9nJIz27U2A6wg="; + rev = "91f8cf4b0358d9b4480079ca7798fa7d9aec76b5"; + hash = "sha256-mEIrMwpWMCAA70Qb/UIOg8XTfg71R/2F4kb3QG38duU="; }; nativeBuildInputs = [ From 694f564459d4bd24642d079991dd0aa0acce357f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:34:42 -0300 Subject: [PATCH 059/300] libtorrent: add thiagokokada as maintainer --- pkgs/by-name/li/libtorrent/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 3f4c664baaa3..0d640fbfe803 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; platforms = platforms.unix; }; } From f0741a3b94823c06aa1fd08a522dbacc5d7466d6 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:10:40 -0300 Subject: [PATCH 060/300] rtorrent: add updateScript --- .../networking/p2p/rakshasa-rtorrent/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index 52ef3f735001..81c9d7abb197 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -14,6 +14,7 @@ , xmlrpc_c , zlib , nixosTests +, unstableGitUpdater }: stdenv.mkDerivation { @@ -54,8 +55,11 @@ stdenv.mkDerivation { "--with-posix-fallocate" ]; - passthru.tests = { - inherit (nixosTests) rtorrent; + passthru = { + updateScript = unstableGitUpdater { tagPrefix = "v"; }; + tests = { + inherit (nixosTests) rtorrent; + }; }; enableParallelBuilding = true; From 0937f85d8f8206e9a4173cfb899214734f3ec34a Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:10:54 -0300 Subject: [PATCH 061/300] rtorrent: 0.9.8+date=2022-06-20 -> 0.9.8-unstable-2023-03-16 --- .../networking/p2p/rakshasa-rtorrent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index 81c9d7abb197..da15557b9ec1 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation { pname = "rakshasa-rtorrent"; - version = "0.9.8+date=2022-06-20"; + version = "0.9.8-unstable-2023-03-16"; src = fetchFromGitHub { owner = "rakshasa"; repo = "rtorrent"; - rev = "92bec88d0904bfb31c808085c2fd0f22d0ec8db7"; - hash = "sha256-er7UdIb+flhq0ye76UmomgfHV2ZSBROpXmfrNDHwTWw="; + rev = "1da0e3476dcabbf74b2e836d6b4c37b4d96bde09"; + hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ="; }; passthru = { From 88dd45844f5bf582050e2e3ce007729c964b9396 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:11:40 -0300 Subject: [PATCH 062/300] rtorrent: add thiagokokada as maintainer --- pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index da15557b9ec1..f55c989eee6d 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; platforms = platforms.unix; mainProgram = "rtorrent"; }; From 2293f663f8fc74f6b2f4b1807e69cd3c3e93e2ff Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 11:36:35 -0300 Subject: [PATCH 063/300] rtorrent: move to pkgs/by-name --- .../default.nix => by-name/rt/rtorrent/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/p2p/rakshasa-rtorrent/default.nix => by-name/rt/rtorrent/package.nix} (100%) diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/by-name/rt/rtorrent/package.nix similarity index 100% rename from pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix rename to pkgs/by-name/rt/rtorrent/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15392b74df88..9e4517c9247c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10210,8 +10210,6 @@ with pkgs; libnids = callPackage ../tools/networking/libnids { }; - rtorrent = callPackage ../applications/networking/p2p/rakshasa-rtorrent { }; - jesec-rtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent { libtorrent = callPackage ../applications/networking/p2p/jesec-rtorrent/libtorrent.nix { }; }; From 1622a46318041a0cce995a1eea6976396af0556c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 25 Jun 2024 16:56:23 +0200 Subject: [PATCH 064/300] knot-dns: 3.3.6 -> 3.3.7 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.7 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index fa7b53382c89..d9d6b2fd57b8 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.6"; + version = "3.3.7"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "c81801e9d6c64c97777cacf47e260f46f37799180d906457a53a9f13dd0f9987"; + sha256 = "18ceb398578342e9a3d5b75f2423945a2f8d1d7c730f24f4d2aa4a24b50e831d"; }; outputs = [ "bin" "out" "dev" ]; From 0a810aaaaf28e1f333a83f2bfe00b8f5c45ddc15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 16:32:00 +0000 Subject: [PATCH 065/300] werf: 2.6.1 -> 2.6.2 --- pkgs/by-name/we/werf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix index 0e9e45603f70..35d1773bec88 100644 --- a/pkgs/by-name/we/werf/package.nix +++ b/pkgs/by-name/we/werf/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "werf"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-10RyCVF1w5xj/qhFXQTlyrt9HG/4di2fUwUtDHU6t44="; + hash = "sha256-jZNypjCmMlDAthoLJiV/82vUbugGi4vP5SNZbasG7YE="; }; - vendorHash = "sha256-d1Dn+JN8tiBVx7YDbtvLW0YgIW2ENrEdx4gKatYy1hw="; + vendorHash = "sha256-x64PKLLkvHKW6lbxWSfAQ5xVy6JpGbCAslfz1seUQ2g="; proxyVendor = true; From 9b7e9479379e9b45ab9a495e174545ec94e99941 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 25 Jun 2024 19:30:14 +0200 Subject: [PATCH 066/300] pinocchio: deactivate one failing test --- pkgs/development/libraries/pinocchio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 9432722647ca..325d8f48388e 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4="; }; - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 - prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + prePatch = '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" ''; From 844d9a170d670bb97d49cc7d4c77288cad1c7d81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 17:37:57 +0000 Subject: [PATCH 067/300] btrfs-progs: 6.9 -> 6.9.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index df328c942a1e..e3fae05fe01e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "6.9"; + version = "6.9.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-fhSl1ZfzI919G0U+Ok5mGn6fB+oGDvv/T3b/gxWRfeg="; + hash = "sha256-7VSz1w0MfBHaBCipz6WoHLguYzFkx7pXz2cU+LaUGLo="; }; nativeBuildInputs = [ From 273ed5610c9effcad8a841d28a6c140f82a00122 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 16:17:25 -0300 Subject: [PATCH 068/300] rtorrent: remove nested usage of with --- pkgs/by-name/rt/rtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index f55c989eee6d..86844faa293d 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -70,12 +70,12 @@ stdenv.mkDerivation { mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc ''; - meta = with lib; { + meta = { homepage = "https://rakshasa.github.io/rtorrent/"; description = "Ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; mainProgram = "rtorrent"; }; } From a8a382d77c890e58fffccc61d538f5b38499b16f Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Tue, 25 Jun 2024 16:18:06 -0300 Subject: [PATCH 069/300] libtorrent: remove nested usage of with --- pkgs/by-name/li/libtorrent/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix index 0d640fbfe803..04de15c9674d 100644 --- a/pkgs/by-name/li/libtorrent/package.nix +++ b/pkgs/by-name/li/libtorrent/package.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = with lib; { + meta = { homepage = "https://github.com/rakshasa/libtorrent"; description = "BitTorrent library written in C++ for *nix, with focus on high performance and good code"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ ebzzry codyopel thiagokokada ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ebzzry codyopel thiagokokada ]; + platforms = lib.platforms.unix; }; } From 6e7d689716904062a8f6a6cc88d2e3b6d5770c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 19:25:46 +0000 Subject: [PATCH 070/300] openvas-scanner: 23.4.1 -> 23.5.0 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 3b75b44a6ef8..53b6d621e0db 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.4.1"; + version = "23.5.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-D0HQ00NCep0hAQ+dDWoinIxivloqgjPbp2lUunTxoyM="; + hash = "sha256-bAQFMYHE9nozmfRILFAswN9y0DxnX8LK2E6c3yqzWlA="; }; nativeBuildInputs = [ From 05d09a6da3465c7073e1c99d4e02d05fbd4f8df5 Mon Sep 17 00:00:00 2001 From: Elliot Cameron Date: Tue, 25 Jun 2024 15:34:02 -0400 Subject: [PATCH 071/300] google-cloud-sdk/components: use fetchurl instead of builtins.fetchurl These URLs don't need to be fetched at evaluation time. This change speeds up evaluation considerably for these components and allows them to be used in Hydra. --- pkgs/tools/admin/google-cloud-sdk/components.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.nix b/pkgs/tools/admin/google-cloud-sdk/components.nix index 2b25d65a7f27..f63b5049e201 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.nix +++ b/pkgs/tools/admin/google-cloud-sdk/components.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchurl , system , snapshotPath , autoPatchelfHook @@ -137,7 +138,7 @@ let inherit pname version snapshot; src = lib.optionalString (src != "") - (builtins.fetchurl + (fetchurl { url = src; inherit sha256; From b8a8175af07e8c319fad8972994b2cbc138af733 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:19:10 +0530 Subject: [PATCH 072/300] hyprland-plugins: 0.41.1 -> 0.41.2 --- .../hyprwm/hyprland-plugins/hyprland-plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 8ae5348e997c..16de4e42e543 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -14,13 +14,13 @@ let mkHyprlandPlugin, }: let - version = "0.41.1"; + version = "0.41.2"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; - rev = "v${version}"; - hash = "sha256-Bw3JRBUZg2kmDwxa/UHvD//gGcNjbftTj2MSeLvx1q8="; + rev = "refs/tags/v${version}"; + hash = "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA="; }; in mkHyprlandPlugin hyprland { From c1f644a8570b6c1748c7e32627b57bd2258def13 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:20:59 +0530 Subject: [PATCH 073/300] hyprlandPlugins.hy3: 0.41.1 -> 0.41.2 --- .../window-managers/hyprwm/hyprland-plugins/hy3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index acb4aa2d322c..a1708fb0a506 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -7,13 +7,13 @@ }: mkHyprlandPlugin hyprland rec { pluginName = "hy3"; - version = "0.41.1"; + version = "0.41.2"; src = fetchFromGitHub { owner = "outfoxxed"; repo = "hy3"; - rev = "hl${version}"; - hash = "sha256-bRLI+zgfT31LCMW4Pf701ZZx2oFeXoBu1BfYQjX6MPc="; + rev = "refs/tags/hl${version}"; + hash = "sha256-aZuNKBwTwj8EXkDBMWNdRKbHPx647wJLWm55h6jOKbo="; }; nativeBuildInputs = [ cmake ]; From e60665293aaf5bb6d33bc00cd3a160fee0eaeb13 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Wed, 26 Jun 2024 01:23:50 +0530 Subject: [PATCH 074/300] hyprland, hyprlandPlugins: add johnrtitor as maintainer I am willing to merge and review PRs of hyprland related packages --- .../window-managers/hyprwm/hyprland-plugins/hy3.nix | 5 ++++- .../hyprwm/hyprland-plugins/hyprland-plugins.nix | 5 ++++- pkgs/by-name/hy/hyprland/package.nix | 3 ++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix index a1708fb0a506..bd4422cb33fb 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hy3.nix @@ -25,6 +25,9 @@ mkHyprlandPlugin hyprland rec { description = "Hyprland plugin for an i3 / sway like manual tiling layout"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ aacebedo ]; + maintainers = with lib.maintainers; [ + aacebedo + johnrtitor + ]; }; } diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 16de4e42e543..b3bd59f7b525 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -33,7 +33,10 @@ let homepage = "https://github.com/hyprwm/hyprland-plugins"; description = "Hyprland ${description} plugin"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ fufexan ]; + maintainers = with lib.maintainers; [ + fufexan + johnrtitor + ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 1044cf3ccb8d..97b54ffdbf15 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -186,8 +186,9 @@ stdenv.mkDerivation (finalAttrs: { description = "Dynamic tiling Wayland compositor that doesn't sacrifice on its looks"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ - wozeparrot fufexan + johnrtitor + wozeparrot ]; mainProgram = "Hyprland"; platforms = lib.platforms.linux; From 8f28c1853d1f47de86bcb2e6546f8e3d6a77cdfb Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 25 Jun 2024 22:08:55 +0200 Subject: [PATCH 075/300] protobuf_27: 27.1 -> 27.2 Diff: https://github.com/protocolbuffers/protobuf/compare/v27.1...v27.2 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v27.2 --- pkgs/development/libraries/protobuf/27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/27.nix b/pkgs/development/libraries/protobuf/27.nix index 0f256c5c783a..03336c2a0b14 100644 --- a/pkgs/development/libraries/protobuf/27.nix +++ b/pkgs/development/libraries/protobuf/27.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix ({ - version = "27.1"; - hash = "sha256-9XOcjNm4k4VhQ/XagcVO2tXxp6bBdyuvrS7sNGy4wG0="; + version = "27.2"; + hash = "sha256-9avetEoB51WblGRy/7FTmhCb06Vi1JfwWv2dxJvna2U="; } // args) From b0d2f902e5c2fac0832ec5b4a1d6141316aa65e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 20:09:50 +0000 Subject: [PATCH 076/300] python311Packages.weaviate-client: 4.6.3 -> 4.6.5 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index d9916af5069d..adc385ebd2a4 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.3"; + version = "4.6.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-v8I0ovH99q5uYlnbZsQYgL9mg3n9i59W2n6/d9IiKyQ="; + hash = "sha256-mlM3fzjKwWvIfqH3LxAiRL3MgqT6RbMuAUzzEwLhlZs="; }; pythonRelaxDeps = [ From 5c3f56c32a4c0897b88db692866ec2575332adc5 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Tue, 25 Jun 2024 00:15:29 +1000 Subject: [PATCH 077/300] doc: Update note under `buildDotnetModule` to reflect actual behaviour --- doc/languages-frameworks/dotnet.section.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 7466c8cdc228..350cf33200bd 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -142,9 +142,7 @@ in buildDotnetModule rec { src = ./.; projectFile = "src/project.sln"; - # File generated with `nix-build -A package.passthru.fetch-deps`. - # To run fetch-deps when this file does not yet exist, set nugetDeps to null - nugetDeps = ./deps.nix; + nugetDeps = ./deps.nix; # see "Generating and updating NuGet dependencies" section for details projectReferences = [ referencedProject ]; # `referencedProject` must contain `nupkg` in the folder structure. @@ -220,6 +218,12 @@ buildDotnetGlobalTool { ``` ## Generating and updating NuGet dependencies {#generating-and-updating-nuget-dependencies} +When writing a new expression, you can use the generated `fetch-deps` script to initialise the lockfile. +After creating a blank `deps.nix` and pointing `nugetDeps` to it, +build the script with `nix-build -A package.fetch-deps` and then run the result. +(When the root attr is your package, it's simply `nix-build -A fetch-deps`.) + +There is also a manual method: First, restore the packages to the `out` directory, ensure you have cloned the upstream repository and you are inside it. @@ -255,6 +259,5 @@ Finally, you move the `deps.nix` file to the appropriate location to be used by If you ever need to update the dependencies of a package, you instead do * `nix-build -A package.fetch-deps` to generate the update script for `package` -* Run `./result deps.nix` to regenerate the lockfile to `deps.nix`, keep in mind if a location isn't provided, it will write to a temporary path instead -* Finally, move the file where needed and look at its contents to confirm it has updated the dependencies. - +* Run `./result` to regenerate the lockfile to the path passed for `nugetDeps` (keep in mind if it can't be resolved to a local path, the script will write to `$1` or a temporary path instead) +* Finally, ensure the correct file was written and the derivation can be built. From d9cea410c2279f01ee45112b1a7a3d16d27c13ac Mon Sep 17 00:00:00 2001 From: 0x61nas Date: Tue, 25 Jun 2024 21:38:41 +0300 Subject: [PATCH 078/300] rustmission: init at 0.3.3 --- pkgs/by-name/ru/rustmission/package.nix | 44 +++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/ru/rustmission/package.nix diff --git a/pkgs/by-name/ru/rustmission/package.nix b/pkgs/by-name/ru/rustmission/package.nix new file mode 100644 index 000000000000..1c1920e22d1d --- /dev/null +++ b/pkgs/by-name/ru/rustmission/package.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +, stdenv +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "rustmission"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "intuis"; + repo = "rustmission"; + rev = "v${version}"; + hash = "sha256-OOewobyfJYnspeXFYzTP7SLrNQRnDl0jv81TJjQAdUE="; + }; + + cargoHash = "sha256-dLddB+YA1uC8CVMVI1aVo1oMufxRupW26hGkb8796Ek="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + # There is no tests + doCheck = false; + + meta = { + description = "A TUI for the Transmission daemon"; + homepage = "https://github.com/intuis/rustmission"; + changelog = "https://github.com/intuis/rustmission/releases/tag/v${version}"; + license = lib.licenses.gpl3Only; + mainProgram = "rustmission"; + maintainers = with lib.maintainers; [ anas ]; + platforms = with lib.platforms; unix ++ windows; + }; +} From ccf18649f7b8d9291d830391728e3849fefb2b91 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 12 Jun 2024 11:15:00 +0200 Subject: [PATCH 079/300] chickenPackages.chickenEggs: update --- .../development/compilers/chicken/5/deps.toml | 161 ++++++++++-------- 1 file changed, 91 insertions(+), 70 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 743da0b0cfe4..bbc256db52dd 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -2,9 +2,9 @@ [7off] dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"] license = "agpl" -sha256 = "0hsqxva92k3yasrlgl7bbq3z3d2d2nd3r3i2v6vimv7mp2chfkdr" +sha256 = "06nzh23bpf9f011wr5sxqnq4nb1b7af6148qz52ri9hbb8r2mi4i" synopsis = "Markdown to Gemini text" -version = "1.31" +version = "1.32" [F-operator] dependencies = ["miscmacros", "datatype", "box"] @@ -79,9 +79,9 @@ version = "3.0.0" [amb] dependencies = ["srfi-1"] license = "bsd" -sha256 = "0ggwmsd4igg099ikn5qja5nkqmrnsw0byyk3q9y04ygvzalqyb36" +sha256 = "0n2wbxb23fai27hgk86jf9lnnrg0dvh989ysjkscdf9my96j448s" synopsis = "The non-deterministic backtracking ambivalence operator" -version = "3.0.9" +version = "3.0.10" [amqp] dependencies = ["bitstring", "mailbox", "srfi-18", "uri-generic"] @@ -105,18 +105,18 @@ synopsis = "Procedures to generate ANSI escape sequences" version = "0.6" [apropos] -dependencies = ["srfi-1", "utf8", "string-utils", "symbol-utils", "check-errors"] +dependencies = ["utf8", "srfi-1", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "01zdifhqc0jfm810106sh87w0fmpchf4dph0k8v1lyjzbj1ivmi4" +sha256 = "01h8fpz32bc3c9ldyamawvj7jf2b4b10zz08a22i90ww5lyvn90s" synopsis = "CHICKEN apropos" -version = "3.8.3" +version = "3.10.2" [arcadedb] -dependencies = ["uri-common", "medea"] +dependencies = ["medea"] license = "zlib-acknowledgement" -sha256 = "1w2iqylz0wfn7is8vss5dkwmi3pxhbh2h7ywzg39x45z2c91sd28" +sha256 = "1lhagnaxwvzax82k7qg8v5w7wj9mqi4y686j52fqiqnry99h73k0" synopsis = "An ArcadeDB database driver for CHICKEN Scheme." -version = "0.7" +version = "0.8" [args] dependencies = ["srfi-1", "srfi-13", "srfi-37"] @@ -289,9 +289,9 @@ version = "1.37" [bitwise-utils] dependencies = [] license = "public-domain" -sha256 = "065q6ha8wsj6qhg7zxkaj2qrj5sm3iz2v7shcp5wh7j3fqwbs5q5" +sha256 = "1p433kx2q1zam5a2isgnxiywgkcb77bmbqlajpr7rvm5i739h8g7" synopsis = "Bitwise utilities" -version = "1.3.0" +version = "1.3.1" [blas] dependencies = ["bind", "compile-file", "srfi-13"] @@ -352,16 +352,16 @@ version = "0.11" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] license = "bsd-1-clause" -sha256 = "0ycm95vcf1dj6m3kqii7b2a5kxyd1m6lzksz77ispay14srgw8rd" +sha256 = "1wzcqbccngcajzw4js7llys1pnmnvsmkk01v1ji6khy4kyghvspl" synopsis = "Hodge podge of macros and combinators" -version = "1.95" +version = "1.97" [brev] dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"] license = "public-domain" -sha256 = "1kbphbz21rlrsfcfqg77hm1vv7wh9z1gcwh5lb2hlrqp2yl7m7yc" +sha256 = "0gzbhyv228a76cnnisn7cqyhjsrphxn0bavxisg9rd40ndggijka" synopsis = "A huge pile of batteries and shortcuts" -version = "1.41" +version = "1.42" [byte-blob] dependencies = ["srfi-1"] @@ -422,9 +422,9 @@ version = "0.4" [check-errors] dependencies = [] license = "bsd" -sha256 = "09ffyffrv3gamjsjgbisn3yxb40wbqy5pfrs6dxw20n1ffimgfw5" +sha256 = "1xgchkpcmk7cwvbr87xmmwnw7z9ah8r8p6hv7kdkpjy66bas0yhj" synopsis = "Argument checks & errors" -version = "3.8.0" +version = "3.8.2" [checks] dependencies = ["simple-exceptions"] @@ -499,9 +499,9 @@ version = "5.0.3" [ck-macros] dependencies = [] license = "public-domain" -sha256 = "1x2d1f0fnzz5h871qgw4hkdffhd7rv7w59lq7r1y0r0jzl2rv83j" +sha256 = "1xry5blp0vjmxidp47f9i8axji2q5f7csjkqi0n1gdwkm54755jz" synopsis = "Composable macros based on the CK abstract machine" -version = "0.3.0" +version = "0.3.1" [clojurian] dependencies = ["srfi-18"] @@ -735,11 +735,11 @@ synopsis = "Directed graph in adjacency list format." version = "2.0" [directory-utils] -dependencies = ["srfi-1", "srfi-13", "miscmacros", "moremacros", "list-utils", "stack", "check-errors"] +dependencies = ["srfi-1", "utf8", "miscmacros", "moremacros", "stack", "list-utils", "check-errors"] license = "bsd" -sha256 = "0jaj7pi27d65wz1zpfxiphkdnk4an5yahhhxs28svsqprq0v0ay1" +sha256 = "0xiga98dddi5vg5h1m2vws5prk4ri96rx6l359lji62aq51h526i" synopsis = "directory-utils" -version = "2.2.6" +version = "2.3.0" [disjoint-set] dependencies = [] @@ -1078,11 +1078,11 @@ synopsis = "Chicken bindings to genann - a simple neural network library in ANSI version = "0.2.2" [generalized-arrays] -dependencies = ["check-errors", "matchable", "srfi-133", "typed-records"] -license = "bsd3" -sha256 = "0d9n1njd1mrcpqz8xim0m5x0yz94b8xyvwzyvsfq4l7q3km44v3k" -synopsis = "An implementation providing generalized arrays and storage classes for CHICKEN Scheme." -version = "0.0.7" +dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-160", "check-errors", "transducers"] +license = "bsd-3" +sha256 = "1ypga6lanhqsm8lpgk6s1nj4q024xb9kl9ar58cwj53h1irn7942" +synopsis = "Provides generalized arrays, intervals, and storage classes for CHICKEN Scheme." +version = "2.0.0" [generics] dependencies = ["simple-cells"] @@ -1108,9 +1108,9 @@ version = "1.21" [getopt-utils] dependencies = ["utf8", "srfi-1", "getopt-long"] license = "bsd" -sha256 = "0i17fj29zbbm05x68h7fy524ypk8vbr62gq6jkrwf18371l0l767" +sha256 = "1992zcps7gghhc9l7sfkglmf2rqgwvw6jz39k7q9mbs690chq1l1" synopsis = "Utilities for getopt-long" -version = "1.1.1" +version = "1.2.0" [git] dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"] @@ -1409,9 +1409,9 @@ version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] license = "unlicense" -sha256 = "1mw6z3piddy9xz494kv0243jhhirlb1dp15dph2p1ks4bhipbr4m" +sha256 = "1ghsqdnw73xz9pbl6d7j38qgs066wsy1y6q9l0ardbqkmkibwyr8" synopsis = "IPFS HTTP API for Scheme" -version = "0.0.13" +version = "0.0.15" [irc] dependencies = ["matchable", "regex", "srfi-1"] @@ -1542,9 +1542,9 @@ version = "1.2" [levenshtein] dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"] license = "bsd" -sha256 = "07jwz006c6yhibg7d9nb35rif04810820pss5mg7c7mbn2nzmq1q" +sha256 = "1q09kml6igd010j630m52rg7vayfsab176k3vjcsjn7ccf3i7a31" synopsis = "Levenshtein edit distance" -version = "2.4.0" +version = "2.4.1" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1703,9 +1703,16 @@ version = "2.8" [matchable] dependencies = [] license = "public-domain" -sha256 = "0bizkac4a926lbk0v2m05ysq359mzhfsqh973m72jc4gcj4azr5p" +sha256 = "1c7c61wivhn8qrj5rfivr2f0ffjgl4ccd6chk9p705rynjiv7pw0" synopsis = "Hygienic MATCH replacement" -version = "1.1" +version = "1.2" + +[math-utils] +dependencies = [] +license = "public-domain" +sha256 = "1jcr67q4pq7i34lkhbqml18rkv6w61wsqclp9k1xgvg6p2b0aaxj" +synopsis = "Miscellaneous math utilities" +version = "1.0.6" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1717,9 +1724,9 @@ version = "0.3.4" [mathh] dependencies = [] license = "public-domain" -sha256 = "1zdm58a950vslyjkw4w04c70vhjwf5bdxw79mp3cq65ik474gi8d" -synopsis = "ISO C math functions, miscellaneous math utilities, and constants" -version = "4.6.4" +sha256 = "1mf9aqjwp068a93fmkm29f5mawc15nizm8wwvfra1af7y4f434al" +synopsis = "ISO C math functions and constants" +version = "4.7.0" [matrico] dependencies = [] @@ -1780,9 +1787,9 @@ version = "4.3.8" [message-digest-type] dependencies = ["blob-utils", "string-utils", "message-digest-primitive", "check-errors"] license = "bsd" -sha256 = "0njvcflhafs5pqvhnm31alp66v1szg2y08fdlwnwq2bzzpaq83id" +sha256 = "15cp3km0lv4s28yq0ynabqmd902325692xyq2hmsv0n68j5jckdz" synopsis = "Message Digest Type" -version = "4.3.5" +version = "4.3.6" [message-digest-utils] dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] @@ -1878,16 +1885,16 @@ version = "4.0.1" [moremacros] dependencies = ["srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "09kc4wmhwkdhspk8g0i357qdq9mp1xcalgnqi8z9yasfy2k6gk1h" +sha256 = "0xwrsak9r77gyq85jhqj1hwjpmv897d8mgzqhw1q7br2clry44sk" synopsis = "More miscellaneous macros" -version = "2.5.0" +version = "2.5.3" [mosquitto] dependencies = ["srfi-1"] license = "mit" -sha256 = "0v03hljm71hl6xr1pffzcpk2izil9w2sp9k68a7iirvpcvqg9iph" +sha256 = "1pdhks3wii43l5wbmqich93zk6vy0b62h8qhv1k2wd8llv33gx6r" synopsis = "Bindings to mosquitto MQTT client library" -version = "0.1.3" +version = "0.1.4" [mpd-client] dependencies = ["regex", "srfi-1"] @@ -1969,9 +1976,9 @@ version = "5.0.8" [number-limits] dependencies = [] license = "bsd" -sha256 = "02nz5sicimp6bmka9lcbafpf7v8xxp3sml47s85wccmr0rky575q" +sha256 = "134958zarw74yrxn97sixmm987b047p7izppc0cxx9rlviq145hd" synopsis = "Limit constants for numbers" -version = "3.0.3" +version = "3.0.8" [oauth] dependencies = ["srfi-1", "srfi-13", "uri-common", "intarweb", "http-client", "hmac", "sha1", "base64"] @@ -2148,6 +2155,13 @@ sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s" synopsis = "Bindings for PostgreSQL's C-api" version = "4.1.4" +[prefixes] +dependencies = ["tree-walkers"] +license = "bsd" +sha256 = "09xy34vz2w9ngi9z2yahv3fw5xiiy4xpdmf33zfvj46k7w5dahpn" +synopsis = "prefixing in er-macro-transformers made easy" +version = "1.0" + [premodules] dependencies = ["simple-tests"] license = "bsd" @@ -2200,9 +2214,9 @@ version = "3.0" [pstk] dependencies = ["srfi-1", "srfi-13"] license = "bsd" -sha256 = "11z0ssdrpyal1px6x5qwxyabxs4y2q7glbz7mnwq0i01imwv1c2v" +sha256 = "075w2kaljy08cx8z78pi3741is1fi63bfsfdy229gkfrbkzl8vpz" synopsis = "PS/Tk: Portable Scheme interface to Tk" -version = "1.4.0" +version = "1.4.1" [pthreads] dependencies = ["srfi-18"] @@ -2319,9 +2333,9 @@ version = "1.4" [redis] dependencies = ["r7rs", "srfi-34", "srfi-35", "srfi-69", "srfi-99", "srfi-113", "srfi-128", "srfi-133", "srfi-152", "srfi-158"] license = "bsd" -sha256 = "1z8pr6dgz652h14zn1vkdm3av48lifk4vf7jzacrq0f0k14i5bc2" +sha256 = "1p3q9216y0ddnghcy83h3xm0vi2qg17kv1v1xff2sfz4mzliy6qf" synopsis = "A Redis client library for Chicken Scheme" -version = "0.5" +version = "0.6" [regex-case] dependencies = ["regex"] @@ -2466,9 +2480,9 @@ version = "0.3.2" [scheme-indent] dependencies = ["srfi-1"] license = "bsd" -sha256 = "0brwmphr724shd32dcixsn9wz9zqrhg27g7rjbiz96885maj6nwf" +sha256 = "1jjgi0wwfk3bx8ayc09y09pxg9awdx5hm397gqhg6gvjbn3sm3in" synopsis = "A Scheme code indenter" -version = "0.5" +version = "0.6" [scheme2c-compatibility] dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"] @@ -2536,9 +2550,9 @@ version = "0.4.1" [semantic-version] dependencies = ["utf8", "srfi-1", "vector-lib", "srfi-69", "srfi-128", "record-variants"] license = "bsd" -sha256 = "02y7d0lpkrn77ypk2dx8nm70lpbszz5w2cy177s4gvy88dx5qgmq" +sha256 = "10wczj83664q09zxgcnf1zr96xds6dmfvn0gvw8cq4i269ppcv0j" synopsis = "Semantic Version Utilities" -version = "0.0.13" +version = "0.0.16" [sendfile] dependencies = ["memory-mapped-files"] @@ -2610,6 +2624,13 @@ sha256 = "0ck8mgs2alvsial3ay9638ia2kl4zs63x6rc480p24sxhil6klg8" synopsis = "An efficient and powerful lexer generator" version = "1.0" +[simple-binds] +dependencies = [] +license = "bsd" +sha256 = "0b5frz0zq5b87l4l5hhca318m0mjllw9zjacbyw0l2w39l48f77z" +synopsis = "Some simple destructuring bind macros" +version = "1.1" + [simple-cells] dependencies = ["checks"] license = "bsd" @@ -3124,9 +3145,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "1m2pyp5mv09inli9jq7fm9q55nhg2xwp50f7s6cgndpp2w2kb38v" +sha256 = "0vqwg2sknm7fm677npbjdvhcfa2s6l41sgvhkk11m10b8jgnr1b3" synopsis = "Time Data Types and Procedures" -version = "4.9.5" +version = "4.9.6" [srfi-193] dependencies = [] @@ -3215,9 +3236,9 @@ version = "4.2.3" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "1pz31xrfja4y43ci5n8gplhdnasbyxx0kwlmcjzycs1js4b66ld1" +sha256 = "1jyjwkz6jz9da3n32cgja2dvwrsl9lckknxjb1ial0359ibqnc3h" synopsis = "Localization" -version = "3.0.8" +version = "3.0.11" [srfi-34] dependencies = [] @@ -3467,9 +3488,9 @@ version = "1.1" [string-utils] dependencies = ["utf8", "srfi-1", "srfi-13", "srfi-69", "miscmacros", "check-errors"] license = "bsd" -sha256 = "0f9m63flywcx7b6rhb7d562v26xilnxl0zcd8c6c4rfjsr0bdgjr" +sha256 = "1ilzdvbmmm7jnq4m3nrbxhj9x2b4d772748m9fjxzl9bqqik1a54" synopsis = "String Utilities" -version = "2.7.3" +version = "2.7.4" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] @@ -3551,9 +3572,9 @@ version = "1.0" [symbol-utils] dependencies = ["utf8"] license = "bsd" -sha256 = "0mxcdlf1i0xn70h9l5grgx1yvkbgq9rcvil02gdp9by5qqcqmklh" +sha256 = "1514yvgpknkiwjksnkcshqxz6c7sb5ab182lfwrrha3ch2islq3h" synopsis = "Symbol Utilities" -version = "2.5.0" +version = "2.6.0" [synch] dependencies = ["srfi-18", "check-errors"] @@ -3691,9 +3712,9 @@ version = "0.1.0" [toml] dependencies = ["r7rs", "rfc3339", "coops"] license = "mit" -sha256 = "10isk4rxcjabm16g59nxafm2vx0vidjq1alaxbih3gw9w2kc11l4" +sha256 = "0235ihy5y34m5nw1n75y84hs9icjls77w99c000ysm6ahlhqmq0x" synopsis = "A Chicken binding to read TOML configuration files" -version = "0.7" +version = "0.8" [topham] dependencies = ["http-client", "intarweb", "medea", "openssl", "optimism", "simple-exceptions", "srfi-1", "module-declarations"] @@ -3733,9 +3754,9 @@ version = "1.7" [tree-walkers] dependencies = [] license = "bsd" -sha256 = "1if8njjaac4i23126jlmzw67y7hcr2hs842nwsgyzi2hi780pzvk" -synopsis = "replacement of car, cdr and consorts" -version = "1.0" +sha256 = "0zsgrw8sxg3fc8z42ghjh47jq2ycwsmsgdw3kn7fbhvypz4yrmfy" +synopsis = "replacement of car, cdr and consorts and other tree- and\nlist-routines" +version = "2.0" [tree] dependencies = ["srfi-1", "srfi-42", "srfi-69", "srfi-71"] @@ -3978,9 +3999,9 @@ version = "0.2" [zshbrev] dependencies = ["brev"] license = "lgplv3" -sha256 = "1zmb84z22p8gv1bk05x7daqpl5h1z71hpivkyc1wbjfxyymmyaxj" +sha256 = "12angz4d31vir1ss80d2ghbh0bdqnbijn44j8hrnb31ikm7xg35z" synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken" -version = "1.21" +version = "1.22" [zstd] dependencies = [] From 0c3f3713208e4245fd69d4bd75cb1e11e8d717ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 21:48:31 +0000 Subject: [PATCH 080/300] cirrus-cli: 0.119.1 -> 0.120.1 --- .../tools/continuous-integration/cirrus-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index e50259bed236..9ccdad057b59 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.119.1"; + version = "0.120.1"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; + sha256 = "sha256-QHLg35Cv18DQleIcXTOGteesSWJ5jK4TayD3OLLrrAY="; }; vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; From 427e92acf35a775fa558ede87a15392ec57cb29e Mon Sep 17 00:00:00 2001 From: Tomodachi94 Date: Tue, 25 Jun 2024 15:24:34 -0700 Subject: [PATCH 081/300] nodePackages.vim-language-server: drop Replaced by the mainspace "vim-language-server", which was added in. https://github.com/NixOS/nixpkgs/pull/296847. Added an alias to the above. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..9b182a1bb7bd 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -160,6 +160,7 @@ mapAliases { triton = pkgs.triton; # Added 2023-05-06 typescript = pkgs.typescript; # Added 2023-06-21 inherit (pkgs) ungit; # added 2023-08-20 + inherit (pkgs) vim-language-server; # added 2024-06-25 inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30 vscode-langservers-extracted = pkgs.vscode-langservers-extracted; # Added 2023-05-27 vue-cli = self."@vue/cli"; # added 2023-08-18 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..c8fe6573dc4e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -267,7 +267,6 @@ , "vega-cli" , "vega-lite" , "vercel" -, "vim-language-server" , "vls" , "vscode-css-languageserver-bin" , "vscode-html-languageserver-bin" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..7f7049db4762 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -91825,24 +91825,6 @@ in bypassCache = true; reconstructLock = true; }; - vim-language-server = nodeEnv.buildNodePackage { - name = "vim-language-server"; - packageName = "vim-language-server"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vim-language-server/-/vim-language-server-2.3.1.tgz"; - sha512 = "Y9Zy3NKzfndLUfuZRrITkpfGvpL2K7hNPV8sJ1iB6mf1YRxIX3Hs6lwZimoD5pmvamUaOQhNGYMS/Ox9itzA4Q=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "vim language server"; - homepage = "https://github.com/iamcco/vim-language-server#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; vls = nodeEnv.buildNodePackage { name = "vls"; packageName = "vls"; From 0775dba689d1457380700e43480a69025d337c63 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 25 Jun 2024 15:48:52 -0700 Subject: [PATCH 082/300] python311Packages.pyreqwest-impersonate: fix Darwin builds --- .../python-modules/pyreqwest-impersonate/default.nix | 8 ++++++++ pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix index 39e57b633170..bdb4bb06c167 100644 --- a/pkgs/development/python-modules/pyreqwest-impersonate/default.nix +++ b/pkgs/development/python-modules/pyreqwest-impersonate/default.nix @@ -1,11 +1,14 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, rustPlatform, pytest, runCommand, boringssl, + libiconv, + SystemConfiguration, }: let @@ -41,6 +44,11 @@ buildPythonPackage rec { rustPlatform.maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + SystemConfiguration + ]; + env.BORING_BSSL_PATH = boringssl-wrapper; optional-dependencies = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 839d53a8d48c..1d833824a597 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10138,7 +10138,9 @@ self: super: with self; { pyrender = callPackage ../development/python-modules/pyrender { }; - pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { }; + pyreqwest-impersonate = callPackage ../development/python-modules/pyreqwest-impersonate { + inherit (pkgs.darwin.apple_sdk.frameworks) SystemConfiguration; + }; pyrevolve = callPackage ../development/python-modules/pyrevolve { }; From 537f976d1776fad6f00333798fdf351201a65e04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:01:08 +0000 Subject: [PATCH 083/300] fzf-make: 0.34.0 -> 0.35.0 --- pkgs/by-name/fz/fzf-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 5bc3552fcc36..ae8681bf1c05 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "fzf-make"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; rev = "v${version}"; - hash = "sha256-x+y0K6b/yCskowOuvjcSCJXM5ym2Qn84/Thui0ahUKU="; + hash = "sha256-hrPBuNCtwYOynv0JUcEq0lVZ9k3iVPNyn04l8zVbkN4="; }; - cargoHash = "sha256-cIoc3sGy33iTkVAln4oSYSBGB0iAFanv746upxnv0ZA="; + cargoHash = "sha256-O7rQp70ukw7LiC+m7rlqEGHVJw3Lo93WEmL3PFD7kBM="; nativeBuildInputs = [ makeBinaryWrapper ]; From f885ac2902b365d66c96b6d07c9a14c8ec5b05c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:14:13 +0000 Subject: [PATCH 084/300] ibus-engines.typing-booster-unwrapped: 2.25.9 -> 2.25.10 --- .../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 d0581164d663..1350ce8764c7 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.9"; + version = "2.25.10"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-dQifLJjgTKkFYBOJKxGXA1w97UBa0Bh56I6nRk0GVj0="; + hash = "sha256-6kcU6oOH75X/M1+fv3m+r05ffIFYrXrlNl8tB6K+B5I="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook3 gobject-introspection ]; From 09e0c8c23449337f2c18ebfa0d20b13cb998de4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:21:44 +0000 Subject: [PATCH 085/300] syft: 1.7.0 -> 1.8.0 --- pkgs/by-name/sy/syft/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix index e3c9cf532184..31402d58fa72 100644 --- a/pkgs/by-name/sy/syft/package.nix +++ b/pkgs/by-name/sy/syft/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "syft"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "anchore"; repo = "syft"; rev = "refs/tags/v${version}"; - hash = "sha256-fTqyFsFWSsVt2Thd15nlsmnNIhQSLAv9SaaaVJWto/8="; + hash = "sha256-S61O/JxVu60GS/T9jVBuebn+EFBwB5jiSEkKV/h/S+s="; # 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; @@ -28,7 +28,7 @@ buildGoModule rec { # hash mismatch with darwin proxyVendor = true; - vendorHash = "sha256-U4PZPUsfWCJB2YFJkirF8Q46pRmhKqzSnk7GpKOrfbU="; + vendorHash = "sha256-WSDbTI0U3Vqkfy8fxuqq9G5uBnBQ3421vyn6RriQx/U="; nativeBuildInputs = [ installShellFiles ]; From a99a4c2387c0eb34e644301d8c6687b698c56e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:23:36 +0000 Subject: [PATCH 086/300] telepresence2: 2.18.0 -> 2.19.0 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 35629c261f1e..8dfcf19e5274 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-zk6HyZfYeJecJgdMU3qnXIKDYuvnu5yjSZtVvKem4uI="; + hash = "sha256-hszaYU0bKd6gtQE57YaorAIZ4IKqoa2+PAgENUCBoVA="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-wvzrnwzkV4SXsiZfIrowMF0G7qFdjEVrF77vM81rxLs="; + vendorHash = "sha256-MMI44rfOk8BXxyxhb/OLKjwwe0Zc6UY3xkCbbBL4MS8="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From 01de659c3cd0f217aebea56ad545f1e38f1f6c16 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:29:17 +0000 Subject: [PATCH 087/300] uv: 0.2.13 -> 0.2.15 --- pkgs/by-name/uv/uv/Cargo.lock | 150 ++++++++++++++++++++------------- pkgs/by-name/uv/uv/package.nix | 6 +- 2 files changed, 95 insertions(+), 61 deletions(-) diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 174a1d9d682c..18313bd9b952 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -224,7 +224,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -391,6 +391,7 @@ name = "bench" version = "0.0.0" dependencies = [ "anyhow", + "chrono", "codspeed-criterion-compat", "criterion", "distribution-filename", @@ -579,9 +580,9 @@ dependencies = [ [[package]] name = "cargo-util" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e977de2867ec90a1654882ff95ca5849a526e893bab588f84664cfcdb11c0a" +checksum = "7b0ade8eec3675f2a0962c3b4c1e1d40f83a8005ed536091d98ed2440bba5254" dependencies = [ "anyhow", "core-foundation", @@ -754,7 +755,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1393,7 +1394,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1812,6 +1813,8 @@ dependencies = [ name = "install-wheel-rs" version = "0.0.1" dependencies = [ + "anyhow", + "assert_fs", "clap", "configparser", "csv", @@ -1828,7 +1831,7 @@ dependencies = [ "pypi-types", "reflink-copy", "regex", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -1982,9 +1985,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libmimalloc-sys" -version = "0.1.38" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -2138,14 +2141,14 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] name = "mimalloc" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -2488,7 +2491,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2535,7 +2538,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2571,7 +2574,7 @@ name = "platform-tags" version = "0.0.1" dependencies = [ "insta", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "thiserror", ] @@ -2693,12 +2696,12 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=a68cbd1a26e43986a31563e1d127e83bafca3a0c#a68cbd1a26e43986a31563e1d127e83bafca3a0c" +source = "git+https://github.com/astral-sh/pubgrub?rev=b4435e2f3af10dab2336a0345b35dcd622699d06#b4435e2f3af10dab2336a0345b35dcd622699d06" dependencies = [ "indexmap", "log", "priority-queue", - "rustc-hash", + "rustc-hash 1.1.0", "thiserror", ] @@ -2712,7 +2715,7 @@ dependencies = [ "indoc", "libc", "memoffset 0.9.1", - "parking_lot 0.11.2", + "parking_lot 0.12.3", "portable-atomic", "pyo3-build-config", "pyo3-ffi", @@ -2760,7 +2763,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2773,7 +2776,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -2809,7 +2812,7 @@ dependencies = [ "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "thiserror", "tokio", @@ -2825,7 +2828,7 @@ dependencies = [ "bytes", "rand", "ring", - "rustc-hash", + "rustc-hash 1.1.0", "rustls", "slab", "thiserror", @@ -3302,6 +3305,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" +[[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + [[package]] name = "rustix" version = "0.38.34" @@ -3431,7 +3440,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3492,7 +3501,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3503,7 +3512,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3734,9 +3743,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3832,7 +3841,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3843,7 +3852,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "test-case-core", ] @@ -3865,7 +3874,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3905,7 +3914,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4021,7 +4030,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4157,7 +4166,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4180,7 +4189,7 @@ dependencies = [ "fs-err", "itertools 0.12.1", "once_cell", - "rustc-hash", + "rustc-hash 1.1.0", "serde", "serde_json", "svg", @@ -4349,9 +4358,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -4418,7 +4427,7 @@ checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" [[package]] name = "uv" -version = "0.2.13" +version = "0.2.15" dependencies = [ "anstream", "anyhow", @@ -4429,7 +4438,6 @@ dependencies = [ "byteorder", "chrono", "clap", - "clap_complete_command", "distribution-types", "filetime", "flate2", @@ -4452,7 +4460,7 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "textwrap", @@ -4468,6 +4476,7 @@ dependencies = [ "url", "uv-auth", "uv-cache", + "uv-cli", "uv-client", "uv-configuration", "uv-dispatch", @@ -4524,7 +4533,7 @@ dependencies = [ "pep508_rs", "pypi-types", "regex", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "tempfile", @@ -4551,7 +4560,7 @@ dependencies = [ "nanoid", "pypi-types", "rmp-serde", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "tempfile", "tracing", @@ -4561,6 +4570,30 @@ dependencies = [ "walkdir", ] +[[package]] +name = "uv-cli" +version = "0.0.1" +dependencies = [ + "anstream", + "anyhow", + "clap", + "clap_complete_command", + "distribution-types", + "fs-err", + "insta", + "install-wheel-rs", + "serde", + "url", + "uv-cache", + "uv-configuration", + "uv-normalize", + "uv-resolver", + "uv-settings", + "uv-toolchain", + "uv-version", + "uv-warnings", +] + [[package]] name = "uv-client" version = "0.0.1" @@ -4621,7 +4654,7 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -4648,7 +4681,7 @@ dependencies = [ "pretty_assertions", "pypi-types", "resvg", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -4683,7 +4716,7 @@ dependencies = [ "install-wheel-rs", "itertools 0.13.0", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "tracing", "uv-build", "uv-cache", @@ -4721,7 +4754,7 @@ dependencies = [ "reqwest", "reqwest-middleware", "rmp-serde", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "tempfile", @@ -4755,7 +4788,7 @@ dependencies = [ "md-5", "pypi-types", "rayon", - "rustc-hash", + "rustc-hash 2.0.0", "sha2", "thiserror", "tokio", @@ -4820,7 +4853,7 @@ dependencies = [ "platform-tags", "pypi-types", "rayon", - "rustc-hash", + "rustc-hash 2.0.0", "same-file", "serde", "tempfile", @@ -4847,7 +4880,7 @@ name = "uv-macros" version = "0.0.1" dependencies = [ "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4876,7 +4909,7 @@ dependencies = [ "pep508_rs", "pypi-types", "requirements-txt", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "thiserror", "toml", @@ -4922,7 +4955,7 @@ dependencies = [ "pypi-types", "requirements-txt", "rkyv", - "rustc-hash", + "rustc-hash 2.0.0", "same-file", "schemars", "serde", @@ -4983,6 +5016,7 @@ dependencies = [ "anyhow", "assert_fs", "cache-key", + "clap", "configparser", "fs-err", "futures", @@ -5031,7 +5065,7 @@ dependencies = [ "pep440_rs", "pep508_rs", "pypi-types", - "rustc-hash", + "rustc-hash 2.0.0", "thiserror", "url", "uv-cache", @@ -5043,7 +5077,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.2.13" +version = "0.2.15" [[package]] name = "uv-virtualenv" @@ -5068,7 +5102,7 @@ dependencies = [ "anstream", "once_cell", "owo-colors", - "rustc-hash", + "rustc-hash 2.0.0", ] [[package]] @@ -5138,7 +5172,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -5172,7 +5206,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5336,7 +5370,7 @@ checksum = "12168c33176773b86799be25e2a2ba07c7aab9968b37541f1094dbd7a60c8946" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5347,7 +5381,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5358,7 +5392,7 @@ checksum = "9d8dc32e0095a7eeccebd0e3f09e9509365ecb3fc6ac4d6f5f14a3f6392942d1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5369,7 +5403,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index 5329a60df8b1..8590c1bee0e5 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -16,21 +16,21 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.2.13"; + version = "0.2.15"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-/YRmaPNTw3RsaB4bTb5UO0qXtRe2h1oD4Bav6VQ4W04="; + hash = "sha256-dHw08huVslrePcZvIXhui87bPGp5+CChiN+DtY7bLVw="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-Q5fMDJrQtob54CTII3+SXHeozy5S5s3iLOzntevdGOs="; - "pubgrub-0.2.1" = "sha256-i1Eaip4J5VXb66p1w0sRjP655AngBLEym70ChbAFFIc="; + "pubgrub-0.2.1" = "sha256-6tr+HATYSn1A1uVJwmz40S4yLDOJlX8vEokOOtdFG0M="; }; }; From 64c7cf7c3e5e71813f2ff34eb46bd47b6e019632 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:34:55 +0000 Subject: [PATCH 088/300] walker: 0.0.71 -> 0.0.72 --- pkgs/by-name/wa/walker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wa/walker/package.nix b/pkgs/by-name/wa/walker/package.nix index 8404948b0314..cb59b475f5dc 100644 --- a/pkgs/by-name/wa/walker/package.nix +++ b/pkgs/by-name/wa/walker/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "walker"; - version = "0.0.71"; + version = "0.0.72"; src = fetchFromGitHub { owner = "abenz1267"; repo = "walker"; rev = "v${version}"; - hash = "sha256-ShLwQBWhaoeHijiQCMO3n0DnhNaEd8GOrYMcli5EIZs="; + hash = "sha256-F100XVtWtY+yxGrMVCrkR/ayM2/aoko1ec0FFgNMhww="; }; vendorHash = "sha256-zDntJ695k8dbwyFXbg9PapWD335MHrWbep1xxzXNIL4="; From 11be616fc6e9ad05215e3848318c2ef0e118b198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 23:52:26 +0000 Subject: [PATCH 089/300] sftpgo: 2.6.1 -> 2.6.2 --- pkgs/servers/sftpgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index c57ef45b3a26..3a3b687459c8 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-LMZAEr0PVTpn4YY22Lz0IuJfRzvADybNExBrgb1qqQ8="; + hash = "sha256-76P4njY/Wb9l4LG+sZwiwQVrvfXCtAELju30GLi7kBE="; }; - vendorHash = "sha256-fhS6uq0uEtSBeWFjh4/HqXDcAsYyvp9jtxcDr+s+uAo="; + vendorHash = "sha256-gBb+qpNFSFhCOYLxXkz3xmyx+3PvyOwLNqjT9zZQuc8="; ldflags = [ "-s" From 5377ecc7a7afc0f0cd46268b1094dfc845615c44 Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Tue, 25 Jun 2024 15:02:25 -0400 Subject: [PATCH 090/300] nix-btm: init at 0.2.0 --- pkgs/by-name/ni/nix-btm/package.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 pkgs/by-name/ni/nix-btm/package.nix diff --git a/pkgs/by-name/ni/nix-btm/package.nix b/pkgs/by-name/ni/nix-btm/package.nix new file mode 100644 index 000000000000..42496a5bff03 --- /dev/null +++ b/pkgs/by-name/ni/nix-btm/package.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, rustPlatform, fetchCrate, darwin }: + +rustPlatform.buildRustPackage rec { + pname = "nix-btm"; + version = "0.2.0"; + + src = fetchCrate { + inherit version; + pname = "nix-btm"; + hash = "sha256-f8XFWlx+gwhF/OD8+tPcLGV/v0QnsDWOcqpY3Js+FAo="; + }; + + cargoHash = "sha256-qUZ3zJjQrteFQerBKFH/+Ys0uOzvI7DH9rCaVtseJMM="; + + buildInputs = lib.optionals stdenv.isDarwin + (with darwin.apple_sdk.frameworks; [ CoreServices SystemConfiguration ]); + + meta = with lib; { + description = "Rust tool to monitor Nix processes"; + homepage = "https://github.com/DieracDelta/nix-btm"; + license = licenses.mit; + maintainers = with maintainers; [ DieracDelta ]; + }; +} From 718545000ee22b64c6c907f28c648e852be0981a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Tue, 25 Jun 2024 17:12:22 -0700 Subject: [PATCH 091/300] bash-completion: add philiptaron as maintainer --- pkgs/shells/bash/bash-completion/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 3bdef89e722e..9e65dcd7c289 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ ]; + maintainers = with maintainers; [ philiptaron ]; }; } From 439ead441aaed0c87e671187a112833c5f4318d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:23:21 +0000 Subject: [PATCH 092/300] android-udev-rules: 20240221 -> 20240625 --- pkgs/os-specific/linux/android-udev-rules/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 5e3768447e28..6c890b075f17 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "android-udev-rules"; - version = "20240221"; + version = "20240625"; src = fetchFromGitHub { owner = "M0Rf30"; repo = "android-udev-rules"; rev = version; - hash = "sha256-Zbztl8ZFLS2UME8LtbahINKk6OUG5jo0O07awMXCPWY="; + hash = "sha256-SlUZElep8ZBkYl+5VPDESZ5sKwIQ+xa0+pB4WmJkNt8="; }; installPhase = '' From c2114f74ccec7d633dbf664f6d50b0b3898764e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:25:59 +0000 Subject: [PATCH 093/300] btcd: 0.24.0 -> 0.24.2 --- pkgs/applications/blockchains/btcd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/btcd/default.nix b/pkgs/applications/blockchains/btcd/default.nix index 85c8692a567d..75b14613b8ae 100644 --- a/pkgs/applications/blockchains/btcd/default.nix +++ b/pkgs/applications/blockchains/btcd/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "btcd"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "btcsuite"; repo = pname; rev = "v${version}"; - hash = "sha256-TLnJZW2CkvAqPTnJKfBY41siHtdZ+HRABsc+4vnQ9/w="; + hash = "sha256-83eiVYXpyiGgLmYxj3rFk4CHG7F9UQ3vk1ZHm64Cm4A="; }; - vendorHash = "sha256-quJEpSDltXhJcgI9H707p3HeLj1uuLzaMplT+YXzh/4="; + vendorHash = "sha256-ek+gaolwpwoEEWHKYpK2OxCpk/0vywF784J3CC0UCZ4="; subPackages = [ "." "cmd/*" ]; From e8f559ab64da4c977d0d8d258a8827cc6a7347fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:29:10 +0000 Subject: [PATCH 094/300] c2patool: 0.9.3 -> 0.9.4 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 247859ccf8e6..60e2bce7c149 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SVHz6Zwl4WOgwCYXtGfNJBmlnJUAWfe+NAkgnG/QC8A="; + sha256 = "sha256-GS3R1qqL9h7kVQQXl0GBsdWUI8rwtJvRW4Cfqp+VYNU="; }; - cargoHash = "sha256-+flZXxdN5mcmxMZeIV4J4wc+mYuGf5LuGAw4Kz/faak="; + cargoHash = "sha256-sdlHCPqLsgM1XG3lNfy+ET1xKCKVcdtRcvShxpBW8MQ="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From b422dafc896070297e0d5a038a52f58bc3c11eea Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 19 Sep 2023 12:28:30 +0300 Subject: [PATCH 095/300] nix-required-mounts: init --- nixos/modules/module-list.nix | 1 + .../modules/programs/nix-required-mounts.nix | 85 +++++++++++++ pkgs/by-name/ni/nix-required-mounts/main.py | 118 ++++++++++++++++++ .../ni/nix-required-mounts/package.nix | 57 +++++++++ .../ni/nix-required-mounts/pyproject.toml | 2 + 5 files changed, 263 insertions(+) create mode 100644 nixos/modules/programs/nix-required-mounts.nix create mode 100644 pkgs/by-name/ni/nix-required-mounts/main.py create mode 100644 pkgs/by-name/ni/nix-required-mounts/package.nix create mode 100644 pkgs/by-name/ni/nix-required-mounts/pyproject.toml diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a008c3c5bdea..b7747743f5a6 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -243,6 +243,7 @@ ./programs/nh.nix ./programs/nix-index.nix ./programs/nix-ld.nix + ./programs/nix-required-mounts.nix ./programs/nm-applet.nix ./programs/nncp.nix ./programs/noisetorch.nix diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix new file mode 100644 index 000000000000..72554dbc6cc5 --- /dev/null +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -0,0 +1,85 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.nix-required-mounts; + hook = + pkgs.nix-required-mounts.override { inherit (cfg) allowedPatterns; }; + + patternType = with lib.types; submodule ({ config, name, ... }: { + options.onFeatures = lib.mkOption { + type = listOf str; + description = "Which requiredSystemFeatures should trigger relaxation of the sandbox"; + default = [ name ]; + }; + options.paths = lib.mkOption { + type = listOf path; + description = "A list of glob patterns, indicating which paths to expose to the sandbox"; + }; + }); + + defaults = { + opengl.onFeatures = [ "opengl" ]; + opengl.paths = [ + "/dev/video*" + "/dev/dri" + + pkgs.addOpenGLRunpath.driverLink + # /run/opengl-driver/lib only contains symlinks + config.hardware.opengl.package + ] ++ config.hardware.opengl.extraPackages; + cuda.onFeatures = [ "cuda" ]; + cuda.paths = defaults.opengl.paths ++ [ "/dev/nvidia*" ]; + }; +in +{ + meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; + options.programs.nix-required-mounts = { + enable = lib.mkEnableOption + "Expose extra paths to the sandbox depending on derivations' requiredSystemFeatures"; + presets.opengl.enable = lib.mkOption { + type = lib.types.bool; + default = config.hardware.opengl.enable; + defaultText = lib.literalExpression "hardware.opengl.enable"; + description = '' + Expose OpenGL drivers to derivations marked with requiredSystemFeatures = [ "opengl" ] + ''; + }; + presets.cuda.enable = lib.mkEnableOption '' + Expose CUDA drivers and GPUs to derivations marked with requiredSystemFeatures = [ "cuda" ] + ''; + allowedPatterns = with lib.types; + lib.mkOption rec { + type = attrsOf patternType; + description = "The hook config, describing which paths to mount for which system features"; + default = { inherit (defaults) opengl; }; + defaultText = lib.literalExpression '' + { + opengl.paths = config.hardware.opengl.extraPackages ++ [ + config.hardware.opengl.package + pkgs.addOpenGLRunpath.driverLink + "/dev/video*" + "/dev/dri" + ]; + } + ''; + example.require-ipfs = [ "/ipfs" ]; + }; + }; + config = lib.mkIf cfg.enable (lib.mkMerge [ + { + nix.settings.pre-build-hook = lib.getExe hook; + } + (lib.mkIf cfg.presets.opengl.enable { + nix.settings.system-features = [ "opengl" ]; + programs.nix-required-mounts.allowedPatterns = { + inherit (defaults) opengl; + }; + }) + (lib.mkIf cfg.presets.cuda.enable { + nix.settings.system-features = [ "cuda" ]; + programs.nix-required-mounts.allowedPatterns = { + inherit (defaults) cuda; + }; + }) + ]); +} diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/main.py new file mode 100644 index 000000000000..50b670785054 --- /dev/null +++ b/pkgs/by-name/ni/nix-required-mounts/main.py @@ -0,0 +1,118 @@ +import glob +import json +import subprocess +import textwrap +from argparse import ArgumentParser +from itertools import chain +from pathlib import Path +from sys import stderr +from typing import List + +CONFIG = { + "nixExe": "nix", + "allowedPatterns": {}, +} + +parser = ArgumentParser("pre-build-hook") +parser.add_argument("derivation_path") +parser.add_argument("sandbox_path", nargs="?") +parser.add_argument( + "--issue-command", + choices=("always", "conditional", "never"), + default="conditional", + help="Whether to print extra-sandbox-paths", +) +parser.add_argument( + "--issue-stop", + choices=("always", "conditional", "never"), + default="conditional", + help="Whether to print the final empty line", +) + + +def symlink_parents(p: Path) -> List[Path]: + out = [] + while p.is_symlink() and p not in out: + p = p.readlink() + out.append(p) + return out + + +def entrypoint(): + if __name__ != "__main__": + return + + args = parser.parse_args() + drv_path = args.derivation_path + + if not Path(drv_path).exists(): + print( + f"[E] {drv_path} doesn't exist." + " This may happen with the remote builds." + " Exiting the hook", + file=stderr, + ) + + proc = subprocess.run( + [ + CONFIG["nixExe"], + "show-derivation", + drv_path, + ], + capture_output=True, + ) + try: + drv = json.loads(proc.stdout) + except json.JSONDecodeError: + print( + "[E] Couldn't parse the output of" + "`nix show-derivation`" + f". Expected JSON, observed: {proc.stdout}", + file=stderr, + ) + print( + textwrap.indent(proc.stdout.decode("utf8"), prefix=" " * 4), + file=stderr, + ) + print("[I] Exiting the nix-required-binds hook", file=stderr) + return + [canon_drv_path] = drv.keys() + + allowed_patterns = CONFIG["allowedPatterns"] + known_features = set( + chain.from_iterable( + pattern["onFeatures"] for pattern in allowed_patterns.values() + ) + ) + + drv_env = drv[canon_drv_path].get("env", {}) + features = drv_env.get("requiredSystemFeatures", []) + if isinstance(features, str): + features = features.split() + + features = list(filter(known_features.__contains__, features)) + + patterns = list(chain.from_iterable(allowed_patterns[f]["paths"] for f in features)) # noqa: E501 + + roots = sorted( + set(Path(path) for pattern in patterns for path in glob.glob(pattern)) + ) + + # the pre-build-hook command + if args.issue_command == "always" or ( + args.issue_command == "conditional" and roots + ): + print("extra-sandbox-paths") + + # arguments, one per line + for p in roots: + guest_path, host_path = p, p + print(f"{guest_path}={host_path}") + + # terminated by an empty line + something_to_terminate = args.issue_stop == "conditional" and roots + if args.issue_stop == "always" or something_to_terminate: + print() + + +entrypoint() diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix new file mode 100644 index 000000000000..cbac41addbc4 --- /dev/null +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -0,0 +1,57 @@ +{ addOpenGLRunpath +, cmake +, allowedPatterns ? rec { + opengl.onFeatures = [ "opengl" ]; + opengl.paths = [ + addOpenGLRunpath.driverLink + "/dev/video*" + "/dev/dri" + ]; + cuda.onFeatures = [ "cuda" ]; + cuda.paths = opengl.paths ++ [ + "/dev/nvidia*" + ]; + } +, buildPackages +, formats +, lib +, nix +, python3 +, runCommand +}: + + +let + confPath = (formats.pythonVars { }).generate "config.py" { + CONFIG = { + inherit allowedPatterns; + nixExe = lib.getExe nix; + }; + }; + pname = "nix-required-mounts"; +in + +runCommand pname +{ + inherit confPath; + meta.mainProgram = pname; +} '' + ${lib.getExe buildPackages.python3.pkgs.flake8} ${./main.py} + + cat > main.py << EOF + #!${lib.getExe python3} + + $(cat ${./main.py}) + EOF + + sed -ie ' + /^entrypoint()$/ { + x ; + r ${confPath} + }' main.py + + echo "entrypoint()" >> main.py + + mkdir -p $out/bin + install main.py $out/bin/${pname} +'' diff --git a/pkgs/by-name/ni/nix-required-mounts/pyproject.toml b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml new file mode 100644 index 000000000000..a8f43fefdf14 --- /dev/null +++ b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml @@ -0,0 +1,2 @@ +[tool.black] +line-length = 79 From 340b41815df042fd5e8153b3f8c7a495bbdaba5c Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 17 Oct 2023 15:25:17 +0300 Subject: [PATCH 096/300] nixosTests.nix-required-mounts: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/nix-required-mounts/default.nix | 44 +++++++++++++++++++ .../ensure-path-not-present.nix | 13 ++++++ .../test-require-feature.nix | 12 +++++ 4 files changed, 70 insertions(+) create mode 100644 nixos/tests/nix-required-mounts/default.nix create mode 100644 nixos/tests/nix-required-mounts/ensure-path-not-present.nix create mode 100644 nixos/tests/nix-required-mounts/test-require-feature.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 6b5ee429f9a2..a33247ba7dbc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -649,6 +649,7 @@ in { nix-config = handleTest ./nix-config.nix {}; nix-ld = handleTest ./nix-ld.nix {}; nix-misc = handleTest ./nix/misc.nix {}; + nix-required-mounts = runTest ./nix-required-mounts; nix-serve = handleTest ./nix-serve.nix {}; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix new file mode 100644 index 000000000000..ee6f7db5ee98 --- /dev/null +++ b/nixos/tests/nix-required-mounts/default.nix @@ -0,0 +1,44 @@ +{ pkgs +, ... +}: + +let + inherit (pkgs) lib; +in + +{ + name = "nix-required-mounts"; + meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; + nodes.machine = { config, pkgs, ... }: { + virtualisation.writableStore = true; + system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ]; + nix.nixPath = [ "nixpkgs=${../../..}" ]; + nix.settings.substituters = lib.mkForce [ ]; + nix.settings.system-features = [ "supported-feature" ]; nix.settings.experimental-features = [ "nix-command" ]; + programs.nix-required-mounts.enable = true; + programs.nix-required-mounts.allowedPatterns.supported-feature = { + onFeatures = [ "supported-feature" ]; + paths = [ "/supported-feature-files" ]; + }; + users.users.person.isNormalUser = true; + virtualisation.fileSystems."/supported-feature-files".fsType = "tmpfs"; + }; + testScript = '' + import shlex + + def person_do(cmd, succeed=True): + cmd = shlex.quote(cmd) + cmd = f"su person -l -c {cmd} &>/dev/console" + + if succeed: + return machine.succeed(cmd) + else: + return machine.fail(cmd) + + start_all() + + person_do("nix-build ${./ensure-path-not-present.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-require-feature.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-require-feature.nix} --argstr feature unsupported-feature", succeed=False) + ''; +} diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix new file mode 100644 index 000000000000..871f336ee9bd --- /dev/null +++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix @@ -0,0 +1,13 @@ +{ pkgs ? import { }, feature }: + +pkgs.runCommandNoCC "${feature}-not-present" +{ +} '' + if [[ -e /${feature}-files ]]; then + echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway" + exit 1 + else + touch $out + fi +'' + diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix new file mode 100644 index 000000000000..ddfd068b87fc --- /dev/null +++ b/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -0,0 +1,12 @@ +{ pkgs ? import { }, feature }: + +pkgs.runCommandNoCC "${feature}-present" +{ + requiredSystemFeatures = [ feature ]; +} '' + if [[ -e /${feature}-files ]]; then + touch $out + else + echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + fi +'' From b9299696abf06a56a5c00f24b343ded3fbed7932 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 16 Oct 2023 21:59:59 +0300 Subject: [PATCH 097/300] blender: add CUDA discovery test --- pkgs/applications/misc/blender/default.nix | 10 ++++++++++ pkgs/applications/misc/blender/test-cuda.py | 8 ++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/applications/misc/blender/test-cuda.py diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e54cae9e56a2..357bbbe0e6f6 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -372,6 +372,16 @@ stdenv.mkDerivation (finalAttrs: { --render-frame 1 done ''; + + cudaAvailable = runCommand + "blender-cuda-available" + { + nativeBuildInputs = [ finalAttrs.finalPackage ]; + requiredSystemFeatures = [ "cuda" ]; + } + '' + blender --background -noaudio --python-exit-code 1 --python ${./test-cuda.py} && touch $out + ''; }; }; diff --git a/pkgs/applications/misc/blender/test-cuda.py b/pkgs/applications/misc/blender/test-cuda.py new file mode 100644 index 000000000000..8a3ec5734759 --- /dev/null +++ b/pkgs/applications/misc/blender/test-cuda.py @@ -0,0 +1,8 @@ +import bpy + +preferences = bpy.context.preferences.addons["cycles"].preferences +devices = preferences.get_devices_for_type("CUDA") +ids = [d.id for d in devices] + +assert any("CUDA" in i for i in ids), f"CUDA not present in {ids}" +print("CUDA is available") From 7ed2cba5e8882c93516f71e3de2bf8a828ccdb06 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 20 Sep 2023 07:02:35 +0300 Subject: [PATCH 098/300] python3Packages.pynvml: add a gpu test --- .../python-modules/pynvml/default.nix | 4 ++++ .../python-modules/pynvml/test-gpu.nix | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/pynvml/test-gpu.nix diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index a115cd723998..e76913a63df4 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + callPackage, fetchFromGitHub, substituteAll, pythonOlder, @@ -50,6 +51,9 @@ buildPythonPackage rec { # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory doCheck = false; + passthru.tests.nvmlInit = callPackage ./test-gpu.nix { }; + + meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; homepage = "https://github.com/gpuopenanalytics/pynvml"; diff --git a/pkgs/development/python-modules/pynvml/test-gpu.nix b/pkgs/development/python-modules/pynvml/test-gpu.nix new file mode 100644 index 000000000000..c316d0b5094b --- /dev/null +++ b/pkgs/development/python-modules/pynvml/test-gpu.nix @@ -0,0 +1,23 @@ +{ runCommandNoCC +, python +}: + +runCommandNoCC "pynvml-gpu-test" +{ + nativeBuildInputs = [ + (python.withPackages (ps: [ ps.pynvml ])) + ]; + requiredSystemFeatures = [ + "cuda" + ]; +} '' + python3 << EOF + import pynvml + from pynvml.smi import nvidia_smi + + pynvml.nvmlInit() + EOF + + touch $out +'' + From f22b9da6b8e66b9b325cff5bab5f22b818f099b5 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 20 Sep 2023 07:14:07 +0300 Subject: [PATCH 099/300] python3Packages.torch{,-bin}: test torch.cuda.is_available() --- pkgs/development/python-modules/torch/bin.nix | 4 ++++ .../python-modules/torch/default.nix | 11 +++++++++- .../python-modules/torch/test-cuda.nix | 21 +++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/torch/test-cuda.nix diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index f9d5cd97c183..37170ea9adf4 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -8,6 +8,7 @@ pythonAtLeast, pythonOlder, addOpenGLRunpath, + callPackage, cudaPackages, future, numpy, @@ -15,6 +16,7 @@ pyyaml, requests, setuptools, + torch-bin, typing-extensions, sympy, jinja2, @@ -119,6 +121,8 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; + passthru.tests.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; + meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; homepage = "https://pytorch.org/"; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index d5d7e823bed7..671e76dfe02d 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -24,6 +24,10 @@ mpi, buildDocs ? false, + # tests.cudaAvailable: + callPackage, + torch, + # Native build inputs cmake, symlinkJoin, @@ -639,11 +643,16 @@ buildPythonPackage rec { rocmSupport rocmPackages ; + cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; # At least for 1.10.2 `torch.fft` is unavailable unless BLAS provider is MKL. This attribute allows for easy detection of its availability. blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - cudaCapabilities = if cudaSupport then supportedCudaCapabilities else [ ]; + } // lib.optionalAttrs cudaSupport { + + tests = lib.optionalAttrs cudaSupport { + cudaAvailable = callPackage ./test-cuda.nix { inherit torch; }; + }; }; meta = { diff --git a/pkgs/development/python-modules/torch/test-cuda.nix b/pkgs/development/python-modules/torch/test-cuda.nix new file mode 100644 index 000000000000..22d73eeb9167 --- /dev/null +++ b/pkgs/development/python-modules/torch/test-cuda.nix @@ -0,0 +1,21 @@ +{ runCommandNoCC +, python +, torch +}: + +runCommandNoCC "${torch.name}-gpu-test" +{ + nativeBuildInputs = [ + (python.withPackages (_: [ torch ])) + ]; + requiredSystemFeatures = [ + "cuda" + ]; +} '' + python3 << EOF + import torch + assert torch.cuda.is_available(), f"{torch.cuda.is_available()=}" + EOF + + touch $out +'' From 6859a2dabc356bc0d575e98c46a215fd83d31fb7 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 18 Oct 2023 12:44:59 +0300 Subject: [PATCH 100/300] nix-required-mounts: use wrappers instead of statically embedding config into the script --- pkgs/by-name/ni/nix-required-mounts/main.py | 36 ++++++++++++------- .../ni/nix-required-mounts/package.nix | 34 +++++++----------- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/main.py index 50b670785054..e8cbc70d4c52 100644 --- a/pkgs/by-name/ni/nix-required-mounts/main.py +++ b/pkgs/by-name/ni/nix-required-mounts/main.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 + import glob import json import subprocess @@ -6,16 +8,23 @@ from argparse import ArgumentParser from itertools import chain from pathlib import Path from sys import stderr -from typing import List +from typing import Dict, List, TypedDict + + +class Pattern(TypedDict): + onFeatures: List[str] + paths: List[str] # List of glob patterns + + +class HookConfig(TypedDict): + nixExe: str + allowedPatterns: Dict[str, Pattern] -CONFIG = { - "nixExe": "nix", - "allowedPatterns": {}, -} parser = ArgumentParser("pre-build-hook") parser.add_argument("derivation_path") parser.add_argument("sandbox_path", nargs="?") +parser.add_argument("--config", type=Path) parser.add_argument( "--issue-command", choices=("always", "conditional", "never"), @@ -39,12 +48,12 @@ def symlink_parents(p: Path) -> List[Path]: def entrypoint(): - if __name__ != "__main__": - return - args = parser.parse_args() drv_path = args.derivation_path + with open(args.config, "r") as f: + config = json.load(f) + if not Path(drv_path).exists(): print( f"[E] {drv_path} doesn't exist." @@ -55,7 +64,7 @@ def entrypoint(): proc = subprocess.run( [ - CONFIG["nixExe"], + config["nixExe"], "show-derivation", drv_path, ], @@ -78,7 +87,7 @@ def entrypoint(): return [canon_drv_path] = drv.keys() - allowed_patterns = CONFIG["allowedPatterns"] + allowed_patterns = config["allowedPatterns"] known_features = set( chain.from_iterable( pattern["onFeatures"] for pattern in allowed_patterns.values() @@ -92,7 +101,9 @@ def entrypoint(): features = list(filter(known_features.__contains__, features)) - patterns = list(chain.from_iterable(allowed_patterns[f]["paths"] for f in features)) # noqa: E501 + patterns = list( + chain.from_iterable(allowed_patterns[f]["paths"] for f in features) + ) # noqa: E501 roots = sorted( set(Path(path) for pattern in patterns for path in glob.glob(pattern)) @@ -115,4 +126,5 @@ def entrypoint(): print() -entrypoint() +if __name__ == "__main__": + entrypoint() diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index cbac41addbc4..c8cae067b24d 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -16,42 +16,32 @@ , formats , lib , nix -, python3 +, python3Packages +, makeWrapper , runCommand }: let - confPath = (formats.pythonVars { }).generate "config.py" { - CONFIG = { - inherit allowedPatterns; - nixExe = lib.getExe nix; - }; + confPath = (formats.json { }).generate "config.py" { + inherit allowedPatterns; + nixExe = lib.getExe nix; }; pname = "nix-required-mounts"; in runCommand pname { - inherit confPath; + nativeBuildInputs = [ + makeWrapper + python3Packages.wrapPython + ]; meta.mainProgram = pname; } '' ${lib.getExe buildPackages.python3.pkgs.flake8} ${./main.py} - cat > main.py << EOF - #!${lib.getExe python3} - - $(cat ${./main.py}) - EOF - - sed -ie ' - /^entrypoint()$/ { - x ; - r ${confPath} - }' main.py - - echo "entrypoint()" >> main.py - mkdir -p $out/bin - install main.py $out/bin/${pname} + install ${./main.py} $out/bin/${pname} + wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" + wrapPythonPrograms '' From 6662b099419d568a7d682e5b851f7f51b34cd589 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 19 Oct 2023 11:42:26 +0300 Subject: [PATCH 101/300] nix-required-mounts: handle __structuredAttrs --- nixos/tests/nix-required-mounts/default.nix | 5 ++++- .../test-structured-attrs-empty.nix | 10 ++++++++++ .../test-structured-attrs.nix | 15 +++++++++++++++ pkgs/by-name/ni/nix-required-mounts/main.py | 19 ++++++++++++------- 4 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix create mode 100644 nixos/tests/nix-required-mounts/test-structured-attrs.nix diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix index ee6f7db5ee98..4550e6ac50a2 100644 --- a/nixos/tests/nix-required-mounts/default.nix +++ b/nixos/tests/nix-required-mounts/default.nix @@ -14,7 +14,8 @@ in system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ]; nix.nixPath = [ "nixpkgs=${../../..}" ]; nix.settings.substituters = lib.mkForce [ ]; - nix.settings.system-features = [ "supported-feature" ]; nix.settings.experimental-features = [ "nix-command" ]; + nix.settings.system-features = [ "supported-feature" ]; + nix.settings.experimental-features = [ "nix-command" ]; programs.nix-required-mounts.enable = true; programs.nix-required-mounts.allowedPatterns.supported-feature = { onFeatures = [ "supported-feature" ]; @@ -40,5 +41,7 @@ in person_do("nix-build ${./ensure-path-not-present.nix} --argstr feature supported-feature") person_do("nix-build ${./test-require-feature.nix} --argstr feature supported-feature") person_do("nix-build ${./test-require-feature.nix} --argstr feature unsupported-feature", succeed=False) + person_do("nix-build ${./test-structured-attrs.nix} --argstr feature supported-feature") + person_do("nix-build ${./test-structured-attrs-empty.nix}") ''; } diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix new file mode 100644 index 000000000000..d788c6773c8e --- /dev/null +++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix @@ -0,0 +1,10 @@ +{ pkgs ? import { } }: + +pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" +{ + __structuredAttrs = true; +} '' + touch $out +'' + + diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix new file mode 100644 index 000000000000..fecd2c32eec0 --- /dev/null +++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix @@ -0,0 +1,15 @@ +{ pkgs ? import { }, feature }: + +pkgs.runCommandNoCC "${feature}-present-structured" +{ + __structuredAttrs = true; + requiredSystemFeatures = [ feature ]; +} '' + if [[ -e /${feature}-files ]]; then + touch $out + else + echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + echo "Do we fail to parse __structuredAttrs=true derivations?" >&2 + fi +'' + diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/main.py index e8cbc70d4c52..8e32483e8a4b 100644 --- a/pkgs/by-name/ni/nix-required-mounts/main.py +++ b/pkgs/by-name/ni/nix-required-mounts/main.py @@ -47,6 +47,13 @@ def symlink_parents(p: Path) -> List[Path]: return out +def get_strings(drv_env: dict, name: str) -> List[str]: + if "__json" in drv_env: + return list(json.loads(drv_env["__json"]).get(name, [])) + else: + return drv_env.get(name, "").split() + + def entrypoint(): args = parser.parse_args() drv_path = args.derivation_path @@ -71,7 +78,7 @@ def entrypoint(): capture_output=True, ) try: - drv = json.loads(proc.stdout) + parsed_drv = json.loads(proc.stdout) except json.JSONDecodeError: print( "[E] Couldn't parse the output of" @@ -85,7 +92,7 @@ def entrypoint(): ) print("[I] Exiting the nix-required-binds hook", file=stderr) return - [canon_drv_path] = drv.keys() + [canon_drv_path] = parsed_drv.keys() allowed_patterns = config["allowedPatterns"] known_features = set( @@ -94,11 +101,9 @@ def entrypoint(): ) ) - drv_env = drv[canon_drv_path].get("env", {}) - features = drv_env.get("requiredSystemFeatures", []) - if isinstance(features, str): - features = features.split() - + parsed_drv = parsed_drv[canon_drv_path] + drv_env = parsed_drv.get("env", {}) + features = get_strings(drv_env, "requiredSystemFeatures") features = list(filter(known_features.__contains__, features)) patterns = list( From 50d4382114e51386fda72c1983ed5c2c62c53ade Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 6 Nov 2023 16:44:14 +0000 Subject: [PATCH 102/300] programs.nix-required-mounts: inherit defaults from the package --- .../modules/programs/nix-required-mounts.nix | 66 ++++++++++--------- .../ni/nix-required-mounts/package.nix | 3 + 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 72554dbc6cc5..c2a81ff03bff 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -2,33 +2,39 @@ let cfg = config.programs.nix-required-mounts; - hook = - pkgs.nix-required-mounts.override { inherit (cfg) allowedPatterns; }; + package = pkgs.nix-required-mounts; + overridenPackage = package.override { inherit (cfg) allowedPatterns; }; - patternType = with lib.types; submodule ({ config, name, ... }: { - options.onFeatures = lib.mkOption { - type = listOf str; - description = "Which requiredSystemFeatures should trigger relaxation of the sandbox"; - default = [ name ]; - }; - options.paths = lib.mkOption { - type = listOf path; - description = "A list of glob patterns, indicating which paths to expose to the sandbox"; - }; - }); + Pattern = with lib.types; + submodule ({ config, name, ... }: { + options.onFeatures = lib.mkOption { + type = listOf str; + description = + "Which requiredSystemFeatures should trigger relaxation of the sandbox"; + default = [ name ]; + }; + options.paths = lib.mkOption { + type = listOf path; + description = + "A list of glob patterns, indicating which paths to expose to the sandbox"; + }; + }); + + driverPaths = [ + # symlinks in /run/opengl-driver/lib: + pkgs.addOpenGLRunpath.driverLink + + # mesa: + config.hardware.opengl.package + + # nvidia_x11, etc: + ] ++ config.hardware.opengl.extraPackages; # nvidia_x11 defaults = { - opengl.onFeatures = [ "opengl" ]; - opengl.paths = [ - "/dev/video*" - "/dev/dri" - - pkgs.addOpenGLRunpath.driverLink - # /run/opengl-driver/lib only contains symlinks - config.hardware.opengl.package - ] ++ config.hardware.opengl.extraPackages; - cuda.onFeatures = [ "cuda" ]; - cuda.paths = defaults.opengl.paths ++ [ "/dev/nvidia*" ]; + opengl.onFeatures = package.allowedPatterns.opengl.onFeatures; + opengl.paths = package.allowedPatterns.opengl.paths ++ driverPaths; + cuda.onFeatures = package.allowedPatterns.cuda.onFeatures; + cuda.paths = package.allowedPatterns.cuda.paths ++ driverPaths; }; in { @@ -49,8 +55,9 @@ in ''; allowedPatterns = with lib.types; lib.mkOption rec { - type = attrsOf patternType; - description = "The hook config, describing which paths to mount for which system features"; + type = attrsOf Pattern; + description = + "The hook config, describing which paths to mount for which system features"; default = { inherit (defaults) opengl; }; defaultText = lib.literalExpression '' { @@ -62,13 +69,12 @@ in ]; } ''; - example.require-ipfs = [ "/ipfs" ]; + example.require-ipfs.paths = [ "/ipfs" ]; + example.require-ipfs.onFeatures = [ "ifps" ]; }; }; config = lib.mkIf cfg.enable (lib.mkMerge [ - { - nix.settings.pre-build-hook = lib.getExe hook; - } + { nix.settings.pre-build-hook = lib.getExe overridenPackage; } (lib.mkIf cfg.presets.opengl.enable { nix.settings.system-features = [ "opengl" ]; programs.nix-required-mounts.allowedPatterns = { diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index c8cae067b24d..58db69487a03 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -36,6 +36,9 @@ runCommand pname makeWrapper python3Packages.wrapPython ]; + passthru = { + inherit allowedPatterns; + }; meta.mainProgram = pname; } '' ${lib.getExe buildPackages.python3.pkgs.flake8} ${./main.py} From 3d84ab0b09773f0a4edef19897ce81e46508fac9 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 6 Nov 2023 16:44:36 +0000 Subject: [PATCH 103/300] nix-required-mounts: expose the VM test in passthru --- pkgs/by-name/ni/nix-required-mounts/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 58db69487a03..dbb35356b7af 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -16,6 +16,7 @@ , formats , lib , nix +, nixosTests , python3Packages , makeWrapper , runCommand @@ -38,6 +39,9 @@ runCommand pname ]; passthru = { inherit allowedPatterns; + tests = { + inherit (nixosTests) nix-required-mounts; + }; }; meta.mainProgram = pname; } '' From 3a0d777486191cbdd2ffc7e31f25156da94c4831 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 6 Nov 2023 16:49:54 +0000 Subject: [PATCH 104/300] nix-required-mounts: link the issue about unavailable .drvs --- pkgs/by-name/ni/nix-required-mounts/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/main.py index 8e32483e8a4b..1d263dcd1028 100644 --- a/pkgs/by-name/ni/nix-required-mounts/main.py +++ b/pkgs/by-name/ni/nix-required-mounts/main.py @@ -64,7 +64,7 @@ def entrypoint(): if not Path(drv_path).exists(): print( f"[E] {drv_path} doesn't exist." - " This may happen with the remote builds." + " Cf. https://github.com/NixOS/nix/issues/9272" " Exiting the hook", file=stderr, ) From 6a0f2aedc14d38cc2ad184f6c9a448729de8f8a5 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 6 Nov 2023 17:21:47 +0000 Subject: [PATCH 105/300] nix-required-mounts: fix: add missing metadata --- .../{main.py => nix_required_mounts.py} | 0 .../ni/nix-required-mounts/package.nix | 35 ++++++++++++------- .../ni/nix-required-mounts/pyproject.toml | 18 ++++++++++ 3 files changed, 41 insertions(+), 12 deletions(-) rename pkgs/by-name/ni/nix-required-mounts/{main.py => nix_required_mounts.py} (100%) diff --git a/pkgs/by-name/ni/nix-required-mounts/main.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py similarity index 100% rename from pkgs/by-name/ni/nix-required-mounts/main.py rename to pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index dbb35356b7af..c1411a6d2a80 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -28,27 +28,38 @@ let inherit allowedPatterns; nixExe = lib.getExe nix; }; - pname = "nix-required-mounts"; + attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); + pname = attrs.project.name; + inherit (attrs.project) version; in -runCommand pname +python3Packages.buildPythonApplication { + inherit pname version; + pyproject = true; + + src = lib.cleanSource ./.; + nativeBuildInputs = [ makeWrapper - python3Packages.wrapPython + python3Packages.setuptools ]; + + postFixup = '' + wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" + ''; + passthru = { inherit allowedPatterns; tests = { inherit (nixosTests) nix-required-mounts; }; }; - meta.mainProgram = pname; -} '' - ${lib.getExe buildPackages.python3.pkgs.flake8} ${./main.py} - - mkdir -p $out/bin - install ${./main.py} $out/bin/${pname} - wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" - wrapPythonPrograms -'' + meta = { + inherit (attrs.project) description; + homepage = attrs.project.urls.Homepage; + license = lib.licenses.mit; + mainProgram = attrs.project.name; + maintainers = with lib.maintainers; [ SomeoneSerge ]; + }; +} diff --git a/pkgs/by-name/ni/nix-required-mounts/pyproject.toml b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml index a8f43fefdf14..bb754e08ab1d 100644 --- a/pkgs/by-name/ni/nix-required-mounts/pyproject.toml +++ b/pkgs/by-name/ni/nix-required-mounts/pyproject.toml @@ -1,2 +1,20 @@ +[build-system] +build-backend = "setuptools.build_meta" +requires = [ "setuptools" ] + +[project] +name = "nix-required-mounts" +version = "0.0.1" +description = """ +A --pre-build-hook for Nix, \ +that allows to expose extra paths in the build sandbox \ +based on derivations' requiredSystemFeatrues""" + +[project.urls] +Homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nix-required-mounts" + +[project.scripts] +nix-required-mounts = "nix_required_mounts:entrypoint" + [tool.black] line-length = 79 From 7418e4fefd622eb1d1709353aa842e136896d70f Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 11 Nov 2023 02:40:44 +0000 Subject: [PATCH 106/300] programs.nix-required-mounts: presets.cuda -> nvidia-gpu This hopefully clarifies that the preset configures the hook to expose "nvidia devices", which includse both the userspace driver and the device nodes. The derivations still declare requiredSystemFeatures = [ "cuda" ] to explicitly indicate they need to use the CUDA functionality and expect a libcuda.so and a CUDA-capable device. Ideally, we'd also include the specific CUDA architectures (sm_86, etc) in feature names. Derivations that use a co-processor but do not care about the vendor or even the particular interface may ask for the more generic "opengl", "vulkan", or "gpu" features. It is then responsibility of the host declaring the support for this feature to ensure the drivers and hardware are appropriately set up. --- .../modules/programs/nix-required-mounts.nix | 38 +++++++------------ .../ni/nix-required-mounts/package.nix | 15 +++++--- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index c2a81ff03bff..c05c2016a6be 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -31,10 +31,8 @@ let ] ++ config.hardware.opengl.extraPackages; # nvidia_x11 defaults = { - opengl.onFeatures = package.allowedPatterns.opengl.onFeatures; - opengl.paths = package.allowedPatterns.opengl.paths ++ driverPaths; - cuda.onFeatures = package.allowedPatterns.cuda.onFeatures; - cuda.paths = package.allowedPatterns.cuda.paths ++ driverPaths; + nvidia-gpu.onFeatures = package.allowedPatterns.nvidia-gpu.onFeatures; + nvidia-gpu.paths = package.allowedPatterns.nvidia-gpu.paths ++ driverPaths; }; in { @@ -42,23 +40,21 @@ in options.programs.nix-required-mounts = { enable = lib.mkEnableOption "Expose extra paths to the sandbox depending on derivations' requiredSystemFeatures"; - presets.opengl.enable = lib.mkOption { - type = lib.types.bool; - default = config.hardware.opengl.enable; - defaultText = lib.literalExpression "hardware.opengl.enable"; - description = '' - Expose OpenGL drivers to derivations marked with requiredSystemFeatures = [ "opengl" ] - ''; - }; - presets.cuda.enable = lib.mkEnableOption '' - Expose CUDA drivers and GPUs to derivations marked with requiredSystemFeatures = [ "cuda" ] + presets.nvidia-gpu.enable = lib.mkEnableOption '' + Declare the support for derivations that require an Nvidia GPU to be + available, e.g. derivations with `requiredSystemFeatures = [ "cuda" ]`. + This mounts the corresponding userspace drivers and device nodes in the + sandbox, but only for derivations that request these special features. + + You may extend or override the exposed paths via the + `programs.nix-required-mounts.allowedPatterns.nvidia-gpu.paths` option. ''; allowedPatterns = with lib.types; lib.mkOption rec { type = attrsOf Pattern; description = "The hook config, describing which paths to mount for which system features"; - default = { inherit (defaults) opengl; }; + default = { }; defaultText = lib.literalExpression '' { opengl.paths = config.hardware.opengl.extraPackages ++ [ @@ -75,16 +71,10 @@ in }; config = lib.mkIf cfg.enable (lib.mkMerge [ { nix.settings.pre-build-hook = lib.getExe overridenPackage; } - (lib.mkIf cfg.presets.opengl.enable { - nix.settings.system-features = [ "opengl" ]; + (lib.mkIf cfg.presets.nvidia-gpu.enable { + nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; programs.nix-required-mounts.allowedPatterns = { - inherit (defaults) opengl; - }; - }) - (lib.mkIf cfg.presets.cuda.enable { - nix.settings.system-features = [ "cuda" ]; - programs.nix-required-mounts.allowedPatterns = { - inherit (defaults) cuda; + inherit (defaults) nvidia-gpu; }; }) ]); diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index c1411a6d2a80..42fa3ff1d90d 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,15 +1,18 @@ { addOpenGLRunpath , cmake , allowedPatterns ? rec { - opengl.onFeatures = [ "opengl" ]; - opengl.paths = [ + # This config is just an example. + # When the hook observes either of the following requiredSystemFeatures: + nvidia-gpu.onFeatures = [ "gpu" "opengl" "vulkan" "cuda" ]; + # It exposes these paths in the sandbox: + nvidia-gpu.paths = [ + # Note that mounting /run/opengl-driver/lib actually isn't sufficient, + # because it's populated with symlinks. One most also mount their + # targets, which is what the NixOS module additionaly does. addOpenGLRunpath.driverLink - "/dev/video*" "/dev/dri" - ]; - cuda.onFeatures = [ "cuda" ]; - cuda.paths = opengl.paths ++ [ "/dev/nvidia*" + "/dev/video*" ]; } , buildPackages From 5560f6a5141d9bcc6c3e0ac2e30c714874c1e076 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 11 Nov 2023 14:02:54 +0000 Subject: [PATCH 107/300] nix-required-mounts: guest and host paths may differ --- .../modules/programs/nix-required-mounts.nix | 13 ++++++-- nixos/tests/nix-required-mounts/default.nix | 13 ++++++-- .../test-require-feature.nix | 10 +++++-- .../nix_required_mounts.py | 30 ++++++++++++++----- .../ni/nix-required-mounts/package.nix | 2 +- 5 files changed, 52 insertions(+), 16 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index c05c2016a6be..611c065815e1 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -5,16 +5,23 @@ let package = pkgs.nix-required-mounts; overridenPackage = package.override { inherit (cfg) allowedPatterns; }; + Mount = with lib; types.submodule { + options.host = mkOption { type = types.str; description = "Host path to mount"; }; + options.guest = mkOption { + type = types.str; + description = "Location in the sandbox to mount the host path at"; + }; + }; Pattern = with lib.types; - submodule ({ config, name, ... }: { + types.submodule ({ config, name, ... }: { options.onFeatures = lib.mkOption { - type = listOf str; + type = listOf types.str; description = "Which requiredSystemFeatures should trigger relaxation of the sandbox"; default = [ name ]; }; options.paths = lib.mkOption { - type = listOf path; + type = listOf (oneOf [ path Mount ]); description = "A list of glob patterns, indicating which paths to expose to the sandbox"; }; diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix index 4550e6ac50a2..38f94bf6fd98 100644 --- a/nixos/tests/nix-required-mounts/default.nix +++ b/nixos/tests/nix-required-mounts/default.nix @@ -19,10 +19,19 @@ in programs.nix-required-mounts.enable = true; programs.nix-required-mounts.allowedPatterns.supported-feature = { onFeatures = [ "supported-feature" ]; - paths = [ "/supported-feature-files" ]; + paths = [ + "/supported-feature-files" + { + host = "/usr/lib/imaginary-fhs-drivers"; + guest = "/run/opengl-driver/lib"; + } + ]; }; users.users.person.isNormalUser = true; - virtualisation.fileSystems."/supported-feature-files".fsType = "tmpfs"; + systemd.tmpfiles.rules = [ + "d /supported-feature-files 0755 person users -" + "f /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root -" + ]; }; testScript = '' import shlex diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix index ddfd068b87fc..061b59e1628a 100644 --- a/nixos/tests/nix-required-mounts/test-require-feature.nix +++ b/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -4,9 +4,13 @@ pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } '' - if [[ -e /${feature}-files ]]; then - touch $out - else + if [[ ! -e /${feature}-files ]]; then echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + exit 1 fi + if [[ ! -f /run/opengl-driver/lib/libcuda.so ]] ; then + echo "The host declares ${feature} support, but it the hook fails to handle the hostPath != guestPath cases" >&2 + exit 1 + fi + touch $out '' diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 1d263dcd1028..5edf61ff115b 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -8,12 +8,20 @@ from argparse import ArgumentParser from itertools import chain from pathlib import Path from sys import stderr -from typing import Dict, List, TypedDict +from typing import Dict, List, Tuple, TypeAlias, TypedDict + +Glob: TypeAlias = str +PathString: TypeAlias = str + + +class Mount(TypedDict): + host: PathString + guest: PathString class Pattern(TypedDict): onFeatures: List[str] - paths: List[str] # List of glob patterns + paths: List[Glob | Mount] class HookConfig(TypedDict): @@ -106,12 +114,21 @@ def entrypoint(): features = get_strings(drv_env, "requiredSystemFeatures") features = list(filter(known_features.__contains__, features)) - patterns = list( + patterns: List[PathString | Mount] = list( chain.from_iterable(allowed_patterns[f]["paths"] for f in features) ) # noqa: E501 - roots = sorted( - set(Path(path) for pattern in patterns for path in glob.glob(pattern)) + # TODO: Would it make sense to preserve the original order instead? + roots: List[Tuple[PathString, PathString]] = sorted( + set( + mnt + for pattern in patterns + for mnt in ( + ((path, path) for path in glob.glob(pattern)) + if isinstance(pattern, PathString) + else [(pattern["guest"], pattern["host"])] + ) + ) ) # the pre-build-hook command @@ -121,8 +138,7 @@ def entrypoint(): print("extra-sandbox-paths") # arguments, one per line - for p in roots: - guest_path, host_path = p, p + for guest_path, host_path in roots: print(f"{guest_path}={host_path}") # terminated by an empty line diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 42fa3ff1d90d..a17962183de1 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -3,7 +3,7 @@ , allowedPatterns ? rec { # This config is just an example. # When the hook observes either of the following requiredSystemFeatures: - nvidia-gpu.onFeatures = [ "gpu" "opengl" "vulkan" "cuda" ]; + nvidia-gpu.onFeatures = [ "gpu" "nvidia-gpu" "opengl" "cuda" ]; # It exposes these paths in the sandbox: nvidia-gpu.paths = [ # Note that mounting /run/opengl-driver/lib actually isn't sufficient, From 3cf5bcfe49c74ba429b87e04cf652833e7e1b260 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 11 Nov 2023 19:43:04 +0000 Subject: [PATCH 108/300] nix-required-mounts: restore the followSymlinks option This way pkgs.nix-required-mounts is "correct" even before we override it in the NixOS module --- .../modules/programs/nix-required-mounts.nix | 22 +++++-- .../nix_required_mounts.py | 57 ++++++++++++++----- .../ni/nix-required-mounts/package.nix | 4 +- 3 files changed, 59 insertions(+), 24 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 611c065815e1..1c79e532a036 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -5,13 +5,17 @@ let package = pkgs.nix-required-mounts; overridenPackage = package.override { inherit (cfg) allowedPatterns; }; - Mount = with lib; types.submodule { - options.host = mkOption { type = types.str; description = "Host path to mount"; }; - options.guest = mkOption { - type = types.str; - description = "Location in the sandbox to mount the host path at"; + Mount = with lib; + types.submodule { + options.host = mkOption { + type = types.str; + description = "Host path to mount"; + }; + options.guest = mkOption { + type = types.str; + description = "Location in the sandbox to mount the host path at"; + }; }; - }; Pattern = with lib.types; types.submodule ({ config, name, ... }: { options.onFeatures = lib.mkOption { @@ -25,6 +29,11 @@ let description = "A list of glob patterns, indicating which paths to expose to the sandbox"; }; + options.unsafeFollowSymlinks = lib.mkEnableOption '' + Instructs the hook to mount the symlink targets as well, when any of + the `paths` contain symlinks. This may not work correctly with glob + patterns. + ''; }); driverPaths = [ @@ -40,6 +49,7 @@ let defaults = { nvidia-gpu.onFeatures = package.allowedPatterns.nvidia-gpu.onFeatures; nvidia-gpu.paths = package.allowedPatterns.nvidia-gpu.paths ++ driverPaths; + nvidia-gpu.unsafeFollowSymlinks = false; }; in { diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 5edf61ff115b..50f0f80f0bf2 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -5,10 +5,11 @@ import json import subprocess import textwrap from argparse import ArgumentParser +from collections import deque from itertools import chain from pathlib import Path from sys import stderr -from typing import Dict, List, Tuple, TypeAlias, TypedDict +from typing import Deque, Dict, List, Set, Tuple, TypeAlias, TypedDict Glob: TypeAlias = str PathString: TypeAlias = str @@ -22,6 +23,7 @@ class Mount(TypedDict): class Pattern(TypedDict): onFeatures: List[str] paths: List[Glob | Mount] + unsafeFollowSymlinks: bool class HookConfig(TypedDict): @@ -50,7 +52,11 @@ parser.add_argument( def symlink_parents(p: Path) -> List[Path]: out = [] while p.is_symlink() and p not in out: - p = p.readlink() + parent = p.readlink() + if parent.is_relative_to("."): + p = p / parent + else: + p = parent out.append(p) return out @@ -111,38 +117,59 @@ def entrypoint(): parsed_drv = parsed_drv[canon_drv_path] drv_env = parsed_drv.get("env", {}) - features = get_strings(drv_env, "requiredSystemFeatures") - features = list(filter(known_features.__contains__, features)) + required_features = get_strings(drv_env, "requiredSystemFeatures") + required_features = list(filter(known_features.__contains__, required_features)) - patterns: List[PathString | Mount] = list( - chain.from_iterable(allowed_patterns[f]["paths"] for f in features) + patterns: List[Tuple[PathString | Mount, bool]] = list( + (path, pattern["unsafeFollowSymlinks"]) + for pattern in allowed_patterns.values() + for path in pattern["paths"] + if any(feature in required_features for feature in pattern["onFeatures"]) ) # noqa: E501 - # TODO: Would it make sense to preserve the original order instead? - roots: List[Tuple[PathString, PathString]] = sorted( - set( + queue: Deque[Tuple[PathString, PathString, bool]] = deque( + ( mnt - for pattern in patterns + for (pattern, follow_symlinks) in patterns for mnt in ( - ((path, path) for path in glob.glob(pattern)) + ((path, path, follow_symlinks) for path in glob.glob(pattern)) if isinstance(pattern, PathString) - else [(pattern["guest"], pattern["host"])] + else [(pattern["guest"], pattern["host"], follow_symlinks)] ) ) ) + unique_mounts: Set[Tuple[PathString, PathString]] = set() + mounts: List[Tuple[PathString, PathString]] = [] + + while queue: + guest_path, host_path, follow_symlinks = queue.popleft() + if (guest_path, host_path) not in unique_mounts: + mounts.append((guest_path, host_path)) + unique_mounts.add((guest_path, host_path)) + + if not follow_symlinks: + continue + + for parent in symlink_parents(Path(host_path)): + parent_str = parent.absolute().as_posix() + queue.append((parent_str, parent_str, follow_symlinks)) + # the pre-build-hook command if args.issue_command == "always" or ( - args.issue_command == "conditional" and roots + args.issue_command == "conditional" and mounts ): print("extra-sandbox-paths") + print_paths = True + else: + print_paths = False # arguments, one per line - for guest_path, host_path in roots: + for guest_path, host_path in mounts if print_paths else []: print(f"{guest_path}={host_path}") # terminated by an empty line - something_to_terminate = args.issue_stop == "conditional" and roots + something_to_terminate = args.issue_stop == "conditional" and mounts if args.issue_stop == "always" or something_to_terminate: print() diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index a17962183de1..8e2611552d05 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -6,14 +6,12 @@ nvidia-gpu.onFeatures = [ "gpu" "nvidia-gpu" "opengl" "cuda" ]; # It exposes these paths in the sandbox: nvidia-gpu.paths = [ - # Note that mounting /run/opengl-driver/lib actually isn't sufficient, - # because it's populated with symlinks. One most also mount their - # targets, which is what the NixOS module additionaly does. addOpenGLRunpath.driverLink "/dev/dri" "/dev/nvidia*" "/dev/video*" ]; + nvidia-gpu.unsafeFollowSymlinks = true; } , buildPackages , formats From 55f54cc2c33e52ae8ac57bced83046b7d9dbc6cd Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 11 Nov 2023 20:52:31 +0000 Subject: [PATCH 109/300] nix-required-mounts: restore (optional) symlink support --- nixos/tests/nix-required-mounts/default.nix | 4 ++- .../test-require-feature.nix | 12 ++++++++- .../nix_required_mounts.py | 25 ++++++++++++------- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix index 38f94bf6fd98..49bf3b0268a6 100644 --- a/nixos/tests/nix-required-mounts/default.nix +++ b/nixos/tests/nix-required-mounts/default.nix @@ -26,11 +26,13 @@ in guest = "/run/opengl-driver/lib"; } ]; + unsafeFollowSymlinks = true; }; users.users.person.isNormalUser = true; systemd.tmpfiles.rules = [ "d /supported-feature-files 0755 person users -" - "f /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root -" + "f /usr/lib/libcuda.so 0444 root root - fakeContent" + "L /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root - /usr/lib/libcuda.so" ]; }; testScript = '' diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix index 061b59e1628a..647d9a92d4a3 100644 --- a/nixos/tests/nix-required-mounts/test-require-feature.nix +++ b/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -8,9 +8,19 @@ pkgs.runCommandNoCC "${feature}-present" echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 exit 1 fi - if [[ ! -f /run/opengl-driver/lib/libcuda.so ]] ; then + libcudaLocation=/run/opengl-driver/lib/libcuda.so + if [[ -e "$libcudaLocation" || -h "$libcudaLocation" ]] ; then + true # we're good + else echo "The host declares ${feature} support, but it the hook fails to handle the hostPath != guestPath cases" >&2 exit 1 fi + if cat "$libcudaLocation" | xargs test fakeContent = ; then + true # we're good + else + echo "The host declares ${feature} support, but it seems to fail to follow symlinks" >&2 + echo "The content of /run/opengl-driver/lib/libcuda.so is: $(cat /run/opengl-driver/lib/libcuda.so)" >&2 + exit 1 + fi touch $out '' diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 50f0f80f0bf2..029740e4b80c 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -143,17 +143,24 @@ def entrypoint(): mounts: List[Tuple[PathString, PathString]] = [] while queue: - guest_path, host_path, follow_symlinks = queue.popleft() - if (guest_path, host_path) not in unique_mounts: - mounts.append((guest_path, host_path)) - unique_mounts.add((guest_path, host_path)) + guest_path_str, host_path_str, follow_symlinks = queue.popleft() + if (guest_path_str, host_path_str) not in unique_mounts: + mounts.append((guest_path_str, host_path_str)) + unique_mounts.add((guest_path_str, host_path_str)) if not follow_symlinks: continue - for parent in symlink_parents(Path(host_path)): - parent_str = parent.absolute().as_posix() - queue.append((parent_str, parent_str, follow_symlinks)) + host_path = Path(host_path_str) + if not (host_path.is_dir() or host_path.is_symlink()): + continue + + # assert host_path_str == guest_path_str, (host_path_str, guest_path_str) + + for child in host_path.iterdir() if host_path.is_dir() else [host_path]: + for parent in symlink_parents(child): + parent_str = parent.absolute().as_posix() + queue.append((parent_str, parent_str, follow_symlinks)) # the pre-build-hook command if args.issue_command == "always" or ( @@ -165,8 +172,8 @@ def entrypoint(): print_paths = False # arguments, one per line - for guest_path, host_path in mounts if print_paths else []: - print(f"{guest_path}={host_path}") + for guest_path_str, host_path_str in mounts if print_paths else []: + print(f"{guest_path_str}={host_path_str}") # terminated by an empty line something_to_terminate = args.issue_stop == "conditional" and mounts From 075dd8b536c0a0765bdafb4926187349bd162b52 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Mon, 20 Nov 2023 01:17:42 +0000 Subject: [PATCH 110/300] nix-required-mounts: allow overriding the rendered config --- .../ni/nix-required-mounts/nix_required_mounts.py | 14 ++++++-------- pkgs/by-name/ni/nix-required-mounts/package.nix | 9 ++++----- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 029740e4b80c..388468f7894e 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -26,15 +26,14 @@ class Pattern(TypedDict): unsafeFollowSymlinks: bool -class HookConfig(TypedDict): - nixExe: str - allowedPatterns: Dict[str, Pattern] +AllowedPatterns: TypeAlias = Dict[str, Pattern] parser = ArgumentParser("pre-build-hook") parser.add_argument("derivation_path") parser.add_argument("sandbox_path", nargs="?") -parser.add_argument("--config", type=Path) +parser.add_argument("--patterns", type=Path, required=True) +parser.add_argument("--nix-exe", type=Path, required=True) parser.add_argument( "--issue-command", choices=("always", "conditional", "never"), @@ -72,8 +71,8 @@ def entrypoint(): args = parser.parse_args() drv_path = args.derivation_path - with open(args.config, "r") as f: - config = json.load(f) + with open(args.patterns, "r") as f: + allowed_patterns = json.load(f) if not Path(drv_path).exists(): print( @@ -85,7 +84,7 @@ def entrypoint(): proc = subprocess.run( [ - config["nixExe"], + args.nix_exe, "show-derivation", drv_path, ], @@ -108,7 +107,6 @@ def entrypoint(): return [canon_drv_path] = parsed_drv.keys() - allowed_patterns = config["allowedPatterns"] known_features = set( chain.from_iterable( pattern["onFeatures"] for pattern in allowed_patterns.values() diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 8e2611552d05..3edc40c06245 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,5 +1,6 @@ { addOpenGLRunpath , cmake +, allowedPatternsPath ? (formats.json { }).generate "patterns.json" allowedPatterns , allowedPatterns ? rec { # This config is just an example. # When the hook observes either of the following requiredSystemFeatures: @@ -25,10 +26,6 @@ let - confPath = (formats.json { }).generate "config.py" { - inherit allowedPatterns; - nixExe = lib.getExe nix; - }; attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); pname = attrs.project.name; inherit (attrs.project) version; @@ -47,7 +44,9 @@ python3Packages.buildPythonApplication ]; postFixup = '' - wrapProgram $out/bin/${pname} --add-flags "--config ${confPath}" + wrapProgram $out/bin/${pname} \ + --add-flags "--patterns ${allowedPatternsPath}" \ + --add-flags "--nix-exe ${lib.getExe nix}" ''; passthru = { From dd70727622d1484253b8993d166be46915d8ce03 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Nov 2023 00:21:33 +0000 Subject: [PATCH 111/300] nixos/nix-required-mounts: mount the runtime closures --- .../modules/programs/nix-required-mounts.nix | 5 ++- .../ni/nix-required-mounts/closure.nix | 34 ++++++++++++++ .../ni/nix-required-mounts/package.nix | 3 +- .../scripts/nix_required_mounts_closure.py | 45 +++++++++++++++++++ 4 files changed, 84 insertions(+), 3 deletions(-) create mode 100644 pkgs/by-name/ni/nix-required-mounts/closure.nix create mode 100644 pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 1c79e532a036..b3c11a51f6fc 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -3,7 +3,9 @@ let cfg = config.programs.nix-required-mounts; package = pkgs.nix-required-mounts; - overridenPackage = package.override { inherit (cfg) allowedPatterns; }; + overridenPackage = package.override { + inherit (cfg) allowedPatterns; + }; Mount = with lib; types.submodule { @@ -37,7 +39,6 @@ let }); driverPaths = [ - # symlinks in /run/opengl-driver/lib: pkgs.addOpenGLRunpath.driverLink # mesa: diff --git a/pkgs/by-name/ni/nix-required-mounts/closure.nix b/pkgs/by-name/ni/nix-required-mounts/closure.nix new file mode 100644 index 000000000000..70a00e86f729 --- /dev/null +++ b/pkgs/by-name/ni/nix-required-mounts/closure.nix @@ -0,0 +1,34 @@ +# Use exportReferencesGraph to capture the possible dependencies of the +# drivers (e.g. libc linked through DT_RUNPATH) and ensure they are mounted +# in the sandbox as well. In practice, things seemed to have worked without +# this as well, but we go with the safe option until we understand why. + +{ lib +, runCommand +, python3Packages +, allowedPatterns +}: +runCommand "allowed-patterns.json" +{ + nativeBuildInputs = [ python3Packages.python ]; + exportReferencesGraph = + builtins.concatMap + (name: + builtins.concatMap + (path: + let + prefix = "${builtins.storeDir}/"; + # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 + exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; + isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); + in + lib.optionals isStorePath [ exportName path ]) + allowedPatterns.${name}.paths) + (builtins.attrNames allowedPatterns); + env.storeDir = "${builtins.storeDir}/"; + shallowConfig = builtins.toJSON allowedPatterns; + passAsFile = [ "shallowConfig" ]; +} + '' + python ${./scripts/nix_required_mounts_closure.py} + '' diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 3edc40c06245..8f5ad450a21c 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,6 +1,6 @@ { addOpenGLRunpath , cmake -, allowedPatternsPath ? (formats.json { }).generate "patterns.json" allowedPatterns +, allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; } , allowedPatterns ? rec { # This config is just an example. # When the hook observes either of the following requiredSystemFeatures: @@ -15,6 +15,7 @@ nvidia-gpu.unsafeFollowSymlinks = true; } , buildPackages +, callPackage , formats , lib , nix diff --git a/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py b/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py new file mode 100644 index 000000000000..4425e98d0925 --- /dev/null +++ b/pkgs/by-name/ni/nix-required-mounts/scripts/nix_required_mounts_closure.py @@ -0,0 +1,45 @@ +import json +import os + +store_dir = os.environ["storeDir"] + +with open(os.environ["shallowConfigPath"], "r") as f: + config = json.load(f) + +cache = {} + + +def read_edges(path: str | dict) -> list[str | dict]: + if isinstance(path, dict): + return [path] + assert isinstance(path, str) + + if not path.startswith(store_dir): + return [path] + if path in cache: + return cache[path] + + name = f"references-{path.removeprefix(store_dir)}" + + assert os.path.exists(name) + + with open(name, "r") as f: + return [p.strip() for p in f.readlines() if p.startswith(store_dir)] + + +def host_path(mount: str | dict) -> str: + if isinstance(mount, dict): + return mount["host"] + assert isinstance(mount, str), mount + return mount + + +for pattern in config: + closure = [] + for path in config[pattern]["paths"]: + closure.append(path) + closure.extend(read_edges(path)) + config[pattern]["paths"] = list({host_path(m): m for m in closure}.values()) + +with open(os.environ["out"], "w") as f: + json.dump(config, f) From 61001a31c320abc59c363af265273d87491074ba Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Nov 2023 01:59:02 +0000 Subject: [PATCH 112/300] nix-required-mounts: enforce that host paths exist --- .../nix_required_mounts.py | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 388468f7894e..72ca086d63b5 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -67,6 +67,30 @@ def get_strings(drv_env: dict, name: str) -> List[str]: return drv_env.get(name, "").split() +def validate_mounts(pattern: Pattern) -> List[Tuple[PathString, PathString, bool]]: + roots = [] + for mount in pattern["paths"]: + if isinstance(mount, PathString): + matches = glob.glob(mount) + assert matches, f"Specified host paths do not exist: {mount}" + + roots.extend((m, m, pattern["unsafeFollowSymlinks"]) for m in matches) + else: + assert isinstance(mount, dict) and "host" in mount, mount + assert Path( + mount["host"] + ).exists(), f"Specified host paths do not exist: {mount['host']}" + roots.append( + ( + mount["guest"], + mount["host"], + pattern["unsafeFollowSymlinks"], + ) + ) + + return roots + + def entrypoint(): args = parser.parse_args() drv_path = args.derivation_path @@ -118,23 +142,15 @@ def entrypoint(): required_features = get_strings(drv_env, "requiredSystemFeatures") required_features = list(filter(known_features.__contains__, required_features)) - patterns: List[Tuple[PathString | Mount, bool]] = list( - (path, pattern["unsafeFollowSymlinks"]) + patterns: List[Pattern] = list( + pattern for pattern in allowed_patterns.values() for path in pattern["paths"] if any(feature in required_features for feature in pattern["onFeatures"]) ) # noqa: E501 queue: Deque[Tuple[PathString, PathString, bool]] = deque( - ( - mnt - for (pattern, follow_symlinks) in patterns - for mnt in ( - ((path, path, follow_symlinks) for path in glob.glob(pattern)) - if isinstance(pattern, PathString) - else [(pattern["guest"], pattern["host"], follow_symlinks)] - ) - ) + (mnt for pattern in patterns for mnt in validate_mounts(pattern)) ) unique_mounts: Set[Tuple[PathString, PathString]] = set() From 6a6b6ac3590abc8020d4fbb332296703551ea867 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Nov 2023 15:37:46 +0000 Subject: [PATCH 113/300] nix-required-mounts: print -> logging --- .../nix_required_mounts.py | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py index 72ca086d63b5..6f05ee913a5a 100644 --- a/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py +++ b/pkgs/by-name/ni/nix-required-mounts/nix_required_mounts.py @@ -8,8 +8,8 @@ from argparse import ArgumentParser from collections import deque from itertools import chain from pathlib import Path -from sys import stderr from typing import Deque, Dict, List, Set, Tuple, TypeAlias, TypedDict +import logging Glob: TypeAlias = str PathString: TypeAlias = str @@ -46,6 +46,7 @@ parser.add_argument( default="conditional", help="Whether to print the final empty line", ) +parser.add_argument("-v", "--verbose", action="count", default=0) def symlink_parents(p: Path) -> List[Path]: @@ -93,17 +94,22 @@ def validate_mounts(pattern: Pattern) -> List[Tuple[PathString, PathString, bool def entrypoint(): args = parser.parse_args() + + VERBOSITY_LEVELS = [logging.ERROR, logging.INFO, logging.DEBUG] + + level_index = min(args.verbose, len(VERBOSITY_LEVELS) - 1) + logging.basicConfig(level=VERBOSITY_LEVELS[level_index]) + drv_path = args.derivation_path with open(args.patterns, "r") as f: allowed_patterns = json.load(f) if not Path(drv_path).exists(): - print( - f"[E] {drv_path} doesn't exist." + logging.error( + f"{drv_path} doesn't exist." " Cf. https://github.com/NixOS/nix/issues/9272" " Exiting the hook", - file=stderr, ) proc = subprocess.run( @@ -117,17 +123,13 @@ def entrypoint(): try: parsed_drv = json.loads(proc.stdout) except json.JSONDecodeError: - print( - "[E] Couldn't parse the output of" + logging.error( + "Couldn't parse the output of" "`nix show-derivation`" f". Expected JSON, observed: {proc.stdout}", - file=stderr, ) - print( - textwrap.indent(proc.stdout.decode("utf8"), prefix=" " * 4), - file=stderr, - ) - print("[I] Exiting the nix-required-binds hook", file=stderr) + logging.error(textwrap.indent(proc.stdout.decode("utf8"), prefix=" " * 4)) + logging.info("Exiting the nix-required-binds hook") return [canon_drv_path] = parsed_drv.keys() From 927b15ed6db1e7da9f35e0f4a3ae85293cac5454 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Nov 2023 16:03:58 +0000 Subject: [PATCH 114/300] nixos/nix-required-mounts: allow passing extra arguments to the hook --- .../modules/programs/nix-required-mounts.nix | 22 +++++++++++++++---- .../ni/nix-required-mounts/package.nix | 6 +++-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index b3c11a51f6fc..98ab819af55e 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -3,9 +3,6 @@ let cfg = config.programs.nix-required-mounts; package = pkgs.nix-required-mounts; - overridenPackage = package.override { - inherit (cfg) allowedPatterns; - }; Mount = with lib; types.submodule { @@ -86,9 +83,26 @@ in example.require-ipfs.paths = [ "/ipfs" ]; example.require-ipfs.onFeatures = [ "ifps" ]; }; + extraWrapperArgs = lib.mkOption { + type = with lib.types; listOf str; + default = [ ]; + description = + lib.mdDoc + "List of extra arguments (such as `--add-flags -v`) to pass to the hook's wrapper"; + }; + package = lib.mkOption { + type = lib.types.package; + default = package.override { + inherit (cfg) + allowedPatterns + extraWrapperArgs; + }; + description = lib.mdDoc "The final package with the final config applied"; + internal = true; + }; }; config = lib.mkIf cfg.enable (lib.mkMerge [ - { nix.settings.pre-build-hook = lib.getExe overridenPackage; } + { nix.settings.pre-build-hook = lib.getExe cfg.package; } (lib.mkIf cfg.presets.nvidia-gpu.enable { nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; programs.nix-required-mounts.allowedPatterns = { diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index 8f5ad450a21c..e674539fb909 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -16,12 +16,13 @@ } , buildPackages , callPackage +, extraWrapperArgs ? [ ] , formats , lib +, makeWrapper , nix , nixosTests , python3Packages -, makeWrapper , runCommand }: @@ -47,7 +48,8 @@ python3Packages.buildPythonApplication postFixup = '' wrapProgram $out/bin/${pname} \ --add-flags "--patterns ${allowedPatternsPath}" \ - --add-flags "--nix-exe ${lib.getExe nix}" + --add-flags "--nix-exe ${lib.getExe nix}" \ + ${builtins.concatStringsSep " " extraWrapperArgs} ''; passthru = { From 9aa0403154ad65ccbaf7bfa92f8eb55c8073bb0d Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Tue, 21 Nov 2023 20:48:09 +0000 Subject: [PATCH 115/300] cudaPackages.saxpy: passthru: test gpu/runtime --- pkgs/development/cuda-modules/saxpy/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 9b7326cd321f..520fa5b68a44 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -3,6 +3,7 @@ cmake, cudaPackages, lib, + saxpy, }: let inherit (cudaPackages) @@ -58,6 +59,16 @@ backendStdenv.mkDerivation { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) ]; + passthru.tests.withCuda = saxpy.overrideAttrs ( + _: { + requiredSystemFeatures = ["cuda"]; + doInstallCheck = true; + postInstallCheck = '' + $out/bin/saxpy + ''; + } + ); + meta = rec { description = "Simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; license = lib.licenses.mit; From efd64b5f0b0794fd15492e867078be2bb0c0c95c Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Fri, 8 Dec 2023 19:09:41 +0000 Subject: [PATCH 116/300] cudaPackages: move cuda tests from passthru.tests Otherwise we crash Ofborg --- pkgs/applications/misc/blender/default.nix | 8 ++++---- pkgs/development/cuda-modules/saxpy/default.nix | 2 +- pkgs/development/python-modules/pynvml/default.nix | 3 +-- pkgs/development/python-modules/torch/bin.nix | 2 +- pkgs/development/python-modules/torch/default.nix | 8 ++------ 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 357bbbe0e6f6..284ee5778101 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -373,16 +373,16 @@ stdenv.mkDerivation (finalAttrs: { done ''; - cudaAvailable = runCommand + }; + gpuChecks.cudaAvailable = { blenderWithCuda, runCommand }: runCommand "blender-cuda-available" { - nativeBuildInputs = [ finalAttrs.finalPackage ]; + nativeBuildInputs = [ blenderWithCuda ]; requiredSystemFeatures = [ "cuda" ]; } '' blender --background -noaudio --python-exit-code 1 --python ${./test-cuda.py} && touch $out - ''; - }; + '' { }; }; meta = { diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 520fa5b68a44..3da3dc08f0eb 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -59,7 +59,7 @@ backendStdenv.mkDerivation { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) ]; - passthru.tests.withCuda = saxpy.overrideAttrs ( + passthru.gpuChecks.withCuda = saxpy.overrideAttrs ( _: { requiredSystemFeatures = ["cuda"]; doInstallCheck = true; diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index e76913a63df4..79624e5298a6 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -51,8 +51,7 @@ buildPythonPackage rec { # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory doCheck = false; - passthru.tests.nvmlInit = callPackage ./test-gpu.nix { }; - + passthru.gpuChecks.nvmlInit = callPackage ./test-gpu.nix { }; meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; diff --git a/pkgs/development/python-modules/torch/bin.nix b/pkgs/development/python-modules/torch/bin.nix index 37170ea9adf4..e2899c081e08 100644 --- a/pkgs/development/python-modules/torch/bin.nix +++ b/pkgs/development/python-modules/torch/bin.nix @@ -121,7 +121,7 @@ buildPythonPackage { pythonImportsCheck = [ "torch" ]; - passthru.tests.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; + passthru.gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torch-bin; }; meta = { description = "PyTorch: Tensors and Dynamic neural networks in Python with strong GPU acceleration"; diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 671e76dfe02d..62c69905609e 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -26,7 +26,7 @@ # tests.cudaAvailable: callPackage, - torch, + torchWithCuda, # Native build inputs cmake, @@ -648,11 +648,7 @@ buildPythonPackage rec { blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - } // lib.optionalAttrs cudaSupport { - - tests = lib.optionalAttrs cudaSupport { - cudaAvailable = callPackage ./test-cuda.nix { inherit torch; }; - }; + gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torchWithCuda; }; }; meta = { From 39f33456e4443cdeb4b56c0b87a667b6a0ee3699 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 9 Dec 2023 21:52:13 +0000 Subject: [PATCH 117/300] python3Packages.torch.gpuChecks: add rocm --- .../python-modules/torch/default.nix | 2 +- .../python-modules/torch/gpu-checks.nix | 50 +++++++++++++++++++ .../python-modules/torch/test-cuda.nix | 21 -------- 3 files changed, 51 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/torch/gpu-checks.nix delete mode 100644 pkgs/development/python-modules/torch/test-cuda.nix diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 62c69905609e..11a3b3df42ce 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -648,7 +648,7 @@ buildPythonPackage rec { blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - gpuChecks.cudaAvailable = callPackage ./test-cuda.nix { torch = torchWithCuda; }; + gpuChecks = callPackage ./gpu-checks.nix { }; }; meta = { diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix new file mode 100644 index 000000000000..71004d8457b2 --- /dev/null +++ b/pkgs/development/python-modules/torch/gpu-checks.nix @@ -0,0 +1,50 @@ +{ + lib, + callPackage, + torchWithCuda, + torchWithRocm, +}: + +let + accelAvailable = + { + feature, + versionAttr, + torch, + runCommandNoCC, + writers, + }: + let + name = "${torch.name}-${feature}-check"; + unwrapped = writers.writePython3Bin "${name}-unwrapped" {libraries = [torch];} '' + import torch + message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" + assert torch.cuda.is_available() and torch.version.${versionAttr}, message + print(message) + ''; + in + runCommandNoCC name + { + nativeBuildInputs = [unwrapped]; + requiredSystemFeatures = [feature]; + passthru = { + inherit unwrapped; + }; + } + '' + ${name}-unwrapped + touch $out + ''; +in +{ + cudaAvailable = callPackage accelAvailable { + feature = "cuda"; + versionAttr = "cuda"; + torch = torchWithCuda; + }; + rocmAvailable = callPackage accelAvailable { + feature = "rocm"; + versionAttr = "hip"; + torch = torchWithRocm; + }; +} diff --git a/pkgs/development/python-modules/torch/test-cuda.nix b/pkgs/development/python-modules/torch/test-cuda.nix deleted file mode 100644 index 22d73eeb9167..000000000000 --- a/pkgs/development/python-modules/torch/test-cuda.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ runCommandNoCC -, python -, torch -}: - -runCommandNoCC "${torch.name}-gpu-test" -{ - nativeBuildInputs = [ - (python.withPackages (_: [ torch ])) - ]; - requiredSystemFeatures = [ - "cuda" - ]; -} '' - python3 << EOF - import torch - assert torch.cuda.is_available(), f"{torch.cuda.is_available()=}" - EOF - - touch $out -'' From da430f48723a3c728b8cb5ea630aba600105e568 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 9 Dec 2023 23:07:01 +0000 Subject: [PATCH 118/300] blender.gpuChecks: add unwrapped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An unwrapped check for `nix run`-ing on the host platform, instead of `nix build`-ing in the sandbox E.g.: ``` ❯ nix run -f ./. --arg config '{ cudaSupport = true; cudaCapabilities = [ "8.6" ]; cudaEnableForwardCompat = false; allowUnfree = true; }' -L blender.gpuChecks.cudaAvailable.unwrapped Blender 4.0.1 Read prefs: "/home/user/.config/blender/4.0/config/userpref.blend" CUDA is available Blender quit ❯ nix build -f ./. --arg config '{ cudaSupport = true; cudaCapabilities = [ "8.6" ]; cudaEnableForwardCompat = false; allowUnfree = true; }' -L blender.gpuChecks blender> Blender 4.0.1 blender> could not get a list of mounted file-systems blender> CUDA is available blender> Blender quit ``` --- pkgs/applications/misc/blender/default.nix | 10 +------ pkgs/applications/misc/blender/gpu-checks.nix | 29 +++++++++++++++++++ 2 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/misc/blender/gpu-checks.nix diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 284ee5778101..38f3e226d0ff 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -374,15 +374,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - gpuChecks.cudaAvailable = { blenderWithCuda, runCommand }: runCommand - "blender-cuda-available" - { - nativeBuildInputs = [ blenderWithCuda ]; - requiredSystemFeatures = [ "cuda" ]; - } - '' - blender --background -noaudio --python-exit-code 1 --python ${./test-cuda.py} && touch $out - '' { }; + gpuChecks = callPackage ./gpu-checks.nix { }; }; meta = { diff --git a/pkgs/applications/misc/blender/gpu-checks.nix b/pkgs/applications/misc/blender/gpu-checks.nix new file mode 100644 index 000000000000..144cdeb968c4 --- /dev/null +++ b/pkgs/applications/misc/blender/gpu-checks.nix @@ -0,0 +1,29 @@ +{ + bash, + blender, + callPackage, + lib, + runCommand, + writeScriptBin, +}: + +let + blenderWithCuda = blender.override {cudaSupport = true;}; + name = "${blenderWithCuda.name}-check-cuda"; + unwrapped = writeScriptBin "${name}-unwrapped" '' + #!${lib.getExe bash} + ${lib.getExe blenderWithCuda} --background -noaudio --python-exit-code 1 --python ${./test-cuda.py} + ''; +in +{ + cudaAvailable = + runCommand name + { + nativeBuildInputs = [unwrapped]; + requiredSystemFeatures = ["cuda"]; + passthru = { + inherit unwrapped; + }; + } + "${name}-unwrapped && touch $out"; +} From ff430d16995ca3cc16cb971c6aa5eb37cae43872 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 20 Jun 2024 21:18:22 +0000 Subject: [PATCH 119/300] nix-required-mounts: cuda: /dev/video* may not exist and aren't relevant --- pkgs/by-name/ni/nix-required-mounts/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index e674539fb909..eded427635dc 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -10,7 +10,6 @@ addOpenGLRunpath.driverLink "/dev/dri" "/dev/nvidia*" - "/dev/video*" ]; nvidia-gpu.unsafeFollowSymlinks = true; } From ebeb6b9d1df9351a76af366aa0821fec78d70e63 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 20 Jun 2024 21:33:51 +0000 Subject: [PATCH 120/300] nix-required-mounts: nixfmt --- .../modules/programs/nix-required-mounts.nix | 94 ++++++++++--------- nixos/tests/nix-required-mounts/default.nix | 54 +++++------ .../ensure-path-not-present.nix | 10 +- .../test-require-feature.nix | 10 +- .../test-structured-attrs-empty.nix | 14 ++- .../test-structured-attrs.nix | 29 +++--- pkgs/applications/misc/blender/gpu-checks.nix | 19 ++-- .../ni/nix-required-mounts/closure.nix | 51 +++++----- .../ni/nix-required-mounts/package.nix | 42 +++++---- .../python-modules/pynvml/test-gpu.nix | 32 +++---- .../python-modules/torch/gpu-checks.nix | 6 +- 11 files changed, 183 insertions(+), 178 deletions(-) diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index 98ab819af55e..c339dd1cfddd 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -1,10 +1,16 @@ -{ config, lib, pkgs, ... }: +{ + config, + lib, + pkgs, + ... +}: let cfg = config.programs.nix-required-mounts; package = pkgs.nix-required-mounts; - Mount = with lib; + Mount = + with lib; types.submodule { options.host = mkOption { type = types.str; @@ -15,25 +21,30 @@ let description = "Location in the sandbox to mount the host path at"; }; }; - Pattern = with lib.types; - types.submodule ({ config, name, ... }: { - options.onFeatures = lib.mkOption { - type = listOf types.str; - description = - "Which requiredSystemFeatures should trigger relaxation of the sandbox"; - default = [ name ]; - }; - options.paths = lib.mkOption { - type = listOf (oneOf [ path Mount ]); - description = - "A list of glob patterns, indicating which paths to expose to the sandbox"; - }; - options.unsafeFollowSymlinks = lib.mkEnableOption '' - Instructs the hook to mount the symlink targets as well, when any of - the `paths` contain symlinks. This may not work correctly with glob - patterns. - ''; - }); + Pattern = + with lib.types; + types.submodule ( + { config, name, ... }: + { + options.onFeatures = lib.mkOption { + type = listOf types.str; + description = "Which requiredSystemFeatures should trigger relaxation of the sandbox"; + default = [ name ]; + }; + options.paths = lib.mkOption { + type = listOf (oneOf [ + path + Mount + ]); + description = "A list of glob patterns, indicating which paths to expose to the sandbox"; + }; + options.unsafeFollowSymlinks = lib.mkEnableOption '' + Instructs the hook to mount the symlink targets as well, when any of + the `paths` contain symlinks. This may not work correctly with glob + patterns. + ''; + } + ); driverPaths = [ pkgs.addOpenGLRunpath.driverLink @@ -53,8 +64,7 @@ in { meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; options.programs.nix-required-mounts = { - enable = lib.mkEnableOption - "Expose extra paths to the sandbox depending on derivations' requiredSystemFeatures"; + enable = lib.mkEnableOption "Expose extra paths to the sandbox depending on derivations' requiredSystemFeatures"; presets.nvidia-gpu.enable = lib.mkEnableOption '' Declare the support for derivations that require an Nvidia GPU to be available, e.g. derivations with `requiredSystemFeatures = [ "cuda" ]`. @@ -64,11 +74,11 @@ in You may extend or override the exposed paths via the `programs.nix-required-mounts.allowedPatterns.nvidia-gpu.paths` option. ''; - allowedPatterns = with lib.types; + allowedPatterns = + with lib.types; lib.mkOption rec { type = attrsOf Pattern; - description = - "The hook config, describing which paths to mount for which system features"; + description = "The hook config, describing which paths to mount for which system features"; default = { }; defaultText = lib.literalExpression '' { @@ -86,28 +96,24 @@ in extraWrapperArgs = lib.mkOption { type = with lib.types; listOf str; default = [ ]; - description = - lib.mdDoc - "List of extra arguments (such as `--add-flags -v`) to pass to the hook's wrapper"; + description = "List of extra arguments (such as `--add-flags -v`) to pass to the hook's wrapper"; }; package = lib.mkOption { type = lib.types.package; - default = package.override { - inherit (cfg) - allowedPatterns - extraWrapperArgs; - }; - description = lib.mdDoc "The final package with the final config applied"; + default = package.override { inherit (cfg) allowedPatterns extraWrapperArgs; }; + description = "The final package with the final config applied"; internal = true; }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ - { nix.settings.pre-build-hook = lib.getExe cfg.package; } - (lib.mkIf cfg.presets.nvidia-gpu.enable { - nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; - programs.nix-required-mounts.allowedPatterns = { - inherit (defaults) nvidia-gpu; - }; - }) - ]); + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { nix.settings.pre-build-hook = lib.getExe cfg.package; } + (lib.mkIf cfg.presets.nvidia-gpu.enable { + nix.settings.system-features = cfg.allowedPatterns.nvidia-gpu.onFeatures; + programs.nix-required-mounts.allowedPatterns = { + inherit (defaults) nvidia-gpu; + }; + }) + ] + ); } diff --git a/nixos/tests/nix-required-mounts/default.nix b/nixos/tests/nix-required-mounts/default.nix index 49bf3b0268a6..60f894ce0bcc 100644 --- a/nixos/tests/nix-required-mounts/default.nix +++ b/nixos/tests/nix-required-mounts/default.nix @@ -1,6 +1,4 @@ -{ pkgs -, ... -}: +{ pkgs, ... }: let inherit (pkgs) lib; @@ -9,32 +7,34 @@ in { name = "nix-required-mounts"; meta.maintainers = with lib.maintainers; [ SomeoneSerge ]; - nodes.machine = { config, pkgs, ... }: { - virtualisation.writableStore = true; - system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ]; - nix.nixPath = [ "nixpkgs=${../../..}" ]; - nix.settings.substituters = lib.mkForce [ ]; - nix.settings.system-features = [ "supported-feature" ]; - nix.settings.experimental-features = [ "nix-command" ]; - programs.nix-required-mounts.enable = true; - programs.nix-required-mounts.allowedPatterns.supported-feature = { - onFeatures = [ "supported-feature" ]; - paths = [ - "/supported-feature-files" - { - host = "/usr/lib/imaginary-fhs-drivers"; - guest = "/run/opengl-driver/lib"; - } + nodes.machine = + { config, pkgs, ... }: + { + virtualisation.writableStore = true; + system.extraDependencies = [ (pkgs.runCommand "deps" { } "mkdir $out").inputDerivation ]; + nix.nixPath = [ "nixpkgs=${../../..}" ]; + nix.settings.substituters = lib.mkForce [ ]; + nix.settings.system-features = [ "supported-feature" ]; + nix.settings.experimental-features = [ "nix-command" ]; + programs.nix-required-mounts.enable = true; + programs.nix-required-mounts.allowedPatterns.supported-feature = { + onFeatures = [ "supported-feature" ]; + paths = [ + "/supported-feature-files" + { + host = "/usr/lib/imaginary-fhs-drivers"; + guest = "/run/opengl-driver/lib"; + } + ]; + unsafeFollowSymlinks = true; + }; + users.users.person.isNormalUser = true; + systemd.tmpfiles.rules = [ + "d /supported-feature-files 0755 person users -" + "f /usr/lib/libcuda.so 0444 root root - fakeContent" + "L /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root - /usr/lib/libcuda.so" ]; - unsafeFollowSymlinks = true; }; - users.users.person.isNormalUser = true; - systemd.tmpfiles.rules = [ - "d /supported-feature-files 0755 person users -" - "f /usr/lib/libcuda.so 0444 root root - fakeContent" - "L /usr/lib/imaginary-fhs-drivers/libcuda.so 0444 root root - /usr/lib/libcuda.so" - ]; - }; testScript = '' import shlex diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix index 871f336ee9bd..270c268fcbd9 100644 --- a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix +++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix @@ -1,8 +1,9 @@ -{ pkgs ? import { }, feature }: - -pkgs.runCommandNoCC "${feature}-not-present" { -} '' + pkgs ? import { }, + feature, +}: + +pkgs.runCommandNoCC "${feature}-not-present" { } '' if [[ -e /${feature}-files ]]; then echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway" exit 1 @@ -10,4 +11,3 @@ pkgs.runCommandNoCC "${feature}-not-present" touch $out fi '' - diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix index 647d9a92d4a3..447fd49a300a 100644 --- a/nixos/tests/nix-required-mounts/test-require-feature.nix +++ b/nixos/tests/nix-required-mounts/test-require-feature.nix @@ -1,9 +1,9 @@ -{ pkgs ? import { }, feature }: - -pkgs.runCommandNoCC "${feature}-present" { - requiredSystemFeatures = [ feature ]; -} '' + pkgs ? import { }, + feature, +}: + +pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } '' if [[ ! -e /${feature}-files ]]; then echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 exit 1 diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix index d788c6773c8e..86f275330936 100644 --- a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix +++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix @@ -1,10 +1,8 @@ -{ pkgs ? import { } }: - -pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { - __structuredAttrs = true; -} '' - touch $out -'' - + pkgs ? import { }, +}: +pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } + '' + touch $out + '' diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix index fecd2c32eec0..874910eee7bb 100644 --- a/nixos/tests/nix-required-mounts/test-structured-attrs.nix +++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix @@ -1,15 +1,18 @@ -{ pkgs ? import { }, feature }: +{ + pkgs ? import { }, + feature, +}: pkgs.runCommandNoCC "${feature}-present-structured" -{ - __structuredAttrs = true; - requiredSystemFeatures = [ feature ]; -} '' - if [[ -e /${feature}-files ]]; then - touch $out - else - echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 - echo "Do we fail to parse __structuredAttrs=true derivations?" >&2 - fi -'' - + { + __structuredAttrs = true; + requiredSystemFeatures = [ feature ]; + } + '' + if [[ -e /${feature}-files ]]; then + touch $out + else + echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2 + echo "Do we fail to parse __structuredAttrs=true derivations?" >&2 + fi + '' diff --git a/pkgs/applications/misc/blender/gpu-checks.nix b/pkgs/applications/misc/blender/gpu-checks.nix index 144cdeb968c4..bfbaf25b989a 100644 --- a/pkgs/applications/misc/blender/gpu-checks.nix +++ b/pkgs/applications/misc/blender/gpu-checks.nix @@ -8,7 +8,7 @@ }: let - blenderWithCuda = blender.override {cudaSupport = true;}; + blenderWithCuda = blender.override { cudaSupport = true; }; name = "${blenderWithCuda.name}-check-cuda"; unwrapped = writeScriptBin "${name}-unwrapped" '' #!${lib.getExe bash} @@ -16,14 +16,11 @@ let ''; in { - cudaAvailable = - runCommand name - { - nativeBuildInputs = [unwrapped]; - requiredSystemFeatures = ["cuda"]; - passthru = { - inherit unwrapped; - }; - } - "${name}-unwrapped && touch $out"; + cudaAvailable = runCommand name { + nativeBuildInputs = [ unwrapped ]; + requiredSystemFeatures = [ "cuda" ]; + passthru = { + inherit unwrapped; + }; + } "${name}-unwrapped && touch $out"; } diff --git a/pkgs/by-name/ni/nix-required-mounts/closure.nix b/pkgs/by-name/ni/nix-required-mounts/closure.nix index 70a00e86f729..3e361114bc4c 100644 --- a/pkgs/by-name/ni/nix-required-mounts/closure.nix +++ b/pkgs/by-name/ni/nix-required-mounts/closure.nix @@ -3,32 +3,35 @@ # in the sandbox as well. In practice, things seemed to have worked without # this as well, but we go with the safe option until we understand why. -{ lib -, runCommand -, python3Packages -, allowedPatterns +{ + lib, + runCommand, + python3Packages, + allowedPatterns, }: runCommand "allowed-patterns.json" -{ - nativeBuildInputs = [ python3Packages.python ]; - exportReferencesGraph = - builtins.concatMap - (name: - builtins.concatMap - (path: - let - prefix = "${builtins.storeDir}/"; - # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 - exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; - isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); - in - lib.optionals isStorePath [ exportName path ]) - allowedPatterns.${name}.paths) - (builtins.attrNames allowedPatterns); - env.storeDir = "${builtins.storeDir}/"; - shallowConfig = builtins.toJSON allowedPatterns; - passAsFile = [ "shallowConfig" ]; -} + { + nativeBuildInputs = [ python3Packages.python ]; + exportReferencesGraph = builtins.concatMap ( + name: + builtins.concatMap ( + path: + let + prefix = "${builtins.storeDir}/"; + # Has to start with a letter: https://github.com/NixOS/nix/blob/516e7ddc41f39ff939b5d5b5dc71e590f24890d4/src/libstore/build/local-derivation-goal.cc#L568 + exportName = ''references-${lib.strings.removePrefix prefix "${path}"}''; + isStorePath = lib.isStorePath path && (lib.hasPrefix prefix "${path}"); + in + lib.optionals isStorePath [ + exportName + path + ] + ) allowedPatterns.${name}.paths + ) (builtins.attrNames allowedPatterns); + env.storeDir = "${builtins.storeDir}/"; + shallowConfig = builtins.toJSON allowedPatterns; + passAsFile = [ "shallowConfig" ]; + } '' python ${./scripts/nix_required_mounts_closure.py} '' diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index eded427635dc..a7b9c3093e3f 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,10 +1,16 @@ -{ addOpenGLRunpath -, cmake -, allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; } -, allowedPatterns ? rec { +{ + addOpenGLRunpath, + cmake, + allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; }, + allowedPatterns ? rec { # This config is just an example. # When the hook observes either of the following requiredSystemFeatures: - nvidia-gpu.onFeatures = [ "gpu" "nvidia-gpu" "opengl" "cuda" ]; + nvidia-gpu.onFeatures = [ + "gpu" + "nvidia-gpu" + "opengl" + "cuda" + ]; # It exposes these paths in the sandbox: nvidia-gpu.paths = [ addOpenGLRunpath.driverLink @@ -12,28 +18,26 @@ "/dev/nvidia*" ]; nvidia-gpu.unsafeFollowSymlinks = true; - } -, buildPackages -, callPackage -, extraWrapperArgs ? [ ] -, formats -, lib -, makeWrapper -, nix -, nixosTests -, python3Packages -, runCommand + }, + buildPackages, + callPackage, + extraWrapperArgs ? [ ], + formats, + lib, + makeWrapper, + nix, + nixosTests, + python3Packages, + runCommand, }: - let attrs = builtins.fromTOML (builtins.readFile ./pyproject.toml); pname = attrs.project.name; inherit (attrs.project) version; in -python3Packages.buildPythonApplication -{ +python3Packages.buildPythonApplication { inherit pname version; pyproject = true; diff --git a/pkgs/development/python-modules/pynvml/test-gpu.nix b/pkgs/development/python-modules/pynvml/test-gpu.nix index c316d0b5094b..6ab4290a2bba 100644 --- a/pkgs/development/python-modules/pynvml/test-gpu.nix +++ b/pkgs/development/python-modules/pynvml/test-gpu.nix @@ -1,23 +1,17 @@ -{ runCommandNoCC -, python -}: +{ runCommandNoCC, python }: runCommandNoCC "pynvml-gpu-test" -{ - nativeBuildInputs = [ - (python.withPackages (ps: [ ps.pynvml ])) - ]; - requiredSystemFeatures = [ - "cuda" - ]; -} '' - python3 << EOF - import pynvml - from pynvml.smi import nvidia_smi + { + nativeBuildInputs = [ (python.withPackages (ps: [ ps.pynvml ])) ]; + requiredSystemFeatures = [ "cuda" ]; + } + '' + python3 << EOF + import pynvml + from pynvml.smi import nvidia_smi - pynvml.nvmlInit() - EOF - - touch $out -'' + pynvml.nvmlInit() + EOF + touch $out + '' diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix index 71004d8457b2..371b83f1b778 100644 --- a/pkgs/development/python-modules/torch/gpu-checks.nix +++ b/pkgs/development/python-modules/torch/gpu-checks.nix @@ -16,7 +16,7 @@ let }: let name = "${torch.name}-${feature}-check"; - unwrapped = writers.writePython3Bin "${name}-unwrapped" {libraries = [torch];} '' + unwrapped = writers.writePython3Bin "${name}-unwrapped" { libraries = [ torch ]; } '' import torch message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" assert torch.cuda.is_available() and torch.version.${versionAttr}, message @@ -25,8 +25,8 @@ let in runCommandNoCC name { - nativeBuildInputs = [unwrapped]; - requiredSystemFeatures = [feature]; + nativeBuildInputs = [ unwrapped ]; + requiredSystemFeatures = [ feature ]; passthru = { inherit unwrapped; }; From 7d667a0996d718b2384ac280ff2b4c9ad22e2beb Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Thu, 20 Jun 2024 22:16:36 +0000 Subject: [PATCH 121/300] nix-required-mounts: refactor: drop unused arguments --- pkgs/by-name/ni/nix-required-mounts/package.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/ni/nix-required-mounts/package.nix b/pkgs/by-name/ni/nix-required-mounts/package.nix index a7b9c3093e3f..197e0812a8ec 100644 --- a/pkgs/by-name/ni/nix-required-mounts/package.nix +++ b/pkgs/by-name/ni/nix-required-mounts/package.nix @@ -1,6 +1,5 @@ { addOpenGLRunpath, - cmake, allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; }, allowedPatterns ? rec { # This config is just an example. @@ -19,16 +18,13 @@ ]; nvidia-gpu.unsafeFollowSymlinks = true; }, - buildPackages, callPackage, extraWrapperArgs ? [ ], - formats, lib, makeWrapper, nix, nixosTests, python3Packages, - runCommand, }: let From 29398d33b7de03fc392059638983e173149ab04d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:37:03 +0000 Subject: [PATCH 122/300] cvemap: 0.0.6 -> 0.0.7 --- pkgs/by-name/cv/cvemap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix index efd51d838e28..a9709006e2fc 100644 --- a/pkgs/by-name/cv/cvemap/package.nix +++ b/pkgs/by-name/cv/cvemap/package.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cvemap"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cvemap"; rev = "refs/tags/v${version}"; - hash = "sha256-aeUYcgBTHWWLTuAXnnc73yXaC3yLZzruqvedUYCnht4="; + hash = "sha256-Ste08J3KIJmugKZegU82wq6N+B5DaHc8Z0UtqKsUYE8="; }; - vendorHash = "sha256-VQGWi01mOP2N4oYsaDK7wn/+hSFEDHhSma9DOZ06Z3k="; + vendorHash = "sha256-+gYJkKJLUsCbh0JhVNOdr8U5pgWYjD56KZ0VePoYecU="; subPackages = [ "cmd/cvemap/" From 2466aa7a209b518a05dafa52dd262fda1808b719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:40:52 +0000 Subject: [PATCH 123/300] bitcoind-abc: 0.29.6 -> 0.29.7 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 8389779a2c8a..857467c96739 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.6"; + version = "0.29.7"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI="; + hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w="; }; nativeBuildInputs = [ pkg-config cmake ]; From 19375f3e3ca785e8f113674fe283eb0b24dc996b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 00:44:57 +0000 Subject: [PATCH 124/300] bitcoin-abc: 0.29.6 -> 0.29.7 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 8389779a2c8a..857467c96739 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.6"; + version = "0.29.7"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-q+7NoZQDzEXBOFeob9Om5mnuocbaYjvdckv7Cur7nCI="; + hash = "sha256-+9uBmmdQ/shWYnJ7tM+Y8OgqYcQHHI2qeMw2tl1lE+w="; }; nativeBuildInputs = [ pkg-config cmake ]; From c7f558820ccd5948c5c55dfc78b291cb9fba075b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 01:09:29 +0000 Subject: [PATCH 125/300] isomd5sum: 1.2.4 -> 1.2.5 --- pkgs/tools/cd-dvd/isomd5sum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 671f82281659..62022066a666 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "isomd5sum"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "rhinstaller"; repo = pname; rev = version; - sha256 = "sha256-tpDk7Wt2zV0vB2IILuIJyMMFBSiHKAVkSqsCwnWApJ0="; + sha256 = "sha256-c/4CQtAzatfG1Z3SfyB2OZmfJRMnyrZZTqSApsK7R+Q="; }; strictDeps = true; From 11a3ee62fe66e627c799d75b2cefe3bba3f99e63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 01:33:57 +0000 Subject: [PATCH 126/300] odo: 3.15.0 -> 3.16.1 --- pkgs/applications/networking/cluster/odo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/odo/default.nix b/pkgs/applications/networking/cluster/odo/default.nix index 9ab5082f61dc..f907f6891430 100644 --- a/pkgs/applications/networking/cluster/odo/default.nix +++ b/pkgs/applications/networking/cluster/odo/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "odo"; - version = "3.15.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = "redhat-developer"; repo = "odo"; rev = "v${version}"; - sha256 = "sha256-UPq211Lo95r2b/Ov/a7uhb5p9M3MlNd72VwkMXPHy2Y="; + sha256 = "sha256-zEN8yfjW3JHf6OzPQC6Rg2/hJ+3d9d2nYhz60BdSK9s="; }; vendorHash = null; From f0fa5f2ed4db01cc9e381b5b594d32fd203a2bd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 01:34:01 +0000 Subject: [PATCH 127/300] opensearch: 2.14.0 -> 2.15.0 --- pkgs/servers/search/opensearch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/opensearch/default.nix b/pkgs/servers/search/opensearch/default.nix index fb9139ec6ee6..1ee13f39892d 100644 --- a/pkgs/servers/search/opensearch/default.nix +++ b/pkgs/servers/search/opensearch/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "opensearch"; - version = "2.14.0"; + version = "2.15.0"; src = fetchurl { url = "https://artifacts.opensearch.org/releases/bundle/opensearch/${finalAttrs.version}/opensearch-${finalAttrs.version}-linux-x64.tar.gz"; - hash = "sha256-NHLt23GDdtq1DliMByXN52jnKGZApdngp04MTz7F7HY="; + hash = "sha256-AUuquYXRwI4JvEiUdx/l3Tk/kxENrXG1RtzBzrsrZyg="; }; nativeBuildInputs = [ From f891e7eaa6a8c52aba9af79c64605a962a304344 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 01:39:17 +0000 Subject: [PATCH 128/300] poutine: 0.11.0 -> 0.12.0 --- pkgs/by-name/po/poutine/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/po/poutine/package.nix b/pkgs/by-name/po/poutine/package.nix index 6ebd925ff2eb..c4446072879b 100644 --- a/pkgs/by-name/po/poutine/package.nix +++ b/pkgs/by-name/po/poutine/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "poutine"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "boostsecurityio"; repo = "poutine"; rev = "refs/tags/v${version}"; - hash = "sha256-T81Qi79VaZzfKL4niTZQW+gwwiBcyInALrvyUg1V4Ck="; + hash = "sha256-mB/d3EWBWHx7zrMGRPGOJc2uD3MlhXV8H2WfNiKlzdE="; }; - vendorHash = "sha256-/chq40j+puAI3KdI15vbZwrnzCKrU7g+Z/t9aOXQ1Sg="; + vendorHash = "sha256-HYuyGSatUOch73IKc7/9imhwz0Oz6Mrccs2HKVQtaVE="; ldflags = [ "-s" From 0794996438213e6c623ffaac79f296a4cc18b755 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 02:13:31 +0000 Subject: [PATCH 129/300] cnspec: 11.9.1 -> 11.10.0 --- pkgs/tools/security/cnspec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cnspec/default.nix b/pkgs/tools/security/cnspec/default.nix index e3c112127143..7f686fb37bca 100644 --- a/pkgs/tools/security/cnspec/default.nix +++ b/pkgs/tools/security/cnspec/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "cnspec"; - version = "11.9.1"; + version = "11.10.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-8i2oNeFxpxhFxFlJR3ib0M1W9NNtqgGjlnKsqzLkf68="; + hash = "sha256-tV7QDa7XSkr+HwegOwEnOjtn1IrLhE0PfrhjjRz0JbM="; }; proxyVendor = true; - vendorHash = "sha256-va23lTCCL/4EpTkBPH+rqZj4f+O4vAg2/nXGMEDNGXU="; + vendorHash = "sha256-KS+fuoLFueI5cHQLiM1g6Qxq4UFKNVGauvchx2aP+RY="; subPackages = [ "apps/cnspec" ]; From bca30eb509d4b7d12bb0b752a2534f49991df9bf Mon Sep 17 00:00:00 2001 From: Jdogzz Date: Tue, 25 Jun 2024 19:27:58 -0700 Subject: [PATCH 130/300] doc: remove outdated Steam documentation related to Java Fixes #297694. --- doc/packages/steam.section.md | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/doc/packages/steam.section.md b/doc/packages/steam.section.md index c9a09962f62d..4c87eeb81836 100644 --- a/doc/packages/steam.section.md +++ b/doc/packages/steam.section.md @@ -40,20 +40,6 @@ Use `programs.steam.enable = true;` if you want to add steam to `systemPackages` have a look at [this pull request](https://github.com/NixOS/nixpkgs/pull/20269). -- **Java** - - 1. There is no java in steam chrootenv by default. If you get a message like: - - ``` - /home/foo/.local/share/Steam/SteamApps/common/towns/towns.sh: line 1: java: command not found - ``` - - you need to add: - - ```nix - steam.override { withJava = true; } - ``` - ## steam-run {#sec-steam-run} The FHS-compatible chroot used for Steam can also be used to run other Linux games that expect a FHS environment. To use it, install the `steam-run` package and run the game with: From f424ca5c4fa297ba784f41ec8bd3ba63c3e61076 Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 26 Jun 2024 04:29:20 +0200 Subject: [PATCH 131/300] ungoogled-chromium: 126.0.6478.114-1 -> 126.0.6478.126-1 https://chromereleases.googleblog.com/2024/06/stable-channel-update-for-desktop_24.html This update includes 5 security fixes. CVEs: CVE-2024-6290 CVE-2024-6291 CVE-2024-6292 CVE-2024-6293 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 54d4e2417f69..7a6ad1abca4d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-lj/XYWkEo7M1i3D5e1MVXTXh02U55lNoo+sxKpu8FNc="; - rev = "126.0.6478.114-1"; + hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM="; + rev = "126.0.6478.126-1"; }; }; - hash = "sha256-sXP+/KXDoy3QnRoa9acGbsXKVCPspyNGtZTLMHBqxvw="; - version = "126.0.6478.114"; + hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; + version = "126.0.6478.126"; }; } From 4b0f5b9580552be35656413cc98d480d5a34ba6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 02:45:18 +0000 Subject: [PATCH 132/300] spla: 1.6.0 -> 1.6.1 --- pkgs/by-name/sp/spla/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sp/spla/package.nix b/pkgs/by-name/sp/spla/package.nix index 86124dfe7772..eccf87258ace 100644 --- a/pkgs/by-name/sp/spla/package.nix +++ b/pkgs/by-name/sp/spla/package.nix @@ -22,13 +22,13 @@ assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ]; stdenv.mkDerivation rec { pname = "spla"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "eth-cscs"; repo = pname; rev = "v${version}"; - hash = "sha256-1k9Su7loXsH7AyhYFZax+4nyNoCO5+WJbXrzGGAIy/c="; + hash = "sha256-fNH1IOKV1Re8G7GH9Xfn3itR80eonTbEGKQRRD16/2k="; }; outputs = [ "out" "dev" ]; From e10b0f95bd07422c63a88cfa50ccccebd4963b99 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 26 Jun 2024 11:52:47 +1000 Subject: [PATCH 133/300] terraform-providers.onepassword: init at 2.1.0 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c23bd6e7372e..e733ce2e2812 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -888,6 +888,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "onepassword": { + "hash": "sha256-rdS9Udzfc/U7E4CIyySnntOCVBBZL0/GuAiVCI5uMrc=", + "homepage": "https://registry.terraform.io/providers/1Password/onepassword", + "owner": "1Password", + "repo": "terraform-provider-onepassword", + "rev": "v2.1.0", + "spdx": "MIT", + "vendorHash": null + }, "opennebula": { "hash": "sha256-Bz/JKPbdxKS7VDnQoXnZ5ajqh++ujl+4wIS49BDtT94=", "homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula", From 0c1fbe5fc5ac3ba43f26f86e4ddc057a1c58bb61 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 26 Jun 2024 05:03:41 +0200 Subject: [PATCH 134/300] doc: Explain cabalSdist test --- pkgs/test/haskell/cabalSdist/default.nix | 5 +++++ pkgs/test/haskell/cabalSdist/local/generated.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/test/haskell/cabalSdist/default.nix b/pkgs/test/haskell/cabalSdist/default.nix index 1031e51e4f14..c0a9d406a503 100644 --- a/pkgs/test/haskell/cabalSdist/default.nix +++ b/pkgs/test/haskell/cabalSdist/default.nix @@ -12,6 +12,11 @@ lib.recurseIntoAttrs rec { localFromCabalSdist = haskellPackages.buildFromCabalSdist localRaw; + # NOTE: ./local refers to the "./." path in `./local/generated.nix`. + # This test makes sure that localHasNoDirectReference can actually fail if + # it doesn't do anything. If this test fails, either the test setup was broken, + # or Haskell packaging has changed the way `src` is treated in such a way that + # either the test or the design of `buildFromCabalSdist` needs to be reconsidered. assumptionLocalHasDirectReference = runCommand "localHasDirectReference" { drvPath = builtins.unsafeDiscardOutputDependency localRaw.drvPath; } '' diff --git a/pkgs/test/haskell/cabalSdist/local/generated.nix b/pkgs/test/haskell/cabalSdist/local/generated.nix index bfa299962bcb..fae1e45f3d97 100644 --- a/pkgs/test/haskell/cabalSdist/local/generated.nix +++ b/pkgs/test/haskell/cabalSdist/local/generated.nix @@ -3,7 +3,7 @@ mkDerivation { pname = "local"; version = "0.1.0.0"; - src = ./.; + src = ./.; # also referred to as ./local in the test; these are the same path constants isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; From 732c7006c5cb887402deb77d51af78f091c0654a Mon Sep 17 00:00:00 2001 From: iivusly Date: Tue, 25 Jun 2024 20:08:44 -0700 Subject: [PATCH 135/300] gitkraken: add gitkraken darwin bin --- pkgs/applications/version-management/gitkraken/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index b806608a5b0a..c1373346b6af 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -161,14 +161,16 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; - nativeBuildInputs = [ unzip ]; + nativeBuildInputs = [ unzip makeWrapper ]; installPhase = '' runHook preInstall - mkdir -p $out/Applications/GitKraken.app + mkdir -p $out/Applications/GitKraken.app $out/bin cp -R . $out/Applications/GitKraken.app + makeWrapper $out/Applications/GitKraken.app/Contents/MacOS/GitKraken $out/bin/gitkraken + runHook postInstall ''; From 3e5790e2c7c23178426401dd124c5522f0401483 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 03:46:37 +0000 Subject: [PATCH 136/300] staruml: 6.1.1 -> 6.1.2 --- pkgs/tools/misc/staruml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index d98225ac365f..0238ef46a951 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -24,12 +24,12 @@ let ]; in stdenv.mkDerivation (finalAttrs: { - version = "6.1.1"; + version = "6.1.2"; pname = "staruml"; src = fetchurl { url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb"; - sha256 = "sha256-AtWzGEegKUDeNLhklm74JNQQqBzdOE4MUYBFp9ubd2A="; + sha256 = "sha256-jAvtcgn51RzO+fkS1LucJs0GOK/x7/7+mWhrNu/dyjg="; }; nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; From 590bc144c2a0d1d43e05897730e9b58ea08fa9a8 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 00:39:39 -0400 Subject: [PATCH 137/300] get-graphql-schema: Move out of nodePackages --- .../ge/get-graphql-schema/package.json | 35 ++++++++++++++ .../by-name/ge/get-graphql-schema/package.nix | 43 +++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 46 ------------------- 5 files changed, 79 insertions(+), 47 deletions(-) create mode 100644 pkgs/by-name/ge/get-graphql-schema/package.json create mode 100644 pkgs/by-name/ge/get-graphql-schema/package.nix diff --git a/pkgs/by-name/ge/get-graphql-schema/package.json b/pkgs/by-name/ge/get-graphql-schema/package.json new file mode 100644 index 000000000000..ade37982b91f --- /dev/null +++ b/pkgs/by-name/ge/get-graphql-schema/package.json @@ -0,0 +1,35 @@ +{ + "name": "get-graphql-schema", + "bin": "dist/index.js", + "files": [ + "README.md", + "dist/" + ], + "version": "2.1.1", + "description": "Downloads the GraphQL Schema of an GraphQL endpoint URL", + "scripts": { + "build": "tsc", + "prepublish": "npm run build && chmod +x dist/index.js", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/graphcool/get-graphql-schema.git" + }, + "author": "Johannes Schickling ", + "license": "MIT", + "dependencies": { + "@types/chalk": "^0.4.31", + "@types/graphql": "^0.8.6", + "@types/minimist": "^1.2.0", + "@types/node": "^7.0.4", + "@types/node-fetch": "^1.6.7", + "chalk": "^1.1.3", + "graphql": "^0.9.1", + "minimist": "^1.2.0", + "node-fetch": "^1.6.3" + }, + "devDependencies": { + "typescript": "^2.1.5" + } +} diff --git a/pkgs/by-name/ge/get-graphql-schema/package.nix b/pkgs/by-name/ge/get-graphql-schema/package.nix new file mode 100644 index 000000000000..25d9f839778c --- /dev/null +++ b/pkgs/by-name/ge/get-graphql-schema/package.nix @@ -0,0 +1,43 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nodejs_22 +}: mkYarnPackage rec { + pname = "get-graphql-schema"; + version = "2.1.1"; + + src = fetchFromGitHub { + owner = "prisma-labs"; + repo = "get-graphql-schema"; + rev = "v${version}"; + hash = "sha256-ujc0LGAqmo4SmItm4VcbBOtmUvL6aV1ppMm4fMmuSRs="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-TZGNX8UHbolLyBmQNGTnFjgx3/3f2HNVQf/h9rIVJKs="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + postFixup = '' + substituteInPlace $out/libexec/get-graphql-schema/deps/get-graphql-schema/dist/index.js \ + --replace-fail "#!/usr/bin/env node" "#!${lib.getExe nodejs_22}" + chmod +x $out/bin/get-graphql-schema + ''; + meta = { + description = "Command line tool for generating a changelog from git tags and commit history"; + homepage = "https://github.com/cookpete/auto-changelog"; + changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "get-graphql-schema"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..f559d655c768 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -86,6 +86,7 @@ mapAliases { git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 + inherit (pkgs) get-graphql-schema; # added 2024-06-26 inherit (pkgs) gqlint; # added 2023-08-19 inherit (pkgs) graphite-cli; # added 2024-01-25 inherit (pkgs) graphqurl; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..8c1af62a2d75 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -112,7 +112,6 @@ , "fx" , "ganache" , "gatsby-cli" -, "get-graphql-schema" , "git-run" , "git-standup" , "@gitbeaker/cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..c8ecdfd9639f 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -28771,15 +28771,6 @@ let sha512 = "tdcqOOpwArNjEr0gNQKCXwaNCWnQJrog14nJNQPeemcLnXQUUGrsCWpWkVKt46zLjcS6/KGoayeJfHHyPDlvwA=="; }; }; - "graphql-14.7.0" = { - name = "graphql"; - packageName = "graphql"; - version = "14.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/graphql/-/graphql-14.7.0.tgz"; - sha512 = "l0xWZpoPKpppFzMfvVyFmp9vLN7w/ZZJPefUicMCepfJeQ8sMcztloGYY9DfjVPo6tIUDzU5Hw3MUbIjj9AVVA=="; - }; - }; "graphql-15.3.0" = { name = "graphql"; packageName = "graphql"; @@ -74233,43 +74224,6 @@ in bypassCache = true; reconstructLock = true; }; - get-graphql-schema = nodeEnv.buildNodePackage { - name = "get-graphql-schema"; - packageName = "get-graphql-schema"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-graphql-schema/-/get-graphql-schema-2.1.2.tgz"; - sha512 = "1z5Hw91VrE3GrpCZE6lE8Dy+jz4kXWesLS7rCSjwOxf5BOcIedAZeTUJRIeIzmmR+PA9CKOkPTYFRJbdgUtrxA=="; - }; - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."encoding-0.1.13" - sources."escape-string-regexp-1.0.5" - sources."graphql-14.7.0" - sources."has-flag-3.0.0" - sources."iconv-lite-0.6.3" - sources."iterall-1.3.0" - sources."minimist-1.2.8" - sources."node-fetch-2.7.0" - sources."safer-buffer-2.1.2" - sources."supports-color-5.5.0" - sources."tr46-0.0.3" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Downloads the GraphQL Schema of an GraphQL endpoint URL"; - homepage = "https://github.com/graphcool/get-graphql-schema#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; git-run = nodeEnv.buildNodePackage { name = "git-run"; packageName = "git-run"; From 6954a8acb9ab6e46c77ede9d8f4b7ea86a0e8684 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 00:18:27 -0400 Subject: [PATCH 138/300] auto-changelog: move out of node-packages --- pkgs/by-name/au/auto-changelog/package.json | 100 ++++++++++++++++++ pkgs/by-name/au/auto-changelog/package.nix | 31 ++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 36 ------- 5 files changed, 132 insertions(+), 37 deletions(-) create mode 100644 pkgs/by-name/au/auto-changelog/package.json create mode 100644 pkgs/by-name/au/auto-changelog/package.nix diff --git a/pkgs/by-name/au/auto-changelog/package.json b/pkgs/by-name/au/auto-changelog/package.json new file mode 100644 index 000000000000..573119c376c5 --- /dev/null +++ b/pkgs/by-name/au/auto-changelog/package.json @@ -0,0 +1,100 @@ +{ + "name": "auto-changelog", + "version": "2.4.0", + "description": "Command line tool for generating a changelog from git tags and commit history", + "main": "./src/index.js", + "bin": { + "auto-changelog": "./src/index.js" + }, + "engines": { + "node": ">=8.3" + }, + "scripts": { + "lint": "standard --verbose | snazzy", + "lint-fix": "standard --fix", + "lint-markdown": "markdownlint README.md test/data/*.md", + "test": "cross-env NODE_ENV=test mocha -r @babel/register test", + "test-coverage": "cross-env NODE_ENV=test nyc mocha test", + "report-coverage": "nyc report --reporter=json && codecov -f coverage/coverage-final.json", + "preversion": "npm run lint && npm run test", + "version": "node src/index.js --package && git add CHANGELOG.md", + "generate-test-data": "cross-env NODE_ENV=test node scripts/generate-test-data.js" + }, + "author": "Pete Cook (https://github.com/cookpete)", + "homepage": "https://github.com/CookPete/auto-changelog", + "repository": { + "type": "git", + "url": "https://github.com/CookPete/auto-changelog.git" + }, + "bugs": { + "url": "https://github.com/CookPete/auto-changelog/issues" + }, + "keywords": [ + "auto", + "automatic", + "changelog", + "change", + "log", + "generator", + "git", + "commit", + "commits", + "history" + ], + "license": "MIT", + "dependencies": { + "commander": "^7.2.0", + "handlebars": "^4.7.7", + "node-fetch": "^2.6.1", + "parse-github-url": "^1.0.2", + "semver": "^7.3.5" + }, + "devDependencies": { + "@babel/core": "^7.14.3", + "@babel/register": "^7.13.16", + "babel-plugin-istanbul": "^6.0.0", + "babel-plugin-rewire": "^1.2.0", + "chai": "^4.3.4", + "codecov": "^3.8.2", + "cross-env": "^7.0.3", + "markdownlint-cli": "^0.30.0", + "mocha": "^9.2.0", + "nyc": "^15.1.0", + "snazzy": "^9.0.0", + "standard": "^16.0.3" + }, + "babel": { + "env": { + "test": { + "plugins": [ + "istanbul", + "rewire" + ] + } + } + }, + "standard": { + "ignore": [ + "test/data/" + ] + }, + "nyc": { + "all": true, + "include": "src", + "exclude": "src/index.js", + "sourceMap": false, + "instrument": false, + "report-dir": "./coverage", + "temp-dir": "./coverage/.nyc_output", + "require": [ + "@babel/register" + ], + "reporter": [ + "text", + "html" + ] + }, + "auto-changelog": { + "breakingPattern": "Breaking change" + } +} diff --git a/pkgs/by-name/au/auto-changelog/package.nix b/pkgs/by-name/au/auto-changelog/package.nix new file mode 100644 index 000000000000..44a4273b9042 --- /dev/null +++ b/pkgs/by-name/au/auto-changelog/package.nix @@ -0,0 +1,31 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub +}: mkYarnPackage rec { + pname = "auto-changelog"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "cookpete"; + repo = "auto-changelog"; + rev = "v${version}"; + hash = "sha256-qgJ/TVyViMhISt/EfCWV7XWQLXKTeZalGHFG905Ma5I="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-rP/Xt0txwfEUmGZ0CyHXSEG9zSMtv8wr5M2Na+6PbyQ="; + }; + + meta = { + description = "Command line tool for generating a changelog from git tags and commit history"; + homepage = "https://github.com/cookpete/auto-changelog"; + changelog = "https://github.com/cookpete/auto-changelog/blob/master/CHANGELOG.md"; + license = lib.licenses.mit; + mainProgram = "auto-changelog"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..20087c294159 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -57,6 +57,7 @@ mapAliases { alloy = pkgs.titanium-alloy; # added 2023-08-17 antennas = pkgs.antennas; # added 2023-07-30 inherit (pkgs) asar; # added 2023-08-26 + inherit (pkgs) auto-changelog; # added 2024-06-25 inherit (pkgs) aws-azure-login; # added 2023-09-30 balanceofsatoshis = pkgs.balanceofsatoshis; # added 2023-07-31 inherit (pkgs) bash-language-server; # added 2024-06-07 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..9758fede52f1 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -21,7 +21,6 @@ , "alex" , "audiosprite" , "autoprefixer" -, "auto-changelog" , "aws-cdk" , "awesome-lint" , "bower" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..a6aa35ffca89 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -63573,42 +63573,6 @@ in bypassCache = true; reconstructLock = true; }; - auto-changelog = nodeEnv.buildNodePackage { - name = "auto-changelog"; - packageName = "auto-changelog"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/auto-changelog/-/auto-changelog-2.4.0.tgz"; - sha512 = "vh17hko1c0ItsEcw6m7qPRf3m45u+XK5QyCrrBFViElZ8jnKrPC1roSznrd1fIB/0vR/zawdECCRJtTuqIXaJw=="; - }; - dependencies = [ - sources."commander-7.2.0" - sources."encoding-0.1.13" - sources."handlebars-4.7.8" - sources."iconv-lite-0.6.3" - sources."minimist-1.2.8" - sources."neo-async-2.6.2" - sources."node-fetch-2.7.0" - sources."parse-github-url-1.0.2" - sources."safer-buffer-2.1.2" - sources."semver-7.6.2" - sources."source-map-0.6.1" - sources."tr46-0.0.3" - sources."uglify-js-3.18.0" - sources."webidl-conversions-3.0.1" - sources."whatwg-url-5.0.0" - sources."wordwrap-1.0.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line tool for generating a changelog from git tags and commit history"; - homepage = "https://github.com/CookPete/auto-changelog"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; aws-cdk = nodeEnv.buildNodePackage { name = "aws-cdk"; packageName = "aws-cdk"; From 61409956c779e02c5f6f832d4525f4b67540a8b3 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 25 Jun 2024 23:40:58 -0400 Subject: [PATCH 139/300] dotenv-cli: init Removes the package from node-packages and adds to pkgs/by-name --- pkgs/by-name/do/dotenv-cli/package.json | 26 ++++++++++++++ pkgs/by-name/do/dotenv-cli/package.nix | 34 +++++++++++++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 29 ---------------- 5 files changed, 61 insertions(+), 30 deletions(-) create mode 100644 pkgs/by-name/do/dotenv-cli/package.json create mode 100644 pkgs/by-name/do/dotenv-cli/package.nix diff --git a/pkgs/by-name/do/dotenv-cli/package.json b/pkgs/by-name/do/dotenv-cli/package.json new file mode 100644 index 000000000000..3ad9bff441a1 --- /dev/null +++ b/pkgs/by-name/do/dotenv-cli/package.json @@ -0,0 +1,26 @@ +{ + "name": "dotenv-cli", + "description": "A global executable to run applications with the ENV variables loaded by dotenv", + "version": "7.4.3", + "author": "entropitor", + "bin": { + "dotenv": "./cli.js" + }, + "dependencies": { + "cross-spawn": "^7.0.3", + "dotenv": "^16.3.0", + "dotenv-expand": "^10.0.0", + "minimist": "^1.2.6" + }, + "devDependencies": { + "standard": "^16.0.4" + }, + "license": "MIT", + "main": "index.js", + "preferGlobal": true, + "repository": "entropitor/dotenv-cli", + "scripts": { + "lint": "standard" + }, + "resolutions": {} +} diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix new file mode 100644 index 000000000000..298fb07118c1 --- /dev/null +++ b/pkgs/by-name/do/dotenv-cli/package.nix @@ -0,0 +1,34 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "dotenv-cli"; + version = "7.4.3"; + + src = fetchFromGitHub { + owner = "entropitor"; + repo = "dotenv-cli"; + rev = "v${version}"; + hash = "sha256-kR9LSHvbvKLuJBGrsmYMeqF3s8SF+/99OeNlKp9azI8="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-Sx5DHUAXquqMqJgvhvHcRPqkfWN49+6icUQIos6OHCg="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI to load dotenv files"; + homepage = "https://github.com/entropitor/dotenv-cli"; + changelog = "https://github.com/entropitor/dotenv-cli/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "dotenv"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..f88bc3c66da4 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -77,6 +77,7 @@ mapAliases { dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 + inherit (pkgs) dotenv-cli; # added 2024-06-26 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; eslint_d = pkgs.eslint_d; # Added 2023-05-26 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..a18e882bbeaa 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -91,7 +91,6 @@ , "dhcp" , "diagnostic-languageserver" , "diff2html-cli" -, "dotenv-cli" , "dotenv-vault" , "elasticdump" , "@electron-forge/cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..fc66e3e7c2b1 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -68820,35 +68820,6 @@ in bypassCache = true; reconstructLock = true; }; - dotenv-cli = nodeEnv.buildNodePackage { - name = "dotenv-cli"; - packageName = "dotenv-cli"; - version = "7.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.4.2.tgz"; - sha512 = "SbUj8l61zIbzyhIbg0FwPJq6+wjbzdn9oEtozQpZ6kW2ihCcapKVZj49oCT3oPM+mgQm+itgvUQcG5szxVrZTA=="; - }; - dependencies = [ - sources."cross-spawn-7.0.3" - sources."dotenv-16.4.5" - sources."dotenv-expand-10.0.0" - sources."isexe-2.0.0" - sources."minimist-1.2.8" - sources."path-key-3.1.1" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."which-2.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "A global executable to run applications with the ENV variables loaded by dotenv"; - homepage = "https://github.com/entropitor/dotenv-cli#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; dotenv-vault = nodeEnv.buildNodePackage { name = "dotenv-vault"; packageName = "dotenv-vault"; From 41a2be1c25bad9874d7a598edbdfba75ab5698ff Mon Sep 17 00:00:00 2001 From: Pyrox Date: Tue, 25 Jun 2024 23:18:21 -0400 Subject: [PATCH 140/300] diagnostic-languageserver: remove from node-packages --- .../di/diagnostic-languageserver/package.json | 33 +++++++ .../di/diagnostic-languageserver/package.nix | 41 ++++++++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 95 ------------------- 5 files changed, 75 insertions(+), 96 deletions(-) create mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.json create mode 100644 pkgs/by-name/di/diagnostic-languageserver/package.nix diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.json b/pkgs/by-name/di/diagnostic-languageserver/package.json new file mode 100644 index 000000000000..17483d559a2f --- /dev/null +++ b/pkgs/by-name/di/diagnostic-languageserver/package.json @@ -0,0 +1,33 @@ +{ + "name": "diagnostic-languageserver", + "version": "1.15.0", + "description": "diagnostic language server", + "main": "./lib/index.js", + "repository": "git@github.com:iamcco/diagnostic-languageserver.git", + "author": "iamcco ", + "license": "MIT", + "scripts": { + "build": "tsc -p ./", + "watch": "tsc -w -p ./" + }, + "bin": { + "diagnostic-languageserver": "./bin/index.js" + }, + "dependencies": { + "commander": "^5.1.0", + "find-up": "^4.1.0", + "lodash": "^4.17.15", + "rxjs": "^6.5.5", + "tempy": "^0.7.1", + "tslib": "^1.11.2", + "vscode-languageserver": "^6.1.1", + "vscode-languageserver-textdocument": "^1.0.1", + "vscode-uri": "^2.1.1" + }, + "devDependencies": { + "@types/lodash": "^4.14.150", + "@types/node": "^11.11.3", + "ignore": "^5.1.8", + "typescript": "^3.8.3" + } +} diff --git a/pkgs/by-name/di/diagnostic-languageserver/package.nix b/pkgs/by-name/di/diagnostic-languageserver/package.nix new file mode 100644 index 000000000000..81d99c83ac9f --- /dev/null +++ b/pkgs/by-name/di/diagnostic-languageserver/package.nix @@ -0,0 +1,41 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "diagnostic-languageserver"; + version = "1.15.0"; + + src = fetchFromGitHub { + owner = "iamcco"; + repo = "diagnostic-languageserver"; + rev = "v${version}"; + hash = "sha256-EFkvxMvtA5L6ZiDxrZxGnNAphNn/P3ra6ZrslplScZg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-T8ppt8EDljtMhGp9i0VleU2Nw3tJexE2ufT6C4EtAz0="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + doDist = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "General purpose Language Server that integrate with linter to support diagnostic features"; + homepage = "https://github.com/iamcco/diagnostic-languageserver"; + changelog = "https://github.com/iamcco/diagnostic-languageserver/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "diagnostic-languageserver"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 8f754479b625..cccf1fe4e1fc 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -76,6 +76,7 @@ mapAliases { inherit (pkgs) create-react-app; # added 2023-09-25 dat = throw "dat was removed because it was broken"; # added 2023-08-21 inherit (pkgs) degit; # added 2023-08-18 + inherit (pkgs) diagnostic-languageserver; # added 2024-06-25 inherit (pkgs) dockerfile-language-server-nodejs; # added 2023-08-18 eask = pkgs.eask; # added 2023-08-17 inherit (pkgs.elmPackages) elm-test; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index d04e5184b9f9..ed2ad9ea12f3 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -89,7 +89,6 @@ , "cspell" , "csslint" , "dhcp" -, "diagnostic-languageserver" , "diff2html-cli" , "dotenv-cli" , "dotenv-vault" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index b2c235e87c2c..161305c0c629 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -56449,15 +56449,6 @@ let sha512 = "GuayqdKZqAwwaCUjDvMTAVRPJOp/SLON3mJ07eGsx/Iq9HjRymhKWztX41rISqDKhHVVyFM+IywICyZDla6U3A=="; }; }; - "vscode-languageserver-6.1.1" = { - name = "vscode-languageserver"; - packageName = "vscode-languageserver"; - version = "6.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.1.1.tgz"; - sha512 = "DueEpkUAkD5XTR4MLYNr6bQIp/UFR0/IPApgXU3YfCBCB08u2sm9hRCs6DxYZELkk++STPjpcjksR2H8qI3cDQ=="; - }; - }; "vscode-languageserver-6.2.0-next.2" = { name = "vscode-languageserver"; packageName = "vscode-languageserver"; @@ -68654,92 +68645,6 @@ in bypassCache = true; reconstructLock = true; }; - diagnostic-languageserver = nodeEnv.buildNodePackage { - name = "diagnostic-languageserver"; - packageName = "diagnostic-languageserver"; - version = "1.15.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diagnostic-languageserver/-/diagnostic-languageserver-1.15.0.tgz"; - sha512 = "B1kH0j0jOd106t5E14xItYazxFAYOsAvhK+e0+eYW3nOzG3saKFXfkoeJ86T8g2U40lIwo0Jt8xusn8gd34Swg=="; - }; - dependencies = [ - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."aggregate-error-3.1.0" - sources."array-union-2.1.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."braces-3.0.3" - sources."clean-stack-2.2.0" - sources."commander-5.1.0" - sources."concat-map-0.0.1" - sources."crypto-random-string-2.0.0" - sources."del-6.1.1" - sources."dir-glob-3.0.1" - sources."fast-glob-3.3.2" - sources."fastq-1.17.1" - sources."fill-range-7.1.1" - sources."find-up-4.1.0" - sources."fs.realpath-1.0.0" - sources."glob-7.2.3" - sources."glob-parent-5.1.2" - sources."globby-11.1.0" - sources."graceful-fs-4.2.11" - sources."ignore-5.3.1" - sources."indent-string-4.0.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."is-extglob-2.1.1" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-path-cwd-2.2.0" - sources."is-path-inside-3.0.3" - sources."is-stream-2.0.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."merge2-1.4.1" - sources."micromatch-4.0.7" - sources."minimatch-3.1.2" - sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-map-4.0.0" - sources."p-try-2.2.0" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-type-4.0.0" - sources."picomatch-2.3.1" - sources."queue-microtask-1.2.3" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."rxjs-6.6.7" - sources."slash-3.0.0" - sources."temp-dir-2.0.0" - sources."tempy-0.7.1" - sources."to-regex-range-5.0.1" - sources."tslib-1.14.1" - sources."type-fest-0.16.0" - sources."unique-string-2.0.0" - sources."vscode-jsonrpc-8.2.0" - sources."vscode-languageserver-6.1.1" - sources."vscode-languageserver-protocol-3.17.5" - sources."vscode-languageserver-textdocument-1.0.11" - sources."vscode-languageserver-types-3.17.5" - sources."vscode-uri-2.1.2" - sources."wrappy-1.0.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "diagnostic language server"; - homepage = "https://github.com/iamcco/diagnostic-languageserver#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; diff2html-cli = nodeEnv.buildNodePackage { name = "diff2html-cli"; packageName = "diff2html-cli"; From 2572634a6d50fdd1aafbd4f98c3553a08ec3f011 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 25 Jun 2024 21:51:13 -0700 Subject: [PATCH 141/300] flutter.engine: fix swiftshader size --- .../compilers/flutter/engine/default.nix | 1 + .../compilers/flutter/engine/package.nix | 17 +++++++++++++---- .../update/get-engine-swiftshader.nix.in | 5 +++++ .../compilers/flutter/versions/3_13/data.json | 2 +- .../compilers/flutter/versions/3_16/data.json | 2 +- .../compilers/flutter/versions/3_19/data.json | 2 +- .../compilers/flutter/versions/3_22/data.json | 2 +- .../compilers/flutter/versions/3_23/data.json | 2 +- 8 files changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix index 4aac2301f866..7bf59dc85719 100644 --- a/pkgs/development/compilers/flutter/engine/default.nix +++ b/pkgs/development/compilers/flutter/engine/default.nix @@ -51,6 +51,7 @@ stdenv.mkDerivation ( runtimeMode outName dart + swiftshader ; inherit altRuntimeMode; diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 7c2cd5cec220..09133fea5fa9 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -15,6 +15,7 @@ fetchgit, runCommand, llvmPackages, + llvmPackages_15, patchelf, openbox, xorg, @@ -67,6 +68,10 @@ let url = "https://swiftshader.googlesource.com/SwiftShader.git"; hash = swiftshaderHash; rev = swiftshaderRev; + + postFetch = '' + rm -rf $out/third_party/llvm-project + ''; }; llvm = symlinkJoin { @@ -178,7 +183,14 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' pushd ${src.name} - ln -s $swiftshader src/flutter/third_party/swiftshader + cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader + chmod -R u+w -- src/flutter/third_party/swiftshader + + ln -s ${llvmPackages_15.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project + + mkdir -p src/flutter/buildtools/${constants.alt-platform} + ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang + ln -s ${dart} src/third_party/dart/tools/sdks/dart-sdk ${lib.optionalString (stdenv.isLinux) '' for patchtool in ''${patchtools[@]}; do @@ -198,9 +210,6 @@ stdenv.mkDerivation (finalAttrs: { popd done - mkdir -p src/flutter/buildtools/${constants.alt-platform} - ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang - dart src/third_party/dart/tools/generate_package_config.dart cp ${./pkg-config.py} src/build/config/linux/pkg-config.py echo "${dartSdkVersion}" >src/third_party/dart/sdk/version diff --git a/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in index 2dffbe950b86..aa71f8ae2ad3 100644 --- a/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in +++ b/pkgs/development/compilers/flutter/update/get-engine-swiftshader.nix.in @@ -2,4 +2,9 @@ fetchgit { url = "https://swiftshader.googlesource.com/SwiftShader.git"; rev = "@engine_swiftshader_rev@"; + + # Keep with in sync of pkgs/development/compilers/flutter/engine/package.nix + postFetch = '' + rm -rf $out/third_party/llvm-project + ''; } diff --git a/pkgs/development/compilers/flutter/versions/3_13/data.json b/pkgs/development/compilers/flutter/versions/3_13/data.json index 9bd8b818bf46..1b61347b30f1 100644 --- a/pkgs/development/compilers/flutter/versions/3_13/data.json +++ b/pkgs/development/compilers/flutter/versions/3_13/data.json @@ -1,7 +1,7 @@ { "version": "3.13.8", "engineVersion": "767d8c75e898091b925519803830fc2721658d07", - "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { diff --git a/pkgs/development/compilers/flutter/versions/3_16/data.json b/pkgs/development/compilers/flutter/versions/3_16/data.json index 08cbdff5bc77..4c9142a149e9 100644 --- a/pkgs/development/compilers/flutter/versions/3_16/data.json +++ b/pkgs/development/compilers/flutter/versions/3_16/data.json @@ -1,7 +1,7 @@ { "version": "3.16.7", "engineVersion": "4a585b79294e830fa89c24924d58a27cc8fbf406", - "engineSwiftShaderHash": "sha256-N6f5aeDroqEwZlUBZi7nhDW8leE/7DqmOtRYOY4wzf4=", + "engineSwiftShaderHash": "sha256-qKf5gXIpI4+05bs7d3W6JlMNTn3vHFQL+i3JpFdyPao=", "engineSwiftShaderRev": "5f9ed9b16931c7155171d31f75004f73f0a3abc8", "channel": "stable", "engineHashes": { diff --git a/pkgs/development/compilers/flutter/versions/3_19/data.json b/pkgs/development/compilers/flutter/versions/3_19/data.json index 491447493db9..a05e0172ca44 100644 --- a/pkgs/development/compilers/flutter/versions/3_19/data.json +++ b/pkgs/development/compilers/flutter/versions/3_19/data.json @@ -1,7 +1,7 @@ { "version": "3.19.4", "engineVersion": "a5c24f538d05aaf66f7972fb23959d8cafb9f95a", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { diff --git a/pkgs/development/compilers/flutter/versions/3_22/data.json b/pkgs/development/compilers/flutter/versions/3_22/data.json index 140b22bbcb1c..2abe37d9dac0 100644 --- a/pkgs/development/compilers/flutter/versions/3_22/data.json +++ b/pkgs/development/compilers/flutter/versions/3_22/data.json @@ -1,7 +1,7 @@ { "version": "3.22.2", "engineVersion": "edd8546116457bdf1c5bdfb13ecb9463d2bb5ed4", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "stable", "engineHashes": { diff --git a/pkgs/development/compilers/flutter/versions/3_23/data.json b/pkgs/development/compilers/flutter/versions/3_23/data.json index a4087fea903e..82233ea5112c 100644 --- a/pkgs/development/compilers/flutter/versions/3_23/data.json +++ b/pkgs/development/compilers/flutter/versions/3_23/data.json @@ -1,7 +1,7 @@ { "version": "3.23.0-0.1.pre", "engineVersion": "bb10c5466638e963479ba5e64e601e42d1a43447", - "engineSwiftShaderHash": "sha256-J8TKwbIQ7hdWCGIu1T//MJlRzT7OTVL0MG/dmMyutPQ=", + "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=", "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f", "channel": "beta", "engineHashes": { From 46a0243923a19886b8e5515c24d8007497273260 Mon Sep 17 00:00:00 2001 From: Tristan Ross Date: Tue, 25 Jun 2024 22:15:45 -0700 Subject: [PATCH 142/300] flutterPackages-source.v3_23.engine: fix building --- .../compilers/flutter/engine/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix index 09133fea5fa9..a87088dc8131 100644 --- a/pkgs/development/compilers/flutter/engine/package.nix +++ b/pkgs/development/compilers/flutter/engine/package.nix @@ -83,6 +83,8 @@ let }; outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt --unoptimized"}"; + + dartPath = "${if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party"}/dart"; in stdenv.mkDerivation (finalAttrs: { pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}"; @@ -168,14 +170,14 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 ]; patchtools = [ - "third_party/dart/tools/sdks/dart-sdk/bin/dart" + "${dartPath}/tools/sdks/dart-sdk/bin/dart" "flutter/third_party/gn/gn" ]; dontPatch = true; patchgit = [ - "third_party/dart" + dartPath "flutter" "." ] ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia"; @@ -183,6 +185,8 @@ stdenv.mkDerivation (finalAttrs: { postUnpack = '' pushd ${src.name} + cp ${./pkg-config.py} src/build/config/linux/pkg-config.py + cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader chmod -R u+w -- src/flutter/third_party/swiftshader @@ -190,7 +194,8 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p src/flutter/buildtools/${constants.alt-platform} ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang - ln -s ${dart} src/third_party/dart/tools/sdks/dart-sdk + + ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk ${lib.optionalString (stdenv.isLinux) '' for patchtool in ''${patchtools[@]}; do @@ -210,9 +215,8 @@ stdenv.mkDerivation (finalAttrs: { popd done - dart src/third_party/dart/tools/generate_package_config.dart - cp ${./pkg-config.py} src/build/config/linux/pkg-config.py - echo "${dartSdkVersion}" >src/third_party/dart/sdk/version + dart src/${dartPath}/tools/generate_package_config.dart + echo "${dartSdkVersion}" >src/${dartPath}/sdk/version rm -rf src/third_party/angle/.git python3 src/flutter/tools/pub_get_offline.py From 7eddea0c28a7d637a1342373515daff9709259a0 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 01:14:45 -0400 Subject: [PATCH 143/300] git-standup: remove from nodePackages The package is already in-tree, this is just maintainance --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9b182a1bb7bd..7f853358c164 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -84,6 +84,7 @@ mapAliases { flood = pkgs.flood; # Added 2023-07-25 generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24 git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21 + inherit (pkgs) git-standup; # added 2024-06-26 inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c8fe6573dc4e..003445804e73 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -114,7 +114,6 @@ , "gatsby-cli" , "get-graphql-schema" , "git-run" -, "git-standup" , "@gitbeaker/cli" , "gramma" , "grammarly-languageserver" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7f7049db4762..82d127df70f2 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -74299,24 +74299,6 @@ in bypassCache = true; reconstructLock = true; }; - git-standup = nodeEnv.buildNodePackage { - name = "git-standup"; - packageName = "git-standup"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/git-standup/-/git-standup-2.3.2.tgz"; - sha512 = "vDYicak+2y+u6TCtneCx/j6LuT9WhJShyWjTB5dhjXqTB9TJ/uF444OmYwrMlaT0/CqxHOV9NXlML+CR8AJxdA=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Recall what you did on the last working day. Psst! or be nosy and find what someone else in your team did ;-)"; - homepage = "https://github.com/kamranahmedse/git-standup#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; "@gitbeaker/cli" = nodeEnv.buildNodePackage { name = "_at_gitbeaker_slash_cli"; packageName = "@gitbeaker/cli"; From 7cc1dc108d2c7512c4c9ffae549012c39bd6cafe Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 26 Jun 2024 08:06:30 +0200 Subject: [PATCH 144/300] python311Packages.cleanlab: 2.6.5 -> 2.6.6 Diff: https://github.com/cleanlab/cleanlab/compare/refs/tags/v2.6.5...v2.6.6 Changelog: https://github.com/cleanlab/cleanlab/releases/tag/v2.6.6 --- .../development/python-modules/cleanlab/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index b7c2070ebcea..e5f227f7545e 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -1,14 +1,19 @@ { lib, buildPythonPackage, - fetchFromGitHub, pythonOlder, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies numpy, scikit-learn, termcolor, tqdm, pandas, - setuptools, + # test dependencies datasets, fasttext, @@ -26,7 +31,7 @@ buildPythonPackage rec { pname = "cleanlab"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -35,7 +40,7 @@ buildPythonPackage rec { owner = "cleanlab"; repo = "cleanlab"; rev = "refs/tags/v${version}"; - hash = "sha256-wehvGh27Ey1YK+eWTjT6jRwa7yqPpx3P0HUNePoljpw="; + hash = "sha256-08ePFTCRuggr4hTCfr/gbzMhLozz4KCywhPFSKYDNng="; }; build-system = [ setuptools ]; From 00f9680427982b78d66e4e1cf3bdd5a838dff592 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 02:18:26 -0400 Subject: [PATCH 145/300] gramma: remove from nodePackages --- pkgs/by-name/gr/gramma/package.json | 84 +++++++ pkgs/by-name/gr/gramma/package.nix | 34 +++ pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 225 ------------------ 5 files changed, 119 insertions(+), 226 deletions(-) create mode 100644 pkgs/by-name/gr/gramma/package.json create mode 100644 pkgs/by-name/gr/gramma/package.nix diff --git a/pkgs/by-name/gr/gramma/package.json b/pkgs/by-name/gr/gramma/package.json new file mode 100644 index 000000000000..5aa4d87333b0 --- /dev/null +++ b/pkgs/by-name/gr/gramma/package.json @@ -0,0 +1,84 @@ +{ + "name": "gramma", + "version": "1.6.0", + "license": "ISC", + "repository": "https://github.com/caderek/gramma", + "homepage": "https://caderek.github.io/gramma/", + "description": "Command line grammar checker", + "main": "src/index.js", + "bin": "src/cli.js", + "exports": { + ".": "./src/index.js", + "./esm": "./bundle/gramma.esm.js", + "./esm-min": "./bundle/gramma.esm.min.js", + "./iife": "./bundle/gramma.min.js" + }, + "types": "src/index.d.ts", + "scripts": { + "build": "rm -rf bin; yarn run build:win64; yarn run build:macos; yarn run build:linux64; yarn run build:zip; yarn run build:bundles", + "build:win64": "pkg -c package.json -t node16-win-x64 --out-path bin/windows64 src/cli.js", + "build:macos": "pkg -c package.json -t node16-macos-x64 --out-path bin/macos src/cli.js", + "build:linux64": "pkg -c package.json -t node16-linux-x64 --out-path bin/linux64 src/cli.js", + "build:bundles": "yarn run build:esm; yarn run build:esm-min; yarn run build:iife", + "build:esm": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.js --format=esm", + "build:esm-min": "esbuild src/index.js --bundle --outfile=bundle/gramma.esm.min.js --format=esm --minify", + "build:iife": "esbuild src/index.js --bundle --outfile=bundle/gramma.min.js --format=iife --minify --global-name=gramma", + "build:zip": "node scripts/zipBinaries.js", + "format": "prettier --write \"src/**/*.js\"", + "lint": "eslint src/**", + "test": "jest", + "test:ci": "jest --coverage && cat ./coverage/lcov.info | codacy-coverage", + "check:langs": "node scripts/checkLanguagesSupport.js", + "prepare": "husky install", + "definitions": "tsc" + }, + "keywords": [ + "grammar", + "command-line", + "checker" + ], + "author": "Maciej Cąderek | maciej.caderek@gmail.com", + "dependencies": { + "cli-progress": "^3.9.1", + "decompress": "^4.2.1", + "decompress-unzip": "^4.0.1", + "dotenv": "^10.0.0", + "intercept-stdout": "^0.1.2", + "isomorphic-fetch": "^3.0.0", + "kleur": "^4.1.4", + "portfinder": "^1.0.28", + "progress-stream": "^2.0.0", + "prompts": "^2.4.1", + "query-string": "^7.0.1", + "rimraf": "^3.0.2", + "tcp-port-used": "^1.0.2", + "yargs": "^17.2.1" + }, + "devDependencies": { + "@types/jest": "^27.0.2", + "codacy-coverage": "^3.4.0", + "esbuild": "^0.13.4", + "eslint": "^7.32.0", + "eslint-config-airbnb": "^18.2.1", + "eslint-config-prettier": "^8.3.0", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-react": "^7.26.1", + "gramma": "^1.5.0", + "husky": "^7.0.0", + "jest": "^27.2.4", + "pkg": "^5.3.3", + "prettier": "^2.4.1", + "shelljs": "^0.8.4", + "typescript": "^4.4.3" + }, + "jest": { + "verbose": true, + "testMatch": [ + "**/?(*.)(spec|test).?(m)js" + ] + }, + "engines": { + "node": ">=12.0.0" + } +} diff --git a/pkgs/by-name/gr/gramma/package.nix b/pkgs/by-name/gr/gramma/package.nix new file mode 100644 index 000000000000..d5ba331d0003 --- /dev/null +++ b/pkgs/by-name/gr/gramma/package.nix @@ -0,0 +1,34 @@ +{ + lib, + mkYarnPackage, + fetchYarnDeps, + fetchFromGitHub, + nix-update-script +}: mkYarnPackage rec { + pname = "gramma"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "caderek"; + repo = "gramma"; + rev = "v${version}"; + hash = "sha256-gfBwKpsttdhjD/Opn8251qskURpwLX2S5NSbpwP3hFg="; + }; + + packageJSON = ./package.json; + offlineCache = fetchYarnDeps { + yarnLock = "${src}/yarn.lock"; + hash = "sha256-FuR6wUhAaej/vMgjAlICMEj1pPf+7PFrdu2lTFshIkg="; + }; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "command-line grammar checker"; + homepage = "https://caderek.github.io/gramma/"; + changelog = "https://github.com/caderek/gramma/releases/tag/v${version}"; + license = lib.licenses.isc; + mainProgram = "gramma"; + maintainers = with lib.maintainers; [ pyrox0 ]; + }; +} diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 9b182a1bb7bd..bbf9cb5598de 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -87,6 +87,7 @@ mapAliases { inherit (pkgs) gitmoji-cli; # added 2023-09-23 glob = pkgs.node-glob; # added 2023-08-18 inherit (pkgs) gqlint; # added 2023-08-19 + inherit (pkgs) gramma; # added 2024-06-26 inherit (pkgs) graphite-cli; # added 2024-01-25 inherit (pkgs) graphqurl; # added 2023-08-19 gtop = pkgs.gtop; # added 2023-07-31 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index c8fe6573dc4e..09ac79592fb4 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -116,7 +116,6 @@ , "git-run" , "git-standup" , "@gitbeaker/cli" -, "gramma" , "grammarly-languageserver" , "graphql" , "graphql-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 7f7049db4762..812bdbf28261 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -31039,15 +31039,6 @@ let sha512 = "v7cSY1J8ydZ0GyjUHqF+1bshJ6cnEVLo9EnjB8p+4HDRPZc9N5jjmvUV7NvEsqQOKyH0pmIBFWXVQbiS0+OBbA=="; }; }; - "intercept-stdout-0.1.2" = { - name = "intercept-stdout"; - packageName = "intercept-stdout"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/intercept-stdout/-/intercept-stdout-0.1.2.tgz"; - sha512 = "Umb41Ryp5FzLurfCRAWx+jjNAk8jsw2RTk2XPIwus+86h/Y2Eb4DfOWof/mZ6FBww8SoO45rJSlg25054/Di9w=="; - }; - }; "internal-ip-1.2.0" = { name = "internal-ip"; packageName = "internal-ip"; @@ -32857,15 +32848,6 @@ let sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; }; - "isomorphic-fetch-3.0.0" = { - name = "isomorphic-fetch"; - packageName = "isomorphic-fetch"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz"; - sha512 = "qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA=="; - }; - }; "isomorphic-textencoder-1.0.1" = { name = "isomorphic-textencoder"; packageName = "isomorphic-textencoder"; @@ -35170,15 +35152,6 @@ let sha512 = "mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="; }; }; - "lodash._arraycopy-3.0.0" = { - name = "lodash._arraycopy"; - packageName = "lodash._arraycopy"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"; - sha512 = "RHShTDnPKP7aWxlvXKiDT6IX2jCs6YZLCtNhOru/OX2Q/tzX295vVBK5oX1ECtN+2r86S0Ogy8ykP1sgCZAN0A=="; - }; - }; "lodash._arrayeach-3.0.0" = { name = "lodash._arrayeach"; packageName = "lodash._arrayeach"; @@ -35899,15 +35872,6 @@ let sha512 = "wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="; }; }; - "lodash.toarray-3.0.2" = { - name = "lodash.toarray"; - packageName = "lodash.toarray"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-3.0.2.tgz"; - sha512 = "ptkjUqvuHjTuMJJxiktJpZhxM5l60bEkfntJx+NFzdQd1bZVxfpTF1bhFYFqBrT4F0wZ1qx9KbVmHJV3Rfc7Tw=="; - }; - }; "lodash.toarray-4.4.0" = { name = "lodash.toarray"; packageName = "lodash.toarray"; @@ -44640,15 +44604,6 @@ let sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; }; }; - "progress-stream-2.0.0" = { - name = "progress-stream"; - packageName = "progress-stream"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz"; - sha512 = "xJwOWR46jcXUq6EH9yYyqp+I52skPySOeHfkxOZ2IY1AiBi/sFJhbhAKHoV3OTw/omQ45KTio9215dRJ2Yxd3Q=="; - }; - }; "prom-client-11.5.3" = { name = "prom-client"; packageName = "prom-client"; @@ -50202,15 +50157,6 @@ let sha512 = "phdEoDlA6EUIVtzwq1UiNMXDUogczp204aYF/yfOhjNePWFfIpBJ1k5wLMuXQhEOOMjuTJEcc4vdZa+vuP+n/Q=="; }; }; - "speedometer-1.0.0" = { - name = "speedometer"; - packageName = "speedometer"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz"; - sha512 = "lgxErLl/7A5+vgIIXsh9MbeukOaCb2axgQ+bKCdIE+ibNT4XNYGNCR1qFEGq6F+YDASXK3Fh/c5FgtZchFolxw=="; - }; - }; "speedtest-net-1.6.2" = { name = "speedtest-net"; packageName = "speedtest-net"; @@ -57196,15 +57142,6 @@ let sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg=="; }; }; - "whatwg-fetch-3.6.20" = { - name = "whatwg-fetch"; - packageName = "whatwg-fetch"; - version = "3.6.20"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz"; - sha512 = "EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg=="; - }; - }; "whatwg-mimetype-2.3.0" = { name = "whatwg-mimetype"; packageName = "whatwg-mimetype"; @@ -74365,168 +74302,6 @@ in bypassCache = true; reconstructLock = true; }; - gramma = nodeEnv.buildNodePackage { - name = "gramma"; - packageName = "gramma"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gramma/-/gramma-1.6.0.tgz"; - sha512 = "5I4yc0miSXU2jvD17zpleKufSggU8etr5uxxLX0nkFLJRfB4Fp2yg1s1SuietfaripT9H2lVhftFYrj2wl56uw=="; - }; - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."async-2.6.4" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-1.2.3" - sources."brace-expansion-1.1.11" - sources."buffer-5.7.1" - sources."buffer-alloc-1.2.0" - sources."buffer-alloc-unsafe-1.1.0" - sources."buffer-crc32-0.2.13" - sources."buffer-fill-1.0.0" - sources."cli-progress-3.12.0" - sources."cliui-8.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."commander-2.20.3" - sources."concat-map-0.0.1" - sources."core-util-is-1.0.3" - sources."debug-3.2.7" - sources."decode-uri-component-0.2.2" - sources."decompress-4.2.1" - sources."decompress-tar-4.1.1" - (sources."decompress-tarbz2-4.1.1" // { - dependencies = [ - sources."file-type-6.2.0" - ]; - }) - sources."decompress-targz-4.1.1" - (sources."decompress-unzip-4.0.1" // { - dependencies = [ - sources."file-type-3.9.0" - ]; - }) - sources."deep-is-0.1.4" - sources."dotenv-10.0.0" - sources."emoji-regex-8.0.0" - sources."encoding-0.1.13" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.2" - sources."fd-slicer-1.1.0" - sources."file-type-5.2.0" - sources."filter-obj-1.1.0" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."get-caller-file-2.0.5" - sources."get-stream-2.3.1" - sources."glob-7.2.3" - sources."graceful-fs-4.2.11" - sources."iconv-lite-0.6.3" - sources."ieee754-1.2.1" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."intercept-stdout-0.1.2" - sources."ip-regex-4.3.0" - sources."is-fullwidth-code-point-3.0.0" - sources."is-natural-number-4.0.1" - sources."is-stream-1.1.0" - sources."is-url-1.2.4" - sources."is2-2.0.9" - sources."isarray-1.0.0" - sources."isomorphic-fetch-3.0.0" - sources."kleur-4.1.5" - sources."lodash-4.17.21" - sources."lodash._arraycopy-3.0.0" - sources."lodash._basevalues-3.0.0" - sources."lodash._getnative-3.9.1" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.toarray-3.0.2" - (sources."make-dir-1.3.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."minimatch-3.1.2" - sources."minimist-1.2.8" - sources."mkdirp-0.5.6" - sources."ms-2.1.3" - sources."node-fetch-2.7.0" - sources."object-assign-4.1.1" - sources."once-1.4.0" - sources."path-is-absolute-1.0.1" - sources."pend-1.2.0" - sources."pify-2.3.0" - sources."pinkie-2.0.4" - sources."pinkie-promise-2.0.1" - sources."portfinder-1.0.32" - sources."process-nextick-args-2.0.1" - sources."progress-stream-2.0.0" - (sources."prompts-2.4.2" // { - dependencies = [ - sources."kleur-3.0.3" - ]; - }) - sources."query-string-7.1.3" - (sources."readable-stream-2.3.8" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."require-directory-2.1.1" - sources."rimraf-3.0.2" - sources."safe-buffer-5.2.1" - sources."safer-buffer-2.1.2" - sources."seek-bzip-1.0.6" - sources."sisteransi-1.0.5" - sources."speedometer-1.0.0" - sources."split-on-first-1.1.0" - sources."strict-uri-encode-2.0.0" - sources."string-width-4.2.3" - (sources."string_decoder-1.1.1" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-dirs-2.1.0" - sources."tar-stream-1.6.2" - (sources."tcp-port-used-1.0.2" // { - dependencies = [ - sources."debug-4.3.1" - sources."ms-2.1.2" - ]; - }) - sources."through-2.3.8" - sources."through2-2.0.5" - sources."to-buffer-1.1.1" - sources."tr46-0.0.3" - sources."unbzip2-stream-1.4.3" - sources."util-deprecate-1.0.2" - sources."webidl-conversions-3.0.1" - sources."whatwg-fetch-3.6.20" - sources."whatwg-url-5.0.0" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."y18n-5.0.8" - sources."yargs-17.7.2" - sources."yargs-parser-21.1.1" - sources."yauzl-2.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Command line grammar checker"; - homepage = "https://caderek.github.io/gramma/"; - license = "ISC"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; grammarly-languageserver = nodeEnv.buildNodePackage { name = "grammarly-languageserver"; packageName = "grammarly-languageserver"; From c2ef2f69c4c102e6377ae114402cf938bcf805fb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 08:46:22 +0200 Subject: [PATCH 146/300] python312Packages.tencentcloud-sdk-python: 3.0.1175 -> 3.0.1176 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1175...3.0.1176 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1176/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 14b60b888088..58d882c12218 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.1175"; + version = "3.0.1176"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-TpLPYwSzZDqvXfeePFgayS0KzeaTDMCEvOzdj1/uHjM="; + hash = "sha256-/0qLZDAqY0Q1pROy6YDtvziAnkwM/WCmqzpkmSx2TPU="; }; build-system = [ setuptools ]; From bb4496375f459bb54eb8376c8895a02af2bb9825 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Jun 2024 16:44:56 +1000 Subject: [PATCH 147/300] maintainers/team-list: add katexochen to golang --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4cb61377a0a4..9aa9444e85bb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -380,6 +380,7 @@ with lib.maintainers; golang = { members = [ kalbasit + katexochen mic92 zowoq qbit From 4d6e0b8ca3a773b765075f35401fd63050ede366 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 25 Jun 2024 09:36:36 +1000 Subject: [PATCH 148/300] CODEOWNERS: add katexochen to golang --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 35f1bacbf5cf..a90d2574662d 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -288,9 +288,9 @@ nixos/modules/services/networking/networkmanager.nix @Janik-Haag /pkgs/applications/blockchains @mmahut @RaghavSood # Go -/doc/languages-frameworks/go.section.md @kalbasit @Mic92 @zowoq -/pkgs/build-support/go @kalbasit @Mic92 @zowoq -/pkgs/development/compilers/go @kalbasit @Mic92 @zowoq +/doc/languages-frameworks/go.section.md @kalbasit @katexochen @Mic92 @zowoq +/pkgs/build-support/go @kalbasit @katexochen @Mic92 @zowoq +/pkgs/development/compilers/go @kalbasit @katexochen @Mic92 @zowoq # GNOME /pkgs/desktops/gnome @jtojnar From 4d88ae7b6189d9b81df24d5452a8bdc3f1cc22e0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Jun 2024 16:41:11 +1000 Subject: [PATCH 149/300] go: remove unused bootstraps --- pkgs/development/compilers/go/bootstrap116.nix | 15 --------------- pkgs/development/compilers/go/bootstrap117.nix | 15 --------------- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/compilers/go/bootstrap116.nix delete mode 100644 pkgs/development/compilers/go/bootstrap117.nix diff --git a/pkgs/development/compilers/go/bootstrap116.nix b/pkgs/development/compilers/go/bootstrap116.nix deleted file mode 100644 index 71573b0bdd22..000000000000 --- a/pkgs/development/compilers/go/bootstrap116.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.16"; - hashes = { - # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "6000a9522975d116bf76044967d7e69e04e982e9625330d9a539a8b45395f9a8"; - darwin-arm64 = "4dac57c00168d30bbd02d95131d5de9ca88e04f2c5a29a404576f30ae9b54810"; - linux-386 = "ea435a1ac6d497b03e367fdfb74b33e961d813883468080f6e239b3b03bea6aa"; - linux-amd64 = "013a489ebb3e24ef3d915abe5b94c3286c070dfe0818d5bca8108f1d6e8440d2"; - linux-arm64 = "3770f7eb22d05e25fbee8fb53c2a4e897da043eb83c69b9a14f8d98562cd8098"; - linux-armv6l = "d1d9404b1dbd77afa2bdc70934e10fbfcf7d785c372efc29462bb7d83d0a32fd"; - linux-ppc64le = "27a1aaa988e930b7932ce459c8a63ad5b3333b3a06b016d87ff289f2a11aacd6"; - linux-s390x = "be4c9e4e2cf058efc4e3eb013a760cb989ddc4362f111950c990d1c63b27ccbe"; - }; -} diff --git a/pkgs/development/compilers/go/bootstrap117.nix b/pkgs/development/compilers/go/bootstrap117.nix deleted file mode 100644 index 3afa2ba9a10f..000000000000 --- a/pkgs/development/compilers/go/bootstrap117.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.17.13"; - hashes = { - # Use `print-hashes.sh ${version}` to generate the list below - darwin-amd64 = "c101beaa232e0f448fab692dc036cd6b4677091ff89c4889cc8754b1b29c6608"; - darwin-arm64 = "e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea"; - linux-386 = "5e02f35aecc6b89679f631e0edf12c49922dd31c8140cf8dd725c5797a9f2425"; - linux-amd64 = "4cdd2bc664724dc7db94ad51b503512c5ae7220951cac568120f64f8e94399fc"; - linux-arm64 = "914daad3f011cc2014dea799bb7490442677e4ad6de0b2ac3ded6cee7e3f493d"; - linux-armv6l = "260431d7deeb8893c21e71fcbbb1fde3258616d8eba584c8d72060228ab42c86"; - linux-ppc64le = "bd0763fb130f8412672ffe1e4a8e65888ebe2419e5caa9a67ac21e8c298aa254"; - linux-s390x = "08f6074e1e106cbe5d78622357db71a93648c7a4c4e4b02e3b5f2a1828914c76"; - }; -} From 2dbd8d8258ac09714f974ef6f7fd665a0e1775b7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 23 Jun 2024 16:35:50 +1000 Subject: [PATCH 150/300] go_1_23: init at 1.23rc1 --- pkgs/development/compilers/go/1.23.nix | 190 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 11 ++ 2 files changed, 201 insertions(+) create mode 100644 pkgs/development/compilers/go/1.23.nix diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix new file mode 100644 index 000000000000..5660710f049f --- /dev/null +++ b/pkgs/development/compilers/go/1.23.nix @@ -0,0 +1,190 @@ +{ lib +, stdenv +, fetchurl +, tzdata +, substituteAll +, iana-etc +, Security +, Foundation +, xcbuild +, mailcap +, buildPackages +, pkgsBuildTarget +, threadsCross +, testers +, skopeo +, buildGo123Module +}: + +let + useGccGoBootstrap = stdenv.buildPlatform.isMusl; + goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { }; + + skopeoTest = skopeo.override { buildGoModule = buildGo123Module; }; + + goarch = platform: { + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + "i686" = "386"; + "mips" = "mips"; + "mips64el" = "mips64le"; + "mipsel" = "mipsle"; + "powerpc64" = "ppc64"; + "powerpc64le" = "ppc64le"; + "riscv64" = "riscv64"; + "s390x" = "s390x"; + "x86_64" = "amd64"; + "wasm32" = "wasm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system: ${platform.parsed.cpu.name}"); + + # We need a target compiler which is still runnable at build time, + # to handle the cross-building case where build != host == target + targetCC = pkgsBuildTarget.targetPackages.stdenv.cc; + + isCross = stdenv.buildPlatform != stdenv.targetPlatform; +in +stdenv.mkDerivation (finalAttrs: { + pname = "go"; + version = "1.23rc1"; + + src = fetchurl { + url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; + hash = "sha256-bpxHZYcoCGY8zwuTflY3x99nFGlD+m6JCagaDRKcgEU="; + }; + + strictDeps = true; + buildInputs = [ ] + ++ lib.optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [ Foundation Security xcbuild ]; + + depsBuildTarget = lib.optional isCross targetCC; + + depsTargetTarget = lib.optional stdenv.targetPlatform.isWindows threadsCross.package; + + postPatch = '' + patchShebangs . + ''; + + patches = [ + (substituteAll { + src = ./iana-etc-1.17.patch; + iana = iana-etc; + }) + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + (substituteAll { + src = ./mailcap-1.17.patch; + inherit mailcap; + }) + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + (substituteAll { + src = ./tzdata-1.19.patch; + inherit tzdata; + }) + ./remove-tools-1.11.patch + ./go_no_vendor_checks-1.22.patch + ]; + + GOOS = if stdenv.targetPlatform.isWasi then "wasip1" else stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = + if isCross then + "${targetCC}/bin/${targetCC.targetPrefix}c++" + else + null; + + GOARM = toString (lib.intersectLists [ (stdenv.hostPlatform.parsed.cpu.version or "") ] [ "5" "6" "7" ]); + GO386 = "softfloat"; # from Arch: don't assume sse2 on i686 + # Wasi does not support CGO + CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1; + + GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go"; + + buildPhase = '' + runHook preBuild + export GOCACHE=$TMPDIR/go-cache + + export PATH=$(pwd)/bin:$PATH + + ${lib.optionalString isCross '' + # Independent from host/target, CC should produce code for the building system. + # We only set it when cross-compiling. + export CC=${buildPackages.stdenv.cc}/bin/cc + ''} + ulimit -a + + pushd src + ./make.bash + popd + runHook postBuild + ''; + + preInstall = '' + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform.system != stdenv.hostPlatform.system) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} pkg/tool/${finalAttrs.GOHOSTOS}_${finalAttrs.GOHOSTARCH} + ''} + '' else lib.optionalString (stdenv.hostPlatform.system != stdenv.targetPlatform.system) '' + rm -rf bin/*_* + ${lib.optionalString (!(finalAttrs.GOHOSTARCH == finalAttrs.GOARCH && finalAttrs.GOOS == finalAttrs.GOHOSTOS)) '' + rm -rf pkg/${finalAttrs.GOOS}_${finalAttrs.GOARCH} pkg/tool/${finalAttrs.GOOS}_${finalAttrs.GOARCH} + ''} + ''); + + installPhase = '' + runHook preInstall + mkdir -p $out/share/go + cp -a bin pkg src lib misc api doc go.env $out/share/go + mkdir -p $out/bin + ln -s $out/share/go/bin/* $out/bin + runHook postInstall + ''; + + disallowedReferences = [ goBootstrap ]; + + passthru = { + inherit goBootstrap skopeoTest; + tests = { + skopeo = testers.testVersion { package = skopeoTest; }; + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "go version"; + version = "go${finalAttrs.version}"; + }; + }; + }; + + meta = with lib; { + changelog = "https://go.dev/doc/devel/release#go${lib.versions.majorMinor finalAttrs.version}"; + description = "Go Programming language"; + homepage = "https://go.dev/"; + license = licenses.bsd3; + maintainers = teams.golang.members; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + mainProgram = "go"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c30c8d34d70..ea28726c914e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25058,6 +25058,17 @@ with pkgs; go = buildPackages.go_1_22; }; + # requires a newer Apple SDK + go_1_23 = darwin.apple_sdk_11_0.callPackage ../development/compilers/go/1.23.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation Security; + }; + buildGo123Module = darwin.apple_sdk_11_0.callPackage ../build-support/go/module.nix { + go = buildPackages.go_1_23; + }; + buildGo123Package = darwin.apple_sdk_11_0.callPackage ../build-support/go/package.nix { + go = buildPackages.go_1_23; + }; + leaps = callPackage ../development/tools/leaps { }; ### DEVELOPMENT / HARE From 6d5ed65f38c7700dee68395d62dd34e53b402003 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:06:59 +0000 Subject: [PATCH 151/300] terraform-providers.aci: 2.13.2 -> 2.14.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 e733ce2e2812..15eacd91f6f7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-Xe6RDA9Ijq6BnrTzlXHt+6hfNf7CkrJ4TY6dp4TUm4E=", + "hash": "sha256-4EVSO/DCuKSI3CPlaXSDxuy0pqAMBHRDwGJTBdQd61w=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.13.2", + "rev": "v2.14.0", "spdx": "MPL-2.0", "vendorHash": null }, From 3602998901b109bdd3a93243103157662af436c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:07:10 +0000 Subject: [PATCH 152/300] terraform-providers.aiven: 4.15.0 -> 4.19.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 15eacd91f6f7..cb5b10d90eb3 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-6FcHqSXszJZkIX9wytkNU8+rKgBu34k2Xnfq6fcqkHs=", + "hash": "sha256-PCtWQP2FsYl5OITVCUp6OJub0uXDLJebWP310F4KWU8=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.15.0", + "rev": "v4.19.1", "spdx": "MIT", - "vendorHash": "sha256-SNpsdbNvgLOS8pSSvz58xThTqzCOOPZMggJb7HetzAw=" + "vendorHash": "sha256-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" }, "akamai": { "hash": "sha256-WOLEKdY8GbvAREbWQqAdITGVb4erHmIMp9GT2CsKvTk=", From 97137d6624c553809f3618983671bc7ee494914f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:08:02 +0000 Subject: [PATCH 153/300] terraform-providers.acme: 2.21.0 -> 2.23.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 cb5b10d90eb3..77cde13456a6 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-CFyB6jLHtnHxY9LB5a3qaMVfz6isi1pSXcscVMM9QKA=", + "hash": "sha256-4H3isw9YRWJANez3qcJYnXO9yW2DoGUAoOPGI7mLXlI=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.21.0", + "rev": "v2.23.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-wqXMoByVqd2NxdFunK29Hq59pfQoXW+kHoH0dTcfFVw=" + "vendorHash": "sha256-RZmT31fetR46vFQRoLkBjadD6ROqvElI/jOZnf6FWTU=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", From 81eec7a9d6d0af90f7d46bb6587b6b1ca666df11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:08:14 +0000 Subject: [PATCH 154/300] terraform-providers.akamai: 6.0.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 77cde13456a6..3493d89b4800 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-5Ljj3L7mhtvn5P9xw4W3AlHqRBGohKFGbiAmpN3dT0w=" }, "akamai": { - "hash": "sha256-WOLEKdY8GbvAREbWQqAdITGVb4erHmIMp9GT2CsKvTk=", + "hash": "sha256-jDCrNDJ6O9dXE6bG4GAMFytlVbEe/Z8mb6vx4DG355U=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v6.0.0", + "rev": "v6.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-g3U0w+gvrOzS8W3Cu+wpOlWo8JHUlBpxRkDDl6wzcXM=" + "vendorHash": "sha256-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" }, "alicloud": { "hash": "sha256-+3MgqAMcDfwhVW3zGSsjLfVWmVNWyrjtUqB9KYzdYRk=", From 084e28ca73bc9bc8c6296b4d7b76a03906cfcf2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:09:09 +0000 Subject: [PATCH 155/300] terraform-providers.auth0: 1.2.0 -> 1.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 3493d89b4800..9deb38dca329 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-P5L2Q8t9TxJnu5cjOwEKek1KNKAw78fqZoOSAo6AvzQ=" }, "auth0": { - "hash": "sha256-Yoje6btftS0slz2newORBbb9kTjWXaXzbP94YKT6+3E=", + "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.2.0", + "rev": "v1.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-kBLyk8glOuvgpbGLUUwtzKecqDDU8VS3JxN6tPIhMro=" + "vendorHash": "sha256-oc6ZI5j7pqiiFgfbaTARb6sn+Ma/rqrupv/RPN05mrc=" }, "avi": { "hash": "sha256-OKUxIJO5WR8ZVkhst1xIgxKsAy+9PNHOmG2NsaRUxFY=", From 0c2acc4dbca2335a4f21225731e6330f777280f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:09:11 +0000 Subject: [PATCH 156/300] terraform-providers.artifactory: 10.4.3 -> 11.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 9deb38dca329..1e9247e6b6fb 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-qlmAOc4wSxQ9Xnr4zBB98OSFW4HB7w7yStsUNfsylsE=", + "hash": "sha256-4gE8+z4GZElmkVK9nVDriAolXJ95arNNKyIq88XAwp8=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v10.4.3", + "rev": "v11.0.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-P5L2Q8t9TxJnu5cjOwEKek1KNKAw78fqZoOSAo6AvzQ=" + "vendorHash": "sha256-5kdyDc3/jBvg6QNBivh8J4SrYgMd0dkiUHUx43wzepQ=" }, "auth0": { "hash": "sha256-Ay/EPlAxpEehbDsOeOyOViwT3jDsd3FmpHB5sxnAxAs=", From b64c154055a78684a7e9e0495f83284f72c5b04f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:09:48 +0000 Subject: [PATCH 157/300] terraform-providers.alicloud: 1.220.1 -> 1.225.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 1e9247e6b6fb..77d6a2d14426 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-QQaLUJJs/7hfLTIOIkG9WF7XmkLXsJP9MOQAvQoDQOw=" }, "alicloud": { - "hash": "sha256-+3MgqAMcDfwhVW3zGSsjLfVWmVNWyrjtUqB9KYzdYRk=", + "hash": "sha256-x/hq45iqcKurjFeXsdycWqDlJ+O1/4f01+6ay6TDejY=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.220.1", + "rev": "v1.225.1", "spdx": "MPL-2.0", "vendorHash": null }, From d97f1e99d55a1acc8b97d52e3e9a1f2cf76fdc1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:09:59 +0000 Subject: [PATCH 158/300] terraform-providers.azuread: 2.47.0 -> 2.52.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 77d6a2d14426..b12a70606913 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -126,11 +126,11 @@ "vendorHash": "sha256-2KQEX1QwPrN32gFMKF7QPnisLdBC/bn74wX1f8uiC+0=" }, "azuread": { - "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", + "hash": "sha256-8uGSVvYygkR8WuKVGYVGN5dq2LoFQx8tbNYLYVBW4LE=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.47.0", + "rev": "v2.52.0", "spdx": "MPL-2.0", "vendorHash": null }, From 66d089cf80f2e5598395295c57d8de80236e8fcb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:10:34 +0000 Subject: [PATCH 159/300] terraform-providers.bigip: 1.22.0 -> 1.22.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 b12a70606913..2bd6a4792829 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -163,11 +163,11 @@ "vendorHash": "sha256-hd64VJOkl+BtMXR+VcGam8ycKdfuwmaj67cBxx6rS8w=" }, "bigip": { - "hash": "sha256-cGFlVcu8G7xpiHk1dhgLIkZHc6srOn/eLyQk9xETpnI=", + "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.22.0", + "rev": "v1.22.2", "spdx": "MPL-2.0", "vendorHash": null }, From 801d6ee1abce05eabe6b90df622d28707a906b24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:10:46 +0000 Subject: [PATCH 160/300] terraform-providers.baiducloud: 1.19.40 -> 1.21.8 --- .../networking/cluster/terraform-providers/providers.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2bd6a4792829..dcd84702b9bc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -153,14 +153,13 @@ "vendorHash": null }, "baiducloud": { - "deleteVendor": true, - "hash": "sha256-qLjAHoBnb6//QYxYZyN13RxWOuEjxwSOiPyfR1qMtro=", + "hash": "sha256-uKIBimMMTManwztb4vdMCpsRWMr6GB8O7vK850sVI2g=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.40", + "rev": "v1.21.8", "spdx": "MPL-2.0", - "vendorHash": "sha256-hd64VJOkl+BtMXR+VcGam8ycKdfuwmaj67cBxx6rS8w=" + "vendorHash": null }, "bigip": { "hash": "sha256-F7AD3Wb6R6exPRcEByOTuEQFdYSJB+V2cVotO2cabt0=", From 52e2af3f7aa35ffe21bce4a2c8a722c92452d05d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:11:07 +0000 Subject: [PATCH 161/300] terraform-providers.bitbucket: 2.40.0 -> 2.42.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 dcd84702b9bc..59cc068c7527 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -171,11 +171,11 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-rapsVhYfyASIn9zVQTwhAF4A2Taw9djYlh+sJXCpJNA=", + "hash": "sha256-fvSy0gnSQkpSCfKlmOQW+ItMi6utocsDB6ex4RZMvGo=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.40.0", + "rev": "v2.42.0", "spdx": "MPL-2.0", "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, From 9f8b8e436266f907f9259b38d9240e6ee66f1d97 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:11:44 +0000 Subject: [PATCH 162/300] terraform-providers.buildkite: 1.6.0 -> 1.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 59cc068c7527..1c1670d941f5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -189,13 +189,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-DIquKLQB27deYYG3vMlhBoO/EZ5WK04zAR7qPrRQ38k=", + "hash": "sha256-/vyiQZ4UDe42sIxacgWDf+wktwd8ZXhW++gh+qF4C3c=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.6.0", + "rev": "v1.10.0", "spdx": "MIT", - "vendorHash": "sha256-1HYJ1k3ZK9rK/cDOXnJz556qqBkyikRxCBbOeJhl3Ks=" + "vendorHash": "sha256-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" }, "checkly": { "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", From 2dab8c175c4cfdbbcb5def421cec017c0d53999f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:12:10 +0000 Subject: [PATCH 163/300] terraform-providers.checkly: 1.7.6 -> 1.7.8 --- .../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 1c1670d941f5..d4b223e31ae8 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-Vozfdh6LwIS0ISc28OGmEnpS9jjFth1i6bNUGY4mXKc=" }, "checkly": { - "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", + "hash": "sha256-xM3KJiWO1Lsw33talLR6gcalEm9gRffUOikdUQZ6AsM=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.6", + "rev": "v1.7.8", "spdx": null, - "vendorHash": "sha256-zxlKKA2bi+PV0T+znLAFEbTe5ynGfl0bE913GWojwEo=" + "vendorHash": "sha256-TgoTz9kFLhikfQYt654nmoGPzjVLfUMnUrs3mVqrgJo=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", From 5c20a4ac83adbf6deebc199340a8aecb75a7d3a9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:13:31 +0000 Subject: [PATCH 164/300] terraform-providers.azurerm: 3.97.1 -> 3.109.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 d4b223e31ae8..5d67505003ce 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-kJ6snlePBGRqE8mS95ROzskz+b4cnPLz/OO1Vk+i56Q=", + "hash": "sha256-ukfUXWT1Q8jziaSMpZl2awaid9GfByl3TniG63JxkuQ=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.97.1", + "rev": "v3.109.0", "spdx": "MPL-2.0", "vendorHash": null }, From 3bf0dad31c80d3daf7ad68422b9e6900c409d9ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:13:35 +0000 Subject: [PATCH 165/300] terraform-providers.cloudinit: 2.3.3 -> 2.3.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 5d67505003ce..fbe72a1a897b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -244,13 +244,13 @@ "vendorHash": "sha256-6MKWpiDq4yI3mfIJyzEsWLa7gi0+DScI5jKcOcM6Qs0=" }, "cloudinit": { - "hash": "sha256-etZeCGtYhO0szRGxnj1c3/WOelxScWiHEA9w1Jb7bEE=", + "hash": "sha256-CmlFKg9ZvcTBLbFjZEwPAKNtXUMNcsxraO4ECCud/9E=", "homepage": "https://registry.terraform.io/providers/hashicorp/cloudinit", "owner": "hashicorp", "repo": "terraform-provider-cloudinit", - "rev": "v2.3.3", + "rev": "v2.3.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" + "vendorHash": "sha256-Hny481ihxllpoVPL5/0rTV9oCAmyoGKxCYiN986aKTk=" }, "cloudscale": { "hash": "sha256-O4Y8p5S5C4SldryndecoaX5d8nrX10nqurAkJ0Un2NY=", From aaadbb8108dd771584c93d60f3c21c7082760716 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:13:36 +0000 Subject: [PATCH 166/300] terraform-providers.cloudflare: 4.29.0 -> 4.35.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 fbe72a1a897b..ad310ed716b7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -225,13 +225,13 @@ "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-p4jRSFNalEzIs8k1QZBVSUERmdK0qVYdk4oUoQRtQww=", + "hash": "sha256-7MdXh5SIQwFPL5APmdrkrh++shZRbRUAYrVIHDGjM68=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.29.0", + "rev": "v4.36.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-HgTjVtC5Z7/3b86fFHTcZE4vUukWtBdWFdwgWGQW9ZQ=" + "vendorHash": "sha256-og31UnUsXGgOm2dH0jlvEpvjOnxUlRy04s2TffiVX00=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", From 55ecc8bac3a22d2160a3fac9a091f9139ff1ef69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:04 +0000 Subject: [PATCH 167/300] terraform-providers.digitalocean: 2.36.0 -> 2.39.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 ad310ed716b7..f898ba1f70f3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -318,11 +318,11 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "digitalocean": { - "hash": "sha256-wwb62tZZxpr7NXbiqcS40aF9E2msagj2Mqy4kogDsEA=", + "hash": "sha256-66bG22xNzJEjCZJ7pHY4OW1vj8qTJIXd0CF/0zLiyug=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.36.0", + "rev": "v2.39.2", "spdx": "MPL-2.0", "vendorHash": null }, From 9aab01cbbc69931de49bafe2a28987128f987a8f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:07 +0000 Subject: [PATCH 168/300] terraform-providers.dexidp: 0.3.4 -> 0.5.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 f898ba1f70f3..5bb1443abacf 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-vIdM7SEWYnBw30wGl7wM/sMl4xtRPTUQvhqGoJxfKBg=" }, "dexidp": { - "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", + "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", "homepage": "https://registry.terraform.io/providers/marcofranssen/dexidp", "owner": "marcofranssen", "repo": "terraform-provider-dexidp", - "rev": "v0.3.4", + "rev": "v0.5.0", "spdx": "MIT", - "vendorHash": "sha256-ejM1RmVBW3v0OStYzJTCym2ByWHJ1zzz/yWVbUiQWN0=" + "vendorHash": "sha256-xW0sPt2TGmoQXc5a2lp6471amBbDDPZbyc9YIIHP+M0=" }, "dhall": { "hash": "sha256-QjY5ZazQn4HiLQtdmw9X7o5tFw+27B2IISzmzMMHjHE=", From e7853d01ddce78c03789fe80eae93f0b93b78520 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:29 +0000 Subject: [PATCH 169/300] terraform-providers.datadog: 3.38.0 -> 3.39.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 5bb1443abacf..d01524243730 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -290,13 +290,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-zAu2zkC9saWg1Miu4OkqeXtNhGgboCzr/CRmtfFsAVc=", + "hash": "sha256-L6GXoyjTd2n2n79gPvmQ0zLhW0iDS8ZcrY1gxPaQ61I=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.38.0", + "rev": "v3.39.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vIdM7SEWYnBw30wGl7wM/sMl4xtRPTUQvhqGoJxfKBg=" + "vendorHash": "sha256-jK6GI44o1FoJw9eZaCbWz1zw3dHqyaS5664h+Z27OXQ=" }, "dexidp": { "hash": "sha256-XR8OI+Nf3PKNzZzM+jvylF8Itnapb9Xdztxq4OyXPVQ=", From a8b16ee8b169d36a059734b4b109dc43a3530e3f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:40 +0000 Subject: [PATCH 170/300] terraform-providers.dnsimple: 1.5.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 d01524243730..fd8afafd59fd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -345,13 +345,13 @@ "vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA=" }, "dnsimple": { - "hash": "sha256-aa5L1FO9Ro215zj3vH1H9k0fP2mYI5+TAvyPQumwWOM=", + "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", "homepage": "https://registry.terraform.io/providers/dnsimple/dnsimple", "owner": "dnsimple", "repo": "terraform-provider-dnsimple", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-XA6gvm4S5kwdW2uha6B5BUX5mR8HPOs3xgPgGdIc0d4=" + "vendorHash": "sha256-Zl98s0+sgs+n/OkrJMsia0MxqO/AGWId8zzY+/n6LXM=" }, "docker": { "hash": "sha256-UyHOI8C0eDV5YllAi9clHp/CEldHjIp3FHHMPy1rK58=", From 4b8f9639221819f72c175c42f1ef55901adf0bd8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:40 +0000 Subject: [PATCH 171/300] terraform-providers.dns: 3.4.0 -> 3.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 fd8afafd59fd..a186bb051733 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -336,13 +336,13 @@ "vendorHash": null }, "dns": { - "hash": "sha256-7PRRdL1LhcHKHqqdB7KvBsrrPjaYEKfoSPpc31/Ki/c=", + "hash": "sha256-D9Y4VjNWvbIC8LjMSJp+KqyV0LvomfaiqjkOItwAF/w=", "homepage": "https://registry.terraform.io/providers/hashicorp/dns", "owner": "hashicorp", "repo": "terraform-provider-dns", - "rev": "v3.4.0", + "rev": "v3.4.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-z2p2tjTK7eL0gRU8XnXw9SY9qokqiqJOVhkiBQlHRnA=" + "vendorHash": "sha256-yOuZcvaregVLf0O6Teuvv6FtapuQGgHjTkqiH2euV8U=" }, "dnsimple": { "hash": "sha256-xF0zvUKJgB67rKNkeHKyKU0k7INiCKzN+G6v0PIq204=", From 32e03081a05157faeac6f48a0e935a5ae466898b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:14:56 +0000 Subject: [PATCH 172/300] terraform-providers.doppler: 1.7.0 -> 1.8.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 a186bb051733..5cfeb6cb27a4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -363,13 +363,13 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-PfqFf3V+zH4SPvciLNnB9KWCVm8M94q8rzedUuXABAg=", + "hash": "sha256-jDCmIHdfHi+gp3+HGo8Wh+xYiHVU2Zy0lxETKW2rvGA=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.7.0", + "rev": "v1.8.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E=" + "vendorHash": "sha256-UvpSfCelEsV9gjRWHxdYvVe3HAnYWWY5KYLVYiqc/So=" }, "elasticsearch": { "hash": "sha256-a6kHN3w0sQCP+0+ZtFwcg9erfVBYkhNo+yOrnwweGWo=", From be7fea246e3368795413e6b9b5f7209606faaaf3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:15:13 +0000 Subject: [PATCH 173/300] terraform-providers.exoscale: 0.57.0 -> 0.59.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 5cfeb6cb27a4..5862eb69a4d5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -390,11 +390,11 @@ "vendorHash": "sha256-9+cytMN5VK0nwLiR58lzE+UzlvqI677/rOxzd8D5k30=" }, "exoscale": { - "hash": "sha256-0PsMSEbMoeuoa17AZvzbSOoY48IeQ4CPGWknkc0tDQQ=", + "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.57.0", + "rev": "v0.59.1", "spdx": "MPL-2.0", "vendorHash": null }, From 37ca25293442acce4cf7560f4ce66aaff49a48ff Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:15:23 +0000 Subject: [PATCH 174/300] terraform-providers.equinix: 1.34.0 -> 1.38.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 5862eb69a4d5..b04070e49962 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -381,13 +381,13 @@ "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=" }, "equinix": { - "hash": "sha256-Wtt4vkHcDBTzObfpOSdH4RAfoT/1+B58PytJ1NSkyQk=", + "hash": "sha256-jnV8dg9CJ38YKdEmc0hxDDbl/YUQgPTM6D5YYVjjWFc=", "homepage": "https://registry.terraform.io/providers/equinix/equinix", "owner": "equinix", "repo": "terraform-provider-equinix", - "rev": "v1.34.0", + "rev": "v1.38.1", "spdx": "MIT", - "vendorHash": "sha256-9+cytMN5VK0nwLiR58lzE+UzlvqI677/rOxzd8D5k30=" + "vendorHash": "sha256-25kuUGbBCHOL3RzQcLDzzdfQ1j+XvqJSEyIowV0Od8A=" }, "exoscale": { "hash": "sha256-d6vdYtEBD34SPHDAlkpTb/T8D7TaLbVwMYjSefuNdr0=", From be7f5e964326719caaee0574143c9b9f7c3c8035 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:15:27 +0000 Subject: [PATCH 175/300] terraform-providers.fastly: 5.7.1 -> 5.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 b04070e49962..86ba1a262140 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -408,11 +408,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-jjZKwxJeimutMuz8TdNLsLigiXidtfxdsptrxSo3940=", + "hash": "sha256-xoxxicu0bXoaISMNwZNM6G8bBz0GKv48ORpcABwSsg8=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.7.1", + "rev": "v5.10.0", "spdx": "MPL-2.0", "vendorHash": null }, From 6c29136edbc0b23a0ff05560fe0b8f7034cf0904 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:15:54 +0000 Subject: [PATCH 176/300] terraform-providers.github: 6.2.1 -> 6.2.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 86ba1a262140..e858910768e0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -445,11 +445,11 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-K3/taXnlIroiWQYyZB2LElAcF5fQm2aaEp3OXqKCJ+E=", + "hash": "sha256-6RAGc1UXebNm24d4+7S0LugvpSVgjIvqa7B6y+pozkA=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.2.1", + "rev": "v6.2.2", "spdx": "MIT", "vendorHash": null }, From 37cb92cff3d4ce1b117159cd75e6b2c6f40ff0b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:16:16 +0000 Subject: [PATCH 177/300] terraform-providers.fortios: 1.19.0 -> 1.20.0 --- .../networking/cluster/terraform-providers/providers.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e858910768e0..50cfa80e323f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -426,14 +426,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortios": { - "hash": "sha256-SENWlcDkb6S73yKratGSlT151wWuR43B40SoK7Hb6Qs=", + "hash": "sha256-/4+FpytrKGDpl6ZZoZ6BpsiiqlxTcxRs+Ag4wVJ9NLw=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", - "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.19.0", + "rev": "1.20.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mE25KfP2+7K7nHpkQOn1pfilm+fz5kGDDW8U+P2zglY=" + "vendorHash": "sha256-eFPOY0oGjTw9JIHNJks5Dgv2vJyS/eaEi+bPQkdBFlc=" }, "gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", From 14d86947f066e48d10d8264bf7eb05816c1c1721 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:17:17 +0000 Subject: [PATCH 178/300] terraform-providers.google: 5.23.0 -> 5.35.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 50cfa80e323f..48cb459a3a69 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -462,13 +462,13 @@ "vendorHash": "sha256-7hIThIq3uU803aK+paR5KdTdfVmSZu7Spf9UepaVgvc=" }, "google": { - "hash": "sha256-LV3/4X/4jA+mZrkbzmYqiQDOVkH3zie2YCc6M9voJpA=", + "hash": "sha256-YonRToq/xdUy584hlzG+0/olYPhq3yxBUEahGz1ODkk=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v5.23.0", + "rev": "v5.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SUYBSggBAl63plYz1kf+BBL6yPKbHAG8cjJE1JquSQ4=" + "vendorHash": "sha256-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" }, "google-beta": { "hash": "sha256-0eiMpPuia7M9IPhKHBWXiBXH3LenUonsbs2QdP4V1e4=", From f282d96fbee85bd9def0233ae1924d830ba02d4e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:17:58 +0000 Subject: [PATCH 179/300] terraform-providers.gridscale: 1.24.0 -> 1.25.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 48cb459a3a69..0cc927c85285 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -498,11 +498,11 @@ "vendorHash": "sha256-NAUFTk868XhzLu5boP09JeZbMs1exqOmHkFa9MUJFns=" }, "gridscale": { - "hash": "sha256-gytjUn1xy8HTgItYrxrhm80qrbrjdDQvEcGLZ49VC+0=", + "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.24.0", + "rev": "v1.25.0", "spdx": "MPL-2.0", "vendorHash": null }, From 5d42e65f1fe7968e110949967dae936a69c05ad4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:17:59 +0000 Subject: [PATCH 180/300] terraform-providers.google-beta: 5.23.0 -> 5.35.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 0cc927c85285..59d091200fad 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-cpxk3g3bKG+3s53WBJlX2O722qNeQICqaIqcMrpDJYs=" }, "google-beta": { - "hash": "sha256-0eiMpPuia7M9IPhKHBWXiBXH3LenUonsbs2QdP4V1e4=", + "hash": "sha256-71eEmUUwSGM81kNwzvJ1QnkjMskdRx8BoETNSLIjYog=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v5.23.0", + "rev": "v5.35.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-y9m+rOuQWSooeZBMuM1irx0CtdHtOqmhKv7+f8GNO6g=" + "vendorHash": "sha256-2sqUzK8yxNKdfvrToCQWK8Eyr2n4ch6/KrrIAYmLwcA=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 33dd57b26117ab7789398d7189a783a20fa5079f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:18:01 +0000 Subject: [PATCH 181/300] terraform-providers.grafana: 2.14.3 -> 3.2.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 59d091200fad..1fe4e1d70f8d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -489,13 +489,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-7Hv0jAYnTh8B2xpxIlMdQL3mVANSRYRyG5OTHZLp4wA=", + "hash": "sha256-VEg95n7S4PDWjGPbuADOQWymGDlS4jupQAHo2OCkfAA=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.14.3", + "rev": "v3.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-NAUFTk868XhzLu5boP09JeZbMs1exqOmHkFa9MUJFns=" + "vendorHash": "sha256-ykPnplAA7s6lVQ7M0We7irIxOM2Ie4zSdQQynIjLFWA=" }, "gridscale": { "hash": "sha256-pFBH3J61Bk3QSfYVtLx3NrAFqrAnvKjKzL8qpeH5cOw=", From 20b2e742623ce69dc5ece66c3fc4b18edf9a2a60 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:18:27 +0000 Subject: [PATCH 182/300] terraform-providers.harbor: 3.10.10 -> 3.10.12 --- .../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 1fe4e1d70f8d..9e2dc2799201 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -507,13 +507,13 @@ "vendorHash": null }, "harbor": { - "hash": "sha256-Pv4Eoswmx+FVVq6jqP69bCMrUmt5persxdrtvY9N79I=", + "hash": "sha256-dlAjbiSSgTuuZhTML66l4mSa3Rf14G86++RyXUJYbkw=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.10.10", + "rev": "v3.10.12", "spdx": "MIT", - "vendorHash": "sha256-1zaC82m8ylkz4lSocDVoXjF6yWWEL4He0lIKXs/7VtE=" + "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { "hash": "sha256-D7RBrpOxfSfeip7z+mAkWBjSTVnnM/MfN7Qvl/E+nA0=", From ba5351fc21270773382bb0883075a665f13731ee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:18:30 +0000 Subject: [PATCH 183/300] terraform-providers.hcloud: 1.45.0 -> 1.47.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 9e2dc2799201..1fabff1495e9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -516,13 +516,13 @@ "vendorHash": "sha256-TZxiDRVZPfg3jSflZsSbVaVcfUNqJ2U+ymHIm01pgkI=" }, "hcloud": { - "hash": "sha256-D7RBrpOxfSfeip7z+mAkWBjSTVnnM/MfN7Qvl/E+nA0=", + "hash": "sha256-2eCHgHh6SVSHqjf+h4tRaD1orzh1LRUNVJdNsfLtZMc=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.45.0", + "rev": "v1.47.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sipYN9Z76fib4j15VIn/1Rn7QelNNB2+KeFn5rIA6hM=" + "vendorHash": "sha256-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" }, "helm": { "hash": "sha256-Zj0mZfQhZimk3QozKHNU7quO/SqV3278Y+l9bFa8w/k=", From e4ccf85fe6040a32f43473509a93600599f38425 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:19:04 +0000 Subject: [PATCH 184/300] terraform-providers.htpasswd: 1.0.4 -> 1.2.1 --- .../networking/cluster/terraform-providers/providers.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1fabff1495e9..7eafa671e0ea 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -552,14 +552,13 @@ "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y=" }, "htpasswd": { - "hash": "sha256-3Az8iNoau+2KGkdDjR+QAfuEcEhKfRmZFb5f4kaFyoU=", + "hash": "sha256-Kc3L8oqQOP+k8PZAWkRApDj+3LRgs3P3mm4vX2QcUdg=", "homepage": "https://registry.terraform.io/providers/loafoe/htpasswd", "owner": "loafoe", - "proxyVendor": true, "repo": "terraform-provider-htpasswd", - "rev": "v1.0.4", + "rev": "v1.2.1", "spdx": "MIT", - "vendorHash": "sha256-6jaAgyHS5H63YKnm4xcYmjKVhPbWm6KK6qHzxg/78yU=" + "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", From b08c80d38470e931adadc2246c63bde9e56f2de3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:19:05 +0000 Subject: [PATCH 185/300] terraform-providers.helm: 2.12.1 -> 2.14.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 7eafa671e0ea..c99175d51d5b 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-wCr9tYaA6Y1LgbhvWbRtqtDrviMu45WnXAB/WMWpkl0=" }, "helm": { - "hash": "sha256-Zj0mZfQhZimk3QozKHNU7quO/SqV3278Y+l9bFa8w/k=", + "hash": "sha256-SD5lUEkbn09S/fnQNyCE9ZZ2fkXbcFZfdE95GGEqHzE=", "homepage": "https://registry.terraform.io/providers/hashicorp/helm", "owner": "hashicorp", "repo": "terraform-provider-helm", - "rev": "v2.12.1", + "rev": "v2.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-qoXWnAbjRsvFDtlDCfeaIjc5hZIbCgosyH0pXhHkWiA=" + "vendorHash": "sha256-p6VUNSJKJtPrawdsi8Lgmu0uYjRmsdP4nsOl2L6h3JA=" }, "heroku": { "hash": "sha256-B/NaFe8KOKGJJlF3vZnpdMnbD1VxBktqodPBk+4NZEc=", From 2338f2494c72ee7bff7195ad1c1e4d02f9922fd6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:19:07 +0000 Subject: [PATCH 186/300] terraform-providers.http: 3.4.2 -> 3.4.3 --- .../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 c99175d51d5b..ff56de2a9a32 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -561,13 +561,13 @@ "vendorHash": "sha256-zo22ng+J9ItkptdgUt6Pekkd9T7hFTYdVAWnp2k2vrs=" }, "http": { - "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", + "hash": "sha256-fGJBrgobtDAOPXnAIcmuepgCRVIdSCABQlP+dycAm+E=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.2", + "rev": "v3.4.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" + "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" }, "huaweicloud": { "hash": "sha256-yYMI1UuOU/DbGYqReI//zhBmlD96KYot7h987k4Cl6o=", From 03559cdf1f644105719e4cf40b89ca015b2ddff0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:19:32 +0000 Subject: [PATCH 187/300] terraform-providers.infoblox: 2.5.0 -> 2.7.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 ff56de2a9a32..e016d5d625ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -624,11 +624,11 @@ "vendorHash": "sha256-/SpaWENm6nwveUACS7hvH/Z25CTzQK/6igPhTW/fYJ8=" }, "infoblox": { - "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", + "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", "homepage": "https://registry.terraform.io/providers/infobloxopen/infoblox", "owner": "infobloxopen", "repo": "terraform-provider-infoblox", - "rev": "v2.5.0", + "rev": "v2.7.0", "spdx": "MPL-2.0", "vendorHash": null }, From fcf3513235eef99fb26ce9c34d0044ae9ecb5654 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:19:48 +0000 Subject: [PATCH 188/300] terraform-providers.incus: 0.1.1 -> 0.1.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 e016d5d625ae..be256614dfec 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -615,13 +615,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-GahwviyhXcrCtM0jjJKKEwHkZTcJnVPB1JlVsJjcv+k=", + "hash": "sha256-nyL8sWFgTlJjuAYhBuzThCm89UHwYmb+x+A39z2FCj0=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.1.1", + "rev": "v0.1.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-/SpaWENm6nwveUACS7hvH/Z25CTzQK/6igPhTW/fYJ8=" + "vendorHash": "sha256-81ykw34Qj5qAAa06p7br94bvlIM4uNiKNUI8d+Gw07g=" }, "infoblox": { "hash": "sha256-x5WGCYvsXby2O8J15fvoRNsYnBCaYdjx6LuDkYAfIlU=", From ce55ba4de95ad7ca06a6374cc13242132e25d3b4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:20:03 +0000 Subject: [PATCH 189/300] terraform-providers.huaweicloud: 1.63.0 -> 1.65.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 be256614dfec..19d9290f4128 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -570,11 +570,11 @@ "vendorHash": "sha256-3yrcTs0QV2I4CX1TZgY9FimXC2G/p1s+xNsurH0n8e8=" }, "huaweicloud": { - "hash": "sha256-yYMI1UuOU/DbGYqReI//zhBmlD96KYot7h987k4Cl6o=", + "hash": "sha256-04y0G3555aRnB3Zc9TgeYOMo1QyJ9ns4r85AikXSNE4=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.63.0", + "rev": "v1.65.2", "spdx": "MPL-2.0", "vendorHash": null }, From bfcd375f8e364ef9c2a28db2f17f954cb487a4c5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:20:16 +0000 Subject: [PATCH 190/300] terraform-providers.kafka-connect: 0.3.0 -> 0.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 19d9290f4128..27aec822cdcb 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-Adfz3r3xWY7a4u9/m6a1rvQYGq+E8Q5pAuS/uMgZRQM=" }, "kafka-connect": { - "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", + "hash": "sha256-3EUTte3txaDRz3jh0h23+Bf1tdLeCvPN9x8mYWY5VjI=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka-connect", "owner": "Mongey", "repo": "terraform-provider-kafka-connect", - "rev": "v0.3.0", + "rev": "v0.4.1", "spdx": "MIT", - "vendorHash": "sha256-cLp8w0UcO9Hork/GTLOGCcSvfaYEIKl5so3/0ELm79Y=" + "vendorHash": "sha256-rGujp6FsQnkznRfjrSSB+4lLC3wAv6yvL/jAoWOiST0=" }, "keycloak": { "hash": "sha256-2Z7nQ5NKS18OtoXXLm/P1n64NAxLR8nfMGyS2y17lag=", From 41e0995fb07c535ac51fe510773e95b02e8ae37e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:20:46 +0000 Subject: [PATCH 191/300] terraform-providers.launchdarkly: 2.18.2 -> 2.19.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 27aec822cdcb..ddf6794dffeb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -687,13 +687,13 @@ "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" }, "launchdarkly": { - "hash": "sha256-C+RGrw+XAaAekKkwvf5gtoiXghSJuByUJvyKgUt/DSE=", + "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.18.2", + "rev": "v2.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NCyEU30hw1aWB7T8sM3lrJEUtPdWlbCGdWDaRgjeJdM=" + "vendorHash": "sha256-pO9QTtqA+YG0i+o1+p3PYg8E/mUpzIV3II++CxQcuHE=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", From a16ef4254e86fbf1d7b064f63dd9b2da84209304 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:21:03 +0000 Subject: [PATCH 192/300] terraform-providers.kubernetes: 2.27.0 -> 2.31.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 ddf6794dffeb..8a995f6f15cd 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -678,13 +678,13 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-l2WPpczgKjDYxtZFqhqmJvq8CdsAIBQBeofZOn7BLzM=", + "hash": "sha256-MlM7OEpzDOmM8BaaGYn6ZSDaIO8IswreOIkLOkbqQHo=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.27.0", + "rev": "v2.31.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" + "vendorHash": "sha256-MfXuVZC7aroO83CJTNCh5YfbmMlUG1CiPeGgxhUFjN0=" }, "launchdarkly": { "hash": "sha256-ZJxtrDGUH/Ea07CwBX+om0Ccsg6oSUjoS9pKIOnl0GM=", From f9f078a63123e767a1ca2b52f9d2f35b26804c12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:21:15 +0000 Subject: [PATCH 193/300] terraform-providers.linode: 2.18.0 -> 2.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 8a995f6f15cd..16d2cc26a85e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -705,13 +705,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-BZoMNx0a+dXMpY/YaYKEL3dQonGELlNzDVtOq7Z4Yfk=", + "hash": "sha256-6q1x34SWBCDi1jGoyNoxMAtHqxqP3qAVk1MLMLIRbg8=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.18.0", + "rev": "v2.23.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1okvZTEycuGymzcKtUNrxZpiPVoc2ykMxMUbq8mgEOw=" + "vendorHash": "sha256-ZQkFp9UXhY61YgtPVaWOSoQIYNcaTs9V/iwZ+UDRluA=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From d8f0f49d622d153fdc84e92b767860ee29e6dccc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:21:26 +0000 Subject: [PATCH 194/300] terraform-providers.lxd: 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 16d2cc26a85e..4d08e409db0b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -732,13 +732,13 @@ "vendorHash": "sha256-PpLqFek6FnD+xWF8QMS2PFUP7sXXVWWWosq6fpLRzxg=" }, "lxd": { - "hash": "sha256-culY1Im8D4CtgC2LtTFFB0BgrNgLfDLT0I290+0NE3A=", + "hash": "sha256-z7AjOKMSf2XnyCQiBcjFY0V9mDLF6Fj54Ck7971Ehio=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-NHf6xjbbDHsTdjzZ0gIa08PE53Bjv2llBRIgNTx7fj4=" + "vendorHash": "sha256-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" }, "mailgun": { "hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=", From 89ca832141b7698a3977fd4fdd078aabd78d02fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:21:34 +0000 Subject: [PATCH 195/300] terraform-providers.mailgun: 0.7.5 -> 0.7.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 4d08e409db0b..4c461099756e 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-fu6EgUIw1rFswXM3xUi0DLSChhl2c3a70uJO7aZhX+I=" }, "mailgun": { - "hash": "sha256-fg1I1lt2cA0DgxLnxYrm0V55pD9AkpAdonXVGYeFZwQ=", + "hash": "sha256-Sj6iejtaSdAPg2tI5f0b88Lni431cervHxlQWwGl8Bo=", "homepage": "https://registry.terraform.io/providers/wgebis/mailgun", "owner": "wgebis", "repo": "terraform-provider-mailgun", - "rev": "v0.7.5", + "rev": "v0.7.6", "spdx": "MPL-2.0", - "vendorHash": "sha256-yUXxq8NTOv8ZmWp0WiIID2cRU6AZiItIs99uGZpt9dc=" + "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8=" }, "matchbox": { "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=", From 9f9058147f7a4cfc8b8dd135374a02ad3709bdc7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:01 +0000 Subject: [PATCH 196/300] terraform-providers.migadu: 2024.4.4 -> 2024.6.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 4c461099756e..417c95c01ee5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -768,13 +768,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-qP862jjbYks+6DR5eGzVlCvYyfupejqaxD2CgwSZxdQ=", + "hash": "sha256-EGVIk828DwYGMkRBGs3Lnt9goYb+biWoZcXmfuy/OPg=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.4.4", + "rev": "2024.6.6", "spdx": "0BSD", - "vendorHash": "sha256-r5fOj6YsW8ggoEbfyLvJDmD9P8WQ1J5K7ztg/NYm6y4=" + "vendorHash": "sha256-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" }, "minio": { "hash": "sha256-dgMK61jFXnOvE11FIoIJfFN1zb+N9HrFZ/WtQqwktbw=", From d2955e89383905b4074a244f65a2bbece3998c11 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:02 +0000 Subject: [PATCH 197/300] terraform-providers.minio: 2.2.0 -> 2.3.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 417c95c01ee5..e9380bc56acd 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-xUb3tRMG9Exth2d2/1hGVa3llFss99up1cnNaldwse0=" }, "minio": { - "hash": "sha256-dgMK61jFXnOvE11FIoIJfFN1zb+N9HrFZ/WtQqwktbw=", + "hash": "sha256-P+rhDVmZl8DouSOTkBRE2MNG0ZcpLDveO3Npt1AIEGU=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v2.2.0", + "rev": "v2.3.2", "spdx": "AGPL-3.0", - "vendorHash": "sha256-Uxexx5sK6D+EEEPWLnWFE0HPG1RKUsYnSJ/1bV9JBkw=" + "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { "hash": "sha256-xdPR0wyDEsyJCzRcGuDNhD4K+19KhZXsGxygoDadfvY=", From 13605fdfd066c83de37aa4e864e0d856bd789de7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:30 +0000 Subject: [PATCH 198/300] terraform-providers.mongodbatlas: 1.15.3 -> 1.17.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 e9380bc56acd..5f278e549d30 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -786,13 +786,13 @@ "vendorHash": "sha256-Gn4P4NIksv8S4DmnuYArxdSQDQsyCeayJJAIkmm/I6A=" }, "mongodbatlas": { - "hash": "sha256-xdPR0wyDEsyJCzRcGuDNhD4K+19KhZXsGxygoDadfvY=", + "hash": "sha256-TitX99F/jx2q2FOSmJAGLprhFSsG4CBdmKQhzNqxotk=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.15.3", + "rev": "v1.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-1cbmarVuMIkLuEBo2+O14wHqV0hbT/Jxh0sWRvfnDoE=" + "vendorHash": "sha256-Te8Kd+1B3T3Ngo+xKgiqjnm5CZ2QRNXEQxPlaLPXNRY=" }, "namecheap": { "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", From 17513d7f9199223f9548e657fb735ec6e4e10107 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:41 +0000 Subject: [PATCH 199/300] terraform-providers.newrelic: 3.34.1 -> 3.38.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 5f278e549d30..d504b400c41e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -813,13 +813,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-npQn5eN3dGXy7bgVXpobn1HyVemrdxD5sASubbpY7qs=", + "hash": "sha256-UxSWEejkEH5VzPWXc2RZ5ho8rtvwH6zYUEP+W/r4ny0=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.34.1", + "rev": "v3.38.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Riutsej7+FISe0wFH9lGghyR5D6Jv3WbP3a33pqVBzU=" + "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" }, "nomad": { "hash": "sha256-+S78qH7xMvJEGvgTRlxADNZI24PNgqCj1xgmIl4Oif4=", From 002fb39960752e6d634b4965ad302d8c7e99657b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:42 +0000 Subject: [PATCH 200/300] terraform-providers.nomad: 2.2.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 d504b400c41e..e83d8438372c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -822,13 +822,13 @@ "vendorHash": "sha256-wsIi0BwwSXiVhYg2h53UzqjbGpPYMHXcmmMXO20gbWw=" }, "nomad": { - "hash": "sha256-+S78qH7xMvJEGvgTRlxADNZI24PNgqCj1xgmIl4Oif4=", + "hash": "sha256-42QZfbbugxV6USCz0Urnhfcsf+DZKpOepC44Z37dGkw=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.2.0", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-f/L9ZkirFIb+Yu2H4wz9wCb65NCC0TsmEnZPCI4Z6gw=" + "vendorHash": "sha256-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { "hash": "sha256-ZGqHIzK7tv7WeKHE8w11lOfDeWZqhi/88DOHcDaYHNg=", From 01f089642057bcec441e4ca75e444cd73fc8cda5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:22:57 +0000 Subject: [PATCH 201/300] terraform-providers.ns1: 2.2.1 -> 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 e83d8438372c..59c70037c320 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-+4JU2z56W/uT+DW4+LRf1hwK0nLK9WARTY31bqMpHNM=" }, "ns1": { - "hash": "sha256-ZGqHIzK7tv7WeKHE8w11lOfDeWZqhi/88DOHcDaYHNg=", + "hash": "sha256-KbtMwLgwCPHilzQ22oco99q6c5+0B/9OXoc0IZXLLVk=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.2.1", + "rev": "v2.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-mOxhYVsq/yl1BqMyRWmLM/YrncMTlqiUo4GdAObH3ZU=" + "vendorHash": "sha256-kQFlW6G20x1OJNywb+KfJC1A7XSdgHlif7/szUOBuhs=" }, "null": { "hash": "sha256-KOwJXGvMc9Xgq4Kbr72aW6RDwzldUrU1C3aDxpKO3qE=", From 9f6bc6e1309110df0c4c55f40f6a9b127746b99c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:23:37 +0000 Subject: [PATCH 202/300] terraform-providers.okta: 4.8.0 -> 4.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 59c70037c320..894e0aedff8a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -868,13 +868,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-PaiLWAvEW7YKAWgd6n0ZaLFrkq+5GxV+O2eF5nPZAeE=", + "hash": "sha256-GHC2HhpyPBQ5gPg/HPmP+Bms6O5mLhdAysKW58FWhwA=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.8.0", + "rev": "v4.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-LDKnlCxp1NWSWjb0vujoq3npeQXfyT+dJK6gp1gMQDc=" + "vendorHash": "sha256-71z33jsQmNQoCVSQCiyjHnfUMtwY+KB5Mn2MHItwGa0=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From b04a10ebefd2fb681f2c6cd0e4537f5cc8cd167a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:23:42 +0000 Subject: [PATCH 203/300] terraform-providers.openstack: 1.54.1 -> 2.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 894e0aedff8a..5c545143edf2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -904,13 +904,13 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-kD1UfsnSLMFBzPZNguT3XaIXk0+Tp4qCPfNV3FonaIo=", + "hash": "sha256-NSfKyXTuPiEYFE8guWsRcJsKiccMrHJRK4I5REzzIZQ=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.54.1", + "rev": "v2.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" + "vendorHash": "sha256-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" }, "opentelekomcloud": { "hash": "sha256-wRKwrxZbT2z71gVE+O8bLjZmRGsZDhdn4raShedV4kc=", From f4f6cf501a68a63e3d182b61c51e3380c8c2084c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:24:45 +0000 Subject: [PATCH 204/300] terraform-providers.ovh: 0.40.0 -> 0.45.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 5c545143edf2..38bd12b613b2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -931,11 +931,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-SGezO0L/rt5rnIz3LijkKdXn0+EPlmM/rGQ/aB2GES4=", + "hash": "sha256-346lBl1AnEdZmLEfsPiTW7I6rhOv61t004DBx7gRkF8=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.40.0", + "rev": "v0.45.0", "spdx": "MPL-2.0", "vendorHash": null }, From b512ca0bca4e1a53a6ee19651ebe97be761904e0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:24:47 +0000 Subject: [PATCH 205/300] terraform-providers.opentelekomcloud: 1.36.5 -> 1.36.12 --- .../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 38bd12b613b2..e712b3a39510 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-TS1Zp9IMD+Mq91QhyRuDgzbwd61bASWLPft5JdNCcy4=" }, "opentelekomcloud": { - "hash": "sha256-wRKwrxZbT2z71gVE+O8bLjZmRGsZDhdn4raShedV4kc=", + "hash": "sha256-UhECzYRA9AaATeYdC68ALd3aoB8G0okWQm1U9VkgL5c=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.5", + "rev": "v1.36.12", "spdx": "MPL-2.0", - "vendorHash": "sha256-Xlba/lceTt1DPtHZxeIQqbscl+pZl7hw6xJXleXd0r0=" + "vendorHash": "sha256-PwYc9p8nRe0QkgLKLOeb7KYTLgFiT2JQGsmTfFLzBH4=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", From c2dc0956b62aee1bcbefabd647e7ae448745068a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:24:50 +0000 Subject: [PATCH 206/300] terraform-providers.oci: 5.36.0 -> 5.46.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 e712b3a39510..94bf13634ba9 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -859,11 +859,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-dGFpk83154mQlH2iM52mo+208MAU4BYBOOBH529QmRI=", + "hash": "sha256-EcemPlqHB3Ggra0o1rzjxAGtcpBKpUp3/H8zS56COYA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.36.0", + "rev": "v5.46.0", "spdx": "MPL-2.0", "vendorHash": null }, From 40b48850f9cc6ce9626632f820f4a24d8397b42e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:34:29 +0000 Subject: [PATCH 207/300] terraform-providers.pagerduty: 3.11.0 -> 3.14.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 94bf13634ba9..734875e63f7c 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 }, "pagerduty": { - "hash": "sha256-joR7uucMEBbQIuec29m+t3w5W/omgzexg70+Sh2MeBY=", + "hash": "sha256-GB2U+JBMAj+ePay7CYHWv/daLzVm+V+5YoADJ6uQp+E=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.11.0", + "rev": "v3.14.3", "spdx": "MPL-2.0", "vendorHash": null }, From 85d1c5a67810fd985905be774c8cd9aa83fac5ec Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:35:01 +0000 Subject: [PATCH 208/300] terraform-providers.project: 1.5.2 -> 1.6.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 734875e63f7c..03ae3d8ea37f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -985,13 +985,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-U3hm1BqqePffuLBg+U4hgzcZpk+VCLhE5GsnRRYKT30=", + "hash": "sha256-CuUHTuq2ufSuolpvfkT4Q30tiIGkpuIoYCYqY9EOd9s=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.5.2", + "rev": "v1.6.2", "spdx": "Apache-2.0", - "vendorHash": "sha256-2gVJpNRIEO/mTBg3m5CoxpeC2U09hnV9bPi5537f1Mk=" + "vendorHash": "sha256-UcoTldBVqCPh1SVaZm2aKeRVCVfgE/zGOR7+feDEUM0=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", From 1f9e0062c3b490ec69237c3e878f9e2886555a9e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:35:30 +0000 Subject: [PATCH 209/300] terraform-providers.random: 3.6.0 -> 3.6.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 03ae3d8ea37f..215207f755bb 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-kzOEHkVCHOwISXVPmKbJJ2BbBdIJ3G1JtA1nFGZYnG8=" }, "random": { - "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", + "hash": "sha256-10SRHJx7h04qRH4XnBsqiwJ43nxTodj89kkik2UTI6E=", "homepage": "https://registry.terraform.io/providers/hashicorp/random", "owner": "hashicorp", "repo": "terraform-provider-random", - "rev": "v3.6.0", + "rev": "v3.6.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-f89G4Ln6JX1uJNeH7Vv69Fkibh1K3jOiULVvcn4ILao=" + "vendorHash": "sha256-No5XSWYIDmlxA9iczZWXXRZyy8JRSefPk36usv+Tf7c=" }, "remote": { "hash": "sha256-x0mTouv+hRGznyn2XxohWzPb0vjJvJf6kDlWrLJ/JvA=", From 223e5fc440e73a1715655939d3ef2e966cd1a373 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:35:52 +0000 Subject: [PATCH 210/300] terraform-providers.remote: 0.1.2 -> 0.1.3 --- .../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 215207f755bb..1c5e1dd7a40f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1030,13 +1030,13 @@ "vendorHash": "sha256-No5XSWYIDmlxA9iczZWXXRZyy8JRSefPk36usv+Tf7c=" }, "remote": { - "hash": "sha256-x0mTouv+hRGznyn2XxohWzPb0vjJvJf6kDlWrLJ/JvA=", + "hash": "sha256-zuKtkJLTMsrGgk7OIY+K/HhEddgFuEfzK7DcwPnUX6k=", "homepage": "https://registry.terraform.io/providers/tenstad/remote", "owner": "tenstad", "repo": "terraform-provider-remote", - "rev": "v0.1.2", + "rev": "v0.1.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-dMT3PEYNu9NxwLmY5SHa79yeVSB8Pi3UBEHiGvGGVmU=" + "vendorHash": "sha256-lkooWo0DbpL4zjNQ20TRw+hsHXWZP9u7u95n1WyzTQk=" }, "rundeck": { "hash": "sha256-VPkHnSOTnRvvX6+K0L0q5IqSSFCE6VPdg2BaSejFMNc=", From e8f4976781d5f32b69f692c56e8b8e3ffdc3429b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:36:29 +0000 Subject: [PATCH 211/300] terraform-providers.scaleway: 2.38.3 -> 2.41.3 --- .../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 1c5e1dd7a40f..39edb7c7861e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1048,13 +1048,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-TRmBSATsynbvRg9TC6kYPbzV3Y2X9Kr/3FjyMe7Kj6c=", + "hash": "sha256-VTtS5iqeMzcaVveMlnJZDrXUSf0Ts/FG7STVix08mQs=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.38.3", + "rev": "v2.41.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-hUueCEaNuTQFD17eyne7LMUr5dXdycLFJ7/d9AJh3F4=" + "vendorHash": "sha256-eLQLozDXk83vjfTrsJHQqU3GMZToMwvjadqf+X7OeOU=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 8b4fe69b915f5c74f1da3bb7c1bc02b65a57f08b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:36:55 +0000 Subject: [PATCH 212/300] terraform-providers.selectel: 4.1.1 -> 5.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 39edb7c7861e..505bacc2ef19 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1066,13 +1066,13 @@ "vendorHash": null }, "selectel": { - "hash": "sha256-HgHgZEo6fKxunbE5W8LUVukvmGpEc0bqbpO/ZcdwmTE=", + "hash": "sha256-yIQdxwkcpFKm2+woHW7yClWAwQr82XaCDFHh6KAOaQI=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v4.1.1", + "rev": "v5.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-VT9A7x7CAKJjuCXLI42s6WDy/XSME0UYLU6k1YcreU0=" + "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" }, "sentry": { "hash": "sha256-sUXOH0cbD5Zf3e4KHLUYM8vu2knJdfIWZ+fq9HMfJ54=", From 89497c37332aa4ea341ad11c73106cbdbc7035cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:37:21 +0000 Subject: [PATCH 213/300] terraform-providers.sentry: 0.12.2 -> 0.13.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 505bacc2ef19..4673e66f8622 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1075,13 +1075,13 @@ "vendorHash": "sha256-PyATpaCqu8csmpf83EODKgecZaquraFlh1bTYhhhBO4=" }, "sentry": { - "hash": "sha256-sUXOH0cbD5Zf3e4KHLUYM8vu2knJdfIWZ+fq9HMfJ54=", + "hash": "sha256-iTwl5FowrrhznO+Zr7QXy7/6HlYWCryZTMxNsBGSfWI=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.12.2", + "rev": "v0.13.1", "spdx": "MIT", - "vendorHash": "sha256-C4gyHcfWN7v5a5gB8CjoDkAlqRxgd6bpsT8n9St2tEM=" + "vendorHash": "sha256-nMI79G1e1+ISdWNjL0Qh/pD8JkD1/1khNkwULU6PyxU=" }, "shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", From 5302037fc6ca52dcc8b3eeab42f808979e1c0ca7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:37:47 +0000 Subject: [PATCH 214/300] terraform-providers.signalfx: 9.1.1 -> 9.1.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 4673e66f8622..bc51b28dd109 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1093,13 +1093,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-n8IpbCt8DKl4AIurIy5NnoZ3vWJyqrQvYEho6UEDmWc=", + "hash": "sha256-JPL2VjYIg8qW9kk6QaT3+alWtMvKHXRlqLD6AZ2+cQ0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.1.1", + "rev": "v9.1.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-aw1q9iCQKu4SynnbTRI8Tx+UbKWjG+2PFS5iDIirgh8=" + "vendorHash": "sha256-uPAWL2BigYiazZQSScM/J39dLDtYheq2P6l4A9M3rOA=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From a84ad23366e769cd855e555747b676f003ca95d9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:38:51 +0000 Subject: [PATCH 215/300] terraform-providers.snowflake: 0.87.2 -> 0.92.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 bc51b28dd109..05c088f7afd1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1120,13 +1120,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-X0VD4aI7WzNsy36e39eWzn2IIaLuXnhFSgiMnbb4myU=", + "hash": "sha256-3vC246+XoCfmnEdNFHW8iy0fy5aN+kmaZzgJot4hKs0=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.87.2", + "rev": "v0.92.0", "spdx": "MIT", - "vendorHash": "sha256-hvaZBOeAVutoKv46BLE1ud1Ox0K0InpTSG5G2WwTj5s=" + "vendorHash": "sha256-pxti3wXBke16zoEPaTbXrTc/LI1QbvKfBvbUSxnAIOk=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", From 1cb82b23bbd06b6eff6df0d8283eafd692556f1c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:39:27 +0000 Subject: [PATCH 216/300] terraform-providers.spotinst: 1.168.1 -> 1.178.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 05c088f7afd1..5e2bd570d291 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-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-frnDZx02Kmp2C0djkZYfeZ6WsGc9mFUNmpajsfx8FCI=", + "hash": "sha256-6bdOwmAKxP7EVdRV8vw6b/lewPm35zE9T0Dah6NL5FA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.168.1", + "rev": "v1.178.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pf9FsI11CKANee0dM0djLVF1xwztKVlb0bVAkp/6zbc=" + "vendorHash": "sha256-c6vs7FypPQybAzFAsTnOGVjVLhhmj6v2/O0FU1z6X0A=" }, "ssh": { "hash": "sha256-1UN5QJyjCuxs2vQYlSuz2jsu/HgGTxOoWWRcv4qcwow=", From d0bd994a4dad968e35f7d7cd6cab95090c177537 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:39:56 +0000 Subject: [PATCH 217/300] terraform-providers.stackpath: 2.0.0 -> 2.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 5e2bd570d291..a242e0037d24 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1156,11 +1156,11 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "stackpath": { - "hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=", + "hash": "sha256-n1IPOJ1NlguNMJASCXjNNUK0b5wGYe29aTcw7fNwVcU=", "homepage": "https://registry.terraform.io/providers/stackpath/stackpath", "owner": "stackpath", "repo": "terraform-provider-stackpath", - "rev": "v2.0.0", + "rev": "v2.1.0", "spdx": "MPL-2.0", "vendorHash": "sha256-G+5vSXhxmt0Qsqt7vnecPZfIxAonNF3l7ygQZ0nemnU=" }, From 9d8607789103b6b68df8e5812d68c8cb4821f85d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:40:34 +0000 Subject: [PATCH 218/300] terraform-providers.sumologic: 2.28.3 -> 2.30.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 a242e0037d24..8246ff915830 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1174,11 +1174,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-wGqOUeDJs80s5xNsnJ4uLg6DXxcZA+P30XtY4DyCDzo=", + "hash": "sha256-ei5BxMyrx4CyVYl81DUDxLdbjGJBiTZWiFylhUFTr0s=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.28.3", + "rev": "v2.30.1", "spdx": "MPL-2.0", "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" }, From 7324078304184fdababd9f457f8898ec822d79a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:40:58 +0000 Subject: [PATCH 219/300] terraform-providers.tailscale: 0.15.0 -> 0.16.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 8246ff915830..f7436c07dcbf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1183,13 +1183,13 @@ "vendorHash": "sha256-ti0zBliq3DXVNWlqE0dO6T5UxN/p1fLMt4FK/0/j9oY=" }, "tailscale": { - "hash": "sha256-hvhdaxO7CbsfFzDw0UuRxlgRwvumWPz/I65IgounflQ=", + "hash": "sha256-hMcnHTdxxEfAU5cd0nlK2Bc+fxfrERk4wYaRidPM4mA=", "homepage": "https://registry.terraform.io/providers/tailscale/tailscale", "owner": "tailscale", "repo": "terraform-provider-tailscale", - "rev": "v0.15.0", + "rev": "v0.16.1", "spdx": "MIT", - "vendorHash": "sha256-+XgYutJTSKL6HmAX4GLnktqcM3AxYP7B1UHzAp/Oz78=" + "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, "talos": { "hash": "sha256-DoO2aGoBkuafPJGNz0opmkFw4wwUgsczA2D0bSXQAlg=", From f240851ecc72f1d87b4dd237dce70a1a77e40db8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:41:31 +0000 Subject: [PATCH 220/300] terraform-providers.talos: 0.4.0 -> 0.5.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 f7436c07dcbf..d768cc8ba1e0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1192,13 +1192,13 @@ "vendorHash": "sha256-RAmAN57hIHvQvZ2pjbLbanixUk8Cart6a3PQPXhnx9U=" }, "talos": { - "hash": "sha256-DoO2aGoBkuafPJGNz0opmkFw4wwUgsczA2D0bSXQAlg=", + "hash": "sha256-HsblGVHCrOdNDGfNGyGjZxC1LmzZHxjOzknYmY2/BU0=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.4.0", + "rev": "v0.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" + "vendorHash": "sha256-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { "hash": "sha256-pjxEcA8K9n70FWMwpTXr8fwOCj/GVmiL9XfKLRLQ6tI=", From 41774346e8b5ac9ccc64baf8fd6d6080b4d5c83e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:41:55 +0000 Subject: [PATCH 221/300] terraform-providers.temporalcloud: 0.0.6 -> 0.0.8 --- .../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 d768cc8ba1e0..f84fbe9b6922 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-939lQsdp0Ixj9FU7IqxbOAM93GwL+X6gC3kY5/0x+AE=" }, "temporalcloud": { - "hash": "sha256-pjxEcA8K9n70FWMwpTXr8fwOCj/GVmiL9XfKLRLQ6tI=", + "hash": "sha256-ISx/kc3Mi/EBnzfrMojRTsZEG10iPqKMB8Ac8SzBZmY=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v0.0.6", + "rev": "v0.0.8", "spdx": "MPL-2.0", "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" }, From be6535a9a0d2fb29cc159884189afde35d0a06fe Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:43:34 +0000 Subject: [PATCH 222/300] terraform-providers.tencentcloud: 1.81.86 -> 1.81.105 --- .../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 f84fbe9b6922..cffb0a7cb788 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1210,11 +1210,11 @@ "vendorHash": "sha256-2rYaxDDIPH46gXNILnTcHRsChpEd406r4pzWdnHMLNM=" }, "tencentcloud": { - "hash": "sha256-nYQVrWpCiDTXJ6BA9dwXkslGF/dvlT+E8WBD7By91Cw=", + "hash": "sha256-RR7F+sZl/btVEsybmKFxG3yrE7PkvdstMuDAJwx4Ggk=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.86", + "rev": "v1.81.105", "spdx": "MPL-2.0", "vendorHash": null }, From 322943841ed1e3e52f7485d06b149511e8a1a076 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:44:01 +0000 Subject: [PATCH 223/300] terraform-providers.tfe: 0.53.0 -> 0.56.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 cffb0a7cb788..40ce5dac5494 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1219,13 +1219,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-5Txgqf/4dh2fsB6guqgLs3PxZs1QB32NzqCFIwM4ogg=", + "hash": "sha256-mfJtQs+fl7zfysWJO/EBM/DMYYOvR5nuOwDA6sei1PI=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.53.0", + "rev": "v0.56.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7rMBmB93dLPyd9VcVc9R8SnXQ0XkU6SHc6j/KiAODVg=" + "vendorHash": "sha256-heMfI1NLjOHSKondXY8mRCNWFedSYJqfn9nU2Ywj57c=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", From 6b935cf95aea22bd19af4f12614a3e94a384e5c1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:44:27 +0000 Subject: [PATCH 224/300] terraform-providers.time: 0.11.1 -> 0.11.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 40ce5dac5494..a5b2ef88beb5 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 }, "time": { - "hash": "sha256-yRYGyDPMR/2+OOjqXj1OhpvYoAUEbgWPcW4PcatPPh8=", + "hash": "sha256-Uwe0VpY7CKXNy6RNS+yoIkyLmMQ2daJ5x7IhJV+KuxU=", "homepage": "https://registry.terraform.io/providers/hashicorp/time", "owner": "hashicorp", "repo": "terraform-provider-time", - "rev": "v0.11.1", + "rev": "v0.11.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UZ0DpurmLmju/MG0uhAXgbwQoas94/R9TNT1cyO6pIQ=" + "vendorHash": "sha256-dmBCjbVmK4Qa07bcgUxKch5Vj7nylgNA7rzx+7ag3CY=" }, "tls": { "hash": "sha256-2K18jY2+oPvelMtZ2o4WJcAPhc93nCvJdHq+VNfmWZI=", From c53d9c33525800c93ce0928b76642d34f43e957f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:44:58 +0000 Subject: [PATCH 225/300] terraform-providers.ucloud: 1.38.8 -> 1.39.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 a5b2ef88beb5..a5776d6f2571 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1274,11 +1274,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-u9LxsBKmS80h4y+/nJZ+0+cmQP5gS/I+T5g8H/QlPDA=", + "hash": "sha256-mPTejWXREIBjEZVb660bUUnyj3z7hgfKPrUsSVvMx7A=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.8", + "rev": "v1.39.1", "spdx": "MPL-2.0", "vendorHash": null }, From 160658aa9fb4639c609b70c6429aa3e2e8006661 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:46:10 +0000 Subject: [PATCH 226/300] terraform-providers.utils: 1.19.2 -> 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 a5776d6f2571..45b28626f24c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1283,13 +1283,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-LGjH/nQj18v8qjwJEU1CkrauGqSizsTpl80Q5jNIwUE=", + "hash": "sha256-9a8K2Yl3hfmUG+/QgQJdXnW6lxkOJps1BskFto3tIwg=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.19.2", + "rev": "1.23.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-QC5EWVSkBDMfLR2f0u0K2LOn6FaHCeFkNJeq8vWQp+o=" + "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" }, "vault": { "hash": "sha256-Pdh2rudUwOgY292JPPrvxIABHC+/dBYK5iNTaHZ9ed0=", From 4a6d9f860ac76d349c5887b6231374830353adcf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:46:58 +0000 Subject: [PATCH 227/300] terraform-providers.vault: 4.2.0 -> 4.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 45b28626f24c..7ff5d8146c52 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1292,13 +1292,13 @@ "vendorHash": "sha256-oaVBYSH2ix9SUqvrFo+oBIS80/Sb3E7Z/Jpvznt+OtU=" }, "vault": { - "hash": "sha256-Pdh2rudUwOgY292JPPrvxIABHC+/dBYK5iNTaHZ9ed0=", + "hash": "sha256-tPRwdSwygypfgXAS3QmZNAb4GXe/8IFsRs8YGa4HDJg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v4.2.0", + "rev": "v4.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-b/1g/1hFbIfzYJ0lQKNzalLkD95LLRgoftuoeDicalE=" + "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" }, "vcd": { "hash": "sha256-yywk60Ae1Ch+kuOqoKfAqrOhUAbJVQxA0wJW+CfZ4CY=", From 39a884c3ff559b97ec18324f45ab4213d0d61db4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:47:26 +0000 Subject: [PATCH 228/300] terraform-providers.vcd: 3.12.0 -> 3.12.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 7ff5d8146c52..ee01345c09ac 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1301,13 +1301,13 @@ "vendorHash": "sha256-rS6tigtjTGG2c4FwSjn6dvblwqYtPQS/tl7qQ+P7uVM=" }, "vcd": { - "hash": "sha256-yywk60Ae1Ch+kuOqoKfAqrOhUAbJVQxA0wJW+CfZ4CY=", + "hash": "sha256-f5uoRyf8uW/hJ9MAbi9KdViWh8CMR/FlQyJtAY5pEvI=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.12.0", + "rev": "v3.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-53Cj5ooDsg91iiuYzjAt9u9S40g6plcz6lqlnawNFNM=" + "vendorHash": "sha256-vKfHRTmTRxwDijEA1l4IyjBHS5kZx9LcGfprUntVg5w=" }, "venafi": { "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", From 3e3d54fb6b1f9e213cd27a62981e0ab138a70f6e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:47:58 +0000 Subject: [PATCH 229/300] terraform-providers.venafi: 0.18.0 -> 0.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 ee01345c09ac..fb1353b2b9b2 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-vKfHRTmTRxwDijEA1l4IyjBHS5kZx9LcGfprUntVg5w=" }, "venafi": { - "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", + "hash": "sha256-0ea6ael4NQDHFOrXsMKE/KRRpARKjrxPBFykB8Bk1JA=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.18.0", + "rev": "v0.21.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" + "vendorHash": "sha256-PPoPNl7Lc/siAAupLS07vbDipAO1Q0mmDuqSE5/om50=" }, "virtualbox": { "hash": "sha256-Oijdx22s7wIDC+Sms097rFVNRF9tzMlUNlPMV7GSsiI=", From 4ded7e79bdcc03ea18718058abba9391a53dd4f4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:48:27 +0000 Subject: [PATCH 230/300] terraform-providers.vra7: 3.0.13 -> 3.0.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 fb1353b2b9b2..e9f4abe0959b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1337,11 +1337,11 @@ "vendorHash": "sha256-OzcDMLWwnBYIkBcL6U1t9oCNhZZokBUf2TONb+OfgPE=" }, "vra7": { - "hash": "sha256-v/0LBzyUUqt+Jx4GubCC2QzKdgt5WrrjZ4YvfxA2+GA=", + "hash": "sha256-KzxthTn3z0kZTUTKO8zq6DaNMTnfb7gFlbuWgxZtqwo=", "homepage": "https://registry.terraform.io/providers/vmware/vra7", "owner": "vmware", "repo": "terraform-provider-vra7", - "rev": "v3.0.13", + "rev": "v3.0.15", "spdx": "MPL-2.0", "vendorHash": null }, From 036849a27d409e074305d53a6c2e5b11ab16694c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:48:59 +0000 Subject: [PATCH 231/300] terraform-providers.vsphere: 2.7.0 -> 2.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 e9f4abe0959b..b75964e22d70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1346,13 +1346,13 @@ "vendorHash": null }, "vsphere": { - "hash": "sha256-SATX9BO6tnHW8+oeSeMNP3+opKHBk42va2J8YdrnlUw=", + "hash": "sha256-BCEUFIw47o7lFmOaQ/SBk2n1bPnvzAwdxeuuMNx4OgA=", "homepage": "https://registry.terraform.io/providers/hashicorp/vsphere", "owner": "hashicorp", "repo": "terraform-provider-vsphere", - "rev": "v2.7.0", + "rev": "v2.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-cHzIOIGy5DT5q5fvQlv56V6/vU0akBFM34M+c2+qIy4=" + "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" }, "vultr": { "hash": "sha256-+J4RHQWOy4Wfv2/8UNHe8g2fp2yAxzqzZZRv749B3Yc=", From 13dbfb7e0f4b5aa43766da4f9d794ca43d86e28e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:49:18 +0000 Subject: [PATCH 232/300] terraform-providers.vultr: 2.19.0 -> 2.21.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 b75964e22d70..15337a5a67ad 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1355,11 +1355,11 @@ "vendorHash": "sha256-K7T4ZGz8Us/RRWoAmT5M++m6uJKl6tyPX7T+sS7NuLs=" }, "vultr": { - "hash": "sha256-+J4RHQWOy4Wfv2/8UNHe8g2fp2yAxzqzZZRv749B3Yc=", + "hash": "sha256-gQwLGnYmB9bwpGrLNdbw+zY0MlPPrY/37rJPtindT1Q=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.19.0", + "rev": "v2.21.0", "spdx": "MPL-2.0", "vendorHash": null }, From 9208076626e57636dc866ec732186662bb4c04ce Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jun 2024 02:50:17 +0000 Subject: [PATCH 233/300] terraform-providers.yandex: 0.112.0 -> 0.122.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 15337a5a67ad..9b613c6ff4ae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1373,12 +1373,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-mlai++RjiYFSJLkhyWyKKYs/LFVoKIHtFB2bGmB5DFM=", + "hash": "sha256-PTlnXq30roG1ueLJM5aGSeuDJ5zukmU33T9Qf7cnxd8=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.112.0", + "rev": "v0.122.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eE8gYyIGVBmw02I6j9GoEm2TiOmHGWhOs5pcqj/6PaA=" + "vendorHash": "sha256-Lo847kKBWDFeN3t7T/akaQ8gkU7b+p1BSSi4ddLLDyc=" } } From 3ee370f8c64e438f1d3c5b5811f519ab94ac819c Mon Sep 17 00:00:00 2001 From: Heinz Deinhart Date: Wed, 26 Jun 2024 10:26:22 +0200 Subject: [PATCH 234/300] remove libcurl workaround patch --- .../ddnet-18.2-nixos-libcurl-brotli-disable.patch | 13 ------------- pkgs/games/ddnet/default.nix | 4 ---- 2 files changed, 17 deletions(-) delete mode 100644 pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch diff --git a/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch b/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch deleted file mode 100644 index 577cfa3811e1..000000000000 --- a/pkgs/games/ddnet/ddnet-18.2-nixos-libcurl-brotli-disable.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur ddnet-18.2/src/engine/shared/http.cpp ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp ---- ddnet-18.2/src/engine/shared/http.cpp 2024-04-30 20:27:51.000000000 +0200 -+++ ddnet-18.2-nixos-libcurl-workaround/src/engine/shared/http.cpp 2024-05-05 21:17:33.792870233 +0200 -@@ -146,7 +146,8 @@ - curl_easy_setopt(pH, CURLOPT_URL, m_aUrl); - curl_easy_setopt(pH, CURLOPT_NOSIGNAL, 1L); - curl_easy_setopt(pH, CURLOPT_USERAGENT, GAME_NAME " " GAME_RELEASE_VERSION " (" CONF_PLATFORM_STRING "; " CONF_ARCH_STRING ")"); -- curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl. -+ // curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, ""); // Use any compression algorithm supported by libcurl. -+ curl_easy_setopt(pH, CURLOPT_ACCEPT_ENCODING, "gzip, deflate"); // NixOS libcurl workaround: don't use brotli - - curl_easy_setopt(pH, CURLOPT_HEADERDATA, this); - curl_easy_setopt(pH, CURLOPT_HEADERFUNCTION, HeaderCallback); diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 6908f1f57a41..87ce27e96bff 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -50,10 +50,6 @@ stdenv.mkDerivation rec { hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg="; }; - patches = [ - ./ddnet-18.2-nixos-libcurl-brotli-disable.patch - ]; - nativeBuildInputs = [ cmake ninja From 54f0f3829c4efaaa4fbd518ee0e412ff78d63b40 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 26 Jun 2024 10:48:15 +0200 Subject: [PATCH 235/300] pinocchio: deactivate one failing test on aarch64 --- pkgs/development/libraries/pinocchio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 325d8f48388e..470668bb1eb2 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace unittest/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-models)" "" # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" From 82e0c944494d133a8a5cbee384028270f37e0271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Wed, 26 Jun 2024 10:53:31 +0200 Subject: [PATCH 236/300] ddnet: 18.2 -> 18.3 https://ddnet.org/downloads/#18.3 --- pkgs/games/ddnet/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ddnet/default.nix b/pkgs/games/ddnet/default.nix index 87ce27e96bff..955baea28be8 100644 --- a/pkgs/games/ddnet/default.nix +++ b/pkgs/games/ddnet/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cargo , cmake , ninja @@ -35,19 +36,19 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "18.2"; + version = "18.3"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - hash = "sha256-KerV174GPF2htfaQo5gRFLgpnGf9UoS0zQ/yd/SDFkQ="; + hash = "sha256-QefbA6ncxMDHmd7tBH1bU+8FoVVJVdEtOuVXEvteSOE="; }; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit src; - hash = "sha256-cAz98SspJ5QFjw7rXtdmfShllAx89pg+PUs20bkmBCg="; + hash = "sha256-XwSdDvE0p/A+6ZbV82K78jgIxGs71fu7ZDGTl0I0cCI="; }; nativeBuildInputs = [ @@ -91,6 +92,13 @@ stdenv.mkDerivation rec { Security ]); + patches = [ + (fetchpatch { + url = "https://github.com/ddnet/ddnet/pull/8517/commits/c840bf45016a30e629f7684df5fab5d07b2c70d5.patch"; + hash = "sha256-UG7pi0Xh/nAHFEF1RIyNZLewF+NFilTLARbV5oUlftc="; + }) + ]; + postPatch = '' substituteInPlace src/engine/shared/storage.cpp \ --replace /usr/ $out/ From da9b2bda450880043af2fdb76ef39818857d5a94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 09:04:29 +0000 Subject: [PATCH 237/300] zpaqfranz: 59.8 -> 59.9 --- pkgs/by-name/zp/zpaqfranz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix index e951b59eb467..9ba51b15abad 100644 --- a/pkgs/by-name/zp/zpaqfranz/package.nix +++ b/pkgs/by-name/zp/zpaqfranz/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "zpaqfranz"; - version = "59.8"; + version = "59.9"; src = fetchFromGitHub { owner = "fcorbelli"; repo = "zpaqfranz"; rev = finalAttrs.version; - hash = "sha256-N3R/M0TS8XzRilQT4NFqIlfo2NqfunA38IrQBz5uaPg="; + hash = "sha256-1TmJHksFeiDjkIslA9FAZrWElgfCV1HOtS7H2pq8sHY="; }; nativeBuildInputs = [ From 14e55ea612cb13b6fe8337f3be3c8d7c178a3abc Mon Sep 17 00:00:00 2001 From: vigress8 <150687949+vigress8@users.noreply.github.com> Date: Wed, 26 Jun 2024 13:04:20 +0400 Subject: [PATCH 238/300] pegtl: init at 3.2.7 --- pkgs/by-name/pe/pegtl/package.nix | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 pkgs/by-name/pe/pegtl/package.nix diff --git a/pkgs/by-name/pe/pegtl/package.nix b/pkgs/by-name/pe/pegtl/package.nix new file mode 100644 index 000000000000..152aa513133a --- /dev/null +++ b/pkgs/by-name/pe/pegtl/package.nix @@ -0,0 +1,39 @@ +{ + cmake, + fetchFromGitHub, + gitUpdater, + lib, + ninja, + stdenv, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "pegtl"; + version = "3.2.7"; + + src = fetchFromGitHub { + owner = "taocpp"; + repo = "PEGTL"; + rev = finalAttrs.version; + hash = "sha256-IV5YNGE4EWVrmg2Sia/rcU8jCuiBynQGJM6n3DCWTQU="; + }; + + nativeBuildInputs = [ + cmake + ninja + ]; + + passthru.updateScript = gitUpdater { }; + + meta = { + homepage = "https://github.com/taocpp/pegtl"; + description = "Parsing Expression Grammar Template Library"; + longDescription = '' + Zero-dependency C++ header-only parser combinator library + for creating parsers according to a Parsing Expression Grammar (PEG). + ''; + license = lib.licenses.boost; + maintainers = with lib.maintainers; [ vigress8 ]; + platforms = lib.platforms.all; + }; +}) From d0df3dcc3a3c5279a670d009588de13274b6d1c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 09:25:49 +0000 Subject: [PATCH 239/300] grype: 0.79.0 -> 0.79.1 --- pkgs/by-name/gr/grype/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index dd851078933c..588e0e45d911 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "grype"; - version = "0.79.0"; + version = "0.79.1"; src = fetchFromGitHub { owner = "anchore"; repo = "grype"; rev = "refs/tags/v${version}"; - hash = "sha256-fFiZ6GOKaHcBnxakhd3Mdm1hHmfAwyq/ScBNUwrm0vw="; + hash = "sha256-Ih1xja20e3wCZ68kRA9bK8jh+pw/5KtlgeE3dDjqeE0="; # 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; @@ -30,7 +30,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-PIs+6P7w6vjOOpH96KEdG6tHRCU7ijtdyS/1C77BPDw="; + vendorHash = "sha256-iSpSJwAHB/HJ3Ut1VgUBd1yCwOaM4f3ihR0J4YjMVxM="; nativeBuildInputs = [ installShellFiles ]; From f4bd45f2ca2a26f3e7c04cd69b6381d0bbfd1a5a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:08:39 +0200 Subject: [PATCH 240/300] modrinth-app-unwrapped: replace nodePackages.pnpm with pnpm_8 --- pkgs/by-name/mo/modrinth-app-unwrapped/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index 121d9072ab09..7814ec363dce 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -15,7 +15,8 @@ jq, libsoup, moreutils, - nodePackages, + pnpm_8, + nodejs, openssl, pkg-config, webkitgtk, @@ -51,7 +52,7 @@ rustPlatform.buildRustPackage { cacert jq moreutils - nodePackages.pnpm + pnpm_8 ]; # https://github.com/NixOS/nixpkgs/blob/763e59ffedb5c25774387bf99bc725df5df82d10/pkgs/applications/misc/pot/default.nix#L56 @@ -77,7 +78,8 @@ rustPlatform.buildRustPackage { nativeBuildInputs = [ cargo-tauri desktop-file-utils - nodePackages.pnpm + pnpm_8 + nodejs pkg-config ]; From ffa77cec627b69ffdfb8c1780963d45ba1ddf448 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 26 Jun 2024 01:28:46 -0400 Subject: [PATCH 241/300] nodePackages.pnpm: alias Sets it to be an alias of the pkgs/by-name pnpm package. --- pkgs/development/node-packages/aliases.nix | 1 + .../node-packages/node-packages.json | 1 - .../node-packages/node-packages.nix | 18 ------------------ pkgs/development/node-packages/overrides.nix | 19 ------------------- 4 files changed, 1 insertion(+), 38 deletions(-) diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix index 7f853358c164..c89a8b709df0 100644 --- a/pkgs/development/node-packages/aliases.nix +++ b/pkgs/development/node-packages/aliases.nix @@ -119,6 +119,7 @@ mapAliases { parcel-bundler = parcel; # added 2023-09-04 pkg = pkgs.vercel-pkg; # added 2023-10-04 inherit (pkgs) pm2; # added 2024-01-22 + inherit (pkgs) pnpm; # added 2024-06-26 prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14 inherit (pkgs) pxder; # added 2023-09-26 inherit (pkgs) quicktype; # added 2023-09-09 diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 003445804e73..0d2a10d51da8 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -181,7 +181,6 @@ , "patch-package" , "peerflix" , "peerflix-server" -, "pnpm" , "poor-mans-t-sql-formatter-cli" , "postcss" , "postcss-cli" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 82d127df70f2..761085cc1f63 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -85656,24 +85656,6 @@ in bypassCache = true; reconstructLock = true; }; - pnpm = nodeEnv.buildNodePackage { - name = "pnpm"; - packageName = "pnpm"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-9.3.0.tgz"; - sha512 = "7nuT4MK9EUCcZCT5K4ZvMdPqG+9fvkfTx1AM3DyWaIM9LlVoGtZt9bZAxh+p3CXVRu+lTXbX+L9UsTYUrCk2MQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.io"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; poor-mans-t-sql-formatter-cli = nodeEnv.buildNodePackage { name = "poor-mans-t-sql-formatter-cli"; packageName = "poor-mans-t-sql-formatter-cli"; diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 7f56b6d74c51..c725197bddb6 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -217,25 +217,6 @@ final: prev: { ''; }; - pnpm = prev.pnpm.override { - nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; - - preRebuild = '' - sed 's/"link:/"file:/g' --in-place package.json - ''; - - postInstall = let - pnpmLibPath = lib.makeBinPath [ - nodejs.passthru.python - nodejs - ]; - in '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : ${pnpmLibPath} - done - ''; - }; - postcss-cli = prev.postcss-cli.override (oldAttrs: let esbuild-version = (lib.findFirst (dep: dep.name == "esbuild") null oldAttrs.dependencies).version; esbuild-linux-x64 = { From 620cfcbbee064cdf1a48e44c55e16eb72913d527 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 26 Jun 2024 11:47:44 +0200 Subject: [PATCH 242/300] python311Packages.flax: 0.8.4 -> 0.8.5 Diff: https://github.com/google/flax/compare/refs/tags/v0.8.4...v0.8.5 Changelog: https://github.com/google/flax/releases/tag/v0.8.5 --- .../python-modules/flax/default.nix | 34 ++++++++++++------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix index 7c443368bd41..955177b9bbca 100644 --- a/pkgs/development/python-modules/flax/default.nix +++ b/pkgs/development/python-modules/flax/default.nix @@ -1,32 +1,40 @@ { lib, buildPythonPackage, - cloudpickle, - einops, + pythonOlder, fetchFromGitHub, - jax, + + # build-system jaxlib, - keras, - matplotlib, + pythonRelaxDepsHook, + setuptools-scm, + + # dependencies + jax, msgpack, numpy, optax, orbax-checkpoint, - pytest-xdist, - pytestCheckHook, - pythonOlder, - pythonRelaxDepsHook, pyyaml, rich, - setuptools-scm, - tensorflow, tensorstore, typing-extensions, + + # checks + cloudpickle, + einops, + keras, + pytest-xdist, + pytestCheckHook, + tensorflow, + + # optional-dependencies + matplotlib, }: buildPythonPackage rec { pname = "flax"; - version = "0.8.4"; + version = "0.8.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -35,7 +43,7 @@ buildPythonPackage rec { owner = "google"; repo = "flax"; rev = "refs/tags/v${version}"; - hash = "sha256-ZwqKZdJ9LOfWTav5nE9xMsMw/DbryqQUuu5fqeugBzY="; + hash = "sha256-6WOFq0758gtNdrlWqSQBlKmWVIGe5e4PAaGrvHoGjr0="; }; build-system = [ From 4b72e3cf0c6b6561f6b3c600c2d6c46370cceb8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 24 Jun 2024 15:54:36 +0200 Subject: [PATCH 243/300] gitlab: replace universal-prefetch-url with nix-prefetch-url It's even less code... Co-Authored-By: Yaya --- .../version-management/gitlab/update.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 195fce350c28..bb46af27c690 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix nix-universal-prefetch python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git +#! nix-shell -I nixpkgs=../../../.. -i python3 -p bundix bundler nix-update nix python3 python3Packages.requests python3Packages.click python3Packages.click-log python3Packages.packaging prefetch-yarn-deps git import click import click_log @@ -49,19 +49,13 @@ class GitLabRepo: reverse=True, ) return versions - def get_git_hash(self, rev: str): return ( subprocess.check_output( [ - "nix-universal-prefetch", - "fetchFromGitLab", - "--owner", - self.owner, - "--repo", - self.repo, - "--rev", - rev, + "nix-prefetch-url", + "--unpack", + f"https://gitlab.com/{self.owner}/{self.repo}/-/archive/{rev}/{self.repo}-{rev}.tar.gz", ] ) .decode("utf-8") From 9050404e910e8ea3ac97c054e34654dc387e9e2c Mon Sep 17 00:00:00 2001 From: Eric Kim-Butler Date: Wed, 26 Jun 2024 11:28:17 +0200 Subject: [PATCH 244/300] nushell: 0.94.1 -> 0.95.0 --- pkgs/shells/nushell/default.nix | 24 ++++++++++++++---------- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/polars.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index e0a699438177..34bdab129b23 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -13,9 +13,6 @@ , Security , nghttp2 , libgit2 -# string interpolation dependends on a date that is erroring out -# this will be fixed in releases after 0.90.1 -, doCheck ? false , withDefaultFeatures ? true , additionalFeatures ? (p: p) , testers @@ -24,7 +21,7 @@ }: let - version = "0.94.1"; + version = "0.95.0"; in rustPlatform.buildRustPackage { @@ -35,10 +32,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-uwtmSyNJJUtaFrBd9W89ZQpWzBOswOLWTevkPlg6Ano="; + hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ="; }; - cargoHash = "sha256-4caqvbNxXRZksQrySydPlzn9S6gr2xPLFLSEcAEGnI8="; + cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] @@ -52,12 +49,19 @@ rustPlatform.buildRustPackage { buildNoDefaultFeatures = !withDefaultFeatures; buildFeatures = additionalFeatures [ ]; - inherit doCheck; - checkPhase = '' runHook preCheck - echo "Running cargo test" - HOME=$(mktemp -d) cargo test + ( + # The skipped tests all fail in the sandbox because in the nushell test playground, + # the tmp $HOME is not set, so nu falls back to looking up the passwd dir of the build + # user (/var/empty). The assertions however do respect the set $HOME. + set -x + HOME=$(mktemp -d) cargo test -j $NIX_BUILD_CORES --offline -- \ + --test-threads=$NIX_BUILD_CORES \ + --skip=repl::test_config_path::test_default_config_path \ + --skip=repl::test_config_path::test_xdg_config_bad \ + --skip=repl::test_config_path::test_xdg_config_empty + ) runHook postCheck ''; diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 80d29c4dcadc..a4e3b5dfc451 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-r5r+LdG6isZiKzwaZM/RIzQnZwrVBDCbdM1SMbvVU0E="; + cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 7a937b33aa46..f1f59e66e2b5 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-ENDDkEpUp+3a0Numb7+McVP04VtSZaU4pbu4uEFT9Jc="; + cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; diff --git a/pkgs/shells/nushell/plugins/polars.nix b/pkgs/shells/nushell/plugins/polars.nix index d1bda99acafb..f014c4a939e0 100644 --- a/pkgs/shells/nushell/plugins/polars.nix +++ b/pkgs/shells/nushell/plugins/polars.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_polars"; inherit (nushell) version src; - cargoHash = "sha256-GkVX12MEHFP4g183zUzOUn4MNeTEBEpB+D5s0OXa4nc="; + cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index 0473b291aff3..f9d573f41348 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-l4fmO2LQpiSpGQVfuqJLcuYIryIlq/iYlPuI4FS+RlQ="; + cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100="; nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ]; From 955e04a283aa8c03643d4d39e03b53550fc79622 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 12:21:43 +0000 Subject: [PATCH 245/300] hwloc: 2.10.0 -> 2.11.0 --- pkgs/development/libraries/hwloc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 7dc11069e9a6..38550115bfb0 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "hwloc"; - version = "2.10.0"; + version = "2.11.0"; src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${lib.versions.majorMinor version}/downloads/hwloc-${version}.tar.bz2"; - sha256 = "sha256-AwXdYMneL75lGf4qTo/cbT243ldKDKeBK5LoDAWuE5I="; + sha256 = "sha256-A5A7h8rV23K9APeSbWpTdEsQxcaiOMa2hRDn3BVg5Pk="; }; configureFlags = [ From 00ba4c2c35f5e450f28e13e931994c730df05563 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 25 Jun 2024 00:48:17 +0000 Subject: [PATCH 246/300] vscodium: 1.90.1.24165 -> 1.90.2.24171 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 3461744ec6eb..c1f275b6911e 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1r76ikfikagg9v278pgiqhnjsv7pqn0xi372y1l0wsashlxl7kb0"; - x86_64-darwin = "156604xzazmb54p0rdkv5wy9livg0xz2jviycdizablmvsxybs57"; - aarch64-linux = "0cp120pcjpgf9qvmks9f8l2caxqlvnqvmxa7fh9mf83zpkdmnsnl"; - aarch64-darwin = "1k06648jx64irshs0v4qy6xlkd9mk514xf21dlfhvic4aj89kcx9"; - armv7l-linux = "0jy8hkbxh1969kskggg2y86cphly9l9gs7y4plj90jmlvlzjjjxm"; + x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; + x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; + aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; + aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; + armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.1.24165"; + version = "1.90.2.24171"; pname = "vscodium"; executableName = "codium"; From 77f304adadfcd5f21cbea970ead96e125984754f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 12:52:09 +0000 Subject: [PATCH 247/300] codeberg-cli: 0.4.0 -> 0.4.2 --- pkgs/by-name/co/codeberg-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index d058e72b4e80..f6d440e557ea 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage rec { pname = "codeberg-cli"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "RobWalt"; repo = "codeberg-cli"; rev = "v${version}"; - hash = "sha256-g5V3Noqh7Y9v/t/dt7n45/NblqNtpZCKELPc9DOkb8A="; + hash = "sha256-SUKV7tH7tvSPtlMcRlOgjvAEqPoBi4J41Ak5k4h4Qj0="; }; - cargoHash = "sha256-zTg/3PcFWzBmKZA7lRIpM3P03d1qpNVBczqWFbnxpic="; + cargoHash = "sha256-FlW0Q2UUt6AX/A0MznGpJY8+yoMs70N58Ow05ly9YyE="; nativeBuildInputs = [ pkg-config installShellFiles From 4e222b05a53a2624b92cc246d83753514e262d59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 12:52:51 +0000 Subject: [PATCH 248/300] protolint: 0.49.8 -> 0.50.1 --- pkgs/development/tools/protolint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index 6fecadca5e7a..a9252814d28e 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.49.8"; + version = "0.50.1"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-x4xjFXpyuZRBcE6I+s3GCJmTg/nm9lHHnXNAKOFA5RQ="; + hash = "sha256-zn9bxOWJWlF3lpVAuJQTTnBqNeTAZg+0bPVGAzf3a54="; }; - vendorHash = "sha256-xHBiY2SHprGxmjaNqHPUMc0oa4iQ9L3X8ydvEiG5om4="; + vendorHash = "sha256-E3pzeu+JA97z2q21ARTgwTPldhWODqkCP7rQMMKygAw="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: From daba831863b0a4e2dbeb9e13165f7c4f24e8f2fb Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 26 Jun 2024 16:23:01 +0300 Subject: [PATCH 249/300] kdePackages.kirigami-addons: 1.2.1 -> 1.3.0 --- pkgs/kde/misc/kirigami-addons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix index c20cff446e00..f9105b4f16b7 100644 --- a/pkgs/kde/misc/kirigami-addons/default.nix +++ b/pkgs/kde/misc/kirigami-addons/default.nix @@ -7,11 +7,11 @@ }: mkKdeDerivation rec { pname = "kirigami-addons"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz"; - hash = "sha256-ZXQm+exVz+xafwSEjtK03yrIv8szwlYmrSOSGdRE7pg="; + hash = "sha256-9eRNen19/YZsUpuwBPcgQBNgmhbJdXCR/NssbFvgD/M="; }; extraBuildInputs = [qtdeclarative]; From 8589a96244b10a0457e4d5e54f54a52dfd581241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 26 Jun 2024 11:52:47 +0200 Subject: [PATCH 250/300] nix-unit: 2.18.0 -> 2.23.0 --- pkgs/by-name/ni/nix-unit/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix index a9f1b7105c29..ddcf0c2a43a9 100644 --- a/pkgs/by-name/ni/nix-unit/package.nix +++ b/pkgs/by-name/ni/nix-unit/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nix-unit"; - version = "2.18.0"; + version = "2.23.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-unit"; rev = "v${finalAttrs.version}"; - hash = "sha256-9wq14p+85oW4HlD42NJ0jyA++z3nEYjFQ6uT40xdfbc="; + hash = "sha256-sDYeiwVo6+GL4/AHadeExVqE9j3wzdUsyMLs1OYQW7Y="; }; buildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { # We pin the nix version to a known working one here as upgrades can likely break the build. # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests # On each update of nix unit we should re-evaluate what version we need. - nixVersions.nix_2_18 + nixVersions.nix_2_23 boost ]; From ba42623fd59c6845967323bafb0514c769a62d73 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Wed, 26 Jun 2024 11:06:04 -0300 Subject: [PATCH 251/300] rtorrent: use multiple outputs, update documentation --- pkgs/by-name/rt/rtorrent/package.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix index 86844faa293d..c7a74aecf660 100644 --- a/pkgs/by-name/rt/rtorrent/package.nix +++ b/pkgs/by-name/rt/rtorrent/package.nix @@ -1,10 +1,11 @@ { lib , stdenv -, fetchFromGitHub -, autoreconfHook , autoconf-archive +, autoreconfHook , cppunit , curl +, fetchFromGitHub +, installShellFiles , libsigcxx , libtool , libtorrent @@ -28,6 +29,8 @@ stdenv.mkDerivation { hash = "sha256-OXOZSMuNAU+VGwNyyfzcmkTRjDJq9HsKUNxZDYpSvFQ="; }; + outputs = [ "out" "man" ]; + passthru = { inherit libtorrent; }; @@ -35,6 +38,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoconf-archive autoreconfHook + installShellFiles pkg-config ]; @@ -65,9 +69,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; postInstall = '' - mkdir -p $out/share/man/man1 $out/share/doc/rtorrent - mv doc/old/rtorrent.1 $out/share/man/man1/rtorrent.1 - mv doc/rtorrent.rc $out/share/doc/rtorrent/rtorrent.rc + installManPage doc/old/rtorrent.1 + install -Dm644 doc/rtorrent.rc-example -t $out/share/doc/rtorrent/rtorrent.rc ''; meta = { From 7241395bf3ed700863a8567589f9254dd20372f5 Mon Sep 17 00:00:00 2001 From: LAURAilway Date: Wed, 26 Jun 2024 16:45:43 +0200 Subject: [PATCH 252/300] maintainers: remove laurailway --- maintainers/maintainer-list.nix | 6 ------ pkgs/applications/misc/harsh/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0359a5452eb3..203258435b37 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11097,12 +11097,6 @@ githubId = 621759; name = "Lassulus"; }; - laurailway = { - email = "laurailway.git@posteo.net"; - github = "LAURAilway"; - githubId = 118690640; - name = "Laura"; - }; laurent-f1z1 = { email = "laurent.nixpkgs@fainsin.bzh"; github = "Laurent2916"; diff --git a/pkgs/applications/misc/harsh/default.nix b/pkgs/applications/misc/harsh/default.nix index dc1021c6d848..cc576b7a0acf 100644 --- a/pkgs/applications/misc/harsh/default.nix +++ b/pkgs/applications/misc/harsh/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { homepage = "https://github.com/wakatara/harsh"; changelog = "https://github.com/wakatara/harsh/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ laurailway ]; + maintainers = with maintainers; [ ]; mainProgram = "harsh"; }; } From 3f8fcc23db6f820108939dae93b60829ed0fc947 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 14:52:27 +0000 Subject: [PATCH 253/300] intel-compute-runtime: 24.17.29377.6 -> 24.22.29735.20 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 8f5655a90cbd..331e69c84bd0 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "24.17.29377.6"; + version = "24.22.29735.20"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - hash = "sha256-+bx6P1vZlgolHrINzkH4ukXT+hgAtH18DOX6vb9vPVs="; + hash = "sha256-M+buuVTd0w1Js6eDKln+LFhQgeNU4KCbN6vK8PyUdG8="; }; nativeBuildInputs = [ cmake pkg-config ]; From 968cbb1fb6585f62451494a59f82202cf149caab Mon Sep 17 00:00:00 2001 From: Daniel Baker Date: Sun, 23 Jun 2024 13:58:27 -0700 Subject: [PATCH 254/300] python3Packages.ffcv: fix tests Fixes python3Packages.ffcv tests by changing the directory in precheck. Cleaned up and refactored the derivation. --- .../python-modules/ffcv/default.nix | 80 +++++++++++++++---- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/ffcv/default.nix b/pkgs/development/python-modules/ffcv/default.nix index 05750d9baed3..d9c37657adf3 100644 --- a/pkgs/development/python-modules/ffcv/default.nix +++ b/pkgs/development/python-modules/ffcv/default.nix @@ -1,6 +1,8 @@ { buildPythonPackage, + pythonAtLeast, fetchFromGitHub, + setuptools, lib, libjpeg, numba, @@ -10,12 +12,20 @@ pytorch-pfn-extras, terminaltables, tqdm, + pytestCheckHook, + assertpy, + psutil, + torchvision, + webdataset, }: buildPythonPackage rec { pname = "ffcv"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; + + # version 1.0.0 uses distutils which was removed in Python 3.12 + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "libffcv"; @@ -27,15 +37,13 @@ buildPythonPackage rec { # See https://github.com/libffcv/ffcv/issues/159. postPatch = '' substituteInPlace setup.py \ - --replace "'assertpy'," "" \ - --replace "'fastargs'," "" \ - --replace "'imgcat'," "" \ - --replace "'matplotlib'," "" \ - --replace "'psutil'," "" \ - --replace "'sklearn'," "" \ - --replace "'webdataset'," "" + --replace-fail "'assertpy'," "" \ + --replace-fail "'fastargs'," "" \ + --replace-fail "'opencv-python'," "" \ + --replace-fail "'psutil'," "" \ ''; + build-system = [ setuptools ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libjpeg ]; propagatedBuildInputs = [ @@ -47,16 +55,58 @@ buildPythonPackage rec { tqdm ]; - # `ffcv._libffcv*.so` cannot be loaded in the nix build environment for some - # reason. See https://github.com/NixOS/nixpkgs/pull/160441#issuecomment-1045204722. - doCheck = false; - pythonImportsCheck = [ "ffcv" ]; - meta = with lib; { + # C/C++ python modules are only in the installed output and not in the build + # directory. Since tests are run from the build directory python prefers to + # import the local module first which does not contain the C/C++ python + # modules and results in an import error. By changing the directory to + # 'tests' the build directory is no long available and python will import + # from the installed output in the nix store which does contain the C/C++ + # python modules. + preCheck = '' + cd tests + ''; + + nativeCheckInputs = [ + assertpy + psutil + pytestCheckHook + torchvision + webdataset + ]; + + disabledTestPaths = [ + # Tests require network access and do not work in the sandbox + "test_augmentations.py" + # Occasionally causes the testing phase to hang + "test_basic_pipeline.py" + ]; + + disabledTests = [ + # Tests require network access and do not work in the sandbox + "test_cifar_subset" + # Requires CUDA which is unfree and unfree packages are not built by Hydra + "test_cuda" + "test_gpu_normalization" + # torch.multiprocessing.spawn.ProcessRaisedException + "test_traversal_sequential_2" + "test_traversal_sequential_3" + "test_traversal_sequential_4" + "test_traversal_random_2" + "test_traversal_random_3" + "test_traversal_random_4" + "test_traversal_sequential_distributed_with_indices" + "test_traversal_random_distributed_with_indices" + ]; + + meta = { description = "FFCV: Fast Forward Computer Vision"; homepage = "https://ffcv.io"; - license = licenses.asl20; - maintainers = with maintainers; [ samuela ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + samuela + djacu + ]; }; } From df2ebdb07a00eb58af5f29126f9e4576262dd940 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Wed, 26 Jun 2024 17:01:22 +0200 Subject: [PATCH 255/300] wstunnel: 9.7.1 -> 9.7.2 https://github.com/erebe/wstunnel/releases/tag/v9.7.2 --- pkgs/by-name/ws/wstunnel/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index d09cf0f6d01f..4beeef570eff 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -7,7 +7,7 @@ }: let - version = "9.7.1"; + version = "9.7.2"; in rustPlatform.buildRustPackage { @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-VJllyvTlHlyYhzth6tVzqVe8EPfHdXrcrDmtrS16aMM="; + hash = "sha256-5hpkY8MoSo59KmhXsPuLCmWq4KaUzuHBpesQMtgn7hw="; }; - cargoHash = "sha256-sg/tE8D/cNeMliJr7JIstq36gg/mhYM6n8ye2Y2biq0="; + cargoHash = "sha256-kv+DX98SjI3m2CdM4RHoMMISZyrFmlhlSaBor0dFUSE="; checkFlags = [ # Tries to launch a test container From 876d59bacef801bb938683100bbdcf0695f7197f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 24 Jun 2024 07:32:30 -0700 Subject: [PATCH 256/300] mullvad: 2024.1 -> 2024.3 --- .../networking/mullvad/Cargo.lock | 671 ++++++++++++------ .../networking/mullvad/mullvad.nix | 7 +- 2 files changed, 444 insertions(+), 234 deletions(-) diff --git a/pkgs/applications/networking/mullvad/Cargo.lock b/pkgs/applications/networking/mullvad/Cargo.lock index 9cbf256ce7f6..fb0d7780c63f 100644 --- a/pkgs/applications/networking/mullvad/Cargo.lock +++ b/pkgs/applications/networking/mullvad/Cargo.lock @@ -17,6 +17,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +[[package]] +name = "adler32" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" + [[package]] name = "aead" version = "0.5.2" @@ -40,9 +46,9 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ "aead", "aes", @@ -52,6 +58,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "ahash" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + [[package]] name = "aho-corasick" version = "1.0.5" @@ -174,7 +192,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -196,7 +214,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -207,7 +225,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -300,6 +318,21 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec", +] + +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -374,7 +407,7 @@ dependencies = [ "serde_json", "syn 1.0.109", "tempfile", - "toml 0.5.11", + "toml", ] [[package]] @@ -398,6 +431,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chacha20" version = "0.9.1" @@ -486,7 +525,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -561,6 +600,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.9" @@ -570,6 +618,15 @@ dependencies = [ "libc", ] +[[package]] +name = "crc32fast" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +dependencies = [ + "cfg-if", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -633,9 +690,9 @@ dependencies = [ [[package]] name = "curve25519-dalek" -version = "4.1.0" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622178105f911d937a42cdb140730ba4a3ed2becd8ae6ce39c7d28b5d75d4588" +checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348" dependencies = [ "cfg-if", "cpufeatures", @@ -655,7 +712,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -693,6 +750,12 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + [[package]] name = "dashmap" version = "5.5.3" @@ -807,15 +870,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "drain" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f1a0abf3fcefad9b4dd0e414207a7408e12b68414a01e6bb19b897d5bd7632d" -dependencies = [ - "tokio", -] - [[package]] name = "duct" version = "0.13.6" @@ -880,7 +934,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -945,13 +999,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.3" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "errno-dragonfly", "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1094,7 +1147,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -1176,10 +1229,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] -name = "h2" -version = "0.3.24" +name = "glob" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "h2" +version = "0.3.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1200,6 +1259,15 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.14.0" @@ -1227,7 +1295,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "async-recursion", "async-trait", @@ -1252,7 +1320,7 @@ dependencies = [ [[package]] name = "hickory-resolver" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "cfg-if", "futures-util", @@ -1273,7 +1341,7 @@ dependencies = [ [[package]] name = "hickory-server" version = "0.24.0" -source = "git+https://github.com/hickory-dns/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" +source = "git+https://github.com/mullvad/hickory-dns?rev=9e8f8c67fbcb6d2985503027362a3fb022529802#9e8f8c67fbcb6d2985503027362a3fb022529802" dependencies = [ "async-trait", "bytes", @@ -1536,6 +1604,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16" +[[package]] +name = "intersection-derive" +version = "0.0.0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + [[package]] name = "ioctl-sys" version = "0.6.0" @@ -1583,13 +1660,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ "hermit-abi", - "rustix", - "windows-sys 0.48.0", + "libc", + "windows-sys 0.52.0", ] [[package]] @@ -1601,6 +1678,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1708,9 +1794,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.147" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libdbus-sys" @@ -1721,6 +1807,36 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "libflate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" +dependencies = [ + "adler32", + "core2", + "crc32fast", + "dary_heap", + "libflate_lz77", +] + +[[package]] +name = "libflate_lz77" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" +dependencies = [ + "core2", + "hashbrown 0.13.2", + "rle-decode-fast", +] + +[[package]] +name = "libm" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -1729,9 +1845,9 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "lock_api" @@ -1794,6 +1910,22 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +[[package]] +name = "maybenot" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cc2e64fe3f5fb1e247110a9a408449eff2259cc272cf57bad6f161e801ac962" +dependencies = [ + "byteorder", + "hex", + "libflate", + "rand 0.8.5", + "rand_distr", + "ring", + "serde", + "simple-error", +] + [[package]] name = "md-5" version = "0.10.5" @@ -1820,9 +1952,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ "autocfg", ] @@ -1844,9 +1976,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -1879,8 +2011,8 @@ dependencies = [ name = "mullvad-api" version = "0.0.0" dependencies = [ + "cbindgen", "chrono", - "err-derive", "futures", "http", "hyper", @@ -1896,9 +2028,11 @@ dependencies = [ "shadowsocks", "talpid-time", "talpid-types", + "thiserror", "tokio", "tokio-rustls", "tokio-socks", + "uuid", ] [[package]] @@ -1909,14 +2043,14 @@ dependencies = [ "chrono", "clap", "clap_complete", - "err-derive", "futures", - "itertools", + "itertools 0.10.5", "mullvad-management-interface", "mullvad-types", "mullvad-version", "natord", "talpid-types", + "thiserror", "tokio", "windows-sys 0.48.0", "winres", @@ -1931,7 +2065,6 @@ dependencies = [ "clap", "ctrlc", "dirs", - "err-derive", "fern", "futures", "libc", @@ -1953,10 +2086,12 @@ dependencies = [ "simple-signal", "talpid-core", "talpid-dbus", + "talpid-future", "talpid-platform-metadata", "talpid-time", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tokio-stream", "winapi", @@ -1969,9 +2104,9 @@ dependencies = [ name = "mullvad-exclude" version = "0.0.0" dependencies = [ - "err-derive", "nix 0.23.2", "talpid-types", + "thiserror", ] [[package]] @@ -1988,7 +2123,6 @@ dependencies = [ name = "mullvad-jni" version = "0.0.0" dependencies = [ - "err-derive", "futures", "ipnetwork", "jnix", @@ -2002,6 +2136,7 @@ dependencies = [ "rand 0.8.5", "talpid-tunnel", "talpid-types", + "thiserror", ] [[package]] @@ -2009,7 +2144,6 @@ name = "mullvad-management-interface" version = "0.0.0" dependencies = [ "chrono", - "err-derive", "futures", "log", "mullvad-paths", @@ -2020,6 +2154,7 @@ dependencies = [ "prost", "prost-types", "talpid-types", + "thiserror", "tokio", "tonic", "tonic-build", @@ -2032,15 +2167,16 @@ version = "0.0.0" dependencies = [ "cbindgen", "mullvad-paths", + "talpid-platform-metadata", ] [[package]] name = "mullvad-paths" version = "0.0.0" dependencies = [ - "err-derive", "log", "once_cell", + "thiserror", "widestring", "windows-sys 0.48.0", ] @@ -2053,7 +2189,6 @@ dependencies = [ "dirs", "duct", "env_logger 0.10.0", - "err-derive", "log", "mullvad-api", "mullvad-paths", @@ -2062,6 +2197,7 @@ dependencies = [ "regex", "talpid-platform-metadata", "talpid-types", + "thiserror", "tokio", "uuid", "windows-sys 0.48.0", @@ -2073,19 +2209,17 @@ name = "mullvad-relay-selector" version = "0.0.0" dependencies = [ "chrono", - "err-derive", - "futures", + "intersection-derive", "ipnetwork", + "itertools 0.12.1", "log", - "mullvad-api", "mullvad-types", "once_cell", - "parking_lot", + "proptest", "rand 0.8.5", "serde_json", - "talpid-core", "talpid-types", - "tokio", + "thiserror", ] [[package]] @@ -2094,7 +2228,6 @@ version = "0.0.0" dependencies = [ "clap", "env_logger 0.10.0", - "err-derive", "mullvad-api", "mullvad-daemon", "mullvad-management-interface", @@ -2103,7 +2236,9 @@ dependencies = [ "mullvad-version", "once_cell", "talpid-core", + "talpid-future", "talpid-types", + "thiserror", "tokio", ] @@ -2113,7 +2248,7 @@ version = "0.0.0" dependencies = [ "chrono", "clap", - "err-derive", + "intersection-derive", "ipnetwork", "jnix", "log", @@ -2121,6 +2256,7 @@ dependencies = [ "regex", "serde", "talpid-types", + "thiserror", "uuid", ] @@ -2256,19 +2392,6 @@ dependencies = [ "libc", ] -[[package]] -name = "nix" -version = "0.26.1" -source = "git+https://github.com/nix-rust/nix?rev=b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28#b13b7d18e0d2f4a8c05e41576c7ebf26d6dbfb28" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.8.0", - "pin-utils", - "static_assertions", -] - [[package]] name = "nix" version = "0.27.1" @@ -2280,6 +2403,25 @@ dependencies = [ "libc", ] +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.0", + "cfg-if", + "cfg_aliases", + "libc", + "memoffset 0.9.0", +] + +[[package]] +name = "no-std-net" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" + [[package]] name = "notify" version = "6.1.1" @@ -2306,6 +2448,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -2496,7 +2639,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2522,9 +2665,9 @@ dependencies = [ [[package]] name = "pfctl" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e0c1e1bc65fb241166b7ec8278d89cc2432d41adcbe57ffe1095c81e1d7b44" +checksum = "27590368dee28aa01e3024b639818a6bf0ad31635d9eca000aad63021a59284d" dependencies = [ "derive_builder", "errno 0.2.8", @@ -2589,7 +2732,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2626,6 +2769,48 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +[[package]] +name = "pnet_base" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "872e46346144ebf35219ccaa64b1dffacd9c6f188cd7d012bd6977a2a838f42e" +dependencies = [ + "no-std-net", +] + +[[package]] +name = "pnet_macros" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a780e80005c2e463ec25a6e9f928630049a10b43945fea83207207d4a7606f4" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", +] + +[[package]] +name = "pnet_macros_support" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d932134f32efd7834eb8b16d42418dac87086347d1bc7d142370ef078582bc" +dependencies = [ + "pnet_base", +] + +[[package]] +name = "pnet_packet" +version = "0.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bde678bbd85cb1c2d99dc9fc596e57f03aa725f84f3168b0eaf33eeccb41706" +dependencies = [ + "glob", + "pnet_base", + "pnet_macros", + "pnet_macros_support", +] + [[package]] name = "poly1305" version = "0.8.0" @@ -2682,7 +2867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2711,13 +2896,33 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] +[[package]] +name = "proptest" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" +dependencies = [ + "bit-set", + "bit-vec", + "bitflags 2.4.0", + "lazy_static", + "num-traits", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_xorshift", + "regex-syntax 0.8.2", + "rusty-fork", + "tempfile", + "unarray", +] + [[package]] name = "prost" version = "0.12.0" @@ -2736,7 +2941,7 @@ checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.10.5", "log", "multimap", "once_cell", @@ -2745,7 +2950,7 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.31", + "syn 2.0.51", "tempfile", "which", ] @@ -2757,10 +2962,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -2788,31 +2993,11 @@ dependencies = [ "serde", ] -[[package]] -name = "quickcheck" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -dependencies = [ - "rand 0.8.5", -] - -[[package]] -name = "quickcheck_macros" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -2879,6 +3064,16 @@ dependencies = [ "getrandom 0.2.10", ] +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", +] + [[package]] name = "rand_hc" version = "0.2.0" @@ -2888,6 +3083,15 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_xorshift" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" +dependencies = [ + "rand_core 0.6.4", +] + [[package]] name = "redox_syscall" version = "0.2.16" @@ -2926,7 +3130,7 @@ dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] @@ -2937,7 +3141,7 @@ checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.7.5", ] [[package]] @@ -2946,6 +3150,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + [[package]] name = "resolv-conf" version = "0.7.0" @@ -2990,6 +3200,12 @@ dependencies = [ "signature", ] +[[package]] +name = "rle-decode-fast" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" + [[package]] name = "rs-release" version = "0.1.9" @@ -3028,15 +3244,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.11" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ "bitflags 2.4.0", - "errno 0.3.3", + "errno 0.3.8", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3076,6 +3292,18 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" +[[package]] +name = "rusty-fork" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + [[package]] name = "ryu" version = "1.0.15" @@ -3153,7 +3381,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3167,15 +3395,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" -dependencies = [ - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -3355,6 +3574,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "simple-error" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8542b68b8800c3cda649d2c72d688b6907b30f1580043135d61669d4aad1c175" + [[package]] name = "simple-signal" version = "1.1.1" @@ -3431,12 +3656,6 @@ dependencies = [ "der", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.9.3" @@ -3464,6 +3683,22 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +[[package]] +name = "surge-ping" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af341b2be485d647b5dc4cfb2da99efac35b5c95748a08fb7233480fedc5ead3" +dependencies = [ + "hex", + "parking_lot", + "pnet_packet", + "rand 0.8.5", + "socket2 0.5.3", + "thiserror", + "tokio", + "tracing", +] + [[package]] name = "syn" version = "1.0.109" @@ -3477,9 +3712,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.31" +version = "2.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" dependencies = [ "proc-macro2", "quote", @@ -3533,7 +3768,6 @@ dependencies = [ "bitflags 1.3.2", "chrono", "duct", - "err-derive", "futures", "hickory-proto", "hickory-server", @@ -3549,8 +3783,6 @@ dependencies = [ "once_cell", "parking_lot", "pfctl", - "quickcheck", - "quickcheck_macros", "rand 0.8.5", "resolv-conf", "subslice", @@ -3558,17 +3790,15 @@ dependencies = [ "talpid-dbus", "talpid-openvpn", "talpid-routing", - "talpid-time", "talpid-tunnel", "talpid-tunnel-config-client", "talpid-types", "talpid-windows", "talpid-wireguard", + "thiserror", "tokio", "tonic-build", "triggered", - "trust-dns-proto", - "trust-dns-server", "which", "widestring", "windows-service", @@ -3581,10 +3811,20 @@ name = "talpid-dbus" version = "0.0.0" dependencies = [ "dbus", - "err-derive", "libc", "log", "once_cell", + "thiserror", + "tokio", +] + +[[package]] +name = "talpid-future" +version = "0.0.0" +dependencies = [ + "proptest", + "rand 0.8.5", + "talpid-time", "tokio", ] @@ -3593,7 +3833,6 @@ name = "talpid-openvpn" version = "0.0.0" dependencies = [ "async-trait", - "err-derive", "futures", "log", "once_cell", @@ -3605,6 +3844,7 @@ dependencies = [ "talpid-tunnel", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tonic", "tonic-build", @@ -3620,13 +3860,13 @@ name = "talpid-openvpn-plugin" version = "0.0.0" dependencies = [ "env_logger 0.10.0", - "err-derive", "log", "mullvad-version", "openvpn-plugin", "parity-tokio-ipc", "prost", "talpid-types", + "thiserror", "tokio", "tonic", "tonic-build", @@ -3648,20 +3888,20 @@ dependencies = [ name = "talpid-routing" version = "0.0.0" dependencies = [ - "bitflags 1.3.2", - "err-derive", + "bitflags 2.4.0", "futures", "ipnetwork", "libc", "log", "netlink-packet-route", "netlink-sys", - "nix 0.26.1", + "nix 0.28.0", "once_cell", "rtnetlink", "system-configuration", "talpid-types", "talpid-windows", + "thiserror", "tokio", "widestring", "windows-sys 0.48.0", @@ -3681,7 +3921,6 @@ version = "0.0.0" dependencies = [ "cfg-if", "duct", - "err-derive", "futures", "ipnetwork", "jnix", @@ -3690,6 +3929,7 @@ dependencies = [ "talpid-routing", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tun", "windows-sys 0.48.0", @@ -3719,11 +3959,11 @@ name = "talpid-types" version = "0.0.0" dependencies = [ "base64 0.13.1", - "err-derive", "ipnetwork", "jnix", "log", "serde", + "thiserror", "x25519-dalek", "zeroize", ] @@ -3732,10 +3972,10 @@ dependencies = [ name = "talpid-windows" version = "0.0.0" dependencies = [ - "err-derive", "futures", "socket2 0.5.3", "talpid-types", + "thiserror", "windows-sys 0.48.0", ] @@ -3743,17 +3983,18 @@ dependencies = [ name = "talpid-wireguard" version = "0.0.0" dependencies = [ + "base64 0.13.1", "bitflags 1.3.2", "byteorder", "chrono", "duct", - "err-derive", "futures", "hex", "internet-checksum", "ipnetwork", "libc", "log", + "maybenot", "netlink-packet-core", "netlink-packet-route", "netlink-packet-utils", @@ -3761,15 +4002,18 @@ dependencies = [ "nix 0.23.2", "once_cell", "parking_lot", + "proptest", "rand 0.8.5", "rtnetlink", "socket2 0.5.3", + "surge-ping", "talpid-dbus", "talpid-routing", "talpid-tunnel", "talpid-tunnel-config-client", "talpid-types", "talpid-windows", + "thiserror", "tokio", "tokio-stream", "tunnel-obfuscation", @@ -3802,22 +4046,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3889,7 +4133,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -3965,40 +4209,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0a3ab2091e52d7299a39d098e200114a972df0a7724add02a273aa9aada592" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.0.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "tonic" version = "0.10.0" @@ -4036,7 +4246,7 @@ dependencies = [ "proc-macro2", "prost-build", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -4092,7 +4302,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] [[package]] @@ -4108,12 +4318,12 @@ dependencies = [ name = "translations-converter" version = "0.0.0" dependencies = [ - "err-derive", "htmlize", "once_cell", "quick-xml", "regex", "serde", + "thiserror", ] [[package]] @@ -4139,7 +4349,6 @@ dependencies = [ "ipnet", "once_cell", "rand 0.8.5", - "serde", "smallvec", "thiserror", "tinyvec", @@ -4162,7 +4371,6 @@ dependencies = [ "parking_lot", "rand 0.8.5", "resolv-conf", - "serde", "smallvec", "thiserror", "tokio", @@ -4170,29 +4378,6 @@ dependencies = [ "trust-dns-proto", ] -[[package]] -name = "trust-dns-server" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2863cefc06d1d5605ea937bfd8939e23687bb44dd5d136217ad9378582f9cc" -dependencies = [ - "async-trait", - "bytes", - "cfg-if", - "drain", - "enum-as-inner", - "futures-executor", - "futures-util", - "serde", - "thiserror", - "time", - "tokio", - "toml 0.7.7", - "tracing", - "trust-dns-proto", - "trust-dns-resolver", -] - [[package]] name = "try-lock" version = "0.2.4" @@ -4215,7 +4400,7 @@ name = "tunnel-obfuscation" version = "0.0.0" dependencies = [ "async-trait", - "err-derive", + "thiserror", "tokio", "udp-over-tcp", ] @@ -4256,6 +4441,12 @@ dependencies = [ "tokio", ] +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" + [[package]] name = "unicode-bidi" version = "0.3.13" @@ -4333,6 +4524,15 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "wait-timeout" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" +dependencies = [ + "libc", +] + [[package]] name = "walkdir" version = "2.4.0" @@ -4385,7 +4585,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", "wasm-bindgen-shared", ] @@ -4407,7 +4607,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4695,15 +4895,6 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" -[[package]] -name = "winnow" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" -dependencies = [ - "memchr", -] - [[package]] name = "winreg" version = "0.50.0" @@ -4730,14 +4921,14 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b68db261ef59e9e52806f688020631e987592bd83619edccda9c47d42cde4f6c" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] name = "x25519-dalek" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", "rand_core 0.6.4", @@ -4745,6 +4936,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + [[package]] name = "zeroize" version = "1.6.0" @@ -4762,5 +4973,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.31", + "syn 2.0.51", ] diff --git a/pkgs/applications/networking/mullvad/mullvad.nix b/pkgs/applications/networking/mullvad/mullvad.nix index 22ff97682929..b1f64da558b9 100644 --- a/pkgs/applications/networking/mullvad/mullvad.nix +++ b/pkgs/applications/networking/mullvad/mullvad.nix @@ -17,21 +17,20 @@ }: rustPlatform.buildRustPackage rec { pname = "mullvad"; - version = "2024.1"; + version = "2024.3"; src = fetchFromGitHub { owner = "mullvad"; repo = "mullvadvpn-app"; rev = version; - hash = "sha256-syIBYZe+e6i5A6Te51eNKcwwycnRhO1o2tP+z81NYXQ="; + hash = "sha256-poQtE+XIlPcL9viAau+70xWx1fPrTXJXMcuPvXlqjZg="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "nix-0.26.1" = "sha256-b5bLeZVNbJE7aBnyzl0qvo0mXFeXa4hAZiuT1VJiFLk="; - "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; "hickory-proto-0.24.0" = "sha256-IqGVoQ1vRruCcaDr82ARkvSo42Pe9Q6iJIWnSd6GqEg="; + "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4="; }; }; From c8c4d48cb341106d19a9a08a275c3e47e1caf1ad Mon Sep 17 00:00:00 2001 From: noisersup Date: Wed, 26 Jun 2024 17:45:00 +0200 Subject: [PATCH 257/300] ferretdb: update homepage ferretdb.com is used in the Github repository description for some time. --- pkgs/servers/nosql/ferretdb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/ferretdb/default.nix b/pkgs/servers/nosql/ferretdb/default.nix index 57f0ed7c9f86..8b791d51c392 100644 --- a/pkgs/servers/nosql/ferretdb/default.nix +++ b/pkgs/servers/nosql/ferretdb/default.nix @@ -41,7 +41,7 @@ buildGoModule rec { description = "Truly Open Source MongoDB alternative"; mainProgram = "ferretdb"; changelog = "https://github.com/FerretDB/FerretDB/releases/tag/v${version}"; - homepage = "https://www.ferretdb.io/"; + homepage = "https://www.ferretdb.com/"; license = licenses.asl20; maintainers = with maintainers; [ dit7ya noisersup julienmalka ]; }; From 163ef81abd0b9469e493f4f82f3f41cef81f81b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 15:57:48 +0000 Subject: [PATCH 258/300] cue: 0.9.1 -> 0.9.2 --- pkgs/by-name/cu/cue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 39a506dbc69e..b2f8359419e0 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cue"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; rev = "v${version}"; - hash = "sha256-hhu66uiBkxyYRw8eruqxVifr2yftDXcYRTK5VYbjRPQ="; + hash = "sha256-C3BvI43oo71y19ZRflqhKRQF7DwBBOV0yRlutv+W18g="; }; vendorHash = "sha256-FsFignBh669E60S8l8siQHLzeSfB5X/XOHBXPMDX3Cg="; From 79a7186f1ce8d94b0c136a7cc7c3e2e31facc794 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 26 Jun 2024 00:29:42 +0000 Subject: [PATCH 259/300] cudaPackages: updated convention for gpu/runtime checks Runtime tests (derivations asking for a relaxed sandbox) are now expected at p.gpuCheck, p.gpuChecks., or at p.tests..gpuCheck. --- .../modules/programs/nix-required-mounts.nix | 1 - pkgs/applications/misc/blender/default.nix | 20 ++++++++++-- pkgs/applications/misc/blender/gpu-checks.nix | 26 --------------- .../cuda-modules/saxpy/default.nix | 18 +++++------ .../cuda-modules/write-gpu-python-test.nix | 29 +++++++++++++++++ .../python-modules/pynvml/default.nix | 10 ++++-- .../python-modules/pynvml/test-gpu.nix | 17 ---------- .../python-modules/torch/default.nix | 2 +- .../python-modules/torch/gpu-checks.nix | 32 +++++++------------ .../python-modules/torch/tests.nix | 3 ++ pkgs/top-level/cuda-packages.nix | 2 ++ 11 files changed, 79 insertions(+), 81 deletions(-) delete mode 100644 pkgs/applications/misc/blender/gpu-checks.nix create mode 100644 pkgs/development/cuda-modules/write-gpu-python-test.nix delete mode 100644 pkgs/development/python-modules/pynvml/test-gpu.nix create mode 100644 pkgs/development/python-modules/torch/tests.nix diff --git a/nixos/modules/programs/nix-required-mounts.nix b/nixos/modules/programs/nix-required-mounts.nix index c339dd1cfddd..5d25958a7698 100644 --- a/nixos/modules/programs/nix-required-mounts.nix +++ b/nixos/modules/programs/nix-required-mounts.nix @@ -85,7 +85,6 @@ in opengl.paths = config.hardware.opengl.extraPackages ++ [ config.hardware.opengl.package pkgs.addOpenGLRunpath.driverLink - "/dev/video*" "/dev/dri" ]; } diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 38f3e226d0ff..3d044abaad6d 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -7,6 +7,7 @@ SDL, addOpenGLRunpath, alembic, + blender, boost, brotli, callPackage, @@ -372,9 +373,21 @@ stdenv.mkDerivation (finalAttrs: { --render-frame 1 done ''; - + tester-cudaAvailable = cudaPackages.writeGpuTestPython { } '' + import subprocess + subprocess.run([${ + lib.concatMapStringsSep ", " (x: ''"${x}"'') [ + (lib.getExe (blender.override { cudaSupport = true; })) + "--background" + "-noaudio" + "--python-exit-code" + "1" + "--python" + "${./test-cuda.py}" + ] + }], check=True) # noqa: E501 + ''; }; - gpuChecks = callPackage ./gpu-checks.nix { }; }; meta = { @@ -383,7 +396,8 @@ stdenv.mkDerivation (finalAttrs: { # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport unfree; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; }); + platforms = [ "aarch64-linux" "x86_64-darwin" diff --git a/pkgs/applications/misc/blender/gpu-checks.nix b/pkgs/applications/misc/blender/gpu-checks.nix deleted file mode 100644 index bfbaf25b989a..000000000000 --- a/pkgs/applications/misc/blender/gpu-checks.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - bash, - blender, - callPackage, - lib, - runCommand, - writeScriptBin, -}: - -let - blenderWithCuda = blender.override { cudaSupport = true; }; - name = "${blenderWithCuda.name}-check-cuda"; - unwrapped = writeScriptBin "${name}-unwrapped" '' - #!${lib.getExe bash} - ${lib.getExe blenderWithCuda} --background -noaudio --python-exit-code 1 --python ${./test-cuda.py} - ''; -in -{ - cudaAvailable = runCommand name { - nativeBuildInputs = [ unwrapped ]; - requiredSystemFeatures = [ "cuda" ]; - passthru = { - inherit unwrapped; - }; - } "${name}-unwrapped && touch $out"; -} diff --git a/pkgs/development/cuda-modules/saxpy/default.nix b/pkgs/development/cuda-modules/saxpy/default.nix index 3da3dc08f0eb..5eb0a235ace8 100644 --- a/pkgs/development/cuda-modules/saxpy/default.nix +++ b/pkgs/development/cuda-modules/saxpy/default.nix @@ -16,7 +16,6 @@ let cudatoolkit flags libcublas - setupCudaHook ; inherit (lib) getDev getLib getOutput; fs = lib.fileset; @@ -59,20 +58,19 @@ backendStdenv.mkDerivation { (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString) ]; - passthru.gpuChecks.withCuda = saxpy.overrideAttrs ( - _: { - requiredSystemFeatures = ["cuda"]; - doInstallCheck = true; - postInstallCheck = '' - $out/bin/saxpy - ''; - } - ); + passthru.gpuCheck = saxpy.overrideAttrs (_: { + requiredSystemFeatures = [ "cuda" ]; + doInstallCheck = true; + postInstallCheck = '' + $out/bin/${saxpy.meta.mainProgram or (lib.getName saxpy)} + ''; + }); meta = rec { description = "Simple (Single-precision AX Plus Y) FindCUDAToolkit.cmake example for testing cross-compilation"; license = lib.licenses.mit; maintainers = lib.teams.cuda.members; + mainProgram = "saxpy"; platforms = lib.platforms.unix; badPlatforms = lib.optionals (flags.isJetsonBuild && cudaOlder "11.4") platforms; }; diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-python-test.nix new file mode 100644 index 000000000000..5f0d5c6b8fe6 --- /dev/null +++ b/pkgs/development/cuda-modules/write-gpu-python-test.nix @@ -0,0 +1,29 @@ +{ + lib, + writers, + runCommand, +}: +{ + feature ? "cuda", + name ? feature, + libraries ? [ ], +}: +content: + +let + tester = writers.writePython3Bin "tester-${name}" { inherit libraries; } content; + tester' = tester.overrideAttrs (oldAttrs: { + passthru.gpuCheck = + runCommand "test-${name}" + { + nativeBuildInputs = [ tester' ]; + requiredSystemFeatures = [ feature ]; + } + '' + set -e + ${tester.meta.mainProgram or (lib.getName tester')} + touch $out + ''; + }); +in +tester' diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 79624e5298a6..762771c66a2b 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - callPackage, + cudaPackages, fetchFromGitHub, substituteAll, pythonOlder, @@ -9,6 +9,7 @@ setuptools, pytestCheckHook, versioneer, + pynvml, }: buildPythonPackage rec { @@ -51,7 +52,12 @@ buildPythonPackage rec { # OSError: /run/opengl-driver/lib/libnvidia-ml.so.1: cannot open shared object file: No such file or directory doCheck = false; - passthru.gpuChecks.nvmlInit = callPackage ./test-gpu.nix { }; + passthru.tests.tester-nvmlInit = cudaPackages.writeGpuTestPython { libraries = [ pynvml ]; } '' + import pynvml + from pynvml.smi import nvidia_smi # noqa: F401 + + print(f"{pynvml.nvmlInit()=}") + ''; meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; diff --git a/pkgs/development/python-modules/pynvml/test-gpu.nix b/pkgs/development/python-modules/pynvml/test-gpu.nix deleted file mode 100644 index 6ab4290a2bba..000000000000 --- a/pkgs/development/python-modules/pynvml/test-gpu.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ runCommandNoCC, python }: - -runCommandNoCC "pynvml-gpu-test" - { - nativeBuildInputs = [ (python.withPackages (ps: [ ps.pynvml ])) ]; - requiredSystemFeatures = [ "cuda" ]; - } - '' - python3 << EOF - import pynvml - from pynvml.smi import nvidia_smi - - pynvml.nvmlInit() - EOF - - touch $out - '' diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 11a3b3df42ce..9597a047bdb4 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -648,7 +648,7 @@ buildPythonPackage rec { blasProvider = blas.provider; # To help debug when a package is broken due to CUDA support inherit brokenConditions; - gpuChecks = callPackage ./gpu-checks.nix { }; + tests = callPackage ./tests.nix { }; }; meta = { diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix index 371b83f1b778..d01fffe45cb0 100644 --- a/pkgs/development/python-modules/torch/gpu-checks.nix +++ b/pkgs/development/python-modules/torch/gpu-checks.nix @@ -1,8 +1,8 @@ { lib, - callPackage, torchWithCuda, torchWithRocm, + callPackage, }: let @@ -11,38 +11,28 @@ let feature, versionAttr, torch, - runCommandNoCC, - writers, + cudaPackages, }: - let - name = "${torch.name}-${feature}-check"; - unwrapped = writers.writePython3Bin "${name}-unwrapped" { libraries = [ torch ]; } '' + cudaPackages.writeGpuPythonTest + { + inherit feature; + libraries = [ torch ]; + name = "${feature}Available"; + } + '' import torch message = f"{torch.cuda.is_available()=} and {torch.version.${versionAttr}=}" assert torch.cuda.is_available() and torch.version.${versionAttr}, message print(message) ''; - in - runCommandNoCC name - { - nativeBuildInputs = [ unwrapped ]; - requiredSystemFeatures = [ feature ]; - passthru = { - inherit unwrapped; - }; - } - '' - ${name}-unwrapped - touch $out - ''; in { - cudaAvailable = callPackage accelAvailable { + tester-cudaAvailable = callPackage accelAvailable { feature = "cuda"; versionAttr = "cuda"; torch = torchWithCuda; }; - rocmAvailable = callPackage accelAvailable { + tester-rocmAvailable = callPackage accelAvailable { feature = "rocm"; versionAttr = "hip"; torch = torchWithRocm; diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix new file mode 100644 index 000000000000..5a46d0886868 --- /dev/null +++ b/pkgs/development/python-modules/torch/tests.nix @@ -0,0 +1,3 @@ +{ callPackage }: + +callPackage ./gpu-checks.nix { } diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index d34a37294ae0..7f01f4310c9e 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -77,6 +77,8 @@ let saxpy = final.callPackage ../development/cuda-modules/saxpy { }; nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; + + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-python-test.nix { }; }); mkVersionedPackageName = From f74f819ce1bff18c9cf33d92dcf11e03c6055924 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:00:32 +0000 Subject: [PATCH 260/300] clipcat: 0.18.0 -> 0.18.1 --- pkgs/by-name/cl/clipcat/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/clipcat/package.nix b/pkgs/by-name/cl/clipcat/package.nix index da6118d901cf..b72baf6e46b5 100644 --- a/pkgs/by-name/cl/clipcat/package.nix +++ b/pkgs/by-name/cl/clipcat/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-i+5hUwarJHa3QzHPqJ0N/gztKWoRCKXsEbX3Q/1PQ9Q="; + hash = "sha256-rftAGrquvNPRu49rDUaPVO7EUMCvcLoV0w801BBOG8c="; }; - cargoHash = "sha256-lPH2v+OfO/NCLdAVvPbIgAeVAOWHjhNIOap94p0+NR0="; + cargoHash = "sha256-Amm/NnJSnqB5q+bxRJ5A6GKOFhIGTq1OSXESF5r22bI="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa From a5ccc48f11e8be170973ecca7e33ba21603fb498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:08:07 +0000 Subject: [PATCH 261/300] obs-studio-plugins.obs-vertical-canvas: 1.4.3 -> 1.4.4 --- .../video/obs-studio/plugins/obs-vertical-canvas.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 7b6f98c2b63d..c43b823dd7f8 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-nzuPjVwtWGPSNLnWNT4D03j1xZp37HH77t1DnilSQ8E="; + sha256 = "sha256-RBsdYG73SoX+dB4sUq641SL0ETUFE+PVAmr/DaqMuLI="; }; nativeBuildInputs = [ cmake ]; From d978d2d57bc77be128130d3f36ac95c6fdc2be69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:12:14 +0000 Subject: [PATCH 262/300] git-instafix: 0.2.4 -> 0.2.5 --- pkgs/by-name/gi/git-instafix/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gi/git-instafix/package.nix b/pkgs/by-name/gi/git-instafix/package.nix index 69a077401095..84f1709f304a 100644 --- a/pkgs/by-name/gi/git-instafix/package.nix +++ b/pkgs/by-name/gi/git-instafix/package.nix @@ -13,7 +13,7 @@ let maintainers ; - version = "0.2.4"; + version = "0.2.5"; in rustPlatform.buildRustPackage { pname = "git-instafix"; @@ -23,10 +23,10 @@ rustPlatform.buildRustPackage { owner = "quodlibetor"; repo = "git-instafix"; rev = "v${version}"; - hash = "sha256-lrGWt3y8IbGzOjp6k3nZD4CnC1S9aMpJPwNL/Mik5Lw="; + hash = "sha256-tizA5BLZZ/9gfHv2X8is7EJD1reMvfA7c6JETUoUgvI="; }; - cargoHash = "sha256-+mBxHC7AzHuQ/k9OwT92iL25aW0WXyPcG5SOsWdgV5U="; + cargoHash = "sha256-kIIwswj8mfpY382O0bdMoSk6+T+614l2QCeRgz3ZxEY="; buildInputs = [ libgit2 ]; nativeCheckInputs = [ git ]; From ad4d0d761a6a59be5d0efcc13d1da0d2b9bec620 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 26 Jun 2024 20:20:49 +0400 Subject: [PATCH 263/300] paho-mqtt-cpp: migrate to by-name --- .../default.nix => by-name/pa/paho-mqtt-cpp/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/paho-mqtt-cpp/default.nix => by-name/pa/paho-mqtt-cpp/package.nix} (100%) diff --git a/pkgs/development/libraries/paho-mqtt-cpp/default.nix b/pkgs/by-name/pa/paho-mqtt-cpp/package.nix similarity index 100% rename from pkgs/development/libraries/paho-mqtt-cpp/default.nix rename to pkgs/by-name/pa/paho-mqtt-cpp/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38c65b8f36c0..c3a401d063ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11507,8 +11507,6 @@ with pkgs; paho-mqtt-c = callPackage ../development/libraries/paho-mqtt-c { }; - paho-mqtt-cpp = callPackage ../development/libraries/paho-mqtt-cpp { }; - pakcs = callPackage ../development/compilers/pakcs { # Doesn't compile with GHC 9.0 due to whitespace syntax changes # see also https://github.com/NixOS/nixpkgs/issues/166108 From ffac7f11b99b00a4ee3aaa01e9d65d11d5506f6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:26:46 +0000 Subject: [PATCH 264/300] git-cliff: 2.3.0 -> 2.4.0 --- pkgs/applications/version-management/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index 0f6db5806599..7307988693b6 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-iTjfFl/bTvyElCIpTj7dsVu3azUSwNTryyssHdCaODg="; + hash = "sha256-JRFd84DR0pLimAslr+LTC2N09sjOuFCXU71hRsEriOs="; }; - cargoHash = "sha256-/Elb/hsk96E7D6TrLgbhD5cQhsXpDigNm5p9FpKGEUQ="; + cargoHash = "sha256-pLbz2z+l8E/R+GffseOacKrjr6ERZf1ETh8tVQjI4TU="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 1f10eafdf6983fb84d9dea3a67d36b7b2e49394f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:33:56 +0000 Subject: [PATCH 265/300] jaq: 1.4.0 -> 1.5.0 --- pkgs/development/tools/jaq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index fd1604f0c216..c9e6f1221efa 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-6HqZBJeUaYykTZLSrqQN0Rt6rvnvzb53T56oy06wIUw="; + hash = "sha256-Lk8lss9ZwyN7fuWwHm7e7HvYNIUSNelswoYhZ+Dr6iw="; }; - cargoHash = "sha256-Zais+yGfrzxKrKA4uAG65uzhamnuYxQEKkIaeiOlcLQ="; + cargoHash = "sha256-0YPzPRBqO9otX9kSxufeW/M0TggKAoSTsChbOhMjv74="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From e52335e6f463cc723cad440d0c6f455e044ec582 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:42:22 +0900 Subject: [PATCH 266/300] lgogdownloader: 3.12 -> 3.14 Signed-off-by: Ludovico Piero --- pkgs/games/lgogdownloader/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index a03a05bcb356..c0eaa3cd93f6 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -11,6 +11,7 @@ , rhash , tinyxml-2 , help2man +, html-tidy , wrapQtAppsHook , qtbase , qtwebengine @@ -22,19 +23,20 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.12"; + version = "3.14"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; - rev = "v${version}"; - hash = "sha256-IjZizO0HWDqtviY3TZ3AYYm5A0sU74YXjfFEtvQvv04="; + rev = "refs/tags/v${version}"; + hash = "sha256-pxYiSefscglHN53wvp38Ec4/3X46sWc56Y4YKNtqABQ="; }; nativeBuildInputs = [ cmake pkg-config help2man + html-tidy ] ++ lib.optional enableGui wrapQtAppsHook; buildInputs = [ From 6d6ec24782ada971635654564a7e058a6dd2e784 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:42:48 +0900 Subject: [PATCH 267/300] lgogdownloader: format with nixfmt Signed-off-by: Ludovico Piero --- pkgs/games/lgogdownloader/default.nix | 67 ++++++++++++++------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index c0eaa3cd93f6..f36ccd4df8b2 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -1,24 +1,25 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, curl -, boost -, liboauth -, jsoncpp -, htmlcxx -, rhash -, tinyxml-2 -, help2man -, html-tidy -, wrapQtAppsHook -, qtbase -, qtwebengine -, testers -, lgogdownloader +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + curl, + boost, + liboauth, + jsoncpp, + htmlcxx, + rhash, + tinyxml-2, + help2man, + html-tidy, + wrapQtAppsHook, + qtbase, + qtwebengine, + testers, + lgogdownloader, -, enableGui ? true + enableGui ? true, }: stdenv.mkDerivation rec { @@ -39,18 +40,20 @@ stdenv.mkDerivation rec { html-tidy ] ++ lib.optional enableGui wrapQtAppsHook; - buildInputs = [ - boost - curl - htmlcxx - jsoncpp - liboauth - rhash - tinyxml-2 - ] ++ lib.optionals enableGui [ - qtbase - qtwebengine - ]; + buildInputs = + [ + boost + curl + htmlcxx + jsoncpp + liboauth + rhash + tinyxml-2 + ] + ++ lib.optionals enableGui [ + qtbase + qtwebengine + ]; cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; From 67c56278a72833e7c1425f8c5d089a90158e13e9 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 01:43:22 +0900 Subject: [PATCH 268/300] lgogdownloader: remove `meta = with lib;` Signed-off-by: Ludovico Piero --- pkgs/games/lgogdownloader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index f36ccd4df8b2..6a543ec30cbe 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -61,12 +61,12 @@ stdenv.mkDerivation rec { version = testers.testVersion { package = lgogdownloader; }; }; - meta = with lib; { + meta = { description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; mainProgram = "lgogdownloader"; homepage = "https://github.com/Sude-/lgogdownloader"; - license = licenses.wtfpl; - maintainers = with maintainers; [ _0x4A6F ]; - platforms = platforms.linux; + license = lib.licenses.wtfpl; + maintainers = with lib.maintainers; [ _0x4A6F ]; + platforms = lib.platforms.linux; }; } From 754d615da4241033551bf27e59dbedab14182fcd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 18:45:24 +0200 Subject: [PATCH 269/300] python312Packages.boto3-stubs: 1.34.132 -> 1.34.133 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 734e5d4cbb13..32d3faf4a6e5 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.132"; + version = "1.34.133"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-NHl+3LxgiiX6qb9a6nbXLWpdUExXVJJYYMlS5DHLRa4="; + hash = "sha256-A/bkmxDzyoLXE9O1MqAMEzVRphmR2yD0pQUBT+0Y97s="; }; build-system = [ setuptools ]; From 08453df283552d77654b58e33843cadd839fe9d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 17:02:03 +0000 Subject: [PATCH 270/300] pdfhummus: 4.6.4 -> 4.6.5 --- pkgs/development/libraries/pdfhummus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pdfhummus/default.nix b/pkgs/development/libraries/pdfhummus/default.nix index 13869dba89da..53a3d080f541 100644 --- a/pkgs/development/libraries/pdfhummus/default.nix +++ b/pkgs/development/libraries/pdfhummus/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "pdfhummus"; - version = "4.6.4"; + version = "4.6.5"; src = fetchFromGitHub { owner = "galkahana"; repo = "PDF-Writer"; rev = "v${version}"; - hash = "sha256-7VltECiXQY+6M5EE17SKj0KwLk0+gOJfbLqprafIgLQ="; + hash = "sha256-0k753wogNW8oW//mlVWxGLt8VIO+29f0C4CJ+rGprvw="; }; nativeBuildInputs = [ From 5ca35d5ef7d8d8682f3b07ee852b451979e2b97b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 17:03:38 +0000 Subject: [PATCH 271/300] pinact: 0.2.0 -> 0.2.1 --- pkgs/by-name/pi/pinact/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pi/pinact/package.nix b/pkgs/by-name/pi/pinact/package.nix index 1c32aac2180d..133688d22693 100644 --- a/pkgs/by-name/pi/pinact/package.nix +++ b/pkgs/by-name/pi/pinact/package.nix @@ -7,18 +7,18 @@ let pname = "pinact"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "suzuki-shunsuke"; repo = "pinact"; rev = "v${version}"; - hash = "sha256-ndlyfp+neoOEzofIlQEQp/6masnzMQFWAPmhan3hlb0="; + hash = "sha256-HfeHfKXDBHPgxisWSVnrLOQf/4NXtnehkIjQqiCoFIc="; }; in buildGoModule { inherit pname version src; - vendorHash = "sha256-qu4CHh2013q7e7mBuymlKEhjpdtSOaWGVutjegoVP7E="; + vendorHash = "sha256-L9EGygiJ40f7Yw46KdaAof5O/ren6inTK7XerB/uv1g="; doCheck = true; From 856e51b61836e11bb2dce89661bc230aeb70c373 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:13:46 +0200 Subject: [PATCH 272/300] python312Packages.kasa-crypt: 0.4.2 -> 0.4.4 Diff: https://github.com/bdraco/kasa-crypt/compare/refs/tags/v0.4.2...v0.4.4 Changelog: https://github.com/bdraco/kasa-crypt/blob/v0.4.4/CHANGELOG.md --- pkgs/development/python-modules/kasa-crypt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kasa-crypt/default.nix b/pkgs/development/python-modules/kasa-crypt/default.nix index 44d86fc29a5a..2622f3d3bb9a 100644 --- a/pkgs/development/python-modules/kasa-crypt/default.nix +++ b/pkgs/development/python-modules/kasa-crypt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "kasa-crypt"; - version = "0.4.2"; + version = "0.4.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "kasa-crypt"; rev = "refs/tags/v${version}"; - hash = "sha256-7PLOuWxA5ziOuysSu+nLWNmNA3/sbuUCuZcMRBflf6U="; + hash = "sha256-9uDloaf9w75O+7r27PK/xOf0TrK43ndxnTUcm4CmOXo="; }; postPatch = '' From 94c9cfb9915c712fba797d541de95592846bb323 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:17:03 +0200 Subject: [PATCH 273/300] python312Packages.pyais: 2.6.5 -> 2.6.6 Diff: https://github.com/M0r13n/pyais/compare/refs/tags/v2.6.5...v2.6.6 Changelog: https://github.com/M0r13n/pyais/blob/2.6.6/CHANGELOG.txt --- pkgs/development/python-modules/pyais/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix index 2070b0616cb1..2cbeb25693b9 100644 --- a/pkgs/development/python-modules/pyais/default.nix +++ b/pkgs/development/python-modules/pyais/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyais"; - version = "2.6.5"; + version = "2.6.6"; pyproject = true; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "M0r13n"; repo = "pyais"; rev = "refs/tags/v${version}"; - hash = "sha256-/I/4ATvX/0ya8xtineXyjSFJBGhDNy/tosh2NdnKLK4="; + hash = "sha256-8i852bf0FRaorI3vJnuHTZSik6yoqtHr3wbafSvKmBM="; }; nativeBuildInputs = [ setuptools ]; From 99012254d74d5a98274604b32872ab4b4fb7038f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:17:39 +0200 Subject: [PATCH 274/300] python312Packages.pyflume: 0.8.3 -> 0.8.7 Diff: https://github.com/ChrisMandich/PyFlume/compare/refs/tags/v0.8.3...v0.8.7 Changelog: https://github.com/ChrisMandich/PyFlume/releases/tag/v0.8.7 --- pkgs/development/python-modules/pyflume/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyflume/default.nix b/pkgs/development/python-modules/pyflume/default.nix index 32f0016deed2..e838e7c2159e 100644 --- a/pkgs/development/python-modules/pyflume/default.nix +++ b/pkgs/development/python-modules/pyflume/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyflume"; - version = "0.8.3"; + version = "0.8.7"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "ChrisMandich"; repo = "PyFlume"; rev = "refs/tags/v${version}"; - hash = "sha256-RtzbAXjMtvKc8vnZIxIJnc6CS+BrYcQgdy5bVaJumg0="; + hash = "sha256-/8gLKe+6GaPQe0J3YBmOVcAcAcqfrWM7UQCoX+qOEmw="; }; propagatedBuildInputs = [ From 627a36545f7b07bcb421791d63a2ffbb77347152 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:19:25 +0200 Subject: [PATCH 275/300] python312Packages.python-roborock: 2.3.0 -> 2.5.0 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v2.3.0...v2.5.0 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v2.5.0/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 261624e1902f..02e550736312 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "2.3.0"; + version = "2.5.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-YjD/aTSUeVuMyrdC2dcKgIqeBC+8NircRFLh2+mbD+8="; + hash = "sha256-W+xq6FwBZNjrqivAWv821h5Pak0wGaksQoYN5EULSnA="; }; postPatch = '' From 90f09f380d2102b674c492a96ed36425e7c7bd84 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:20:49 +0200 Subject: [PATCH 276/300] python312Packages.zha-quirks: 0.0.116 -> 0.0.117 Diff: https://github.com/zigpy/zha-device-handlers/compare/refs/tags/0.0.116...0.0.117 Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.117 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 9fca32df4185..171a725cf0e8 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.116"; + version = "0.0.117"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; rev = "refs/tags/${version}"; - hash = "sha256-dWKIKIN61Y2vSbC7maxe4DoSYsAqeGtyWksnvAc2Pa8="; + hash = "sha256-uk1G8X5TLuA4spTrd+077wggCooqvqJZh3NIwC4/BFM="; }; postPatch = '' From 106f703cf0c7c1fb719e99904df9103921a8e0be Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:21:24 +0200 Subject: [PATCH 277/300] python312Packages.yalexs-ble: 2.4.2 -> 2.4.3 Diff: https://github.com/bdraco/yalexs-ble/compare/refs/tags/v2.4.2...v2.4.3 Changelog: https://github.com/bdraco/yalexs-ble/blob/v2.4.3/CHANGELOG.md --- pkgs/development/python-modules/yalexs-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index 337ffbf114c9..a38ecebdffdc 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.4.2"; + version = "2.4.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-A/4N3vmFuzg9vaPISs0P3KxRQZSquPpR1zYcYEePkTA="; + hash = "sha256-e+XTozOStGiYa4VBM/mQfcpYTapKe92OeZPuD5SwSIQ="; }; nativeBuildInputs = [ poetry-core ]; From 951258537123b13a7ecf9db625cd4820866970d0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:22:14 +0200 Subject: [PATCH 278/300] python312Packages.xiaomi-ble: 0.30.0 -> 0.30.1 Diff: https://github.com/Bluetooth-Devices/xiaomi-ble/compare/refs/tags/v0.30.0...v0.30.1 Changelog: https://github.com/Bluetooth-Devices/xiaomi-ble/releases/tag/v0.30.1 --- pkgs/development/python-modules/xiaomi-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xiaomi-ble/default.nix b/pkgs/development/python-modules/xiaomi-ble/default.nix index e081f49cae91..5e834c3419a4 100644 --- a/pkgs/development/python-modules/xiaomi-ble/default.nix +++ b/pkgs/development/python-modules/xiaomi-ble/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "xiaomi-ble"; - version = "0.30.0"; + version = "0.30.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "xiaomi-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-pWTWzw1ZdXnxPERkJUHumBboSIVo0t5HqQFRXC90CpU="; + hash = "sha256-1YeT525L6SsybiA+k5vPx5D2yvYdcuxfhpUMlZCX2Jo="; }; postPatch = '' From 6057844c05b564f906be3ba763d64ae3c7d156c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:34:49 +0200 Subject: [PATCH 279/300] python312Packages.python-fullykiosk: 0.0.13 -> 0.0.14 Diff: https://github.com/cgarwood/python-fullykiosk/compare/refs/tags/0.0.13...0.0.14 Changelog: https://github.com/cgarwood/python-fullykiosk/releases/tag/0.0.14 --- pkgs/development/python-modules/python-fullykiosk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-fullykiosk/default.nix b/pkgs/development/python-modules/python-fullykiosk/default.nix index 3e3a65ff9815..66b6cb4528c4 100644 --- a/pkgs/development/python-modules/python-fullykiosk/default.nix +++ b/pkgs/development/python-modules/python-fullykiosk/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fullykiosk"; - version = "0.0.13"; + version = "0.0.14"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "cgarwood"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-GElLaSSr/EEhtjgasP2C79kf+HluVPuQ21I8La7IvLs="; + hash = "sha256-+JBgBi05zNgIt2cXlHjFPI6nBFR7SpMCWIQHKtnZeX4="; }; propagatedBuildInputs = [ aiohttp ]; From dc300d4b6d12f6aa80f1c335d22b60e278d47a55 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:40:05 +0200 Subject: [PATCH 280/300] python312Packages.pyinsteon: 1.6.2 -> 1.6.3 Diff: https://github.com/pyinsteon/pyinsteon/compare/refs/tags/1.6.2...1.6.3 Changelog: https://github.com/pyinsteon/pyinsteon/releases/tag/1.6.3 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index af11516e851a..fe3c2dc444d7 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.6.2"; + version = "1.6.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "pyinsteon"; repo = "pyinsteon"; rev = "refs/tags/${version}"; - hash = "sha256-V1sYLKKlTMG9Km53uNCU34e8D/owxuDNT+HGZxtK21I="; + hash = "sha256-SyhPM3NS7iJX8jwTJ4YWZ72eYLn9JT6eESekPf5eCKI="; }; build-system = [ setuptools ]; From 3b7f9507d68c52522d9563082ac83a32070e8b03 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:42:56 +0200 Subject: [PATCH 281/300] python312Packages.nats-py: 2.7.2 -> 2.8.0 Diff: https://github.com/nats-io/nats.py/compare/refs/tags/v2.7.2...v2.8.0 Changelog: https://github.com/nats-io/nats.py/releases/tag/v2.8.0 --- pkgs/development/python-modules/nats-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix index 7102d87286bb..a79a068f86dd 100644 --- a/pkgs/development/python-modules/nats-py/default.nix +++ b/pkgs/development/python-modules/nats-py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "nats-py"; - version = "2.7.2"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "nats-io"; repo = "nats.py"; rev = "refs/tags/v${version}"; - hash = "sha256-5lvdt1JbOmdts0CYU00bSmv0LsMQsOe//yUgyevBULE="; + hash = "sha256-xPjyi5dFR9xVp1Fl6mM2JNKTRlLBQ6J9aB0dpjnZ+eQ="; }; build-system = [ setuptools ]; From f87ddee497d4392d5c5ce36a10ea32a9eb39b05b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 19:51:08 +0200 Subject: [PATCH 282/300] python312Packages.std-uritemplate: 1.0.1 -> 1.0.2 Changelog: https://github.com/std-uritemplate/std-uritemplate/releases/tag/1.0.2 --- pkgs/development/python-modules/std-uritemplate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix index 83c17826ff28..be7ff2030ca5 100644 --- a/pkgs/development/python-modules/std-uritemplate/default.nix +++ b/pkgs/development/python-modules/std-uritemplate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "std-uritemplate"; - version = "1.0.1"; + version = "1.0.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "std_uritemplate"; inherit version; - hash = "sha256-Mf7o2nDbj663cdC6OfXIK/newY1NKnUpWTniowXlNvE="; + hash = "sha256-lJ2YDTjUI3mf9Jh6g17rXppFRD3GGpzIMEYdkmz0JuQ="; }; build-system = [ poetry-core ]; From e18b0c24a2345af3f5357ffa300f67ad2e716664 Mon Sep 17 00:00:00 2001 From: Ludovico Piero Date: Thu, 27 Jun 2024 03:01:31 +0900 Subject: [PATCH 283/300] lgogdownloader: move to `pkgs/by-name` Signed-off-by: Ludovico Piero --- .../lg/lgogdownloader/package.nix} | 10 ++++------ pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 8 deletions(-) rename pkgs/{games/lgogdownloader/default.nix => by-name/lg/lgogdownloader/package.nix} (90%) diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/by-name/lg/lgogdownloader/package.nix similarity index 90% rename from pkgs/games/lgogdownloader/default.nix rename to pkgs/by-name/lg/lgogdownloader/package.nix index 6a543ec30cbe..6bf32f339418 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/by-name/lg/lgogdownloader/package.nix @@ -13,9 +13,7 @@ tinyxml-2, help2man, html-tidy, - wrapQtAppsHook, - qtbase, - qtwebengine, + libsForQt5, testers, lgogdownloader, @@ -38,7 +36,7 @@ stdenv.mkDerivation rec { pkg-config help2man html-tidy - ] ++ lib.optional enableGui wrapQtAppsHook; + ] ++ lib.optional enableGui libsForQt5.wrapQtAppsHook; buildInputs = [ @@ -51,8 +49,8 @@ stdenv.mkDerivation rec { tinyxml-2 ] ++ lib.optionals enableGui [ - qtbase - qtwebengine + libsForQt5.qtbase + libsForQt5.qtwebengine ]; cmakeFlags = lib.optional enableGui "-DUSE_QT_GUI=ON"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04cb6100324c..c4a1c7bf58e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36683,8 +36683,6 @@ with pkgs; left4gore-bin = callPackage ../games/left4gore { }; - lgogdownloader = libsForQt5.callPackage ../games/lgogdownloader { }; - liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; liberation-circuit = callPackage ../games/liberation-circuit { }; From fe87b4b182cf9c5e415e63106f5e7dc5d03afcf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 20:45:15 +0200 Subject: [PATCH 284/300] python312Packages.led-ble: 1.0.1 -> 1.0.2 Diff: https://github.com/Bluetooth-Devices/led-ble/compare/refs/tags/v1.0.1...v1.0.2 Changelog: https://github.com/Bluetooth-Devices/led-ble/blob/v1.0.2/CHANGELOG.md --- pkgs/development/python-modules/led-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/led-ble/default.nix b/pkgs/development/python-modules/led-ble/default.nix index b02f4edb4577..595e353c431b 100644 --- a/pkgs/development/python-modules/led-ble/default.nix +++ b/pkgs/development/python-modules/led-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "led-ble"; - version = "1.0.1"; + version = "1.0.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-8DBA01QjW99OVYI9zC1Q+utnwzc10idUG7y+lmUbO4A="; + hash = "sha256-4z6SJE/VFNa81ecDal2IEX9adYBrSzco9VfhUPKBj4k="; }; postPatch = '' From 501f5c08431010355953541e4c32e51e615204c6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 26 Jun 2024 20:46:17 +0200 Subject: [PATCH 285/300] python312Packages.govee-ble: 0.31.2 -> 0.31.3 Diff: https://github.com/Bluetooth-Devices/govee-ble/compare/refs/tags/v0.31.2...v0.31.3 Changelog: https://github.com/bluetooth-devices/govee-ble/blob/v0.31.3/CHANGELOG.md --- pkgs/development/python-modules/govee-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix index 07e60b09b516..c9a97a114c95 100644 --- a/pkgs/development/python-modules/govee-ble/default.nix +++ b/pkgs/development/python-modules/govee-ble/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "govee-ble"; - version = "0.31.2"; + version = "0.31.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "govee-ble"; rev = "refs/tags/v${version}"; - hash = "sha256-aWSf80WmVopkvqCzQKHEw9McrfepZcN+fhrUP90gf5U="; + hash = "sha256-Gb9k2MieRKSJeKpmltL9HYA7pYKTSTWLGDgo52mY6xA="; }; postPatch = '' From 7e76543d3f0353583b0c8e6917d34ded96710ab6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 19:07:52 +0000 Subject: [PATCH 286/300] rar2fs: 1.29.6 -> 1.29.7 --- pkgs/tools/filesystems/rar2fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 925a600b64e2..88fedbcb6794 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.6"; + version = "1.29.7"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "sha256-b8zMCzSFJewXMQOuaKwMJx//Wq9vT/bUj6XS/jDBBBo="; + sha256 = "sha256-iYlmNtaJZrnsNNNlaoV1Vu6PHrHIr/glhgs3784JCm4="; }; postPatch = '' From fdcd6eee1b01fadb5121f31b0d660cab6fe023a3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Thu, 27 Jun 2024 03:06:45 +0800 Subject: [PATCH 287/300] emacs.pkgs.org: stop applying a patch if not needed Org 9.7.5 has this patch. This fixes https://github.com/nix-community/emacs-overlay/issues/411. --- .../editors/emacs/elisp-packages/elpa-devel-packages.nix | 2 +- .../applications/editors/emacs/elisp-packages/elpa-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 9550969adbbe..192320fab674 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -66,7 +66,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index a3d729b636ee..3e8ab4625fec 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -143,7 +143,7 @@ self: let org = super.org.overrideAttrs (old: { dontUnpack = false; - patches = old.patches or [ ] ++ [ + patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [ # security fix backported from 9.7.5 (pkgs.fetchpatch { url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8"; From f6727a9e3ee8365e1af3f94931f113fb0c6d37d6 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 22 May 2024 10:53:37 +0200 Subject: [PATCH 288/300] nixos/ollama: add `loadModels` config option Allows users to download model files upon service startup, instead of at the first use of the model, improving percieved startup latency. --- nixos/modules/services/misc/ollama.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index 1467c3f93bc8..c460514783ef 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: let - inherit (lib) types; + inherit (lib) types mkBefore; cfg = config.services.ollama; ollamaPackage = cfg.package.override { @@ -132,6 +132,14 @@ in Since `ollama run` is mostly a shell around the ollama server, this is usually sufficient. ''; }; + loadModels = lib.mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + The models to download as soon as the service starts. + Search for models of your choice from: https://ollama.com/library + ''; + }; openFirewall = lib.mkOption { type = types.bool; default = false; @@ -161,6 +169,14 @@ in DynamicUser = cfg.sandbox; ReadWritePaths = cfg.writablePaths; }; + postStart = mkBefore '' + set -x + export OLLAMA_HOST=${lib.escapeShellArg cfg.host}:${builtins.toString cfg.port} + for model in ${lib.escapeShellArgs cfg.loadModels} + do + ${lib.escapeShellArg (lib.getExe ollamaPackage)} pull "$model" + done + ''; }; networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; From 6b3550d252f3c0523d2eb396ff8c7a06b131ee47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 19:11:54 +0000 Subject: [PATCH 289/300] sad: 0.4.29 -> 0.4.30 --- pkgs/tools/text/sad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sad/default.nix b/pkgs/tools/text/sad/default.nix index a3fba1a8d088..1b8dad394c9a 100644 --- a/pkgs/tools/text/sad/default.nix +++ b/pkgs/tools/text/sad/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "sad"; - version = "0.4.29"; + version = "0.4.30"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "sad"; rev = "refs/tags/v${version}"; - hash = "sha256-TLVUvz/phAy+ljIsdv4GVSFHTAZ5ywQs32WHsu9g9Fc="; + hash = "sha256-pTCdoKY/+ubUY3adN/Cqop0Gvuqh6Bs55arjT9mjQ18="; }; - cargoHash = "sha256-4XmTxeKbdC4HRownFlEc4GrSVimKkQg/yNI0us7gzQI="; + cargoHash = "sha256-ndl0jFQA30h90nnEcIl2CXfF/+cuj/UqUV/7ilsUPb4="; nativeBuildInputs = [ python3 ]; From 0aff8c5ede72dd45f16303b4ef702520d3f9dbe6 Mon Sep 17 00:00:00 2001 From: Anomalocaridid <29845794+Anomalocaridid@users.noreply.github.com> Date: Wed, 26 Jun 2024 15:52:12 -0400 Subject: [PATCH 290/300] handlr-regex: 0.10.0 -> 0.10.1 --- pkgs/by-name/ha/handlr-regex/package.nix | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ha/handlr-regex/package.nix b/pkgs/by-name/ha/handlr-regex/package.nix index a3d5b886874b..2d42ed39241e 100644 --- a/pkgs/by-name/ha/handlr-regex/package.nix +++ b/pkgs/by-name/ha/handlr-regex/package.nix @@ -1,19 +1,31 @@ -{ lib, rustPlatform, fetchFromGitHub, shared-mime-info, libiconv, installShellFiles }: +{ + lib, + rustPlatform, + fetchFromGitHub, + shared-mime-info, + libiconv, + installShellFiles, + nix-update-script, +}: rustPlatform.buildRustPackage rec { pname = "handlr-regex"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "Anomalocaridid"; repo = pname; rev = "v${version}"; - hash = "sha256-RCMTRf/mrLCDrmJSAofTgCHKK4GogkdGXnN4lFFQMA8="; + hash = "sha256-6ASljvJF/qbl8nvAZKQ2rQ8CQPovTF7FLKp8enIjIP4="; }; - cargoHash = "sha256-GHRryBeofZQbVTyOwMwYKVAymui8VvsUQhiwGu0+HEE="; + cargoHash = "sha256-4tm7N8l7ScKhhOFxt/1ssArdF9fgvCyrDrBASaiOusI="; + + nativeBuildInputs = [ + installShellFiles + shared-mime-info + ]; - nativeBuildInputs = [ installShellFiles shared-mime-info ]; buildInputs = [ libiconv ]; preCheck = '' @@ -29,6 +41,8 @@ rustPlatform.buildRustPackage rec { installManPage assets/manual/man1/* ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Fork of handlr with support for regex"; homepage = "https://github.com/Anomalocaridid/handlr-regex"; From 521521def13bf10920574184820081e6a9c027c5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 26 Jun 2024 16:48:55 +0000 Subject: [PATCH 291/300] mprocs: 0.6.4 -> 0.7.0 --- pkgs/tools/misc/mprocs/default.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/misc/mprocs/default.nix b/pkgs/tools/misc/mprocs/default.nix index a2e7f8a018dc..0da79da2a099 100644 --- a/pkgs/tools/misc/mprocs/default.nix +++ b/pkgs/tools/misc/mprocs/default.nix @@ -2,28 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "mprocs"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "pvolok"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-uwr+cHenV38IsTEW/PQB0kCDsyahiQrBh4s8v8SyEn8="; + repo = "mprocs"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-e15SzlX8CHzWOF4UnPybqYHELuT2vZ+4mkbz413WDr4="; }; - cargoSha256 = "sha256-H9oHppG7sew/3JrUtWq2Pip1S9H36qYeHu6x/sPfwV0="; + cargoHash = "sha256-UZvXoD70f5QHTW9Xr8tRms1wqV9/dpN/u3Mv7/gwyZ4="; - # Package tests are currently failing (even upstream) but the package seems to work fine. - # Relevant issues: - # https://github.com/pvolok/mprocs/issues/50 - # https://github.com/pvolok/mprocs/issues/61 - doCheck = false; - - meta = with lib; { + meta = { description = "TUI tool to run multiple commands in parallel and show the output of each command separately"; homepage = "https://github.com/pvolok/mprocs"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage pyrox0 ]; + changelog = "https://github.com/pvolok/mprocs/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage pyrox0 ]; mainProgram = "mprocs"; }; } From b5af504a3d7ccc519d224beed840b98478e340e8 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 26 Jun 2024 22:01:28 +0200 Subject: [PATCH 292/300] doc: migrate lib.filesystem to doc-comment format (#312222) * doc: migrate lib.filesystem to doc-comment format * defintion list fixes lib/filesystem.nix Co-authored-by: Daniel Sidhion --------- Co-authored-by: Daniel Sidhion --- lib/filesystem.nix | 234 ++++++++++++++++++++++++++++++++------------- 1 file changed, 167 insertions(+), 67 deletions(-) diff --git a/lib/filesystem.nix b/lib/filesystem.nix index c416db02eb57..5a78bcca4ebd 100644 --- a/lib/filesystem.nix +++ b/lib/filesystem.nix @@ -1,4 +1,4 @@ -/* +/** Functions for querying information about the filesystem without copying any files to the Nix store. */ @@ -29,19 +29,35 @@ in { - /* + /** The type of a path. The path needs to exist and be accessible. The result is either "directory" for a directory, "regular" for a regular file, "symlink" for a symlink, or "unknown" for anything else. - Type: - pathType :: Path -> String + # Inputs - Example: - pathType /. - => "directory" + path - pathType /some/file.nix - => "regular" + : The path to query + + # Type + + ``` + pathType :: Path -> String + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathType` usage example + + ```nix + pathType /. + => "directory" + + pathType /some/file.nix + => "regular" + ``` + + ::: */ pathType = builtins.readFileType or @@ -59,53 +75,97 @@ in else (readDir (dirOf path)).${baseNameOf path} ); - /* + /** Whether a path exists and is a directory. - Type: - pathIsDirectory :: Path -> Bool - Example: - pathIsDirectory /. - => true + # Inputs - pathIsDirectory /this/does/not/exist - => false + `path` - pathIsDirectory /some/file.nix - => false + : 1\. Function argument + + # Type + + ``` + pathIsDirectory :: Path -> Bool + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathIsDirectory` usage example + + ```nix + pathIsDirectory /. + => true + + pathIsDirectory /this/does/not/exist + => false + + pathIsDirectory /some/file.nix + => false + ``` + + ::: */ pathIsDirectory = path: pathExists path && pathType path == "directory"; - /* + /** Whether a path exists and is a regular file, meaning not a symlink or any other special file type. - Type: - pathIsRegularFile :: Path -> Bool - Example: - pathIsRegularFile /. - => false + # Inputs - pathIsRegularFile /this/does/not/exist - => false + `path` - pathIsRegularFile /some/file.nix - => true + : 1\. Function argument + + # Type + + ``` + pathIsRegularFile :: Path -> Bool + ``` + + # Examples + :::{.example} + ## `lib.filesystem.pathIsRegularFile` usage example + + ```nix + pathIsRegularFile /. + => false + + pathIsRegularFile /this/does/not/exist + => false + + pathIsRegularFile /some/file.nix + => true + ``` + + ::: */ pathIsRegularFile = path: pathExists path && pathType path == "regular"; - /* + /** A map of all haskell packages defined in the given path, identified by having a cabal file with the same name as the directory itself. - Type: Path -> Map String Path + + # Inputs + + `root` + + : The directory within to search + + # Type + + ``` + Path -> Map String Path + ``` */ haskellPathsInDir = - # The directory within to search root: let # Files in the root root-files = builtins.attrNames (builtins.readDir root); @@ -120,17 +180,30 @@ in builtins.pathExists (value + "/${name}.cabal") ) root-files-with-paths; in builtins.listToAttrs cabal-subdirs; - /* + /** Find the first directory containing a file matching 'pattern' upward from a given 'file'. Returns 'null' if no directories contain a file matching 'pattern'. - Type: RegExp -> Path -> Nullable { path : Path; matches : [ MatchResults ]; } + + # Inputs + + `pattern` + + : The pattern to search for + + `file` + + : The file to start searching upward from + + # Type + + ``` + RegExp -> Path -> Nullable { path : Path; matches : [ MatchResults ]; } + ``` */ locateDominatingFile = - # The pattern to search for pattern: - # The file to start searching upward from file: let go = path: let files = builtins.attrNames (builtins.readDir path); @@ -150,13 +223,23 @@ in in go (if isDir then file else parent); - /* + /** Given a directory, return a flattened list of all files within it recursively. - Type: Path -> [ Path ] + + # Inputs + + `dir` + + : The path to recursively list + + # Type + + ``` + Path -> [ Path ] + ``` */ listFilesRecursive = - # The path to recursively list dir: lib.flatten (lib.mapAttrsToList (name: type: if type == "directory" then @@ -165,7 +248,7 @@ in dir + "/${name}" ) (builtins.readDir dir)); - /* + /** Transform a directory tree containing package files suitable for `callPackage` into a matching nested attribute set of derivations. @@ -223,40 +306,57 @@ in As a result, directories with no `.nix` files (including empty directories) will be transformed into empty attribute sets. - Example: - packagesFromDirectoryRecursive { - inherit (pkgs) callPackage; + # Inputs + + Structured function argument + + : Attribute set containing the following attributes. + Additional attributes are ignored. + + `callPackage` + + : `pkgs.callPackage` + + Type: `Path -> AttrSet -> a` + + `directory` + + : The directory to read package files from + + Type: `Path` + + + # Type + + ``` + packagesFromDirectoryRecursive :: AttrSet -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.filesystem.packagesFromDirectoryRecursive` usage example + + ```nix + packagesFromDirectoryRecursive { + inherit (pkgs) callPackage; + directory = ./my-packages; + } + => { ... } + + lib.makeScope pkgs.newScope ( + self: packagesFromDirectoryRecursive { + callPackage = self.callPackage; directory = ./my-packages; } - => { ... } + ) + => { ... } + ``` - lib.makeScope pkgs.newScope ( - self: packagesFromDirectoryRecursive { - callPackage = self.callPackage; - directory = ./my-packages; - } - ) - => { ... } - - Type: - packagesFromDirectoryRecursive :: AttrSet -> AttrSet + ::: */ packagesFromDirectoryRecursive = - # Options. { - /* - `pkgs.callPackage` - - Type: - Path -> AttrSet -> a - */ callPackage, - /* - The directory to read package files from - - Type: - Path - */ directory, ... }: From 6b36d738857991a96d3eb5f7530450fff90acefa Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Wed, 19 Jun 2024 21:31:11 +0300 Subject: [PATCH 293/300] cppcheck: move to `pkgs/by-name` --- .../cppcheck/default.nix => by-name/cp/cppcheck/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/analysis/cppcheck/default.nix => by-name/cp/cppcheck/package.nix} (100%) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/by-name/cp/cppcheck/package.nix similarity index 100% rename from pkgs/development/tools/analysis/cppcheck/default.nix rename to pkgs/by-name/cp/cppcheck/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7ca23b08c30..1238e7cf37f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18317,8 +18317,6 @@ with pkgs; cov-build = callPackage ../development/tools/analysis/cov-build { }; - cppcheck = callPackage ../development/tools/analysis/cppcheck { }; - cpplint = callPackage ../development/tools/analysis/cpplint { }; credstash = with python3Packages; toPythonApplication credstash; From cf7a400d313a32a8ffc635f87b7fc665d5c46640 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Wed, 19 Jun 2024 21:32:53 +0300 Subject: [PATCH 294/300] cppcheck: reformat --- pkgs/by-name/cp/cppcheck/package.nix | 44 ++++++++++++++++++---------- 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index bf30b47d54ee..122d1f8525ea 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -1,22 +1,26 @@ -{ lib -, stdenv -, fetchFromGitHub +{ + lib, + stdenv, + fetchFromGitHub, -, docbook_xml_dtd_45 -, docbook_xsl -, installShellFiles -, libxslt -, pcre -, pkg-config -, python3 -, which + docbook_xml_dtd_45, + docbook_xsl, + installShellFiles, + libxslt, + pcre, + pkg-config, + python3, + which, }: stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; version = "2.14.1"; - outputs = [ "out" "man" ]; + outputs = [ + "out" + "man" + ]; src = fetchFromGitHub { owner = "danmar"; @@ -40,7 +44,12 @@ stdenv.mkDerivation (finalAttrs: { (python3.withPackages (ps: [ ps.pygments ])) ]; - makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; + makeFlags = [ + "PREFIX=$(out)" + "MATCHCOMPILER=yes" + "FILESDIR=$(out)/share/cppcheck" + "HAVE_RULES=yes" + ]; enableParallelBuilding = true; strictDeps = true; @@ -73,13 +82,16 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Static analysis tool for C/C++ code"; - homepage = "http://cppcheck.sourceforge.net"; - license = lib.licenses.gpl3Plus; longDescription = '' Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - maintainers = with lib.maintainers; [ joachifm paveloom ]; + homepage = "http://cppcheck.sourceforge.net"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + joachifm + paveloom + ]; platforms = lib.platforms.unix; }; }) From 4a48decea2d0190cf7e3f502dd4326dcb55fc88d Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Wed, 19 Jun 2024 21:40:22 +0300 Subject: [PATCH 295/300] cppcheck: 2.14.1 -> 2.14.2 --- pkgs/by-name/cp/cppcheck/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 122d1f8525ea..ed12a43f2b3d 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.14.1"; + version = "2.14.2"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-KXE3zmhaTweQhs0Qh7Xd5ILiuGVewtrvOkRkt8hjU58="; + hash = "sha256-aVjQqwsTw6TCLxs2oQif3hX5kfXHua7ekBpO/PyneAQ="; }; nativeBuildInputs = [ From b4cffe178c94f0e2b6d293a2d3333f701144c27e Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 26 Jun 2024 22:12:18 +0200 Subject: [PATCH 296/300] lib.meta: refactor to use doc-comments (#313589) * doc: use doc-comments for lib.meta * adds missing argument to setPrio --- lib/meta.nix | 355 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 283 insertions(+), 72 deletions(-) diff --git a/lib/meta.nix b/lib/meta.nix index 9a97afb1aa9b..8fa93d40d595 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -1,5 +1,7 @@ -/* Some functions for manipulating meta attributes, as well as the - name attribute. */ +/** + Some functions for manipulating meta attributes, as well as the + name attribute. +*/ { lib }: @@ -11,90 +13,225 @@ in rec { - /* Add to or override the meta attributes of the given - derivation. + /** + Add to or override the meta attributes of the given + derivation. - Example: - addMetaAttrs {description = "Bla blah";} somePkg + # Inputs + + `newAttrs` + + : 1\. Function argument + + `drv` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.addMetaAttrs` usage example + + ```nix + addMetaAttrs {description = "Bla blah";} somePkg + ``` + + ::: */ addMetaAttrs = newAttrs: drv: drv // { meta = (drv.meta or {}) // newAttrs; }; - /* Disable Hydra builds of given derivation. + /** + Disable Hydra builds of given derivation. + + # Inputs + + `drv` + + : 1\. Function argument */ dontDistribute = drv: addMetaAttrs { hydraPlatforms = []; } drv; - /* - Change the [symbolic name of a derivation](https://nixos.org/manual/nix/stable/language/derivations.html#attr-name). + /** + Change the [symbolic name of a derivation](https://nixos.org/manual/nix/stable/language/derivations.html#attr-name). - :::{.warning} - Dependent derivations will be rebuilt when the symbolic name is changed. - ::: + :::{.warning} + Dependent derivations will be rebuilt when the symbolic name is changed. + ::: + + # Inputs + + `name` + + : 1\. Function argument + + `drv` + + : 2\. Function argument */ setName = name: drv: drv // {inherit name;}; - /* Like `setName`, but takes the previous name as an argument. + /** + Like `setName`, but takes the previous name as an argument. - Example: - updateName (oldName: oldName + "-experimental") somePkg + # Inputs + + `updater` + + : 1\. Function argument + + `drv` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.updateName` usage example + + ```nix + updateName (oldName: oldName + "-experimental") somePkg + ``` + + ::: */ updateName = updater: drv: drv // {name = updater (drv.name);}; - /* Append a suffix to the name of a package (before the version - part). */ + /** + Append a suffix to the name of a package (before the version + part). + + # Inputs + + `suffix` + + : 1\. Function argument + */ appendToName = suffix: updateName (name: let x = builtins.parseDrvName name; in "${x.name}-${suffix}-${x.version}"); - /* Apply a function to each derivation and only to derivations in an attrset. + /** + Apply a function to each derivation and only to derivations in an attrset. + + + # Inputs + + `f` + + : 1\. Function argument + + `set` + + : 2\. Function argument */ mapDerivationAttrset = f: set: lib.mapAttrs (name: pkg: if lib.isDerivation pkg then (f pkg) else pkg) set; - /* Set the nix-env priority of the package. + /** + Set the nix-env priority of the package. + + # Inputs + + `priority` + : 1\. Function argument + + `drv` + : 2\. Function argument */ setPrio = priority: addMetaAttrs { inherit priority; }; - /* Decrease the nix-env priority of the package, i.e., other - versions/variants of the package will be preferred. + /** + Decrease the nix-env priority of the package, i.e., other + versions/variants of the package will be preferred. + + # Inputs + + `drv` + + : 1\. Function argument + */ lowPrio = setPrio 10; - /* Apply lowPrio to an attrset with derivations + /** + Apply lowPrio to an attrset with derivations + + + # Inputs + + `set` + + : 1\. Function argument */ lowPrioSet = set: mapDerivationAttrset lowPrio set; - /* Increase the nix-env priority of the package, i.e., this - version/variant of the package will be preferred. + /** + Increase the nix-env priority of the package, i.e., this + version/variant of the package will be preferred. + + # Inputs + + `drv` + + : 1\. Function argument */ hiPrio = setPrio (-10); - /* Apply hiPrio to an attrset with derivations + /** + Apply hiPrio to an attrset with derivations + + + # Inputs + + `set` + + : 1\. Function argument */ hiPrioSet = set: mapDerivationAttrset hiPrio set; - /* Check to see if a platform is matched by the given `meta.platforms` - element. + /** + Check to see if a platform is matched by the given `meta.platforms` + element. - A `meta.platform` pattern is either + A `meta.platform` pattern is either - 1. (legacy) a system string. + 1. (legacy) a system string. - 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). + 2. (modern) a pattern for the entire platform structure (see `lib.systems.inspect.platformPatterns`). - 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). + 3. (modern) a pattern for the platform `parsed` field (see `lib.systems.inspect.patterns`). - We can inject these into a pattern for the whole of a structured platform, - and then match that. + We can inject these into a pattern for the whole of a structured platform, + and then match that. - Example: - lib.meta.platformMatch { system = "aarch64-darwin"; } "aarch64-darwin" - => true + + # Inputs + + `platform` + + : 1\. Function argument + + `elem` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.platformMatch` usage example + + ```nix + lib.meta.platformMatch { system = "aarch64-darwin"; } "aarch64-darwin" + => true + ``` + + ::: */ platformMatch = platform: elem: ( # Check with simple string comparison if elem was a string. @@ -112,39 +249,70 @@ rec { ) platform ); - /* Check if a package is available on a given platform. + /** + Check if a package is available on a given platform. - A package is available on a platform if both + A package is available on a platform if both - 1. One of `meta.platforms` pattern matches the given - platform, or `meta.platforms` is not present. + 1. One of `meta.platforms` pattern matches the given + platform, or `meta.platforms` is not present. - 2. None of `meta.badPlatforms` pattern matches the given platform. + 2. None of `meta.badPlatforms` pattern matches the given platform. - Example: - lib.meta.availableOn { system = "aarch64-darwin"; } pkg.zsh - => true + + # Inputs + + `platform` + + : 1\. Function argument + + `pkg` + + : 2\. Function argument + + + # Examples + :::{.example} + ## `lib.meta.availableOn` usage example + + ```nix + lib.meta.availableOn { system = "aarch64-darwin"; } pkg.zsh + => true + ``` + + ::: */ availableOn = platform: pkg: ((!pkg?meta.platforms) || any (platformMatch platform) pkg.meta.platforms) && all (elem: !platformMatch platform elem) (pkg.meta.badPlatforms or []); - /* Get the corresponding attribute in lib.licenses - from the SPDX ID. - For SPDX IDs, see - https://spdx.org/licenses + /** + Get the corresponding attribute in lib.licenses + from the SPDX ID. + For SPDX IDs, see + https://spdx.org/licenses - Type: - getLicenseFromSpdxId :: str -> AttrSet + # Type - Example: - lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit - => true - lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit - => true - lib.getLicenseFromSpdxId "MY LICENSE" - => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE - => { shortName = "MY LICENSE"; } + ``` + getLicenseFromSpdxId :: str -> AttrSet + ``` + + # Examples + :::{.example} + ## `lib.meta.getLicenseFromSpdxId` usage example + + ```nix + lib.getLicenseFromSpdxId "MIT" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "mIt" == lib.licenses.mit + => true + lib.getLicenseFromSpdxId "MY LICENSE" + => trace: warning: getLicenseFromSpdxId: No license matches the given SPDX ID: MY LICENSE + => { shortName = "MY LICENSE"; } + ``` + + ::: */ getLicenseFromSpdxId = let @@ -156,15 +324,34 @@ rec { { shortName = licstr; } ); - /* Get the path to the main program of a package based on meta.mainProgram + /** + Get the path to the main program of a package based on meta.mainProgram - Type: getExe :: package -> string - Example: - getExe pkgs.hello - => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" - getExe pkgs.mustache-go - => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache" + # Inputs + + `x` + + : 1\. Function argument + + # Type + + ``` + getExe :: package -> string + ``` + + # Examples + :::{.example} + ## `lib.meta.getExe` usage example + + ```nix + getExe pkgs.hello + => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" + getExe pkgs.mustache-go + => "/nix/store/am9ml4f4ywvivxnkiaqwr0hyxka1xjsf-mustache-go-1.3.0/bin/mustache" + ``` + + ::: */ getExe = x: getExe' x (x.meta.mainProgram or ( # This could be turned into an error when 23.05 is at end of life @@ -173,14 +360,38 @@ rec { x )); - /* Get the path of a program of a derivation. + /** + Get the path of a program of a derivation. - Type: getExe' :: derivation -> string -> string - Example: - getExe' pkgs.hello "hello" - => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" - getExe' pkgs.imagemagick "convert" - => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" + + # Inputs + + `x` + + : 1\. Function argument + + `y` + + : 2\. Function argument + + # Type + + ``` + getExe' :: derivation -> string -> string + ``` + + # Examples + :::{.example} + ## `lib.meta.getExe'` usage example + + ```nix + getExe' pkgs.hello "hello" + => "/nix/store/g124820p9hlv4lj8qplzxw1c44dxaw1k-hello-2.12/bin/hello" + getExe' pkgs.imagemagick "convert" + => "/nix/store/5rs48jamq7k6sal98ymj9l4k2bnwq515-imagemagick-7.1.1-15/bin/convert" + ``` + + ::: */ getExe' = x: y: assert assertMsg (isDerivation x) From 08c21134cdf4852f251a71bac0b859f9e3237ba2 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 26 Jun 2024 17:59:01 +0200 Subject: [PATCH 297/300] pandoc: apply patch removing the usage of polyfill.io in the templates If you output HTML with MathJax content Pandoc might uses a JS library provided by cdn.polyfill.io which is now considered to be a bad actor. https://sansec.io/research/polyfill-supply-chain-attack Pandoc does not use this domain in recent versions but upgrading it seems more complex right now especially if we consider backports to the stable releases. --- .../haskell-modules/configuration-common.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1efb46422a3..fb6f9608b76d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1962,7 +1962,17 @@ self: super: { readline = appendPatch ./patches/readline-fix-for-cabal-3.patch super.readline; # https://github.com/jgm/pandoc/issues/9589 - pandoc = assert super.pandoc.version == "3.1.11.1"; dontCheck super.pandoc; + pandoc = assert super.pandoc.version == "3.1.11.1"; lib.pipe super.pandoc + [ + dontCheck + (appendPatch + (pkgs.fetchpatch { + name = "drop-usage-known-bad-actor-cdn.patch"; + url = "https://github.com/jgm/pandoc/commit/5877ec546df29115163b36de32837f5e08506092.patch"; + hash = "sha256-2ffdL2dS/hHWBjJcIHbae5OdL/VKlHNKUMDHRy3hqvc="; + }) + ) + ]; # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) pandoc-include-code = doJailbreak super.pandoc-include-code; From 02b69a56cbd1f594746e3927531fd9ae68bedfb1 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 26 Jun 2024 23:31:14 +0200 Subject: [PATCH 298/300] rar2fs: switch to unrar 7 --- pkgs/tools/filesystems/rar2fs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 88fedbcb6794..0181c0d0ef4f 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , autoreconfHook , fuse2 -, unrar_6 +, unrar }: stdenv.mkDerivation rec { @@ -23,10 +23,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ fuse2 unrar_6 ]; + buildInputs = [ fuse2 unrar ]; configureFlags = [ - "--with-unrar=${unrar_6.src}/unrar" + "--with-unrar=${unrar.src}/unrar" "--disable-static-unrar" ]; From 07f6955b94b846227d67eb33cf458c6db30fac02 Mon Sep 17 00:00:00 2001 From: Jeremy Schlatter Date: Wed, 26 Jun 2024 15:10:21 -0700 Subject: [PATCH 299/300] python3Packages.torch: fix tests.*.gpuCheck --- pkgs/development/python-modules/torch/gpu-checks.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/gpu-checks.nix b/pkgs/development/python-modules/torch/gpu-checks.nix index d01fffe45cb0..55a4b45f7152 100644 --- a/pkgs/development/python-modules/torch/gpu-checks.nix +++ b/pkgs/development/python-modules/torch/gpu-checks.nix @@ -13,7 +13,7 @@ let torch, cudaPackages, }: - cudaPackages.writeGpuPythonTest + cudaPackages.writeGpuTestPython { inherit feature; libraries = [ torch ]; From b5c9f563f3a4fa107feb47079a8534b60dcfad9c Mon Sep 17 00:00:00 2001 From: Yureka Date: Thu, 27 Jun 2024 00:54:55 +0200 Subject: [PATCH 300/300] wgautomesh: 0.1.0 -> unstable-20240524 (#321524) Fixes build with musl 1.2.5 --- pkgs/tools/networking/wgautomesh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/wgautomesh/default.nix b/pkgs/tools/networking/wgautomesh/default.nix index cd686a9bd592..ed4f2b7d3cd9 100644 --- a/pkgs/tools/networking/wgautomesh/default.nix +++ b/pkgs/tools/networking/wgautomesh/default.nix @@ -4,17 +4,17 @@ }: rustPlatform.buildRustPackage rec { pname = "wgautomesh"; - version = "0.1.0"; + version = "unstable-20240524"; src = fetchFromGitea { domain = "git.deuxfleurs.fr"; owner = "Deuxfleurs"; repo = "wgautomesh"; - rev = "v${version}"; - sha256 = "FiFEpYLSJg52EtBXaZ685ICbaIyY9URrDt0bS0HPi0Q="; + rev = "59d315b853d4251dfdfd8229152bc151655da438"; + hash = "sha256-1xphnyuRMZEeq907nyhAW7iERYJLS1kxH0wRBsfYL40="; }; - cargoHash = "sha256-DGDVjQ4fr4/F1RE0qVc5CWcXrrCEswCF7rQQwlKzMPA="; + cargoHash = "sha256-HZ1VImsfxRd0sFN/vKAKgwIV2eio2GiEz+6c1+dCmdk="; meta = with lib; { description = "Simple utility to help connect wireguard nodes together in a full mesh topology";