From 5091b60dd55def1c5747e7adefde94d9f53ebc9d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 18:48:49 +0000 Subject: [PATCH 01/45] argyllcms: 2.3.0 -> 2.3.1 --- pkgs/tools/graphics/argyllcms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 9c17990ee67a..2b17fa796e84 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "2.3.0"; + version = "2.3.1"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - sha256 = "sha256-UNjCcqJgbRSox55OP3pLdKFHY0NPLHEq3nwqvxWre7U="; + sha256 = "sha256-XWsubjdD1tg0o7x/aoAalemAChehWkwh4fkP2WRvhAw="; }; nativeBuildInputs = [ jam unzip ]; From eb72be85415765d1538bdf6e3b06090614f7a6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 17 Jul 2022 12:32:28 +0200 Subject: [PATCH 02/45] lib/types: add `number` For numbers that can be ints or floats. --- lib/types.nix | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 354714b28733..76001804e721 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -226,11 +226,11 @@ rec { }; int = mkOptionType { - name = "int"; - description = "signed integer"; - check = isInt; - merge = mergeEqualOption; - }; + name = "int"; + description = "signed integer"; + check = isInt; + merge = mergeEqualOption; + }; # Specialized subdomains of int ints = @@ -291,10 +291,34 @@ rec { port = ints.u16; float = mkOptionType { - name = "float"; - description = "floating point number"; - check = isFloat; - merge = mergeEqualOption; + name = "float"; + description = "floating point number"; + check = isFloat; + merge = mergeEqualOption; + }; + + number = either int float; + + numbers = let + betweenDesc = lowest: highest: + "${builtins.toJSON lowest} and ${builtins.toJSON highest} (both inclusive)"; + in { + between = lowest: highest: + assert lib.assertMsg (lowest <= highest) + "numbers.between: lowest must be smaller than highest"; + addCheck number (x: x >= lowest && x <= highest) // { + name = "numberBetween"; + description = "integer or floating point number between ${betweenDesc lowest highest}"; + }; + + nonnegative = addCheck number (x: x >= 0) // { + name = "numberNonnegative"; + description = "nonnegative integer or floating point number, meaning >=0"; + }; + positive = addCheck number (x: x > 0) // { + name = "numberPositive"; + description = "positive integer or floating point number, meaning >0"; + }; }; str = mkOptionType { From 77307fcff86d3e56285b006b3e9204c6b45d90f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 17 Jul 2022 12:56:40 +0200 Subject: [PATCH 03/45] nixos/picom: use `types.numbers.between` --- nixos/modules/services/x11/picom.nix | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index 2eef71f71fcb..85aa11f147b4 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -11,15 +11,6 @@ let addCheck (listOf x) (y: length y == 2) // { description = "pair of ${x.description}"; }; - floatBetween = a: b: with types; - let - # toString prints floats with hardcoded high precision - floatToString = f: builtins.toJSON f; - in - addCheck float (x: x <= b && x >= a) - // { description = "a floating point number in " + - "range [${floatToString a}, ${floatToString b}]"; }; - mkDefaultAttrs = mapAttrs (n: v: mkDefault v); # Basically a tinkered lib.generators.mkKeyValueDefault @@ -93,7 +84,7 @@ in { }; fadeSteps = mkOption { - type = pairOf (floatBetween 0.01 1); + type = pairOf (types.numbers.between 0.01 1); default = [ 0.028 0.03 ]; example = [ 0.04 0.04 ]; description = '' @@ -133,7 +124,7 @@ in { }; shadowOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 0.75; example = 0.8; description = '' @@ -156,7 +147,7 @@ in { }; activeOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' @@ -165,7 +156,7 @@ in { }; inactiveOpacity = mkOption { - type = floatBetween 0.1 1; + type = types.numbers.between 0.1 1; default = 1.0; example = 0.8; description = '' @@ -174,7 +165,7 @@ in { }; menuOpacity = mkOption { - type = floatBetween 0 1; + type = types.numbers.between 0 1; default = 1.0; example = 0.8; description = '' From 5480f45f63f75d9340d5d48602f47d04d3625a2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Mon, 25 Jul 2022 11:19:06 +0200 Subject: [PATCH 04/45] nixos/doc/option-types: refactor, document `number`s --- .../development/option-types.section.md | 68 ++- .../development/option-types.section.xml | 420 ++++++++++-------- 2 files changed, 283 insertions(+), 205 deletions(-) diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 9b35e6630144..7864b62605c2 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -4,7 +4,7 @@ Option types are a way to put constraints on the values a module option can take. Types are also responsible of how values are merged in case of multiple value definitions. -## Basic Types {#sec-option-types-basic} +## Basic types {#sec-option-types-basic} Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in how definition @@ -25,6 +25,11 @@ merging is handled. : A top-level store path. This can be an attribute set pointing to a store path, like a derivation or a flake input. +`types.enum` *`l`* + +: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. + Multiple definitions cannot be merged. + `types.anything` : A type that accepts any value and recursively merges attribute sets @@ -95,7 +100,7 @@ merging is handled. problems. ::: -Integer-related types: +### Numeric types {#sec-option-types-numeric} `types.int` @@ -118,6 +123,10 @@ Integer-related types: from 0 to 2^n−1 respectively (e.g. `0` to `255` for 8 bits). +`types.ints.between` *`lowest highest`* + +: An integer between *`lowest`* and *`highest`* (both inclusive). + `types.ints.positive` : A positive integer (that is > 0). @@ -127,12 +136,39 @@ Integer-related types: : A port number. This type is an alias to `types.ints.u16`. -String-related types: +`types.float` + +: A floating point number. + +`types.number` + +: Either a signed integer or a floating point number. No implicit conversion + is done between the two types, and multiple equal definitions will only be + merged if they have the same type. + +`types.numbers.between` *`lowest highest`* + +: An integer or floating point number between *`lowest`* and *`highest`* (both inclusive). + +`types.numbers.nonnegative` + +: A nonnegative integer or floating point number (that is >= 0). + +`types.numbers.positive` + +: A positive integer or floating point number (that is > 0). + +### String types {#sec-option-types-string} `types.str` : A string. Multiple definitions cannot be merged. +`types.separatedString` *`sep`* + +: A string. Multiple definitions are concatenated with *`sep`*, e.g. + `types.separatedString "|"`. + `types.lines` : A string. Multiple definitions are concatenated with a new line @@ -144,7 +180,7 @@ String-related types: `types.envVar` -: A string. Multiple definitions are concatenated with a collon `":"`. +: A string. Multiple definitions are concatenated with a colon `":"`. `types.strMatching` @@ -152,24 +188,9 @@ String-related types: definitions cannot be merged. The regular expression is processed using `builtins.match`. -## Value Types {#sec-option-types-value} +## Submodule types {#sec-option-types-submodule} -Value types are types that take a value parameter. - -`types.enum` *`l`* - -: One element of the list *`l`*, e.g. `types.enum [ "left" "right" ]`. - Multiple definitions cannot be merged. - -`types.separatedString` *`sep`* - -: A string with a custom separator *`sep`*, e.g. - `types.separatedString "|"`. - -`types.ints.between` *`lowest highest`* - -: An integer between *`lowest`* and *`highest`* (both inclusive). Useful - for creating types like `types.port`. +Submodules are detailed in [Submodule](#section-option-types-submodule). `types.submodule` *`o`* @@ -178,7 +199,6 @@ Value types are types that take a value parameter. value. Submodules are used in composed types to create modular options. This is equivalent to `types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }`. - Submodules are detailed in [Submodule](#section-option-types-submodule). `types.submoduleWith` { *`modules`*, *`specialArgs`* ? {}, *`shorthandOnlyDefinesConfig`* ? false } @@ -239,7 +259,7 @@ Value types are types that take a value parameter. more convenient and discoverable than expecting the module user to type-merge with the `attrsOf submodule` option. -## Composed Types {#sec-option-types-composed} +## Composed types {#sec-option-types-composed} Composed types are types that take a type as parameter. `listOf int` and `either int str` are examples of composed types. @@ -496,7 +516,7 @@ Types are mainly characterized by their `check` and `merge` functions. of strings, and `defs` the list of defined values as a list. It is possible to override a type merge function for custom needs. -## Custom Types {#sec-option-types-custom} +## Custom types {#sec-option-types-custom} Custom types can be created with the `mkOptionType` function. As type creation includes some more complex topics such as submodule handling, diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml index 929d5302ed41..e207b97a46f8 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -6,7 +6,7 @@ in case of multiple value definitions.
- Basic Types + Basic types Basic types are the simplest available types in the module system. Basic types include multiple string types that mainly differ in @@ -49,6 +49,20 @@ + + + types.enum + l + + + + One element of the list + l, e.g. + types.enum [ "left" "right" ]. + Multiple definitions cannot be merged. + + + types.anything @@ -150,186 +164,232 @@ - - Integer-related types: - - - - - types.int - - - - A signed integer. - - - - - - types.ints.{s8, s16, s32} - - - - Signed integers with a fixed length (8, 16 or 32 bits). They - go from −2^n/2 to 2^n/2−1 respectively (e.g. - −128 to 127 for 8 - bits). - - - - - - types.ints.unsigned - - - - An unsigned integer (that is >= 0). - - - - - - types.ints.{u8, u16, u32} - - - - Unsigned integers with a fixed length (8, 16 or 32 bits). - They go from 0 to 2^n−1 respectively (e.g. - 0 to 255 for 8 bits). - - - - - - types.ints.positive - - - - A positive integer (that is > 0). - - - - - - types.port - - - - A port number. This type is an alias to - types.ints.u16. - - - - - - String-related types: - - - - - types.str - - - - A string. Multiple definitions cannot be merged. - - - - - - types.lines - - - - A string. Multiple definitions are concatenated with a new - line "\n". - - - - - - types.commas - - - - A string. Multiple definitions are concatenated with a comma - ",". - - - - - - types.envVar - - - - A string. Multiple definitions are concatenated with a - collon ":". - - - - - - types.strMatching - - - - A string matching a specific regular expression. Multiple - definitions cannot be merged. The regular expression is - processed using builtins.match. - - - - +
+ Numeric types + + + + types.int + + + + A signed integer. + + + + + + types.ints.{s8, s16, s32} + + + + Signed integers with a fixed length (8, 16 or 32 bits). + They go from −2^n/2 to 2^n/2−1 respectively (e.g. + −128 to 127 for 8 + bits). + + + + + + types.ints.unsigned + + + + An unsigned integer (that is >= 0). + + + + + + types.ints.{u8, u16, u32} + + + + Unsigned integers with a fixed length (8, 16 or 32 bits). + They go from 0 to 2^n−1 respectively (e.g. + 0 to 255 for 8 + bits). + + + + + + types.ints.between + lowest highest + + + + An integer between + lowest and + highest (both + inclusive). + + + + + + types.ints.positive + + + + A positive integer (that is > 0). + + + + + + types.port + + + + A port number. This type is an alias to + types.ints.u16. + + + + + + types.float + + + + A floating point number. + + + + + + types.number + + + + Either a signed integer or a floating point number. No + implicit conversion is done between the two types, and + multiple equal definitions will only be merged if they + have the same type. + + + + + + types.numbers.between + lowest highest + + + + An integer or floating point number between + lowest and + highest (both + inclusive). + + + + + + types.numbers.nonnegative + + + + A nonnegative integer or floating point number (that is + >= 0). + + + + + + types.numbers.positive + + + + A positive integer or floating point number (that is > + 0). + + + + +
+
+ String types + + + + types.str + + + + A string. Multiple definitions cannot be merged. + + + + + + types.separatedString + sep + + + + A string. Multiple definitions are concatenated with + sep, e.g. + types.separatedString "|". + + + + + + types.lines + + + + A string. Multiple definitions are concatenated with a new + line "\n". + + + + + + types.commas + + + + A string. Multiple definitions are concatenated with a + comma ",". + + + + + + types.envVar + + + + A string. Multiple definitions are concatenated with a + colon ":". + + + + + + types.strMatching + + + + A string matching a specific regular expression. Multiple + definitions cannot be merged. The regular expression is + processed using builtins.match. + + + + +
-
- Value Types +
+ Submodule types - Value types are types that take a value parameter. + Submodules are detailed in + Submodule. - - - types.enum - l - - - - One element of the list - l, e.g. - types.enum [ "left" "right" ]. - Multiple definitions cannot be merged. - - - - - - types.separatedString - sep - - - - A string with a custom separator - sep, e.g. - types.separatedString "|". - - - - - - types.ints.between - lowest highest - - - - An integer between - lowest and - highest (both - inclusive). Useful for creating types like - types.port. - - - types.submodule @@ -345,8 +405,6 @@ in composed types to create modular options. This is equivalent to types.submoduleWith { modules = toList o; shorthandOnlyDefinesConfig = true; }. - Submodules are detailed in - Submodule. @@ -467,7 +525,7 @@
- Composed Types + Composed types Composed types are types that take a type as parameter. listOf int and @@ -850,7 +908,7 @@ nixThings = mkOption {
- Custom Types + Custom types Custom types can be created with the mkOptionType function. As type creation From 79ae88a1002db5384bc9ad2e8708c77554289f05 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Tue, 9 Aug 2022 14:50:55 +0200 Subject: [PATCH 05/45] nixos/syncthing: Add receiveencrypted folder type This folder type is available in syncthing, but could not be set in NixOS. See for reference. --- nixos/modules/services/networking/syncthing.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 373fd03223d6..5242d3a40350 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -317,11 +317,12 @@ in { }; type = mkOption { - type = types.enum [ "sendreceive" "sendonly" "receiveonly" ]; + type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ]; default = "sendreceive"; description = lib.mdDoc '' Whether to only send changes for this folder, only receive them - or both. + or both. `receiveencrypted` can be used for untrusted devices. See + for reference. ''; }; From e7b7d885f8e5a100eaf57fd1d3013eb81eb6968e Mon Sep 17 00:00:00 2001 From: Jan Schmitt Date: Sat, 13 Aug 2022 10:03:04 +0200 Subject: [PATCH 06/45] tmuxPlugins.tmux-fzf: unstable-2021-10-20 -> unstable-2022-08-02 --- pkgs/misc/tmux-plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 0146c67f33dd..e6ac31d860a3 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -523,12 +523,12 @@ in rec { tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; - version = "unstable-2021-10-20"; + version = "unstable-2022-08-02"; src = fetchFromGitHub { owner = "sainnhe"; repo = "tmux-fzf"; - rev = "1801dd525b39154745ea668fb6916035023949e3"; - sha256 = "e929Jqletmobp3WAR1tPU3pJuYTYVynxc5CvB80gig8="; + rev = "3e261309ad367c3fe56c0ef14af00078684b1035"; + sha256 = "13wlcq3f7944v74lcnfbmabcy2c0ca83ya21s3qn3j0lw3wqj6vj"; }; postInstall = '' find $target -type f -print0 | xargs -0 sed -i -e 's|fzf |${pkgs.fzf}/bin/fzf |g' From d6ba407e5df87cc40d4ef92acf2a21759392dda3 Mon Sep 17 00:00:00 2001 From: Tobias Mayer Date: Sun, 14 Aug 2022 12:21:32 +0200 Subject: [PATCH 07/45] pkgs{Musl,Static}.glog: fix build A few tests fail when built with musl or statically, so we now use gtest and turn those off. --- pkgs/development/libraries/glog/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index f49c8b982993..4e8503b48438 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, gflags, perl }: +{ stdenv, lib, fetchFromGitHub, cmake, gflags, gtest, perl }: stdenv.mkDerivation rec { pname = "glog"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + buildInputs = [ gtest ]; + propagatedBuildInputs = [ gflags ]; cmakeFlags = [ @@ -25,6 +27,17 @@ stdenv.mkDerivation rec { enableParallelChecking = false; checkInputs = [ perl ]; + GTEST_FILTER = + let + filteredTests = lib.optionals stdenv.hostPlatform.isMusl [ + "Symbolize.SymbolizeStackConsumption" + "Symbolize.SymbolizeWithDemanglingStackConsumption" + ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + "LogBacktraceAt.DoesBacktraceAtRightLineWhenEnabled" + ]; + in + lib.optionalString doCheck "-${builtins.concatStringsSep ":" filteredTests}"; + meta = with lib; { homepage = "https://github.com/google/glog"; license = licenses.bsd3; From 37da853f496341eee70170e93095d82bcf60a79a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 14 Aug 2022 12:13:04 -0400 Subject: [PATCH 08/45] nixos/installer: mkForce -> mkImageMediaOverride This is image media, so use the override level designed for it. As detailed in the definition for mkImageMediaOverride: > image media profiles can be derived by inclusion into host config, > hence needing to override host config, but do allow user to mkForce --- .../installer/cd-dvd/installation-cd-graphical-base.nix | 2 +- nixos/modules/profiles/installation-device.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 8c7bac6f6cc1..c5976166fb31 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -26,7 +26,7 @@ with lib; # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; - networking.wireless.enable = mkForce false; + networking.wireless.enable = mkImageMediaOverride false; # KDE complains if power management is disabled (to be precise, if # there is no power management backend such as upower). diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a8601a9e2c06..ae9be08c8d85 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -22,10 +22,10 @@ with lib; config = { # Enable in installer, even if the minimal profile disables it. - documentation.enable = mkForce true; + documentation.enable = mkImageMediaOverride true; # Show the manual. - documentation.nixos.enable = mkForce true; + documentation.nixos.enable = mkImageMediaOverride true; # Use less privileged nixos user users.users.nixos = { @@ -41,7 +41,7 @@ with lib; # Allow passwordless sudo from nixos user security.sudo = { enable = mkDefault true; - wheelNeedsPassword = mkForce false; + wheelNeedsPassword = mkImageMediaOverride false; }; # Automatically log in at the virtual consoles. From 51a1c735428fd07efc4c7fbe6d7b909018b10e57 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Wed, 31 Aug 2022 17:04:18 -0700 Subject: [PATCH 09/45] nixos/systemd.network: Fix `ipv6RoutePrefixes` example The example doesn't have the top-level attribute `ipv6RoutePrefixConfig` in each attrset of the list. --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 71891ebbfefe..593f37c5c3d7 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1411,7 +1411,7 @@ let ipv6RoutePrefixes = mkOption { default = []; - example = [ { Route = "fd00::/64"; LifetimeSec = 3600; } ]; + example = [ { ipv6RoutePrefixConfig = { Route = "fd00::/64"; LifetimeSec = 3600; }; } ]; type = with types; listOf (submodule ipv6RoutePrefixOptions); description = '' A list of ipv6RoutePrefix sections to be added to the unit. See From 50ad4b18260af918433fb7aac97ed95c4c1c8d4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 16:00:28 +0000 Subject: [PATCH 10/45] glooctl: 1.12.11 -> 1.12.12 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 30ae4f468f8c..75effcdc8ff5 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.11"; + version = "1.12.12"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-vG1FSBHXaJBJk9dC61yZK1Vkr8PyQ7Q4TVZWRIsDY3E="; + hash = "sha256-aQUN1T6AH1TRj2pPkNFoS5Fmo3NPmmiEXFZfFeXtN1w="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From 8b95a9d56078f7934c9945598a6abdd9a7009fe8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 4 Sep 2022 20:46:00 +0300 Subject: [PATCH 11/45] xprompt: fix cross-compilation --- pkgs/tools/X11/xprompt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xprompt/default.nix b/pkgs/tools/X11/xprompt/default.nix index 69149b3889b8..e8633d1eb383 100644 --- a/pkgs/tools/X11/xprompt/default.nix +++ b/pkgs/tools/X11/xprompt/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { in optionalString (conf != null) "cp ${configFile} config.h"; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ "CC:=$(CC)" "PREFIX=$(out)" ]; passthru.updateScript = nix-update-script { attrPath = pname; From 3ac5542df0f71126fe78c03ece133d09873b433a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 4 Sep 2022 23:27:20 +0000 Subject: [PATCH 12/45] rapidfuzz-cpp: 1.2.0 -> 1.3.0 --- pkgs/development/libraries/rapidfuzz-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index d3fc35bbfc7d..ae4b5176e3af 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rapidfuzz-cpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "maxbachmann"; repo = "rapidfuzz-cpp"; rev = "v${version}"; - hash = "sha256-S92ookWpQ4OW53oYXPiCokUchI+47CILDR5RXxPJbmU="; + hash = "sha256-LhMubYSq5EO4Pup+mVPQpcXwur/bPz+NZ1CcyqDt6lM="; }; patches = [ From 72a60822a7d1cb5eddc31178dfe82b96c7b46d04 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 6 Sep 2022 12:55:06 -0400 Subject: [PATCH 13/45] piping-server-rust: 0.14.0 -> 0.14.1 --- pkgs/servers/piping-server-rust/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/piping-server-rust/default.nix b/pkgs/servers/piping-server-rust/default.nix index c889edb886ad..dda0a6d1d229 100644 --- a/pkgs/servers/piping-server-rust/default.nix +++ b/pkgs/servers/piping-server-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "piping-server-rust"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "nwtgck"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ON3/GaDwQ9DtApRZuYClZWzFhmiLi988jIBvl0DgYSM="; + sha256 = "sha256-QgOrKAPLphvIMqcOrbYuo4ra65IV8dK5+6tyh+YyyP4="; }; - cargoSha256 = "sha256-rc3VTJllDu4oIFcswCNUJejJHzC2PoJJV9EU5fOC7fQ="; + cargoSha256 = "sha256-Nd+Frhospp6ERYFuxzEzKbkLAFqTv7Lp7MWwv09S+KA="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ]; From 1d352157877a09259b0ae396917bc71a30bcd0ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 11:05:24 +0000 Subject: [PATCH 14/45] boulder: 2022-08-29 -> 2022-09-06 --- pkgs/tools/admin/boulder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix index 7629cafec187..b39e565eadd8 100644 --- a/pkgs/tools/admin/boulder/default.nix +++ b/pkgs/tools/admin/boulder/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "boulder"; - version = "2022-08-29"; + version = "2022-09-06"; src = fetchFromGitHub { owner = "letsencrypt"; @@ -19,7 +19,7 @@ buildGoModule rec { git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT find "$out" -name .git -print0 | xargs -0 rm -rf ''; - hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM="; + hash = "sha256-BteHJAjIMPckbNIxgZCSSZV2iUc/yKVd0Px+S9ZwwUI="; }; vendorHash = null; From ceb7c1d13c31822765a39d320d090e50198cd72e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 7 Sep 2022 12:00:36 +0000 Subject: [PATCH 15/45] cpp-utilities: 5.18.0 -> 5.19.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 6740f458725e..7fe511373d8d 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.18.0"; + version = "5.19.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i/ihEPJHyWzRywzpXhYpauA8lL51yjoiWod8Nc/6gV0="; + sha256 = "sha256-sygt30x5S2n24ONMBRzNyLZcnl4hM4tUFpX/Yx6ZSMM="; }; nativeBuildInputs = [ cmake ]; From 9cb9dd71561c715968a3d30144f6eb5c959f68c2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Sep 2022 09:03:05 -0400 Subject: [PATCH 16/45] hyperfine: 1.14.0 -> 1.15.0 --- pkgs/tools/misc/hyperfine/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix index 897c1bdf5002..cd5fb46d84a2 100644 --- a/pkgs/tools/misc/hyperfine/default.nix +++ b/pkgs/tools/misc/hyperfine/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "hyperfine"; - version = "1.14.0"; + version = "1.15.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-3DDgh/0iD1LJEPjicLtHcs9PMso/Wv+3vlkWfdJlpIM="; + sha256 = "sha256-JJ4sEwe2fXOGlofJ9SkXEllMCMhn7MSJ+H3aAF0F0zk="; }; - cargoSha256 = "sha256-VkB6KJUi5PACpjrK/OJ5tmroJJVnDxhZAQzSWkrtuCU="; + cargoSha256 = "sha256-3xOh51rUnQcUfQ+asurbfNYTb5dWQO5YY/AbGRV+26w="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.isDarwin Security; From ae455c17d476c7d95df68defca64d9f31522e8dd Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 7 Sep 2022 09:09:32 -0400 Subject: [PATCH 17/45] genact: 0.12.0 -> 1.0.0 --- pkgs/applications/misc/genact/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index ebed42852b70..44a1f79e5b81 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "0.12.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ouDaOs72vivJBZVwcJhv4YoPKQOEBctUTqubvrpoBtI="; + sha256 = "sha256-sKFI7r0mwmzKiHy9HmskS10M5v/jZj/VeO4F9ZQl2g0="; }; - cargoSha256 = "sha256-csubycZaBUHPp8XJ1C+nWw7DzVGVJm38/Dgw41qUMYQ="; + cargoSha256 = "sha256-79IC51xdkelgsRJF+rz9UOTfrJ/HS6PbkyxySe0Qk4Q="; meta = with lib; { description = "A nonsense activity generator"; From 0e717901a5f5d2d72fd6cec15af4528f47dc070c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 08:52:56 +0000 Subject: [PATCH 18/45] gnome-frog: 1.1.3 -> 1.2.0 --- pkgs/applications/misc/gnome-frog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gnome-frog/default.nix b/pkgs/applications/misc/gnome-frog/default.nix index 4841a3b15091..ab6b992d5d1c 100644 --- a/pkgs/applications/misc/gnome-frog/default.nix +++ b/pkgs/applications/misc/gnome-frog/default.nix @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { pname = "gnome-frog"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "TenderOwl"; repo = "Frog"; - rev = version; - sha256 = "sha256-yOjfiGJUU25zb/4WprPU59yDAMpttS3jREp1kB5mXUE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-AJ6pFtTM4ViZ9dB41wzHoPSHDdmu+SOzD5fkoAiRLzQ="; }; format = "other"; From c908fca315b139f049e0c43d5b8a41754a941d2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Sep 2022 12:09:44 +0000 Subject: [PATCH 19/45] netbox: 3.3.0 -> 3.3.2 --- pkgs/servers/web-apps/netbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/netbox/default.nix b/pkgs/servers/web-apps/netbox/default.nix index 90b82659ff9f..6fd8782f5826 100644 --- a/pkgs/servers/web-apps/netbox/default.nix +++ b/pkgs/servers/web-apps/netbox/default.nix @@ -17,13 +17,13 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "3.3.0"; + version = "3.3.2"; src = fetchFromGitHub { owner = "netbox-community"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-tdl3A5l8CDNdVpNMKHg31QJoQSdr1v0COTcX33Sh7nc="; + sha256 = "sha256-G7d9CG7mxdtdShWOdbbcWTVD3qrTKjh7j3MX/cTJbPw="; }; format = "other"; From be0f580df3c745b8d003b6c6726033efeaa46033 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 8 Sep 2022 11:34:28 -0400 Subject: [PATCH 20/45] cargo-generate: 0.14.0 -> 0.16.0, fix license also adds figsoda as a maintainer --- .../tools/rust/cargo-generate/default.nix | 32 +++++++++++++------ .../tools/rust/cargo-generate/no-vendor.patch | 11 +++++++ 2 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 pkgs/development/tools/rust/cargo-generate/no-vendor.patch diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 337ff0dda753..dec12ef677aa 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -1,22 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config, libiconv, curl }: +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, libgit2 +, openssl +, stdenv +, Security +}: rustPlatform.buildRustPackage rec { pname = "cargo-generate"; - version = "0.14.0"; + version = "0.16.0"; src = fetchFromGitHub { - owner = "ashleygwilliams"; + owner = "cargo-generate"; repo = "cargo-generate"; rev = "v${version}"; - sha256 = "sha256-OYYGOB1NfNnOl8bd8KozgMCyW4Gb39LoFtD80DPzpdw="; + sha256 = "sha256-qL5ZbLimpsi/7yuhubHF3/tAouE/5zCWRx4nZG841cU="; }; - cargoSha256 = "sha256-qmRKjPhPLpzVVuTHuoo0iTlX3BnT2Udo1kFXvA3zNQE="; + # patch Cargo.toml to not vendor libgit2 and openssl + cargoPatches = [ ./no-vendor.patch ]; + + cargoSha256 = "sha256-OB3rjJNxkUKRQPsWRvCniNPfYBgLFV4yXO7dnVvL7wo="; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + buildInputs = [ libgit2 openssl ] + ++ lib.optionals stdenv.isDarwin [ Security ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld @@ -32,8 +43,9 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cargo, make me a project"; - homepage = "https://github.com/ashleygwilliams/cargo-generate"; - license = licenses.asl20; - maintainers = [ maintainers.turbomack ]; + homepage = "https://github.com/cargo-generate/cargo-generate"; + changelog = "https://github.com/cargo-generate/cargo-generate/blob/v${version}/CHANGELOG.md"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ figsoda turbomack ]; }; } diff --git a/pkgs/development/tools/rust/cargo-generate/no-vendor.patch b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch new file mode 100644 index 000000000000..0c3b18de211c --- /dev/null +++ b/pkgs/development/tools/rust/cargo-generate/no-vendor.patch @@ -0,0 +1,11 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE-*", "*.md"] + + [dependencies] + clap = { version = "3.2", features = ["derive", "std"], default-features = false } +-git2 = { version = "0.14", features = ["ssh", "https", "vendored-libgit2", "vendored-openssl"], default-features = false } ++git2 = { version = "0.14", features = ["ssh", "https"], default-features = false } + console = "0.15" + dialoguer = "0.10" + dirs = "4.0" From 198ef25817a205420056c11eb2dd9321ffda3029 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 00:24:07 +0000 Subject: [PATCH 21/45] python310Packages.casbin: 1.17.0 -> 1.17.1 --- pkgs/development/python-modules/casbin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 2e027eaa990c..2d1e8ec09663 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "1.17.0"; + version = "1.17.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "refs/tags/v${version}"; - hash = "sha256-fBMhrA4zL4XPjQ63AGc5jf585ZpHTBumPievDNfCw7o="; + hash = "sha256-uh5XPhLoCnJtVnEDG+/oQvneEL1KLMWfAx+RXH/GCyE="; }; propagatedBuildInputs = [ From 7199d45dd9a3cfc352e7924cd0c07df3b41757dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 03:31:28 +0000 Subject: [PATCH 22/45] v2ray-geoip: 202208180100 -> 202209080101 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index d71a50ecb68c..507f6059b768 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202208180100"; + version = "202209080101"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "005c33be4dd95339596ddd5ce792e8f97dd168a3"; - sha256 = "sha256-KvEmgtbelZOauE2WBTzJkwJkaUVW2x8ezgmTE+Gbwu8="; + rev = "2e77e5d149f0a8f9c284333b206d0f017b0b66ef"; + sha256 = "sha256-vkWRBSwLpCqZWMlfwOyPWn2MF+/lG+VXnSrDCSR+dak="; }; installPhase = '' From 94de49bb88bf7da845ca7fc9c9856fec422e37cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 03:32:56 +0000 Subject: [PATCH 23/45] valum: 0.3.17 -> 0.3.18 --- pkgs/development/web/valum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 6301ec28c101..a11e0f4cb975 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "valum"; - version = "0.3.17"; + version = "0.3.18"; src = fetchFromGitHub { owner = "valum-framework"; repo = "valum"; rev = "v${version}"; - sha256 = "sha256-GpzFtr6MueHGHA6BEc24oGSfjxyHxIlL52cq+0gmBAI="; + sha256 = "sha256-baAv83YiX8HdBm/t++ktB7pmTVlt4aWZ5xnsAs/NrTI="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 9e65d09e3d98b07afcf74e8a3cddde6cb2cb4d49 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 9 Sep 2022 13:26:38 +0900 Subject: [PATCH 24/45] mafft: 7.505 -> 7.508 changed to fetch from new gitlab repository --- pkgs/applications/science/biology/mafft/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/mafft/default.nix b/pkgs/applications/science/biology/mafft/default.nix index 7b1a3c68072c..19d0d93c58df 100644 --- a/pkgs/applications/science/biology/mafft/default.nix +++ b/pkgs/applications/science/biology/mafft/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "mafft"; - version = "7.505"; + version = "7.508"; - src = fetchurl { - url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz"; - sha256 = "sha256-9Up4Zw/NmWAjO8w7PdNZ85WnHAztRae+HP6uGZUM5v8="; + src = fetchFromGitLab { + owner = "sysimm"; + repo = pname; + rev = version; + sha256 = "sha256-XQllmTgLntCBUFJzV2HL4f4oMilcUVTRgcfeZBdD5c0="; }; preBuild = '' From 1896709820cf32568c3ae1c821548211d4b767bd Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 9 Sep 2022 11:11:25 +0530 Subject: [PATCH 25/45] tailscale: 1.30.0 -> 1.30.1 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index de4d7e7fdf99..91192ee371da 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.30.0"; + version = "1.30.1"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-KruBCpJe6RhQYxNopj7ZZlZZy/UYtO1vQMvHxUgw0P8="; + sha256 = "sha256-sR1DB8Hc/JkCFaoj9FRRJhTeUWWoGUee2kx0EreUbWE="; }; vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; From 9acf28e1f58b6962f7945da6a2981031b6f0f4a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 07:16:49 +0000 Subject: [PATCH 26/45] python310Packages.itemloaders: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/itemloaders/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix index aa8d2acf1c94..8fa13fcc0cc2 100644 --- a/pkgs/development/python-modules/itemloaders/default.nix +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "itemloaders"; - version = "1.0.5"; + version = "1.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scrapy"; repo = pname; - rev = "v${version}"; - hash = "sha256-ueq1Rsuae+wz4eFc1O7luBVR4XWGbefpDr124H6j56g="; + rev = "refs/tags/v${version}"; + hash = "sha256-ZzpWIJNDve6SvLDb+QUDVSXUfJabFuRwtyBeCUasUgY="; }; propagatedBuildInputs = [ From 1a9831d523646582fcd5f3843395bb396fd5c7e8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 09:13:36 +0000 Subject: [PATCH 27/45] ani-cli: 3.3 -> 3.4 --- pkgs/applications/video/ani-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ani-cli/default.nix b/pkgs/applications/video/ani-cli/default.nix index 4e8637cf190f..07a0a5803ca0 100644 --- a/pkgs/applications/video/ani-cli/default.nix +++ b/pkgs/applications/video/ani-cli/default.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation rec { pname = "ani-cli"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "pystardust"; repo = "ani-cli"; rev = "v${version}"; - sha256 = "sha256-khgErF/1DmqnXmTUvTYWuyUAos6aUghImgXp3NjOZEg="; + sha256 = "sha256-Xb7MNL7YKbvyRR5ZppUfCYeYpjNAiJWNOjIFk5fUvpY="; }; nativeBuildInputs = [ makeWrapper ]; From 6f746e18780590bf263c15930f1875b4c08f2154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 09:21:54 +0000 Subject: [PATCH 28/45] argocd-autopilot: 0.4.6 -> 0.4.7 --- .../networking/cluster/argocd-autopilot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix index 0335350ec890..ca4c7139adba 100644 --- a/pkgs/applications/networking/cluster/argocd-autopilot/default.nix +++ b/pkgs/applications/networking/cluster/argocd-autopilot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd-autopilot"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "argoproj-labs"; repo = "argocd-autopilot"; rev = "v${version}"; - sha256 = "sha256-qlxs0dafmGbJdsBgFJGpaEkcKVyOoSeiQknqzJwUs8A="; + sha256 = "sha256-aC3U9Qeahji3xSuJWuMlf2TzKEqPDAOuB52A4Om/fRU="; }; vendorSha256 = "sha256-ujDtfDL1VWe4XjTHD+pXMmMFp0AiuZcE+CKRkMsiv9Q="; From ef2a31bfacb1573d745d5006a1d3f9ea733ec9d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 09:54:46 +0000 Subject: [PATCH 29/45] bazelisk: 1.13.2 -> 1.14.0 --- pkgs/development/tools/bazelisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index b3566a6ad35e..5c5e7c2d530b 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-/6px3S03HJ5W03phGzJTzZ0ROcfA9eKXP+xfBrix1DM="; + sha256 = "sha256-y3DVU2xHYZGUqf+kXhBDpTHACloqOXiMFY9bWU/QfOg="; }; vendorSha256 = "sha256-JJdFecRjPVmpYjDmz+ZBDmyT3Vj41An3BXvI2JzisIg="; From 2c5128782834249943628280864745d3f166762b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 9 Sep 2022 14:04:49 +0200 Subject: [PATCH 30/45] yq-go: 4.27.3 -> 4.27.5 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index eb9478096ab6..c2d839a36efb 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.27.3"; + version = "4.27.5"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-JEIKkiqVkzSXyZBAcZASHkn8MKoFZe52vKqrdJ4kX+I="; + sha256 = "sha256-ZUrpmGNrLJuslcHXWERxNQBfUYutXaCSq13ajFy+D28="; }; - vendorSha256 = "sha256-yv/qft4KpGi4xDfaQoylq1TanATUz5wd3a6RBlILG+s="; + vendorSha256 = "sha256-4J/Qz5JN8UUdwa3/Io2/o4Y01eFK9zOcNAZkndzI178="; nativeBuildInputs = [ installShellFiles ]; From 66fa3d0f3ecb5e69bf56ff0906ea9f40f35e51fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 12:24:02 +0000 Subject: [PATCH 31/45] carapace: 0.8.10 -> 0.15.0 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 788b1d114dd0..928b1c5bb2df 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.8.10"; + version = "0.15.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - sha256 = "0j60fvrmjm4440gj9hib2ar386zxcblw7yifigsnchr7p3i2187n"; + sha256 = "sha256-3ZWYEfssGq6fBoHrDsp6yvkB9TLF+heELEIbZ1TN2lI="; }; - vendorSha256 = "1s1sws79cyz1rl63wayzf7yhb04x29a4a1mkifqnl4cc2pv806jf"; + vendorSha256 = "sha256-OrbVqCgsVX5b5knN6IdlJBWeGfg2fh09a2xe5+2EGEs="; subPackages = [ "./cmd/carapace" ]; From c0ea7e60f91f425024b1a601d17fc03e619cd16f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 12:27:40 +0000 Subject: [PATCH 32/45] cargo-public-api: 0.18.0 -> 0.19.0 --- pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index bba6c791216c..983156c2c05d 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -8,14 +8,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.18.0"; + version = "0.19.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-h5eLJyrk5n2lSSeAT6YHDALay7CsN/xApl3j0s3pIjc="; + sha256 = "sha256-gtqPt59jA4NhbaE9ij45oFEaAJ+l984lWEjloQtBSSE="; }; - cargoSha256 = "sha256-1zt3q04LPER+Kvp6EQHziWzYeckFYO9MmPRlHto2Juo="; + cargoSha256 = "sha256-j0bsuu+A5oCf+0pFM4PAQ3oqq9POc5rrzt5UR0RDnAw="; nativeBuildInputs = [ pkg-config ]; From 2c4922ac0b00dd25c72dc1728fa9114fd320a685 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 9 Sep 2022 00:27:35 +0300 Subject: [PATCH 33/45] aixlog: init at 1.5.0 --- pkgs/development/libraries/aixlog/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/aixlog/default.nix diff --git a/pkgs/development/libraries/aixlog/default.nix b/pkgs/development/libraries/aixlog/default.nix new file mode 100644 index 000000000000..282b62702c75 --- /dev/null +++ b/pkgs/development/libraries/aixlog/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "aixlog"; + version = "1.5.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = pname; + rev = "v${version}"; + hash = "sha256-Xhle7SODRZlHT3798mYIzBi1Mqjz8ai74/UnbVWetiY="; + }; + + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src/include/aixlog.hpp $out/include/aixlog.hpp + + runHook postInstall + ''; + + meta = with lib; { + description = "Header-only C++ logging library"; + homepage = "https://github.com/badaix/aixlog"; + changelog = "https://github.com/badaix/aixlog/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2a73b261309..76563511f510 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1212,6 +1212,8 @@ with pkgs; airwindows-lv2 = callPackage ../applications/audio/airwindows-lv2 { }; + aixlog = callPackage ../development/libraries/aixlog { }; + aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { From cd06cfac455b6a2126acf0618a8dcabc4186f1e6 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 9 Sep 2022 00:27:55 +0300 Subject: [PATCH 34/45] popl: init at 1.3.0 --- pkgs/development/libraries/popl/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/popl/default.nix diff --git a/pkgs/development/libraries/popl/default.nix b/pkgs/development/libraries/popl/default.nix new file mode 100644 index 000000000000..b72b97172e37 --- /dev/null +++ b/pkgs/development/libraries/popl/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "popl"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "badaix"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AkqFRPK0tVdalL+iyMou0LIUkPkFnYYdSqwEbFbgzqI="; + }; + + dontConfigure = true; + dontBuild = true; + dontFixup = true; + + installPhase = '' + runHook preInstall + + install -Dm644 $src/include/popl.hpp $out/include/popl.hpp + + runHook postInstall + ''; + + meta = with lib; { + description = "Header-only C++ program options parser library"; + homepage = "https://github.com/badaix/popl"; + changelog = "https://github.com/badaix/popl/releases/tag/${src.rev}"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76563511f510..bd81938264d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1910,6 +1910,8 @@ with pkgs; pikchr = callPackage ../tools/graphics/pikchr { }; + popl = callPackage ../development/libraries/popl { }; + popsicle = callPackage ../tools/misc/popsicle { }; terminal-colors = callPackage ../applications/misc/terminal-colors { }; From 1e5e228f619f69b0dd56afaac8889f6ec3a3350a Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Fri, 9 Sep 2022 00:28:09 +0300 Subject: [PATCH 35/45] snapcast: switch to packaged dependencies --- pkgs/applications/audio/snapcast/default.nix | 31 +------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 19016b700fdc..f0e5dc9cbb9a 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -1,40 +1,11 @@ { stdenv, lib, fetchFromGitHub, cmake, pkg-config , alsa-lib, asio, avahi, boost17x, flac, libogg, libvorbis, soxr +, aixlog, popl , pulseaudioSupport ? false, libpulseaudio , nixosTests }: assert pulseaudioSupport -> libpulseaudio != null; -let - - dependency = { name, version, sha256 }: - stdenv.mkDerivation { - name = "${name}-${version}"; - - src = fetchFromGitHub { - owner = "badaix"; - repo = name; - rev = "v${version}"; - inherit sha256; - }; - - nativeBuildInputs = [ cmake ]; - }; - - aixlog = dependency { - name = "aixlog"; - version = "1.5.0"; - sha256 = "09mnkrans9zmwfxsiwgkm0rba66c11kg5zby9x3rjic34gnmw6ay"; - }; - - popl = dependency { - name = "popl"; - version = "1.2.0"; - sha256 = "1z6z7fwffs3d9h56mc2m24d5gp4fc5bi8836zyfb276s6fjyfcai"; - }; - -in - stdenv.mkDerivation rec { pname = "snapcast"; version = "0.26.0"; From 52bbbaeb09859b02561a1895f0516e094b2f9d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Fri, 9 Sep 2022 15:39:35 +0200 Subject: [PATCH 36/45] nixos/doc/option-types: add precision loss warning for floats --- nixos/doc/manual/development/option-types.section.md | 5 +++++ .../manual/from_md/development/option-types.section.xml | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md index 7864b62605c2..40b4d78b250e 100644 --- a/nixos/doc/manual/development/option-types.section.md +++ b/nixos/doc/manual/development/option-types.section.md @@ -140,6 +140,11 @@ merging is handled. : A floating point number. + ::: {.warning} + Converting a floating point number to a string with `toString` or `toJSON` + may result in [precision loss](https://github.com/NixOS/nix/issues/5733). + ::: + `types.number` : Either a signed integer or a floating point number. No implicit conversion diff --git a/nixos/doc/manual/from_md/development/option-types.section.xml b/nixos/doc/manual/from_md/development/option-types.section.xml index e207b97a46f8..4036bc0ba743 100644 --- a/nixos/doc/manual/from_md/development/option-types.section.xml +++ b/nixos/doc/manual/from_md/development/option-types.section.xml @@ -256,6 +256,15 @@ A floating point number. + + + Converting a floating point number to a string with + toString or toJSON + may result in + precision + loss. + + From d1535779132f399248417337142a5e54b55988f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 13:50:17 +0000 Subject: [PATCH 37/45] ddosify: 0.8.2 -> 0.8.3 --- pkgs/development/tools/ddosify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index 9d5436ba1712..afcc19d4431d 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-GvRooRsSLny+KZcro/rmagp4QAt4U52THiqTWqdvhK8="; + sha256 = "sha256-Mv56NpzDBsqzHwUkqL6d828E3hVrNT9FXLL6IqWJYeQ="; }; vendorSha256 = "sha256-mq82KNa01gHvW+RUREra+ysaJ1YWIwX0v/uYMxmFN4M="; From 3c1c405e72cd3e7232c5cea2f9ec4d9158bca9af Mon Sep 17 00:00:00 2001 From: Erik Skytthe Date: Fri, 9 Sep 2022 15:11:27 +0200 Subject: [PATCH 38/45] nixos/grafana: fix description text error Description text has been placed incorrectly for allowedDomains and allowedGroups --- nixos/modules/services/monitoring/grafana.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index dd99fa3ddccd..fd3418b8f6bd 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -628,18 +628,18 @@ in { }; allowedDomains = mkOption { description = lib.mdDoc '' - To limit access to authenticated users who are members of one or more groups, - set allowedGroups to a comma- or space-separated list of group object IDs. - You can find object IDs for a specific group on the Azure portal. + Limits access to users who belong to specific domains. + Separate domains with space or comma. ''; default = ""; type = types.str; }; allowedGroups = mkOption { description = lib.mdDoc '' - Limits access to users who belong to specific domains. - Separate domains with space or comma. - ''; + To limit access to authenticated users who are members of one or more groups, + set allowedGroups to a comma- or space-separated list of group object IDs. + You can find object IDs for a specific group on the Azure portal. + ''; default = ""; type = types.str; }; From 32e0213821f9e75421bd01a7561948bef7290229 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Sep 2022 07:08:41 -0700 Subject: [PATCH 39/45] buildkite-agent: 3.38.0 -> 3.39.0 (#190488) --- .../continuous-integration/buildkite-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 71b8f5515d03..3229f2287168 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -3,16 +3,16 @@ nixosTests }: buildGoModule rec { pname = "buildkite-agent"; - version = "3.38.0"; + version = "3.39.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; rev = "v${version}"; - sha256 = "sha256-W93yvdyfk6niSZ/usiOp6Yb8tFgEuC3UmJI6zDEHsFY="; + sha256 = "sha256-wEi14Iax155S2tr+Qxa3figXPDKKIdFcwDYv/nsLScQ="; }; - vendorSha256 = "sha256-n+n+Fank/L8mVCB7ulVXJkpJpr65ELirtBqScot2ANM="; + vendorSha256 = "sha256-RD8BXwzrqHwgxdjpL++a9pIvzD9rfSTqguRVh+CbbnE="; postPatch = '' substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash From 74a1793c659d09d7cf738005308b1f86c90cb59b Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 9 Sep 2022 16:08:57 +0200 Subject: [PATCH 40/45] gopls: 0.9.4 -> 0.9.5 (#190485) --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 60ede8af0a56..31af0aae0e6c 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - sha256 = "sha256-4bhKNMhC8kLRpS5DR6tLF7MgDX4LDeSKoeXcPYC2ywE="; + sha256 = "sha256-kDO7Sxz2pqZZBG2eGAWyh9UTAoYLzkAn86qh9LdepoU="; }; modRoot = "gopls"; - vendorSha256 = "sha256-r7XM7VX0VzFlUqrtvaQaiUXXiD1Vz4C3hmxRMonORAw="; + vendorSha256 = "sha256-ny+gD3ZXp6ZncWJtpW9fprYojQBkIUL+FEKp/7K5rrU="; doCheck = false; From 0ee767138319b0b16a996aa40bc762debc14236e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 9 Sep 2022 08:53:09 -0700 Subject: [PATCH 41/45] prometheus-nginx-exporter: 0.10.0 -> 0.11.0 (#190387) --- pkgs/servers/monitoring/prometheus/nginx-exporter.nix | 6 +++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index ac8ebb8d29b6..903ae7aa2cae 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginx_exporter"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "nginxinc"; repo = "nginx-prometheus-exporter"; rev = "v${version}"; - sha256 = "sha256-k9sbMIn5N3EJ7ZlfmD9pRV6lfywnKyFvpxC/pGGgNTA="; + sha256 = "sha256-glKjScJoJnFEm7Z9LAVF51haeyHB3wQ946U8RzJXs3k="; }; - vendorSha256 = "sha256-SaaHbn97cb/d8symyrBYLzK+5ukVLfGrFiRIz+tKPhw="; + vendorSha256 = "sha256-YyMySHnrjBHm3hRNJDwWBs86Ih4S5DONYuwlQ3FBjkA="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd81938264d9..54481fea354a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23454,10 +23454,7 @@ with pkgs; }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; prometheus-nginx-exporter = callPackage ../servers/monitoring/prometheus/nginx-exporter.nix { }; - prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { - # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild - buildGoModule = buildGo117Module; - }; + prometheus-nginxlog-exporter = callPackage ../servers/monitoring/prometheus/nginxlog-exporter.nix { }; prometheus-node-exporter = callPackage ../servers/monitoring/prometheus/node-exporter.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation IOKit; }; From 08dd3b91ea9751216718b3da1bb8e5386a08178d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 8 Sep 2022 01:25:30 +0200 Subject: [PATCH 42/45] nixos/vector: fix validation for cross compiling --- nixos/modules/services/logging/vector.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/vector.nix b/nixos/modules/services/logging/vector.nix index c4bd4fe809e4..ab5ea887acba 100644 --- a/nixos/modules/services/logging/vector.nix +++ b/nixos/modules/services/logging/vector.nix @@ -43,8 +43,10 @@ in format = pkgs.formats.toml { }; conf = format.generate "vector.toml" cfg.settings; validateConfig = file: - pkgs.runCommand "validate-vector-conf" { } '' - ${pkgs.vector}/bin/vector validate --no-environment "${file}" + pkgs.runCommand "validate-vector-conf" { + nativeBuildInputs = [ pkgs.buildPackages.vector ]; + } '' + vector validate --no-environment "${file}" ln -s "${file}" "$out" ''; in From e6dac8a4f49e60773f14c36e5e5d028617700dd6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 15:23:51 +0000 Subject: [PATCH 43/45] python310Packages.pymetno: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/pymetno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix index f3dcdf6c45a7..d11cf4917d15 100644 --- a/pkgs/development/python-modules/pymetno/default.nix +++ b/pkgs/development/python-modules/pymetno/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pymetno"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Danielhiversen"; repo = "PyMetno"; - rev = version; - sha256 = "sha256-2LNDFQObGqxrzswnqbmvCGLxEI0j+cIdv8o+RZM/7sM="; + rev = "refs/tags/${version}"; + sha256 = "sha256-Do9RQS4gE2BapQtKQsnMzJ8EJzzxkCBA5r3z1zHXIsA="; }; propagatedBuildInputs = [ From 62002c7a4a39ff0e1d884e6fe120d3a373389925 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 08:17:33 +0000 Subject: [PATCH 44/45] python310Packages.mne-python: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/mne-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mne-python/default.nix b/pkgs/development/python-modules/mne-python/default.nix index c1bd721fc118..c7ceeb0d4f77 100644 --- a/pkgs/development/python-modules/mne-python/default.nix +++ b/pkgs/development/python-modules/mne-python/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mne-python"; - version = "1.1.0"; + version = "1.1.1"; # PyPI dist insufficient to run tests src = fetchFromGitHub { owner = "mne-tools"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-p4brwO6uERM2vJdkJ34GdeAKk07QeVEmQrZMPcDjI2I="; + sha256 = "sha256-VM7sKcQeAeK20r4/jehhGlvBSHhYwA2SgsNL5Oa/Hug="; }; propagatedBuildInputs = [ From a4a0d32549ab5c8d20044d1c538e215f55469db3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 06:50:24 +0000 Subject: [PATCH 45/45] python310Packages.ignite: 0.4.9 -> 0.4.10 --- pkgs/development/python-modules/ignite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index fae5a8abf034..5ab12b4ec667 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.9"; + version = "0.4.10"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-KBEoMV9lwlEra4DiGDLgPb85+HrnK4Qiy3XYDa9hO3s="; + sha256 = "sha256-mMiEVenDBNmeXMrDSZamUpnSm+4BQEgfK89zxIaFMio="; }; checkInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ];