From 84e2b5d05ceeeed34f93588be618c3344ce90e9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 7 Jun 2024 07:52:04 +0000 Subject: [PATCH 01/68] git-town: 14.2.1 -> 14.2.2 --- pkgs/applications/version-management/git-town/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index a678e496cdf1..7b362cd7fb25 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-town"; - version = "14.2.1"; + version = "14.2.2"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-7wsN95I8Xa5CXh1Mg3Wv4gyTSRzZMqJ06ALLsud3l2k="; + hash = "sha256-bYCE3Ik0UbbjlZV8EY6pVRZzrTBp2uiZLJjO4UxfGE8="; }; vendorHash = null; From 195d155a1c43f23c9f7d9c4d27ae2ed2771a8599 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 9 Dec 2023 01:16:54 +0100 Subject: [PATCH 02/68] nixos/kerberos_server: use krb format generator, plus misc cleanup - Introduce more possible options by using the krb format generator. - Enforce package choice is using a correct package. - Use meta attribute to decide implementation, allows for overriding the package. - Make necessary changes to the format, to allow for multiple ACL files in heimdal. - Add systemd target and slice for both implementations. - Move state to `/var/lib` - Add documentation --- nixos/modules/security/krb5/default.nix | 18 ++- .../security/krb5/krb5-conf-format.nix | 73 ++++++++++-- .../services/system/kerberos/default.nix | 82 ++++++-------- .../services/system/kerberos/heimdal.nix | 105 +++++++++++------- .../system/kerberos/kerberos-server.md | 55 +++++++++ .../modules/services/system/kerberos/mit.nix | 78 +++++++------ nixos/tests/kerberos/heimdal.nix | 2 +- nixos/tests/kerberos/mit.nix | 2 +- .../libraries/kerberos/heimdal.nix | 2 + 9 files changed, 278 insertions(+), 139 deletions(-) create mode 100644 nixos/modules/services/system/kerberos/kerberos-server.md diff --git a/nixos/modules/security/krb5/default.nix b/nixos/modules/security/krb5/default.nix index 78426c07cbc9..6714c41d8a07 100644 --- a/nixos/modules/security/krb5/default.nix +++ b/nixos/modules/security/krb5/default.nix @@ -77,8 +77,22 @@ in { }; }; - config = mkIf cfg.enable { - environment = { + config = { + assertions = mkIf (cfg.enable || config.services.kerberos_server.enable) [(let + implementation = cfg.package.passthru.implementation or ""; + in { + assertion = lib.elem implementation [ "krb5" "heimdal" ]; + message = '' + `security.krb5.package` must be one of: + + - krb5 + - heimdal + + Currently chosen implementation: ${implementation} + ''; + })]; + + environment = mkIf cfg.enable { systemPackages = [ cfg.package ]; etc."krb5.conf".source = format.generate "krb5.conf" cfg.settings; }; diff --git a/nixos/modules/security/krb5/krb5-conf-format.nix b/nixos/modules/security/krb5/krb5-conf-format.nix index 5a6bbed9fd18..3e5e64ae0cb0 100644 --- a/nixos/modules/security/krb5/krb5-conf-format.nix +++ b/nixos/modules/security/krb5/krb5-conf-format.nix @@ -7,17 +7,61 @@ let inherit (lib) boolToString concatMapStringsSep concatStringsSep filter isAttrs isBool isList mapAttrsToList mkOption singleton splitString; - inherit (lib.types) attrsOf bool coercedTo either int listOf oneOf path - str submodule; + inherit (lib.types) attrsOf bool coercedTo either enum int listOf oneOf + path str submodule; in -{ }: { - type = let - section = attrsOf relation; - relation = either (attrsOf value) value; +{ + enableKdcACLEntries ? false +}: rec { + sectionType = let + relation = oneOf [ + (listOf (attrsOf value)) + (attrsOf value) + value + ]; value = either (listOf atom) atom; atom = oneOf [int str bool]; + in attrsOf relation; + + type = let + aclEntry = submodule { + options = { + principal = mkOption { + type = str; + description = "Which principal the rule applies to"; + }; + access = mkOption { + type = either + (listOf (enum ["add" "cpw" "delete" "get" "list" "modify"])) + (enum ["all"]); + default = "all"; + description = "The changes the principal is allowed to make."; + }; + target = mkOption { + type = str; + default = "*"; + description = "The principals that 'access' applies to."; + }; + }; + }; + + realm = submodule ({ name, ... }: { + freeformType = sectionType; + options = { + acl = mkOption { + type = listOf aclEntry; + default = [ + { principal = "*/admin"; access = "all"; } + { principal = "admin"; access = "all"; } + ]; + description = '' + The privileges granted to a user. + ''; + }; + }; + }); in submodule { - freeformType = attrsOf section; + freeformType = attrsOf sectionType; options = { include = mkOption { default = [ ]; @@ -40,7 +84,17 @@ in ''; type = coercedTo path singleton (listOf path); }; - }; + + } + // + (lib.optionalAttrs enableKdcACLEntries { + realms = mkOption { + type = attrsOf realm; + description = '' + The realm(s) to serve keys for. + ''; + }; + }); }; generate = let @@ -71,6 +125,9 @@ in ${name} = { ${indent (concatStringsSep "\n" (mapAttrsToList formatValue relation))} }'' + else if isList relation + then + concatMapStringsSep "\n" (formatRelation name) relation else formatValue name relation; formatValue = name: value: diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index 7fe970c9609a..34c7c6c84f86 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -1,75 +1,59 @@ -{config, lib, ...}: +{ config, pkgs, lib, ... }: let - inherit (lib) mkOption mkIf types length attrNames; + inherit (lib) mkOption types; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; + inherit (config.security.krb5) package; - aclEntry = { - options = { - principal = mkOption { - type = types.str; - description = "Which principal the rule applies to"; - }; - access = mkOption { - type = types.either - (types.listOf (types.enum ["add" "cpw" "delete" "get" "list" "modify"])) - (types.enum ["all"]); - default = "all"; - description = "The changes the principal is allowed to make."; - }; - target = mkOption { - type = types.str; - default = "*"; - description = "The principals that 'access' applies to."; - }; - }; - }; - - realm = { - options = { - acl = mkOption { - type = types.listOf (types.submodule aclEntry); - default = [ - { principal = "*/admin"; access = "all"; } - { principal = "admin"; access = "all"; } - ]; - description = '' - The privileges granted to a user. - ''; - }; - }; - }; + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; in { imports = [ + (lib.mkRenamedOptionModule [ "services" "kerberos_server" "realms" ] [ "services" "kerberos_server" "settings" "realms" ]) + ./mit.nix ./heimdal.nix ]; - ###### interface options = { services.kerberos_server = { enable = lib.mkEnableOption "the kerberos authentication server"; - realms = mkOption { - type = types.attrsOf (types.submodule realm); + settings = mkOption { + type = format.type; description = '' - The realm(s) to serve keys for. + Settings for the kerberos server of choice. + + See the following documentation: + - Heimdal: {manpage}`kdc.conf(5)` + - MIT Kerberos: ''; + default = { }; }; }; }; + config = lib.mkIf cfg.enable { + environment.systemPackages = [ package ]; + assertions = [ + { + assertion = cfg.settings.realms != { }; + message = "The server needs at least one realm"; + } + { + assertion = lib.length (lib.attrNames cfg.settings.realms) <= 1; + message = "Only one realm per server is currently supported."; + } + ]; - ###### implementation + systemd.slices.system-kerberos-server = { }; + systemd.targets.kerberos-server = { + wantedBy = [ "multi-user.target" ]; + }; + }; - config = mkIf cfg.enable { - environment.systemPackages = [ kerberos ]; - assertions = [{ - assertion = length (attrNames cfg.realms) <= 1; - message = "Only one realm per server is currently supported."; - }]; + meta = { + doc = ./kerberos-server.md; }; } diff --git a/nixos/modules/services/system/kerberos/heimdal.nix b/nixos/modules/services/system/kerberos/heimdal.nix index ecafc9276670..cec4dd276e6b 100644 --- a/nixos/modules/services/system/kerberos/heimdal.nix +++ b/nixos/modules/services/system/kerberos/heimdal.nix @@ -1,68 +1,87 @@ { pkgs, config, lib, ... } : let - inherit (lib) mkIf concatStringsSep concatMapStrings toList mapAttrs - mapAttrsToList; + inherit (lib) mapAttrs; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; - stateDir = "/var/heimdal"; - aclFiles = mapAttrs - (name: {acl, ...}: pkgs.writeText "${name}.acl" (concatMapStrings (( - {principal, access, target, ...} : - "${principal}\t${concatStringsSep "," (toList access)}\t${target}\n" - )) acl)) cfg.realms; + package = config.security.krb5.package; - kdcConfigs = mapAttrsToList (name: value: '' - database = { - dbname = ${stateDir}/heimdal - acl_file = ${value} - } - '') aclFiles; - kdcConfFile = pkgs.writeText "kdc.conf" '' - [kdc] - ${concatStringsSep "\n" kdcConfigs} - ''; + aclConfigs = lib.pipe cfg.settings.realms [ + (mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" ( + { principal, access, target, ... }: + "${principal}\t${lib.concatStringsSep "," (lib.toList access)}\t${target}" + ) acl)) + (lib.mapAttrsToList (name: text: + { + dbname = "/var/lib/heimdal/heimdal"; + acl_file = pkgs.writeText "${name}.acl" text; + } + )) + ]; + + finalConfig = cfg.settings // { + realms = mapAttrs (_: v: removeAttrs v [ "acl" ]) (cfg.settings.realms or { }); + kdc = (cfg.settings.kdc or { }) // { + database = aclConfigs; + }; + }; + + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; + + kdcConfFile = format.generate "kdc.conf" finalConfig; in { - # No documentation about correct triggers, so guessing at them. + config = lib.mkIf (cfg.enable && package.passthru.implementation == "heimdal") { + environment.etc."heimdal-kdc/kdc.conf".source = kdcConfFile; + + systemd.tmpfiles.settings."10-heimdal" = let + databases = lib.pipe finalConfig.kdc.database [ + (map (dbAttrs: dbAttrs.dbname or null)) + (lib.filter (x: x != null)) + lib.unique + ]; + in lib.genAttrs databases (_: { + d = { + user = "root"; + group = "root"; + mode = "0700"; + }; + }); - config = mkIf (cfg.enable && kerberos == pkgs.heimdal) { systemd.services.kadmind = { description = "Kerberos Administration Daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = - "${kerberos}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kadmind --config-file=/etc/heimdal-kdc/kdc.conf"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; systemd.services.kdc = { description = "Key Distribution Center daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = - "${kerberos}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kdc --config-file=/etc/heimdal-kdc/kdc.conf"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; systemd.services.kpasswdd = { description = "Kerberos Password Changing daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = "${kerberos}/libexec/kpasswdd"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/libexec/kpasswdd"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "heimdal"; + }; restartTriggers = [ kdcConfFile ]; }; - - environment.etc = { - # Can be set via the --config-file option to KDC - "heimdal-kdc/kdc.conf".source = kdcConfFile; - }; }; } diff --git a/nixos/modules/services/system/kerberos/kerberos-server.md b/nixos/modules/services/system/kerberos/kerberos-server.md new file mode 100644 index 000000000000..80c71be1541e --- /dev/null +++ b/nixos/modules/services/system/kerberos/kerberos-server.md @@ -0,0 +1,55 @@ +# kerberos_server {#module-services-kerberos-server} + +Kerberos is a computer-network authentication protocol that works on the basis of tickets to allow nodes communicating over a non-secure network to prove their identity to one another in a secure manner. + +This module provides both the MIT and Heimdal implementations of the a Kerberos server. + +## Usage {#module-services-kerberos-server-usage} + +To enable a Kerberos server: + +```nix +{ + security.krb5 = { + # Here you can choose between the MIT and Heimdal implementations. + package = pkgs.krb5; + # package = pkgs.heimdal; + + # Optionally set up a client on the same machine as the server + enable = true; + settings = { + libdefaults.default_realm = "EXAMPLE.COM"; + realms."EXAMPLE.COM" = { + kdc = "kerberos.example.com"; + admin_server = "kerberos.example.com"; + }; + }; + } + + services.kerberos-server = { + enable = true; + settings = { + realms."EXAMPLE.COM" = { + acl = [{ principal = "adminuser"; access= ["add" "cpw"]; }]; + }; + }; + }; +} +``` + +## Notes {#module-services-kerberos-server-notes} + +- The Heimdal documentation will sometimes assume that state is stored in `/var/heimdal`, but this module uses `/var/lib/heimdal` instead. +- Due to the heimdal implementation being chosen through `security.krb5.package`, it is not possible to have a system with one implementation of the client and another of the server. +- While `services.kerberos_server.settings` has a common freeform type between the two implementations, the actual settings that can be set can vary between the two implementations. To figure out what settings are available, you should consult the upstream documentation for the implementation you are using. + +## Upstream Documentation {#module-services-kerberos-server-upstream-documentation} + +- MIT Kerberos homepage: https://web.mit.edu/kerberos +- MIT Kerberos docs: https://web.mit.edu/kerberos/krb5-latest/doc/index.html + +- Heimdal Kerberos GitHub wiki: https://github.com/heimdal/heimdal/wiki +- Heimdal kerberos doc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-docs/index.html +- Heimdal Kerberos kdc manpages (Debian unstable): https://manpages.debian.org/unstable/heimdal-kdc/index.html + +Note the version number in the URLs, it may be different for the latest version. diff --git a/nixos/modules/services/system/kerberos/mit.nix b/nixos/modules/services/system/kerberos/mit.nix index a654bd1fe7e1..9ce58986e27a 100644 --- a/nixos/modules/services/system/kerberos/mit.nix +++ b/nixos/modules/services/system/kerberos/mit.nix @@ -1,31 +1,37 @@ { pkgs, config, lib, ... } : let - inherit (lib) mkIf concatStrings concatStringsSep concatMapStrings toList - mapAttrs mapAttrsToList; + inherit (lib) mapAttrs; cfg = config.services.kerberos_server; - kerberos = config.security.krb5.package; - stateDir = "/var/lib/krb5kdc"; + package = config.security.krb5.package; PIDFile = "/run/kdc.pid"; + + format = import ../../../security/krb5/krb5-conf-format.nix { inherit pkgs lib; } { enableKdcACLEntries = true; }; + aclMap = { add = "a"; cpw = "c"; delete = "d"; get = "i"; list = "l"; modify = "m"; all = "*"; }; - aclFiles = mapAttrs - (name: {acl, ...}: (pkgs.writeText "${name}.acl" (concatMapStrings ( - {principal, access, target, ...} : - let access_code = map (a: aclMap.${a}) (toList access); in - "${principal} ${concatStrings access_code} ${target}\n" - ) acl))) cfg.realms; - kdcConfigs = mapAttrsToList (name: value: '' - ${name} = { - acl_file = ${value} - } - '') aclFiles; - kdcConfFile = pkgs.writeText "kdc.conf" '' - [realms] - ${concatStringsSep "\n" kdcConfigs} - ''; + + aclConfigs = lib.pipe cfg.settings.realms [ + (mapAttrs (name: { acl, ... }: lib.concatMapStringsSep "\n" ( + { principal, access, target, ... }: let + access_code = map (a: aclMap.${a}) (lib.toList access); + in "${principal} ${lib.concatStrings access_code} ${target}" + ) acl)) + + (lib.concatMapAttrs (name: text: { + ${name} = { + acl_file = pkgs.writeText "${name}.acl" text; + }; + })) + ]; + + finalConfig = cfg.settings // { + realms = mapAttrs (n: v: (removeAttrs v [ "acl" ]) // aclConfigs.${n}) (cfg.settings.realms or { }); + }; + + kdcConfFile = format.generate "kdc.conf" finalConfig; env = { # What Debian uses, could possibly link directly to Nix store? KRB5_KDC_PROFILE = "/etc/krb5kdc/kdc.conf"; @@ -33,36 +39,38 @@ let in { - config = mkIf (cfg.enable && kerberos == pkgs.krb5) { + config = lib.mkIf (cfg.enable && package.passthru.implementation == "krb5") { + environment = { + etc."krb5kdc/kdc.conf".source = kdcConfFile; + variables = env; + }; + systemd.services.kadmind = { description = "Kerberos Administration Daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; - serviceConfig.ExecStart = "${kerberos}/bin/kadmind -nofork"; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; + serviceConfig = { + ExecStart = "${package}/bin/kadmind -nofork"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "krb5kdc"; + }; restartTriggers = [ kdcConfFile ]; environment = env; }; systemd.services.kdc = { description = "Key Distribution Center daemon"; - wantedBy = [ "multi-user.target" ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - ''; + partOf = [ "kerberos-server.target" ]; + wantedBy = [ "kerberos-server.target" ]; serviceConfig = { Type = "forking"; PIDFile = PIDFile; - ExecStart = "${kerberos}/bin/krb5kdc -P ${PIDFile}"; + ExecStart = "${package}/bin/krb5kdc -P ${PIDFile}"; + Slice = "system-kerberos-server.slice"; + StateDirectory = "krb5kdc"; }; restartTriggers = [ kdcConfFile ]; environment = env; }; - - environment.etc = { - "krb5kdc/kdc.conf".source = kdcConfFile; - }; - environment.variables = env; }; } diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix index 393289f7a92c..098080a84592 100644 --- a/nixos/tests/kerberos/heimdal.nix +++ b/nixos/tests/kerberos/heimdal.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: { nodes.machine = { config, libs, pkgs, ...}: { services.kerberos_server = { enable = true; - realms = { + settings.realms = { "FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}]; }; }; diff --git a/nixos/tests/kerberos/mit.nix b/nixos/tests/kerberos/mit.nix index 1191d047abbf..172261f95fe6 100644 --- a/nixos/tests/kerberos/mit.nix +++ b/nixos/tests/kerberos/mit.nix @@ -4,7 +4,7 @@ import ../make-test-python.nix ({pkgs, ...}: { nodes.machine = { config, libs, pkgs, ...}: { services.kerberos_server = { enable = true; - realms = { + settings.realms = { "FOO.BAR".acl = [{principal = "admin"; access = ["add" "cpw"];}]; }; }; diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index ff211b6b9c34..77e6e83fdf6b 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -89,6 +89,8 @@ stdenv.mkDerivation { ]; configureFlags = [ + "--with-hdbdir=/var/lib/heimdal" + "--with-libedit-include=${libedit.dev}/include" "--with-libedit-lib=${libedit}/lib" "--with-berkeley-db-include=${db.dev}/include" From f92e6e80b5db9267887f56cef3ae8b8720511f5c Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 7 Jun 2024 07:02:48 -0700 Subject: [PATCH 03/68] tmux: add upstream patch to fix FreeBSD build --- pkgs/tools/misc/tmux/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 913310ec7a47..dec0e1b45335 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -38,10 +38,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; }; - patches = [(fetchpatch { - url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; - hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; - })]; + patches = [ + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; + hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; + }) + # this patch is designed for android but FreeBSD exhibits the same error for the same reason + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; + hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; + }) + ]; nativeBuildInputs = [ pkg-config From 963d36ec193d3d43bb37a1b6739b021949cba6cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 10 Jun 2024 20:46:09 +0000 Subject: [PATCH 04/68] backblaze-b2: 3.19.1 -> 4.0.1 --- pkgs/development/tools/backblaze-b2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 99ce90cc7745..b7e2265c4915 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "3.19.1"; + version = "4.0.1"; pyproject = true; src = fetchFromGitHub { owner = "Backblaze"; repo = "B2_Command_Line_Tool"; rev = "refs/tags/v${version}"; - hash = "sha256-/P1cgAC+a2YCcvbsysYdD+fEwibo+GyE0XY4A0+gMh4="; + hash = "sha256-rZUWPSI7CrKOdEKdsSpekwBerbIMf2iiVrWkV8WrqSc="; }; nativeBuildInputs = with python3Packages; [ From e580dbf175f4ec4b53dbee9b45cfd5f0c9d81ffc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 11 Jun 2024 06:25:05 +0000 Subject: [PATCH 05/68] fluent-bit: 3.0.6 -> 3.0.7 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 0fcb6692243b..f6ac4841d056 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.0.6"; + version = "3.0.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-o48qnyYAiV2gt81hC8/ja+/JWNFlMb47QsBt6BD7VjA="; + hash = "sha256-UoNzgTWPyDoa3hLh9z/aw78lmGcA/ujihUuXnKKqtPc="; }; nativeBuildInputs = [ cmake flex bison ]; From bc85c6205b020ce82a7cd1197c0c908ea7bedaba Mon Sep 17 00:00:00 2001 From: David Vo Date: Tue, 11 Jun 2024 16:42:22 +1000 Subject: [PATCH 06/68] fluent-bit: fix darwin build --- pkgs/tools/misc/fluent-bit/default.nix | 10 ++++++++-- .../misc/fluent-bit/macos-11-sdk-compat.patch | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 0fcb6692243b..a3ba363c2551 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -8,6 +8,7 @@ , postgresql , openssl , libyaml +, darwin }: stdenv.mkDerivation (finalAttrs: { @@ -21,17 +22,22 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-o48qnyYAiV2gt81hC8/ja+/JWNFlMb47QsBt6BD7VjA="; }; + # optional only to avoid linux rebuild + patches = lib.optionals stdenv.isDarwin [ ./macos-11-sdk-compat.patch ]; + nativeBuildInputs = [ cmake flex bison ]; buildInputs = [ openssl libyaml postgresql ] - ++ lib.optionals stdenv.isLinux [ systemd ]; + ++ lib.optionals stdenv.isLinux [ systemd ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.IOKit darwin.apple_sdk_11_0.frameworks.Foundation ]; cmakeFlags = [ "-DFLB_RELEASE=ON" "-DFLB_METRICS=ON" "-DFLB_HTTP_SERVER=ON" "-DFLB_OUT_PGSQL=ON" - ]; + ] + ++ lib.optionals stdenv.isDarwin [ "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13" ]; env.NIX_CFLAGS_COMPILE = toString ( # Used by the embedded luajit, but is not predefined on older mac SDKs. diff --git a/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch b/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch new file mode 100644 index 000000000000..5063e028e656 --- /dev/null +++ b/pkgs/tools/misc/fluent-bit/macos-11-sdk-compat.patch @@ -0,0 +1,17 @@ +diff --git i/src/flb_utils.c w/src/flb_utils.c +index 87637f1331d7..7a0036566438 100644 +--- i/src/flb_utils.c ++++ w/src/flb_utils.c +@@ -1424,11 +1424,11 @@ int flb_utils_get_machine_id(char **out_id, size_t *out_size) + return 0; + } + #elif defined (FLB_SYSTEM_MACOS) + bool bret; + CFStringRef serialNumber; +- io_service_t platformExpert = IOServiceGetMatchingService(kIOMainPortDefault, ++ io_service_t platformExpert = IOServiceGetMatchingService(kIOMasterPortDefault, + IOServiceMatching("IOPlatformExpertDevice")); + + if (platformExpert) { + CFTypeRef serialNumberAsCFString = + IORegistryEntryCreateCFProperty(platformExpert, From 4f8d1589862f36a8b5710ff7eb8216f587b235e9 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 11 Jun 2024 15:43:57 +0200 Subject: [PATCH 07/68] kubo: 0.28.0 -> 0.29.0 https://github.com/ipfs/kubo/releases/tag/v0.29.0 The FUSE mount functionality is no longer completely broken, so reenable the NixOS test. --- nixos/tests/kubo/default.nix | 4 +--- nixos/tests/kubo/kubo-fuse.nix | 2 +- pkgs/by-name/ku/kubo/package.nix | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix index d8c0c69dc1fb..629922fc366d 100644 --- a/nixos/tests/kubo/default.nix +++ b/nixos/tests/kubo/default.nix @@ -1,7 +1,5 @@ { recurseIntoAttrs, runTest }: recurseIntoAttrs { kubo = runTest ./kubo.nix; - # The FUSE functionality is completely broken since Kubo v0.24.0 - # See https://github.com/ipfs/kubo/issues/10242 - # kubo-fuse = runTest ./kubo-fuse.nix; + kubo-fuse = runTest ./kubo-fuse.nix; } diff --git a/nixos/tests/kubo/kubo-fuse.nix b/nixos/tests/kubo/kubo-fuse.nix index 71a5bf61649f..c8c273fc0dfc 100644 --- a/nixos/tests/kubo/kubo-fuse.nix +++ b/nixos/tests/kubo/kubo-fuse.nix @@ -23,7 +23,7 @@ with subtest("FUSE mountpoint"): machine.fail("echo a | su bob -l -c 'ipfs add --quieter'") - # The FUSE mount functionality is broken as of v0.13.0 and v0.17.0. + # The FUSE mount functionality is broken as of v0.13.0. This is still the case with v0.29.0. # See https://github.com/ipfs/kubo/issues/9044. # Workaround: using CID Version 1 avoids that. ipfs_hash = machine.succeed( diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix index fde2afa89c83..9b0163a1ae60 100644 --- a/pkgs/by-name/ku/kubo/package.nix +++ b/pkgs/by-name/ku/kubo/package.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kubo"; - version = "0.28.0"; # When updating, also check if the repo version changed and adjust repoVersion below + version = "0.29.0"; # When updating, also check if the repo version changed and adjust repoVersion below rev = "v${version}"; passthru.repoVersion = "15"; # Also update kubo-migrator when changing the repo version @@ -15,7 +15,7 @@ buildGoModule rec { # Kubo makes changes to its source tarball that don't match the git source. src = fetchurl { url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz"; - hash = "sha256-nq9NpbK9Fql0o1TG8p9lIlnKUnxvMMimz8AYKVozkwY="; + hash = "sha256-udCVyA3NN3RCmVtdIjccfy/RymvrsGJoxlF8DiapP4g="; }; # tarball contains multiple files/directories @@ -41,9 +41,9 @@ buildGoModule rec { postPatch = '' substituteInPlace 'misc/systemd/ipfs.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" substituteInPlace 'misc/systemd/ipfs-hardened.service' \ - --replace '/usr/local/bin/ipfs' "$out/bin/ipfs" + --replace-fail '/usr/local/bin/ipfs' "$out/bin/ipfs" ''; postInstall = '' From 97c6f1c5e8d66a08a663b3caebcce8db513c123b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 12 Jun 2024 15:20:19 +0800 Subject: [PATCH 08/68] kitex: init at 0.10.0 --- pkgs/by-name/ki/kitex/package.nix | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 pkgs/by-name/ki/kitex/package.nix diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix new file mode 100644 index 000000000000..2890eff5f882 --- /dev/null +++ b/pkgs/by-name/ki/kitex/package.nix @@ -0,0 +1,42 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, kitex +}: + +buildGoModule rec { + pname = "kitex"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "cloudwego"; + repo = "kitex"; + rev = "v${version}"; + hash = "sha256-U61n+zaTnABujDSTPcKr4zfMmPVQwxQAotBXZaOVZSo="; + }; + + vendorHash = "sha256-luZH7ynFni5J3CmLRM3jJPshs/u3zahkS1qS2phopLc="; + + subPackages = [ "tool/cmd/kitex" ]; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + ln -s $out/bin/kitex $out/bin/protoc-gen-kitex + ln -s $out/bin/kitex $out/bin/thrift-gen-kitex + ''; + + passthru.tests.version = testers.testVersion { + package = kitex; + version = "v${version}"; + }; + + meta = with lib; { + description = "A high-performance and strong-extensibility Golang RPC framework"; + homepage = "https://github.com/cloudwego/kitex"; + license = licenses.asl20; + maintainers = with maintainers; [ aaronjheng ]; + mainProgram = "kitex"; + }; +} From 66026fd19688c6ef524ee0eb75eeeed0a221289d Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Jun 2024 22:06:53 +0800 Subject: [PATCH 09/68] sticky: 1.19 -> 1.20 https://github.com/linuxmint/sticky/compare/1.19...1.20 --- pkgs/applications/misc/sticky/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/sticky/default.nix b/pkgs/applications/misc/sticky/default.nix index 66b4897e3038..62c3c8394b6a 100644 --- a/pkgs/applications/misc/sticky/default.nix +++ b/pkgs/applications/misc/sticky/default.nix @@ -15,17 +15,16 @@ stdenv.mkDerivation rec { pname = "sticky"; - version = "1.19"; + version = "1.20"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-nvnft62vZ9ivijYnQGULW7ff2aAVJiIx9xq09My2NxE="; + hash = "sha256-HzTXaJgDu72pWM0mGNNBy2yFB0u0rqATFK9JzyOw8oE="; }; postPatch = '' - sed -i -e "s|/usr/bin|$out/bin|" data/org.x.sticky.service sed -i -e "s|/usr/lib|$out/lib|" usr/bin/sticky sed -i -e "s|/usr/share|$out/share|" usr/lib/sticky/*.py ''; @@ -51,20 +50,11 @@ stdenv.mkDerivation rec { xapp ]; - postInstall = '' - # https://github.com/linuxmint/sticky/pull/118 - cp -r ../etc $out - cp -r ../usr/* $out - - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - dontWrapGApps = true; preFixup = '' buildPythonPath "$out $pythonPath" - chmod +x $out/bin/sticky wrapProgram $out/bin/sticky \ --prefix PYTHONPATH : "$program_PYTHONPATH" \ ''${gappsWrapperArgs[@]} From 902922c2f0cfb68a6c2f10c0c0379c6048de8173 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Jun 2024 22:08:11 +0800 Subject: [PATCH 10/68] cinnamon.warpinator: 1.8.3 -> 1.8.4 https://github.com/linuxmint/warpinator/compare/1.8.3...1.8.4 --- pkgs/desktops/cinnamon/warpinator/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/cinnamon/warpinator/default.nix b/pkgs/desktops/cinnamon/warpinator/default.nix index 6f9a7e5a24d3..ca93799f5800 100644 --- a/pkgs/desktops/cinnamon/warpinator/default.nix +++ b/pkgs/desktops/cinnamon/warpinator/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "warpinator"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-qtz8/vO6LJ19NcuFf9p3DWNy41kkoBWlgZGChlnTOvI="; + hash = "sha256-T1boMqzAGMjUD62ZAlWNOe3xUx5H5ZwpR7MNipy/LKA="; }; nativeBuildInputs = [ @@ -78,9 +78,9 @@ stdenv.mkDerivation rec { # We make bubblewrap mode always available since # landlock mode is not supported in old kernels. substituteInPlace src/warpinator-launch.py \ - --replace '"/bin/python3"' '"${pythonEnv.interpreter}"' \ - --replace "/bin/bwrap" "${bubblewrap}/bin/bwrap" \ - --replace 'GLib.find_program_in_path("bwrap")' "True" + --replace-fail '"/usr/bin/python3"' '"${pythonEnv.interpreter}"' \ + --replace-fail "/usr/bin/bwrap" "${bubblewrap}/bin/bwrap" \ + --replace-fail 'GLib.find_program_in_path("bwrap")' "True" ''; passthru.updateScript = gitUpdater { From 713bb9ea9756540f3ebd2890ab7eee441bcb57a3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 12 Jun 2024 22:09:48 +0800 Subject: [PATCH 11/68] xed-editor: 3.6.1 -> 3.6.2 https://github.com/linuxmint/xed/compare/3.6.1...3.6.2 --- pkgs/applications/editors/xed-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/xed-editor/default.nix b/pkgs/applications/editors/xed-editor/default.nix index 9034b2eb375c..d44b07292ca0 100644 --- a/pkgs/applications/editors/xed-editor/default.nix +++ b/pkgs/applications/editors/xed-editor/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xed-editor"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xed"; rev = version; - sha256 = "sha256-RFauTXwiaSd+J8zoJQmib4bKNR4NC/LSCCqCHv8Hdr8="; + sha256 = "sha256-+yY+vzDMeS4AMMAklzADD4/LAQgav3clM2CCK6xh47Q="; }; patches = [ From d22ff132cbc3d3ec309dedf44fe06c6ab21c1027 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 02:24:38 +0000 Subject: [PATCH 12/68] mediamtx: 1.8.2 -> 1.8.3 --- pkgs/servers/mediamtx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index aca51d8dc0d7..23f3d6b47a3d 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -14,16 +14,16 @@ in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-hm6rfO9RF7bsSwxP8tKwiVqEpyQpVK4itWWklbOsKzw="; + hash = "sha256-/r5N9RSlYH6xM+JyETuTQWu0YTvaShI6APi8ibpP7Zg="; }; - vendorHash = "sha256-QsRJ4hCtb29cT4QzPqW19bZxH+wMegufSxwdljXbuqs="; + vendorHash = "sha256-/TgSTXA6SOCfm/wtjJBtyIg4Fo0moJyC640zoIOQ4Fo="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js From feacdb625cb713a497266fd3d7a59f8986f7077f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 03:02:28 +0000 Subject: [PATCH 13/68] vcpkg-tool: 2024-04-23 -> 2024-06-10 --- pkgs/by-name/vc/vcpkg-tool/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix index 327366ddd8bb..c9b7aafc2ee5 100644 --- a/pkgs/by-name/vc/vcpkg-tool/package.nix +++ b/pkgs/by-name/vc/vcpkg-tool/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "vcpkg-tool"; - version = "2024-04-23"; + version = "2024-06-10"; src = fetchFromGitHub { owner = "microsoft"; repo = "vcpkg-tool"; rev = finalAttrs.version; - hash = "sha256-PqmkQcpxuYJGZJs2qemv0hshvO4KTiKc1ZY0//Gq0pY="; + hash = "sha256-TGRTzUd1FtErD+h/ksUsUm1Rhank9/yVy06JbAgEEw0="; }; nativeBuildInputs = [ From 3282b8a9a3c2510b27c85000c25cac0125177720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 03:58:19 +0000 Subject: [PATCH 14/68] vpl-gpu-rt: 24.2.2 -> 24.2.3 --- pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix index f7da2d46a136..ab3abf01b3fd 100644 --- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix +++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "vpl-gpu-rt"; - version = "24.2.2"; + version = "24.2.3"; outputs = [ "out" "dev" ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "vpl-gpu-rt"; rev = "intel-onevpl-${version}"; - sha256 = "sha256-JtvRh4p4wPRnqFfE86tJW+yS9AKMoi3TPZO+LZ2Q7Mo="; + sha256 = "sha256-n2lkt7zRlpbPedNxa21EQvFdYyOAPF//TsY4srbGHQE="; }; nativeBuildInputs = [ cmake pkg-config ]; From c620a92d967ac53bb5307176b8d620915d9aaec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 19:29:21 +0000 Subject: [PATCH 15/68] jx: 3.10.146 -> 3.10.150 --- pkgs/applications/networking/cluster/jx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index 4058bcee9c30..7fe23d370920 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jx"; - version = "3.10.146"; + version = "3.10.150"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-cbf/prSKHiu4I6w08j/HLD8c7Lrgt3eTC5QRVvuhS5w="; + sha256 = "sha256-Zck06wbe+hLbecFnfY/udi1s712ilt7j0EdoumohOEI="; }; vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14="; From a312344c0949cc596393924e8189e26af026d623 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 19:57:41 +0000 Subject: [PATCH 16/68] renode-dts2repl: 0-unstable-2024-06-03 -> 0-unstable-2024-06-11 --- pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index 41fae8a85244..92bf643dc421 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2024-06-03"; + version = "0-unstable-2024-06-11"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "f3a5ca54a6642c7e8e539bc5e62e676a4c6aa2a1"; - hash = "sha256-fi/ihHXCFFNhEPO9EcdxTmNun96TbvXUup3V5lbxN0g="; + rev = "7360c07d2ef1e32661a0efa04323e799d400a58e"; + hash = "sha256-lN3IgLOAeMexWG5zQB9RxRld7Snl3aqNJt3fZV5hdnM="; }; nativeBuildInputs = [ From 05ae9bdbb31d997f9c4d483b94ce04370279393b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Thu, 13 Jun 2024 22:25:09 +0200 Subject: [PATCH 17/68] epson-escpr2: 1.2.9 -> 1.2.10 --- pkgs/misc/drivers/epson-escpr2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4c3b969b425f..b14807e257ea 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.2.9"; + version = "1.2.10"; src = fetchurl { # To find new versions, visit # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for # some printer like for instance "WF-7210" to get to the most recent # version. - url = "https://download3.ebz.epson.net/dsc/f/03/00/15/33/94/3bf10a30a1f8b5b91ddbafa4571c073878ec476b/epson-inkjet-printer-escpr2-1.2.9-1.src.rpm"; - sha256 = "sha256-2smNBTMSqoKYsGUoBtIHS3Fwk9ODbiXaP7Dtq69FG9U="; + url = "https://download3.ebz.epson.net/dsc/f/03/00/15/87/52/84d8972472981a5337b96610c39c8c7586256b55/epson-inkjet-printer-escpr2-1.2.10-1.src.rpm"; + sha256 = "sha256-vrAVarGBp8eI07WMtQSmuNpX5iS26+B2iP/b7U8mJmo="; }; unpackPhase = '' From 4eb71ae95942c76cfa12f2228dc89ab66a389922 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 20:35:13 +0000 Subject: [PATCH 18/68] python311Packages.mdformat-mkdocs: 2.1.0 -> 2.1.1 --- pkgs/development/python-modules/mdformat-mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix index f787faacd2c9..cd5a89c82512 100644 --- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix +++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mdformat-mkdocs"; - version = "2.1.0"; + version = "2.1.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-mkdocs"; rev = "refs/tags/v${version}"; - hash = "sha256-vJdkPNUW7d+H6hEgsAV7L0dV09+mq0Nvzih8aKoU8F8="; + hash = "sha256-hBkHVYlcHCXfE8Z2gLv6Rt0tQSkx2LYqbEtCncDByrI="; }; nativeBuildInputs = [ flit-core ]; From 602f108bf4a792187d6568bc258ca95f17f809e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 20:45:12 +0000 Subject: [PATCH 19/68] calcure: 3.0.1 -> 3.0.2 --- pkgs/applications/misc/calcure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calcure/default.nix b/pkgs/applications/misc/calcure/default.nix index a9fd65a4d99d..bc82942ffccf 100644 --- a/pkgs/applications/misc/calcure/default.nix +++ b/pkgs/applications/misc/calcure/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "calcure"; - version = "3.0.1"; + version = "3.0.2"; pyproject = true; src = fetchFromGitHub { owner = "anufrievroman"; repo = "calcure"; rev = "refs/tags/${version}"; - hash = "sha256-rs3TCZjMndeh2N7e+U62baLs+XqWK1Mk7KVnypSnWPg="; + hash = "sha256-2yWg/9NQxFIwoSLj1e0y1+tgKer8GtOmjzwlTRX/Q+c="; }; nativeBuildInputs = with python3.pkgs; [ From 98d7985ab9cf8056ff232a40912c837616e8d569 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 13 Jun 2024 23:35:11 +0200 Subject: [PATCH 20/68] python3Packages.survey: 5.3.0 -> 5.3.1 --- pkgs/development/python-modules/survey/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/survey/default.nix b/pkgs/development/python-modules/survey/default.nix index da3c22c81362..6c787abb71d1 100644 --- a/pkgs/development/python-modules/survey/default.nix +++ b/pkgs/development/python-modules/survey/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "survey"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-jMTtsrEdt3NPy8NfeNPX4YNwjH2gaQfO89Iag/MBS+A="; + hash = "sha256-uNx8Ij28Li9QQjq/S6OP5kft2K8pDu2NyBK6BP/xcw8="; }; build-system = [ From 9260e62182c7d3245fb583e6c8cf9f534e2e5110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 21:42:01 +0000 Subject: [PATCH 21/68] treesheets: 0-unstable-2024-06-05 -> 0-unstable-2024-06-09 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index d9ca511141f8..cff458a63fd3 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-06-05"; + version = "0-unstable-2024-06-09"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "1ad0ec1ad235dd00bbd6bfdb27e24f3dcd610da4"; - hash = "sha256-1Xb4Jdw04E2xTg/93zsGse3Yao8h51kDcJpbvx41yp0="; + rev = "c753ce40686c3044eb7fb653bb913d1610096cd1"; + hash = "sha256-WpbG2RY7z71GBSDjv/VjcFsGcb/YK7P4oMVEydsYpuw="; }; nativeBuildInputs = [ From 3cda87b5218cd824f04cca46c2984b21629b4b79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 21:54:25 +0000 Subject: [PATCH 22/68] python311Packages.anova-wifi: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/anova-wifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/anova-wifi/default.nix b/pkgs/development/python-modules/anova-wifi/default.nix index a9c7e5bbf9c4..fa0b7074094a 100644 --- a/pkgs/development/python-modules/anova-wifi/default.nix +++ b/pkgs/development/python-modules/anova-wifi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "anova-wifi"; - version = "0.12.0"; + version = "0.13.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Lash-L"; repo = "anova_wifi"; rev = "refs/tags/v${version}"; - hash = "sha256-0RRnQBLglPnPin9/gqWDKIsfi5V7ydrdDKwm93WEnvk="; + hash = "sha256-5BSkUg36k2gNfOrVNkeRwU/4SlfEua3ZU4KTZmKSq4Q="; }; postPatch = '' From a34d744b2f95b3547dd84d59788bda08a8e04d00 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 22:15:15 +0000 Subject: [PATCH 23/68] stackql: 0.5.652 -> 0.5.665 --- pkgs/by-name/st/stackql/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackql/package.nix b/pkgs/by-name/st/stackql/package.nix index fb3f8f65998e..d1d749d971fa 100644 --- a/pkgs/by-name/st/stackql/package.nix +++ b/pkgs/by-name/st/stackql/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "stackql"; - version = "0.5.652"; + version = "0.5.665"; src = fetchFromGitHub { owner = "stackql"; repo = "stackql"; rev = "v${version}"; - hash = "sha256-yE+XMAEsEYj2W3My2gXzZ2QD+YXj62BrzOa/mL+yMCE="; + hash = "sha256-oX1WB6XkjEPzbj3qqXoD8urp827LAU7Cc7lLcpTTZJE="; }; - vendorHash = "sha256-Tcfj1A3W07GkF7CECc5Tu9Er8n+OxsDrUgv7eSlu+wA="; + vendorHash = "sha256-JCWXs3tfTG+aj4hG0eFhl52FmNFvPiBuWpQG2RC6FTM="; ldflags = [ "-s" From ce2eaddb1a4b145f52f3115b759a460c5c0f2026 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 22:18:57 +0000 Subject: [PATCH 24/68] rcp: 0.9.0 -> 0.10.1 --- pkgs/by-name/rc/rcp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix index d48b399c48ca..9d2f64c9b22b 100644 --- a/pkgs/by-name/rc/rcp/package.nix +++ b/pkgs/by-name/rc/rcp/package.nix @@ -7,20 +7,20 @@ rustPlatform.buildRustPackage rec { pname = "rcp"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "wykurz"; repo = "rcp"; rev = "v${version}"; - hash = "sha256-e6m3E1R7o4X9cPEy/ayUIsK0xhRaVsAFDAwObJrDJPA="; + hash = "sha256-nNMcZyJAvqxVSoytmfSqsfk1yVzzZ5aIOj72L+jFAAM="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ IOKit ]); - cargoHash = "sha256-croFSe37yQa9LijaNxKHrZlcJdExz9SweOoG21PPn9E="; + cargoHash = "sha256-3+w+pTws8WjrUqIWYGbE2V438mVUUyrjBH9mHI8uRMQ="; RUSTFLAGS = "--cfg tokio_unstable"; From 87fceeef349f88f132713431400ed8841d05f2af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 22:46:15 +0000 Subject: [PATCH 25/68] cilium-cli: 0.16.9 -> 0.16.10 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 6ae9b8eef5a1..7ea0c3c6905b 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.9"; + version = "0.16.10"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-aER0VLYkHV0mPM4uBaKLPVmQ+Re5KUm8/01l87wMnF8="; + hash = "sha256-SgAqq9tT4Rtg1AvoUsDvR5cCLIOuHwNUFN2NOheciYw="; }; vendorHash = null; From 3d14daacb94468c75b1cc5f3719f1defacc73ef8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 23:21:58 +0000 Subject: [PATCH 26/68] nebula: 1.9.2 -> 1.9.3 --- pkgs/tools/networking/nebula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index 12e93981ef2d..0f6c0cc8b754 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "nebula"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-G4v1lCGTEPOfYeHWl8xy2TowloRefKFAc/P17zWB9kk="; + hash = "sha256-+RferzOPlx7UuqpckQBY/RDO9gptknhuan+Es0Vf/yM="; }; vendorHash = "sha256-4BnFvA0dxsEK7ictDUZ6nol6PtM54kk9dwKPTQbRUR0="; From 6336fc142c043a81af9f2f1beb90747cb4a73b04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 23:47:43 +0000 Subject: [PATCH 27/68] python311Packages.aioairzone-cloud: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/aioairzone-cloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioairzone-cloud/default.nix b/pkgs/development/python-modules/aioairzone-cloud/default.nix index 63815d39e47a..f3304a4b617c 100644 --- a/pkgs/development/python-modules/aioairzone-cloud/default.nix +++ b/pkgs/development/python-modules/aioairzone-cloud/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioairzone-cloud"; - version = "0.5.1"; + version = "0.5.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Noltari"; repo = "aioairzone-cloud"; rev = "refs/tags/${version}"; - hash = "sha256-L5Gb+V0W+9duGV6lRc01jrAfh4U+MS77Y238EeXe0TU="; + hash = "sha256-06r6Q+MdEirLiPrx71NDp8oeRJzqgDg8FtXt46vHutE="; }; build-system = [ setuptools ]; From 9b034252fe156ae8e32510fdf6fa7e7b2acfa24c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 00:35:35 +0000 Subject: [PATCH 28/68] cargo-xwin: 0.16.4 -> 0.17.0 --- pkgs/by-name/ca/cargo-xwin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 5a5cfb00fac0..d31879bad091 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xwin"; - version = "0.16.4"; + version = "0.17.0"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${version}"; - hash = "sha256-nJgy9KoqrCD4NGFOJMN9f1XDyIrZ0a5WHTRX6G/+tnU="; + hash = "sha256-3vQ7pM7Ui0H6qWFWOCW4LzDLJq8bcoFEJrpoa4Tzk9g="; }; - cargoHash = "sha256-JCCL/QV1DjmXTY3UChZ4BfA9VSyOTQLIfh6DSF/kIuA="; + cargoHash = "sha256-4uWPbwntcD4YKdjTlWfMGqM+rddKzaXH1YTX9qLrWrY="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security From 685006d54d8def19569d9677520f50ca9cde0c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 00:48:57 +0000 Subject: [PATCH 29/68] doppler: 3.68.0 -> 3.69.0 --- pkgs/by-name/do/doppler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index 5fc87846ba4b..29537bcb9abb 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.68.0"; + version = "3.69.0"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-IKfLoCFJOGE200Mef660CQNMukEmpgIWo6ngOYvX5Hw="; + sha256 = "sha256-lijVKNmqTcmjgIzlcMdm/DUrBA+0xV6Wge9dt5xdWFY="; }; vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4="; From 240f2f3a48cd7b71755ac89a78e0ff5886721b18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 01:02:09 +0000 Subject: [PATCH 30/68] ddns-go: 6.6.1 -> 6.6.2 --- pkgs/tools/networking/ddns-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/ddns-go/default.nix b/pkgs/tools/networking/ddns-go/default.nix index e6d03c09099e..9c5b96c90ac4 100644 --- a/pkgs/tools/networking/ddns-go/default.nix +++ b/pkgs/tools/networking/ddns-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ddns-go"; - version = "6.6.1"; + version = "6.6.2"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-dlKglwjQj8o48ao5aFmV9oZEIm3Jdt4+7uFkGclSgOs="; + hash = "sha256-rl0J10HuZ7WBnOTylCW0MrNFEoKoBwUicJWy9vcQIew="; }; - vendorHash = "sha256-J18JTLUvUaZDp1/65iJJp4oVSNOsENrMghJVP40ITOo="; + vendorHash = "sha256-dJXXGoTzgbmpDoAYKfkUgsmQILQQ+zbE14+BiaNEHSs="; ldflags = [ "-X main.version=${version}" From 693a911f0d45ed87c4b97c350178367b55d6b93c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 01:29:51 +0000 Subject: [PATCH 31/68] hacompanion: 1.0.12 -> 1.0.15 --- pkgs/by-name/ha/hacompanion/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix index eeb1cd7fe8a2..d9ad59aeabe7 100644 --- a/pkgs/by-name/ha/hacompanion/package.nix +++ b/pkgs/by-name/ha/hacompanion/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hacompanion"; - version = "1.0.12"; + version = "1.0.15"; src = fetchFromGitHub { owner = "tobias-kuendig"; repo = "hacompanion"; rev = "v${version}"; - hash = "sha256-3uPn139e8TyP0rE9hfRKw192YyexG+f3KmlHMmgCN7A="; + hash = "sha256-FR2IowbaHXr9x/eMt+NCuGusMwX2iVxPOuWEkhH2GFM="; }; vendorHash = "sha256-ZZ8nxN+zUeFhSXyoHLMgzeFllnIkKdoVnbVK5KjrLEQ="; From 45ce97ef3578b699da52df972de78b9d82d1ca28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 01:42:55 +0000 Subject: [PATCH 32/68] mpd-discord-rpc: 1.7.2 -> 1.7.3 --- pkgs/tools/audio/mpd-discord-rpc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index 64535fd3e5a1..1da562085158 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "mpd-discord-rpc"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "mpd-discord-rpc"; rev = "v${version}"; - hash = "sha256-Sdvrq9ChaSwjQDVjHVzcVLYbzyCHXsta1/Jo9hVkcDw="; + hash = "sha256-WiHMXazNKyt5N7WmkftZYEHeQi+l9qoU2yr6jRHfjdE="; }; - cargoHash = "sha256-w3ulSCbQBkDATe4yfgGSl7WMrUk3sYlS08UbgvGY/5s="; + cargoHash = "sha256-DnOv9YJpr777p1GVhe8LS5uAUs6Dr/gRLoJarFx5avw="; nativeBuildInputs = [ pkg-config From fe42fa567ac1a2f5904fe011887a25c3858a8bb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 01:56:56 +0000 Subject: [PATCH 33/68] pqrs: 0.3.1 -> 0.3.2 --- pkgs/development/tools/pqrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/development/tools/pqrs/default.nix index 730bc67fbbe8..1d406394ac12 100644 --- a/pkgs/development/tools/pqrs/default.nix +++ b/pkgs/development/tools/pqrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pqrs"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "pqrs"; rev = "v${version}"; - sha256 = "sha256-t6Y6gpMEpccCoyhG66FZEKHVNCbHblaqYZY1iJUZVUA="; + sha256 = "sha256-0oSSoGZga0OGAKUNsLmKkUl8N1l0pVi4KIqrKJbeVVU="; }; - cargoHash = "sha256-fnoYVWpBn5Dil2o+u2MKQqd8dEKFE2i29Qz7cJae+gE="; + cargoHash = "sha256-w0WD+EtVGFMGpS4a2DJrLdbunwF2yiONKQwdcQG2EB0="; meta = with lib; { description = "CLI tool to inspect Parquet files"; From 6511d8b80d1224eae9d30d018a7e4bc1e7856b5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 02:33:01 +0000 Subject: [PATCH 34/68] mcaselector: 2.4 -> 2.4.1 --- pkgs/tools/games/minecraft/mcaselector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix index a533264ebad9..46a7f069212b 100644 --- a/pkgs/tools/games/minecraft/mcaselector/default.nix +++ b/pkgs/tools/games/minecraft/mcaselector/default.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.4"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-6WQIvDmyVVmxHFOMk2emT1a4PMGVjvtC0aSkryvwARs="; + hash = "sha256-4czkp7+akZEPvnYLMFGrqrhBYafDVxDo1iQZYwvaARE="; }; dontUnpack = true; From f2cbc7e33186ff20fe4c23c9f97bf9c844977e0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 02:34:11 +0000 Subject: [PATCH 35/68] netclient: 0.24.1 -> 0.24.2 --- pkgs/by-name/ne/netclient/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 456a422fabdd..5b2dc7b8024e 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-oS0DqrlOyab0MS7qSEquEIixcOYnlGuCYtCBmfEURm0="; + hash = "sha256-7+r2fuFNVvOC0Zl1kqAiAh9C3qqhg7KGrbnOp4Jk+Is="; }; - vendorHash = "sha256-09pRwsB2ycB/MK3isXZLBZDpga95SHYkNPjWWYtUuoU="; + vendorHash = "sha256-eTiNBs8xcfrth/E44URhD8uSgdoXZT1+MD3H24dzI1A="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; From 6df449f45932ec572fa10313725ffe452fe23f4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 03:04:01 +0000 Subject: [PATCH 36/68] testssl: 3.0.8 -> 3.0.9 --- pkgs/applications/networking/testssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index a8e60b9b9439..678262243e2a 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.8"; + version = "3.0.9"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gkDtJlAC7woM2HyYDXntD1+bEuqHTEipqrn2EZjxnH8="; + sha256 = "sha256-MZNQ7oOJD/vjOwDiPOZr3k+Mn0XXVdkP7cC/0mnWLic="; }; nativeBuildInputs = [ makeWrapper ]; From 675b9f3ca3894dffb6fc2bb815306c060853469d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 03:13:56 +0000 Subject: [PATCH 37/68] vault-ssh-plus: 0.7.3 -> 0.7.4 --- pkgs/tools/security/vault-ssh-plus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault-ssh-plus/default.nix b/pkgs/tools/security/vault-ssh-plus/default.nix index 80cfa8674cb2..a3a92f7c6a4c 100644 --- a/pkgs/tools/security/vault-ssh-plus/default.nix +++ b/pkgs/tools/security/vault-ssh-plus/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "vault-ssh-plus"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "isometry"; repo = pname; rev = "v${version}"; - hash = "sha256-IRmFC5WsLmHfPjS/jW5V7dNF5rNvmsh3YKwW7rGII24="; + hash = "sha256-djS50SBR8HTyEd5Ya2I9w5irBrLTqzekEi5ASmkl6yk="; }; - vendorHash = "sha256-cuU7rEpJrwrbiXLajdv4h6GePbpZclweyB9qZ3SIjP0="; + vendorHash = "sha256-NndIBvW1/EZJ2KwP6HZ6wvhrgtmhTe97l3VxprtWq30="; nativeBuildInputs = [ makeWrapper ]; From cf11745cb8af824ea6d038d7e06c190e4f435272 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 03:24:07 +0000 Subject: [PATCH 38/68] step-kms-plugin: 0.11.1 -> 0.11.3 --- pkgs/tools/security/step-kms-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-kms-plugin/default.nix b/pkgs/tools/security/step-kms-plugin/default.nix index 95a3b85fca63..a64f86a31d1e 100644 --- a/pkgs/tools/security/step-kms-plugin/default.nix +++ b/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.11.1"; + version = "0.11.3"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-EkLLhHXvh10tfEY6AY6o3n3JcmCXwauHsQ8VJRBpnnY="; + hash = "sha256-Gl/5AExN2/MEoR2HKpw7mDfuc/1Wj0UGSdXPzHl2JdU="; }; - vendorHash = "sha256-kwM5eNeAVtA6DaoFtBhxc7Jnfb7vVkdIGpUxVGjWwC8="; + vendorHash = "sha256-O6orQYrupJdJbx23TXCP0qWyvn6Hv2iDeRYvIgLp1NM="; proxyVendor = true; From e65c3cd1172c2076ae2dcb54333ef8be5715c5e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 03:40:59 +0000 Subject: [PATCH 39/68] witness: 0.4.0 -> 0.5.2 --- pkgs/tools/security/witness/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/witness/default.nix b/pkgs/tools/security/witness/default.nix index 85ef5aebd7e5..75cdc9e1ce61 100644 --- a/pkgs/tools/security/witness/default.nix +++ b/pkgs/tools/security/witness/default.nix @@ -10,15 +10,15 @@ buildGoModule rec { pname = "witness"; - version = "0.4.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "in-toto"; repo = "witness"; rev = "v${version}"; - sha256 = "sha256-QnZZVQZMkh9GH6io19mlE3gHaiX73TgH7ibFT1H5DB4="; + sha256 = "sha256-3up10DdW0nMPAghEVlnOrFUbjQd1AuNmraBDjBPdjm8="; }; - vendorHash = "sha256-5q405OP8VPChhxiH2tjh2H+ailQRjGmLZvul7CubjJo="; + vendorHash = "sha256-sYWcmQloeZlwuUz0SkucpVGOqkoOpgnsHDsuWyWTBPQ="; nativeBuildInputs = [ installShellFiles ]; From 45005d6a387d764ebb0743db007fedaae1c0def3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 03:59:11 +0000 Subject: [PATCH 40/68] myks: 4.1.3 -> 4.2.0 --- pkgs/by-name/my/myks/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 232b78f0ff8b..df2e495c329b 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "myks"; - version = "4.1.3"; + version = "4.2.0"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; rev = "refs/tags/v${version}"; - hash = "sha256-keXtMO5EhCaG5lNoCf5vmnhidH4+sDQ2na4f76jELnw="; + hash = "sha256-98JkyRszWls2fWS3JxlYa8MRHKpC2ViiDoH8VEk6r3Q="; }; - vendorHash = "sha256-0Xk7B0rfngld9tfgMmq2EiuUym7LE89TvJVSdDo4HD4="; + vendorHash = "sha256-blx/Q787h1eBUmg45VFydqH8hmrCpcobJwIWvTUNDEo="; subPackages = "."; From a31a13189201254cb68e491d9ea8fa167c62ea32 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 14 Jun 2024 13:50:57 +1000 Subject: [PATCH 41/68] git-interactive-rebase-tool: 2.3.0 -> 2.4.0 Diff: https://github.com/MitMaro/git-interactive-rebase-tool/compare/2.3.0...2.4.0 Changelog: https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/2.4.0 --- .../git-interactive-rebase-tool/Cargo.lock | 1366 ----------------- .../git-interactive-rebase-tool/default.nix | 25 +- 2 files changed, 3 insertions(+), 1388 deletions(-) delete mode 100644 pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock b/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock deleted file mode 100644 index 3757eab5de46..000000000000 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/Cargo.lock +++ /dev/null @@ -1,1366 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -dependencies = [ - "memchr", -] - -[[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.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ed72e1635e121ca3e79420540282af22da58be50de153d36f81ddc6b83aa9e" -dependencies = [ - "libc", -] - -[[package]] -name = "anyhow" -version = "1.0.72" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" - -[[package]] -name = "arrayvec" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bumpalo" -version = "3.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" - -[[package]] -name = "captur" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70fab32548d14602e13307a86c41b2dc2fc2ef19c2881bf63598275a7e45b182" - -[[package]] -name = "cc" -version = "1.0.73" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" -dependencies = [ - "jobserver", -] - -[[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.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "time", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "claim" -version = "0.5.0" -source = "git+https://github.com/Turbo87/rust-claim.git?rev=23892a3#23892a345d38e1434303143a73033925284ad04d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" -dependencies = [ - "cfg-if", - "lazy_static", -] - -[[package]] -name = "crossterm" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a84cda67535339806297f1b331d6dd6320470d2a0fe65381e79ee9e156dd3d13" -dependencies = [ - "bitflags", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" -dependencies = [ - "winapi", -] - -[[package]] -name = "dashmap" -version = "5.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391b56fbd302e585b7a9494fb70e40949567b1cf9003a8e4a6041a1687c26573" -dependencies = [ - "cfg-if", - "hashbrown", - "lock_api", -] - -[[package]] -name = "diff" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" - -[[package]] -name = "errno" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" -dependencies = [ - "instant", -] - -[[package]] -name = "form_urlencoded" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" -dependencies = [ - "matches", - "percent-encoding", -] - -[[package]] -name = "futures" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" -dependencies = [ - "futures-channel", - "futures-core", - "futures-executor", - "futures-io", - "futures-sink", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-channel" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" -dependencies = [ - "futures-core", - "futures-sink", -] - -[[package]] -name = "futures-core" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" - -[[package]] -name = "futures-executor" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - -[[package]] -name = "futures-io" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" - -[[package]] -name = "futures-macro" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", -] - -[[package]] -name = "futures-sink" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" - -[[package]] -name = "futures-task" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" - -[[package]] -name = "futures-timer" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" - -[[package]] -name = "futures-util" -version = "0.3.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" -dependencies = [ - "futures-channel", - "futures-core", - "futures-io", - "futures-macro", - "futures-sink", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "getrandom" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" -dependencies = [ - "cfg-if", - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", -] - -[[package]] -name = "girt-config" -version = "2.3.0" -dependencies = [ - "claim", - "girt-git", - "girt-testutils", - "lazy_static", - "proc-macro2", - "rstest", - "rustc_version", - "serial_test", - "tempfile", - "thiserror", -] - -[[package]] -name = "girt-core" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "chrono", - "claim", - "crossbeam-channel", - "girt-config", - "girt-display", - "girt-git", - "girt-input", - "girt-runtime", - "girt-todo-file", - "girt-view", - "if_chain", - "lazy_static", - "num-format", - "parking_lot", - "pico-args", - "pretty_assertions", - "rstest", - "rustc_version", - "serial_test", - "unicode-segmentation", -] - -[[package]] -name = "girt-display" -version = "2.3.0" -dependencies = [ - "crossterm", - "girt-config", - "rstest", - "rustc_version", - "serial_test", - "thiserror", -] - -[[package]] -name = "girt-git" -version = "2.3.0" -dependencies = [ - "chrono", - "claim", - "girt-testutils", - "git2", - "lazy_static", - "parking_lot", - "pretty_assertions", - "rstest", - "rustc_version", - "serial_test", - "tempfile", - "thiserror", -] - -[[package]] -name = "girt-input" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "crossbeam-channel", - "crossterm", - "girt-config", - "girt-runtime", - "lazy_static", - "parking_lot", - "rstest", - "rustc_version", - "serial_test", -] - -[[package]] -name = "girt-runtime" -version = "2.3.0" -dependencies = [ - "claim", - "crossbeam-channel", - "girt-testutils", - "parking_lot", - "rustc_version", - "thiserror", -] - -[[package]] -name = "girt-testutils" -version = "2.3.0" -dependencies = [ - "rustc_version", -] - -[[package]] -name = "girt-todo-file" -version = "2.3.0" -dependencies = [ - "claim", - "girt-testutils", - "pretty_assertions", - "rstest", - "rustc_version", - "tempfile", - "thiserror", - "version-track", -] - -[[package]] -name = "girt-view" -version = "2.3.0" -dependencies = [ - "anyhow", - "bitflags", - "captur", - "claim", - "crossbeam-channel", - "girt-config", - "girt-display", - "girt-runtime", - "parking_lot", - "rustc_version", - "unicode-segmentation", - "unicode-width", - "uuid", - "xi-unicode", -] - -[[package]] -name = "git-interactive-rebase-tool" -version = "2.3.0" -dependencies = [ - "girt-core", - "rustc_version", -] - -[[package]] -name = "git2" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" -dependencies = [ - "bitflags", - "libc", - "libgit2-sys", - "log", - "url", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "iana-time-zone" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef5528d9c2817db4e10cc78f8d4c8228906e5854f389ff6b076cee3572a09d35" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" - -[[package]] -name = "jobserver" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258451ab10b34f8af53416d1fdab72c22e805f0c92a1136d59470ec0b11138b2" -dependencies = [ - "wasm-bindgen", -] - -[[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.147" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" - -[[package]] -name = "libgit2-sys" -version = "0.14.2+1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" -dependencies = [ - "cc", - "libc", - "libz-sys", - "pkg-config", -] - -[[package]] -name = "libz-sys" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e7e15d7610cce1d9752e137625f14e61a28cd45929b6e12e47b50fe154ee2e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - -[[package]] -name = "lock_api" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "mio" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" -dependencies = [ - "libc", - "log", - "miow", - "ntapi", - "wasi 0.11.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", -] - -[[package]] -name = "ntapi" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" -dependencies = [ - "winapi", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "once_cell" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e" - -[[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", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "995f667a6c822200b0433ac218e05582f0e2efa1b922a3fd2fbaadc5f87bab37" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.2.13", - "smallvec", - "windows-sys 0.34.0", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" - -[[package]] -name = "ppv-lite86" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" - -[[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 = "proc-macro2" -version = "1.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" -dependencies = [ - "getrandom", -] - -[[package]] -name = "redox_syscall" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" -dependencies = [ - "bitflags", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" - -[[package]] -name = "relative-path" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" - -[[package]] -name = "rstest" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b96577ca10cb3eade7b337eb46520108a67ca2818a24d0b63f41fd62bc9651c" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e674cf31712b8bb15fdbca3ec0c1b9d825c5a24407ff2b7e005fb6a29ba03" -dependencies = [ - "cfg-if", - "glob", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn 2.0.26", - "unicode-ident", -] - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "semver" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" - -[[package]] -name = "serial_test" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d" -dependencies = [ - "dashmap", - "futures", - "lazy_static", - "log", - "parking_lot", - "serial_test_derive", -] - -[[package]] -name = "serial_test_derive" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "signal-hook" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - -[[package]] -name = "slab" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "syn" -version = "1.0.104" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c3457aacde3c65315de5031ec191ce46604304d2446e803d71ade03308d970" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c0432476357e58790aaa47a8efb0c5138f137343f3b5f23bd36a27e3b0a6d6" -dependencies = [ - "autocfg", - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "thiserror" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35fc5b8971143ca348fa6df4f024d4d55264f3468c71ad1c2f365b0a4d58c42" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463fe12d7993d3b327787537ce8dd4dfa058de32fc2b195ef3cde03dc4771e8f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.26", -] - -[[package]] -name = "time" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[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.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" - -[[package]] -name = "unicode-bidi" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" - -[[package]] -name = "unicode-ident" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" - -[[package]] -name = "unicode-normalization" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "url" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" -dependencies = [ - "form_urlencoded", - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom", - "rand", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version-track" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9affed6b4e63b1f30ed8f0f2c401fa725f5f511eb00e52269f401c4d5ae12f" -dependencies = [ - "uuid", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[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.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.104", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.82" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a" - -[[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-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5acdd78cb4ba54c0045ac14f62d8f94a03d10047904ae2a40afa1e99d8f70825" -dependencies = [ - "windows_aarch64_msvc 0.34.0", - "windows_i686_gnu 0.34.0", - "windows_i686_msvc 0.34.0", - "windows_x86_64_gnu 0.34.0", - "windows_x86_64_msvc 0.34.0", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.48.0", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" - -[[package]] -name = "windows_i686_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" - -[[package]] -name = "windows_i686_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" - -[[package]] -name = "xi-unicode" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" diff --git a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix index f450b17535dd..366f34e10d40 100644 --- a/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix +++ b/pkgs/applications/version-management/git-interactive-rebase-tool/default.nix @@ -2,41 +2,22 @@ rustPlatform.buildRustPackage rec { pname = "git-interactive-rebase-tool"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "MitMaro"; repo = pname; rev = version; - sha256 = "sha256-tMeA2LsNCXxI086y8S+STYwjClWMPaBheP0s0oZ5I5c="; + hash = "sha256-xwvL6QX+eMbxCouE1i86j/PRCxTJVAQnRVeK6fYQo/M="; }; - postPatch = '' - # error: lint `unused_tuple_struct_fields` has been renamed to `dead_code` - substituteInPlace scripts/data/lints.rs src/main.rs src/{config,core,display,git,input,runtime,testutils,todo_file,view}/src/lib.rs \ - --replace-fail "unused_tuple_struct_fields," "" - ''; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "claim-0.5.0" = "sha256-quVV5PnWW1cYK+iSOM/Y0gLu2gPOrZ1ytJif0D5v9g0="; - }; - }; + cargoHash = "sha256-RDGbsmOBVMxInstTrRZK0G5eZR79ZoFK5UlkCj3zpoY="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; # Compilation during tests fails if this env var is not set. preCheck = "export GIRT_BUILD_GIT_HASH=${version}"; postCheck = "unset GIRT_BUILD_GIT_HASH"; - cargoTestFlags = [ - "--workspace" - # build everything except for doctests which are currently broken because - # `config::lib` expects the sourcetree to be a git repo. - "--tests" - "--lib" - "--bins" - ]; meta = with lib; { homepage = "https://github.com/MitMaro/git-interactive-rebase-tool"; From 5ba6bb7ad9710e6aeb9a2b23d45d24ed5055d59a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A9=20Dupuis?= Date: Thu, 13 Jun 2024 22:47:23 -0700 Subject: [PATCH 42/68] Update REXML to fix a dependency resolution issue. REXML accidentally added a version pin on a default gem (strscan) without bumping the major version. REXML removed the pin on strscan in 3.3.0 https://github.com/ruby/rexml/commit/f1df7d13b3e57a5e059273d2f0870163c08d7420#diff-75d0a867bbfd5e375164c17cf7a9df96761fb050e7308f3918ad6fe1fe12d27dL58 --- pkgs/top-level/ruby-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 18819de3029c..62d65ff03b8d 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -3127,10 +3127,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "sha256-CQioY4HZ+XOCRoDfTgp1QidmJy8DscDknbfnnCPbETU="; + sha256 = "0428ady49qssmnmwnafzrjvyba8mzbridsgblv7c7kmd0vqgfn99"; type = "gem"; }; - version = "3.2.8"; + version = "3.3.0"; }; rmagick = { dependencies = ["observer" "pkg-config"]; From 3aacf95825cd8a39762a5075aa45611960fadf33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jun 2024 09:43:47 +0200 Subject: [PATCH 43/68] python312Packages.tencentcloud-sdk-python: 3.0.1167 -> 3.0.1168 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1167...3.0.1168 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1168/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 1dc3384e7cdd..34356e2d11da 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.1167"; + version = "3.0.1168"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-GO1iAkIJyuXAa+iAmIIbnARcm90MjTG689P0WEj8VIA="; + hash = "sha256-Y9H+PV4PAUXCI2/kCVZhwMCvaIjDN+OThAVMoosQ5u0="; }; build-system = [ setuptools ]; From 2ce174d4b610f41eea1be5a25a1fdc32be4a6175 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jun 2024 09:44:13 +0200 Subject: [PATCH 44/68] python312Packages.cyclonedx-python-lib: 7.4.0 -> 7.4.1 Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/refs/tags/v7.4.0...v7.4.1 Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v7.4.1 --- .../python-modules/cyclonedx-python-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 5b3dac5c094d..30629ee89e91 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "7.4.0"; + version = "7.4.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -33,7 +33,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-cR/E0xVPl2iBgjhX9xv8nftmmTDWjDUqRgvNqcAWzRo="; + hash = "sha256-ATeSMS8WaJS/2CaeNQgaK/6zyQBw07+6YYTZdhZPJug="; }; build-system = [ poetry-core ]; From 6e8cd611b1563d17a675595817f73091f6163b73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 14 Jun 2024 09:45:35 +0200 Subject: [PATCH 45/68] python312Packages.neo4j: 5.20.0 -> 5.21.0 Diff: https://github.com/neo4j/neo4j-python-driver/compare/refs/tags/5.20.0...5.21.0 Changelog: https://github.com/neo4j/neo4j-python-driver/releases/tag/5.21.0 --- pkgs/development/python-modules/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix index bb1541fe7234..1dc1de3daab1 100644 --- a/pkgs/development/python-modules/neo4j/default.nix +++ b/pkgs/development/python-modules/neo4j/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "neo4j"; - version = "5.20.0"; + version = "5.21.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "neo4j"; repo = "neo4j-python-driver"; rev = "refs/tags/${version}"; - hash = "sha256-ebWEtsgVj2NLYAKe8z6ge6TvnPmXh0Mqkx0b+ZcOePY="; + hash = "sha256-SGRe5O+6HqLFu4VQc0QC+91KVjqKeqNt5hIBwophvP0="; }; postPatch = '' From 5d195c6c2dc905da6c33b863e9346e73c81a6de4 Mon Sep 17 00:00:00 2001 From: Nydragon Date: Thu, 13 Jun 2024 20:49:45 +0900 Subject: [PATCH 46/68] impala: init at 0.1.1 Impala is a TUI for managing wifi through iwd --- pkgs/by-name/im/impala/package.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 pkgs/by-name/im/impala/package.nix diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix new file mode 100644 index 000000000000..f9756c8f7c64 --- /dev/null +++ b/pkgs/by-name/im/impala/package.nix @@ -0,0 +1,26 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: +rustPlatform.buildRustPackage rec { + pname = "impala"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "pythops"; + repo = "impala"; + rev = "v${version}"; + hash = "sha256-r/aWzSn/Dci69oS/yopG6Ro34U8hniHVanctyM7RvDw="; + }; + + cargoHash = "sha256-IV1ftsRyM0CUlQMVmLip1FiqnouT5TsKASpF/KLARqY="; + + meta = { + description = "TUI for managing wifi"; + homepage = "https://github.com/pythops/impala"; + platforms = lib.platforms.linux; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nydragon ]; + }; +} From dfd695979f592273519318b81e265c2ca0685122 Mon Sep 17 00:00:00 2001 From: Jan Moeller Date: Thu, 30 May 2024 21:47:45 +0200 Subject: [PATCH 47/68] updatecli: improve package quality - remove superfluous use of `pname` - add `testers.testVersion` --- pkgs/by-name/up/updatecli/package.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index c3999383ba9e..dd60bdf8a166 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -4,6 +4,8 @@ , fetchFromGitHub , nix-update-script , installShellFiles +, testers +, updatecli }: buildGoModule rec { @@ -12,7 +14,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "updatecli"; - repo = pname; + repo = "updatecli"; rev = "v${version}"; hash = "sha256-sBkTdr4/DqNrCxtaM1tVTx+rQ1dvJ1KwlFvAJHIZCuw="; }; @@ -32,7 +34,13 @@ buildGoModule rec { "-X github.com/updatecli/updatecli/pkg/core/version.Version=${version}" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { + package = updatecli; + command = "updatecli version"; + }; + }; nativeBuildInputs = [ installShellFiles ]; @@ -52,7 +60,7 @@ buildGoModule rec { Updatecli is a command-line tool used to define and apply update strategies. ''; homepage = "https://www.updatecli.io"; - changelog = "https://github.com/updatecli/updatecli/releases/tag/v${version}"; + changelog = "https://github.com/updatecli/updatecli/releases/tag/${src.rev}"; license = licenses.asl20; mainProgram = "updatecli"; maintainers = with maintainers; [ croissong ]; From cdf10e27a99743bfcfd745683ee6c41e5775d485 Mon Sep 17 00:00:00 2001 From: Jan Moeller Date: Fri, 31 May 2024 00:19:48 +0200 Subject: [PATCH 48/68] updatecli: format with nixfmt-rfc-style --- pkgs/by-name/up/updatecli/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix index dd60bdf8a166..f37d847db2ca 100644 --- a/pkgs/by-name/up/updatecli/package.nix +++ b/pkgs/by-name/up/updatecli/package.nix @@ -1,11 +1,12 @@ -{ lib -, go -, buildGoModule -, fetchFromGitHub -, nix-update-script -, installShellFiles -, testers -, updatecli +{ + lib, + go, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, + testers, + updatecli, }: buildGoModule rec { From 443041454687ee562a65ce5e25eea3cd82228a0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 11:25:27 +0000 Subject: [PATCH 49/68] home-manager: 0-unstable-2024-06-04 -> 0-unstable-2024-06-13 --- pkgs/by-name/ho/home-manager/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index 25370cf2a4d2..b12d6420c1b9 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -16,14 +16,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2024-06-04"; + version = "0-unstable-2024-06-13"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "a7117efb3725e6197dd95424136f79147aa35e5b"; - hash = "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws="; + rev = "8d5e27b4807d25308dfe369d5a923d87e7dbfda3"; + hash = "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU="; }; nativeBuildInputs = [ From e3c8b9970279cb30a7b09b842449539a990a898a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 08:47:55 +0000 Subject: [PATCH 50/68] trezor-suite: 24.5.3 -> 24.5.4 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 3e61e989f3c2..5884fd2a275d 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "24.5.3"; + version = "24.5.4"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-CFkL7vVYz6cS3iHyfG026+c4T3h9y3yDhNkwMKhbrt7hK33Yj1yLQUBw826DUmUNOgwomRwubz5jigCl2724bw=="; - x86_64-linux = "sha512-JgcnCiq/ozrYDMH7zIns5c6x7TwtpJ6VVg6PUkcoDDgmr9ngIJmAdb+/v9mJUv98WNAPKmhCt0/H9DY2qWJ2Bg=="; + aarch64-linux = "sha512-gkN6e4Ndc96FT6vaCmSxuViTKuOc5vnCqptPN8IRno9Nv8L0k6hB7O+0g5E+9hd+3o5WASXKefYIOZAnPI3RZA=="; + x86_64-linux = "sha512-uHMI0fm02XdOyt6mAXEZuTZkNlNykTQbJNeGATBrlLLR98cxrOj8DQ1S7gPd5dkQCJzdmR7ydylj/XPOHsV2Ug=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From ad237c674883bbc0b3b6d361a0c4910802c25fb7 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Fri, 14 Jun 2024 20:16:49 +0800 Subject: [PATCH 51/68] flyctl: 0.2.66 -> 0.2.69 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index ff8bfa4fa3d7..de2b1ab03e8c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.66"; + version = "0.2.69"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-vdiTlUzrldbxWo5LoYnWTGq/P/QA+Qybk78pqxDoUlQ="; + hash = "sha256-6SPJt+az+C0amCnRScp85JqUfnWswHdS1OtOMa40Haw="; }; - vendorHash = "sha256-VdOBAxIaQzld4uX42RPYg4+p5F6mnBnI5efV8X48Eh8="; + vendorHash = "sha256-O5lUw0XzQUoy3mAmSpeW6WfBgg0FLxXkk7hCUAS2+o8="; subPackages = [ "." ]; From aba415e08338023dd7bb8f25dcf94c4a7a397b40 Mon Sep 17 00:00:00 2001 From: Paul Mulders Date: Fri, 14 Jun 2024 14:15:07 +0200 Subject: [PATCH 52/68] ida-free: fix desktop item --- pkgs/by-name/id/ida-free/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/id/ida-free/package.nix b/pkgs/by-name/id/ida-free/package.nix index aac31480a08f..a103480d7247 100644 --- a/pkgs/by-name/id/ida-free/package.nix +++ b/pkgs/by-name/id/ida-free/package.nix @@ -50,8 +50,11 @@ stdenv.mkDerivation rec { desktopName = "IDA Free"; genericName = "Interactive Disassembler"; categories = [ "Development" ]; + startupWMClass = "IDA"; }; + desktopItems = [ desktopItem ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems autoPatchelfHook libsForQt5.wrapQtAppsHook ]; # We just get a runfile in $src, so no need to unpack it. From 9de38ffd8ec88eed4229bd2d2ff1765cde42661c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 12:22:08 +0000 Subject: [PATCH 53/68] prometheus-knot-exporter: 3.3.5 -> 3.3.6 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index f15dc626e59f..2255e660380f 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.5"; + version = "3.3.6"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-7r4zXqomiszDrplMedEyw2ZQ2NwDTf54EOwnsLc5RJ0="; + hash = "sha256-4Fdbu08RbivZF+Hnk+tI1DW9PyzQTI0TngAbZ60CcO8="; }; nativeBuildInputs = [ From 402f32519f8b58d0088b093122f37c8481ba9158 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 12:38:02 +0000 Subject: [PATCH 54/68] ddev: 1.23.1 -> 1.23.2 --- pkgs/applications/virtualization/ddev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ddev/default.nix b/pkgs/applications/virtualization/ddev/default.nix index 35c1f805c8ba..549022d9908c 100644 --- a/pkgs/applications/virtualization/ddev/default.nix +++ b/pkgs/applications/virtualization/ddev/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddev"; - version = "1.23.1"; + version = "1.23.2"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${version}"; - hash = "sha256-qGuYH2xYmd3CYoYobjoum+zUImcsiaG5No36FG0H0bA="; + hash = "sha256-pzBSyCIA2r/4zYIYEmKF6c0gryudSKZebSXSpmJUbsQ="; }; vendorHash = null; From f35b299273df480d4828b8ef0a92ae0d1075bb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Fri, 14 Jun 2024 15:05:57 +0200 Subject: [PATCH 55/68] r0vm: 0.21.0 -> 1.0.1 --- pkgs/by-name/r0/r0vm/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/r0/r0vm/package.nix b/pkgs/by-name/r0/r0vm/package.nix index caca6c16df07..75a8ab6e5976 100644 --- a/pkgs/by-name/r0/r0vm/package.nix +++ b/pkgs/by-name/r0/r0vm/package.nix @@ -10,12 +10,12 @@ }: rustPlatform.buildRustPackage rec { pname = "r0vm"; - version = "0.21.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "risc0"; repo = "risc0"; rev = "v${version}"; - sha256 = "sha256-BIQd6yX453v4w8aU+2awcngOE6t4oIf7BseVLgPG4Bw="; + sha256 = "sha256-0Y7+Z2TEm5ZbEkbO8nSOZulGuZAgl9FdyEVNmqV7S8U="; }; buildAndTestSubdir = "risc0/r0vm"; @@ -33,16 +33,16 @@ rustPlatform.buildRustPackage rec { doCheck = false; - cargoHash = "sha256-OsxCIFgJiHfx52nRYRNLTB501RGKSBPQs2MQAs/BFfc="; + cargoHash = "sha256-3DwrWkjPCE4f/FHjzWyRGAXJPv30B4Ce8fh2oKDhpMM="; postPatch = let - # see https://github.com/risc0/risc0/blob/v0.21.0/risc0/circuit/recursion/build.rs - sha256Hash = "3504a2542626acb974dea1ae5542c90c032c4ef42f230977f40f245442a1ec23"; + # see https://github.com/risc0/risc0/blob/v1.0.1/risc0/circuit/recursion/build.rs + sha256Hash = "4e8496469e1efa00efb3630d261abf345e6b2905fb64b4f3a297be88ebdf83d2"; recursionZkr = fetchurl { name = "recursion_zkr.zip"; url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${sha256Hash}.zip"; - sha256 = "sha256:08zcl515890gyivhj8rgyi72q0qcr515bbm1vrsbkb164raa411m"; + sha256 = "sha256-ToSWRp4e+gDvs2MNJhq/NF5rKQX7ZLTzope+iOvfg9I="; }; in '' From 517d8466ca9e858f12ba1a99c5e6ae355dbc45c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 13 Jun 2024 18:24:42 +0000 Subject: [PATCH 56/68] vscode: 1.90.0 -> 1.90.1 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 212bf8f1930c..2eb93a086ea6 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1ypxzk3p1acv6g9418bchbwi82imnvljgn8h6mjqwqzbf3khf5kd"; - x86_64-darwin = "0nm3765mzqlagbilb01s0zy9zww8rmf8bjlqq0vwvrxxfl7vbyl3"; - aarch64-linux = "0f0cwihiwvpck625s91hc838hzyiylbir3m23r4ncjws298ckyg5"; - aarch64-darwin = "1h7cldjwb8hyx7vq2almplwxl667cc8dw3iv2mqigrx3ibk6sss6"; - armv7l-linux = "0a0iy109qjwj1ri23xmmfa3j3mngz72ljw2m0czaf8rkcaglxa1v"; + x86_64-linux = "039yb1v4vcgsyp3gfvsfm7pxivf20ycyvidhrk26jfm54ghbbnlz"; + x86_64-darwin = "1nkwww12yalkxja8vdln45kzrbybhrca8q0zxj8kk9s8bdzsvr5d"; + aarch64-linux = "0pz8qji6n7j0vrm4l84vxw2sad6q3swz7jda4zyw1n13y7p9kpcj"; + aarch64-darwin = "1a1b233f28x0v7rb7295jdivzxqvp812x585vacxx1qfmpn6mabl"; + armv7l-linux = "12569045nzz5zsmaqd4xvq5lmajcl7w3qdv0n9m5rh2g6s32585c"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.0"; + version = "1.90.1"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "89de5a8d4d6205e5b11647eb6a74844ca23d2573"; + rev = "611f9bfce64f25108829dd295f54a6894e87339d"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "0rwdvbig0a6mzgcn0zb08caaxyx5rk0741f8an3y0vavzgi5k38f"; + sha256 = "1j4fd3281jsm10ngq9lzwph3nil0xwbypc180sh5wifb66bmprf6"; }; }; From fb62df0da2c08d1a5c6d130d3804e803d00700ff Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Fri, 14 Jun 2024 14:31:10 +0200 Subject: [PATCH 57/68] perlPackages.AnyEventI3: 0.17 -> 0.19 Fixes crash in perlPackages.Apppapersway --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 04c2c05dadbb..5071fff62745 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -586,10 +586,10 @@ with self; { AnyEventI3 = buildPerlPackage { pname = "AnyEvent-I3"; - version = "0.17"; + version = "0.19"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz"; - hash = "sha256-U4LJhMnxODlfKfDACvgaoMj0t2VYIFXHPt5LE/BKbWM="; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.19.tar.gz"; + hash = "sha256-G807YNs9VWAUjeeRNT6K8RciZPWoXncZe5/8BB2sSDo="; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; meta = { From e114e912fc2a3601f8fe686db689f3698f147429 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 14 Jun 2024 16:21:00 +0200 Subject: [PATCH 58/68] neomutt: remove ma27 from maintainer list Using aerc these days. --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index b662ce400e56..8a26dbb315c7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "neomutt"; homepage = "https://www.neomutt.org"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ erikryb vrthra ma27 raitobezarius ]; + maintainers = with lib.maintainers; [ erikryb vrthra raitobezarius ]; platforms = lib.platforms.unix; }; }) From 34578c5cabdceb5a4e4274aba63a8a783fb04cd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 14:28:13 +0000 Subject: [PATCH 59/68] php82Packages.grumphp: 2.5.0 -> 2.6.0 --- pkgs/development/php-packages/grumphp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix index 6390abb5c938..e8506e9e008c 100644 --- a/pkgs/development/php-packages/grumphp/default.nix +++ b/pkgs/development/php-packages/grumphp/default.nix @@ -6,16 +6,16 @@ php.buildComposerProject (finalAttrs: { pname = "grumphp"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "phpro"; repo = "grumphp"; rev = "v${finalAttrs.version}"; - hash = "sha256-STTMqOzWE6c+EXA7PGoJTGVCyB3PtNVj5wSZ6igudro="; + hash = "sha256-W4LNzdgWxXDPL46/C8SX99lpRMp/xL5q5v6vX3H80XU="; }; - vendorHash = "sha256-CrcDJb5SfTBxVkFPTLq0PSzqNtkZWDPkH0IW7Crr4Pw="; + vendorHash = "sha256-bpIG3P1BdsYNI59xANaihmjsT7WDKiss3mhi/brA0Mc="; meta = { changelog = "https://github.com/phpro/grumphp/releases/tag/v${finalAttrs.version}"; From a887251577670332e068815a2f9d1c8a414b3cd1 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 5 Jun 2024 11:07:35 +0200 Subject: [PATCH 60/68] ocamlPackages.ezjsonm-encoding: init at 2.0.0 --- .../ezjsonm-encoding/default.nix | 20 +++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix diff --git a/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix new file mode 100644 index 000000000000..ec81d52da687 --- /dev/null +++ b/pkgs/development/ocaml-modules/ezjsonm-encoding/default.nix @@ -0,0 +1,20 @@ +{ lib, fetchurl, buildDunePackage, ezjsonm }: + +buildDunePackage rec { + pname = "ezjsonm-encoding"; + version = "2.0.0"; + + src = fetchurl { + url = "https://github.com/lthms/ezjsonm-encoding/releases/download/${version}/ezjsonm-encoding-${version}.tbz"; + hash = "sha256-e5OPcbbQLr16ANFNZ5i10LjlHgwcRTCYhyvOhVk22yI="; + }; + + propagatedBuildInputs = [ ezjsonm ]; + + meta = { + description = "Encoding combinators a la Data_encoding for Ezjsonm"; + homepage = "https://github.com/lthms/ezjsonmi-encoding"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4b3729bd2164..46866fd88361 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -480,6 +480,8 @@ let ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; + ezjsonm-encoding = callPackage ../development/ocaml-modules/ezjsonm-encoding { }; + ezxmlm = callPackage ../development/ocaml-modules/ezxmlm { }; ### F ### From c92ba66dba45a8161b2c858307d4548b65fbcf67 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 5 Jun 2024 11:07:58 +0200 Subject: [PATCH 61/68] spatial-shell: init at 7 --- pkgs/by-name/sp/spatial-shell/package.nix | 37 +++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/by-name/sp/spatial-shell/package.nix diff --git a/pkgs/by-name/sp/spatial-shell/package.nix b/pkgs/by-name/sp/spatial-shell/package.nix new file mode 100644 index 000000000000..4b741f8aaec2 --- /dev/null +++ b/pkgs/by-name/sp/spatial-shell/package.nix @@ -0,0 +1,37 @@ +{ lib +, ocamlPackages +, fetchFromGitHub +, scdoc +}: + +ocamlPackages.buildDunePackage rec { + pname = "spatial-shell"; + version = "7"; + + src = fetchFromGitHub { + owner = "lthms"; + repo = "spatial-shell"; + rev = version; + hash = "sha256-OeNBP/jea1ABh/WpvCP7We+L20WoTfLZH71raH7bKPI="; + }; + + nativeBuildInputs = [ + scdoc + ]; + + buildInputs = with ocamlPackages; [ + cmdliner + ezjsonm-encoding + poll + ]; + + meta = { + description = "Implementing a spatial model inspired by Material Shell, for i3 and sway"; + homepage = "https://spatial-shell.app"; + changelog = "https://github.com/lthms/spatial-shell/blob/${src.rev}/CHANGES.md"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ fgaz ]; + mainProgram = "spatial"; + platforms = lib.platforms.linux; + }; +} From 82aeb7fba13e2591d2338b9988c8ccf150201df4 Mon Sep 17 00:00:00 2001 From: nova madeline <126072875+nova-r@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:40:55 +0200 Subject: [PATCH 62/68] epkowa: add plugin for Perfection V100 Photo --- pkgs/misc/drivers/epkowa/default.nix | 32 ++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index a2e3bd28f490..b29572b436bd 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -251,6 +251,38 @@ let plugins = { meta = common_meta // { description = "iscan esci s80 plugin for " + passthru.hw; }; }; + s600 = stdenv.mkDerivation rec { + name = "iscan-gt-s600-bundle"; + version = "2.30.4"; + + src = fetchurl { + urls = [ + "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz" + ]; + sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6"; + }; + + nativeBuildInputs = [ autoPatchelfHook rpm ]; + + installPhase = '' + cd plugins + ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv + mkdir $out + cp -r usr/share $out + cp -r usr/lib64 $out/lib + mv $out/share/iscan $out/share/esci + mv $out/lib/iscan $out/lib/esci + ''; + + passthru = { + registrationCommand = '' + $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin" + ''; + hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo"; + }; + meta = common_meta // { description = "iscan gt-s600 plugin for " + passthru.hw; }; + }; s650 = stdenv.mkDerivation rec { name = "iscan-gt-s650-bundle"; version = "2.30.4"; From 04ed10af5996447942407839e351b91e35e56044 Mon Sep 17 00:00:00 2001 From: Jan Moeller Date: Sat, 25 May 2024 23:58:20 +0200 Subject: [PATCH 63/68] commitlint-rs: init at 0.1.11 --- pkgs/by-name/co/commitlint-rs/package.nix | 41 +++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/co/commitlint-rs/package.nix diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix new file mode 100644 index 000000000000..9b31e6cfd309 --- /dev/null +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -0,0 +1,41 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + rustPlatform, + testers, + commitlint-rs, +}: +rustPlatform.buildRustPackage rec { + pname = "commitlint-rs"; + version = "0.1.11"; + + src = fetchFromGitHub { + owner = "KeisukeYamashita"; + repo = "commitlint-rs"; + rev = "v${version}"; + hash = "sha256-FrYXEh75H0u1rE1YNDL/B1gMYMG43jPDJGUMv9y5/3g="; + }; + cargoHash = "sha256-W6HkLCUoylgQQc2fFprmJeLH8KtpVUD4+BXWbNECVZ4="; + + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = commitlint-rs; }; + }; + + meta = with lib; { + description = "Lint commit messages with conventional commit messages"; + homepage = "https://keisukeyamashita.github.io/commitlint-rs"; + changelog = "https://github.com/KeisukeYamashita/commitlint-rs/releases/tag/${src.rev}"; + license = with licenses; [ + mit + asl20 + ]; + mainProgram = "commitlint"; + platforms = with platforms; unix ++ windows; + maintainers = with maintainers; [ + croissong + getchoo + ]; + }; +} From 57597e7e5b5bf535c2b43e450df5b749de4b474e Mon Sep 17 00:00:00 2001 From: Dean Eckert Date: Thu, 6 Jun 2024 11:47:04 +0200 Subject: [PATCH 64/68] zfind: init at 0.4.0 --- pkgs/by-name/zf/zfind/package.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 pkgs/by-name/zf/zfind/package.nix diff --git a/pkgs/by-name/zf/zfind/package.nix b/pkgs/by-name/zf/zfind/package.nix new file mode 100644 index 000000000000..ad0e33e2e833 --- /dev/null +++ b/pkgs/by-name/zf/zfind/package.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "zfind"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "laktak"; + repo = "zfind"; + rev = "v${version}"; + hash = "sha256-T0cTEjjF9GTe+knixsgnbNfACUvbx92PUbLE+wgZ7sk="; + }; + + vendorHash = "sha256-mmoJrqWRmJTAR2wkAB52mpYEEj3XD+jHvlVrw51vqys="; + + ldflags = [ "-X" "main.appVersion=${version}" ]; + + meta = with lib; { + description = "CLI for file search with SQL like syntax."; + longDescription = '' + zfind allows you to search for files, including inside tar, zip, 7z and rar archives. + It makes finding files easy with a filter syntax that is similar to an SQL-WHERE clause. + ''; + homepage = "https://github.com/laktak/zfind"; + changelog = "https://github.com/laktak/zfind/releases/tag/v${version}"; + license = licenses.mit; + mainProgram = "zfind"; + maintainers = with maintainers; [ eeedean ]; + }; +} From c034df3196e780d04a3b8c9b1661deeae1961b34 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Jun 2024 17:34:15 +0200 Subject: [PATCH 65/68] mediamtx: hlsJs: 1.5.8 -> 1.5.11 --- pkgs/servers/mediamtx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 23f3d6b47a3d..3a5b25b30c52 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -7,8 +7,8 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.8/dist/hls.min.js"; - hash = "sha256-KG8Cm0dAsFbrBHuMi9c+bMocpSvWWK4c9aWH9LGfDY4="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.11/dist/hls.min.js"; + hash = "sha256-N10eCJk75KlKpHVXtwgC7vBDrU5b7ZQng9o/QK93m2w="; }; in buildGoModule rec { From 53c9ba52a61c9f08c916fdc8b08b1471701ffbc4 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Fri, 14 Jun 2024 17:34:46 +0200 Subject: [PATCH 66/68] mediamtx: reformat --- pkgs/servers/mediamtx/default.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/mediamtx/default.nix b/pkgs/servers/mediamtx/default.nix index 3a5b25b30c52..35db7a9c6568 100644 --- a/pkgs/servers/mediamtx/default.nix +++ b/pkgs/servers/mediamtx/default.nix @@ -1,8 +1,9 @@ -{ lib -, fetchFromGitHub -, fetchurl -, buildGoModule -, nixosTests +{ + lib, + fetchFromGitHub, + fetchurl, + buildGoModule, + nixosTests, }: let @@ -32,16 +33,14 @@ buildGoModule rec { # Tests need docker doCheck = false; - ldflags = [ - "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" - ]; + ldflags = [ "-X github.com/bluenviron/mediamtx/internal/core.version=v${version}" ]; - passthru.tests = { inherit (nixosTests) mediamtx; }; + passthru.tests = { + inherit (nixosTests) mediamtx; + }; meta = with lib; { - description = - "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams" - ; + description = "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams"; inherit (src.meta) homepage; license = licenses.mit; mainProgram = "mediamtx"; From 3c38ddd2279fa298708d3bda3fa102090120b9b6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 14 Jun 2024 15:38:40 +0000 Subject: [PATCH 67/68] exabgp: 4.2.21 -> 4.2.22 --- pkgs/servers/networking/exabgp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/networking/exabgp/default.nix b/pkgs/servers/networking/exabgp/default.nix index ea3e43183c11..f00b427b15a2 100644 --- a/pkgs/servers/networking/exabgp/default.nix +++ b/pkgs/servers/networking/exabgp/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "exabgp"; - version = "4.2.21"; + version = "4.2.22"; format = "pyproject"; src = fetchFromGitHub { owner = "Exa-Networks"; repo = "exabgp"; rev = "refs/tags/${version}"; - hash = "sha256-NlGE3yHUXPdxAMGhSaXMT2P1e7P+4AWg4lReP3f6Zx8="; + hash = "sha256-PrdCAmefKCBmbBFp04KiQGSsZZ4KNFk/ZtMedh9oow4="; }; nativeBuildInputs = with python3.pkgs; [ From 1895d8639656b288b49f01b8f8f900e6758a78de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 15 Jun 2024 02:15:27 +1000 Subject: [PATCH 68/68] melonDS: 0.9.5-unstable-2024-05-15 -> 0.9.5-unstable-2024-06-08 (#319745) --- pkgs/by-name/me/melonDS/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix index 3ccecc1bab33..74a7cc4a7f68 100644 --- a/pkgs/by-name/me/melonDS/package.nix +++ b/pkgs/by-name/me/melonDS/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonDS"; - version = "0.9.5-unstable-2024-05-15"; + version = "0.9.5-unstable-2024-06-08"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "a72b79a55ad2d61811af11b1b911f6af863f66c2"; - hash = "sha256-cdKfJ316iuRajdrRESt68oR8vkHISFRdHXxVuvGSUqE="; + rev = "8e9b88d01da0d21c3c35db051d7e44d8ee0c7715"; + hash = "sha256-zlOK5yhg9rmLMDnCxQ9CDAy+qWZdvKwTaKxzna1zxxk="; }; nativeBuildInputs = [