From fb39dd6f729dfb36d9f5405756233a8f9e936afa Mon Sep 17 00:00:00 2001 From: Dan Callaghan Date: Sun, 25 Feb 2024 15:27:31 +1100 Subject: [PATCH 001/260] update-python-libraries: ignore yanked releases on PyPI --- .../update-python-libraries/update-python-libraries.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 9e46a11141a6..3430c5806c4a 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -215,7 +215,11 @@ def _get_latest_version_pypi(attr_path, package, extension, current_version, tar url = "{}/{}/json".format(INDEX, package) json = _fetch_page(url) - versions = json["releases"].keys() + versions = { + version + for version, releases in json["releases"].items() + if not all(release["yanked"] for release in releases) + } version = _determine_latest_version(current_version, target, versions) try: From fb757e30facdfb9e64800b9f3562e8d585df18bc Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 14:53:01 +1300 Subject: [PATCH 002/260] mk-python-derivation: Refactor lib usage --- .../python/mk-python-derivation.nix | 71 +++++++++++-------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 074ccbf1bd23..c9465c74a5cf 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -28,6 +28,15 @@ , eggInstallHook }: +let + inherit (builtins) unsafeGetAttrPos; + inherit (lib) + elem optionalString max stringLength fixedWidthString getName + optional optionals optionalAttrs hasSuffix escapeShellArgs + extendDerivation head splitString isBool; + +in + { name ? "${attrs.pname}-${attrs.version}" # Build-time dependencies for the package @@ -128,7 +137,7 @@ let else "setuptools"; - withDistOutput = lib.elem format' ["pyproject" "setuptools" "wheel"]; + withDistOutput = elem format' ["pyproject" "setuptools" "wheel"]; name_ = name; @@ -137,16 +146,16 @@ let # all pythonModules have the pythonModule attribute (drv ? "pythonModule") # Some pythonModules are turned in to a pythonApplication by setting the field to false - && (!builtins.isBool drv.pythonModule); + && (!isBool drv.pythonModule); isMismatchedPython = drv: drv.pythonModule != python; optionalLocation = let - pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; - in lib.optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; + pos = unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; + in optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; leftPadName = name: against: let - len = lib.max (lib.stringLength name) (lib.stringLength against); - in lib.strings.fixedWidthString len " " name; + len = max (stringLength name) (stringLength against); + in fixedWidthString len " " name; throwMismatch = drv: let myName = "'${namePrefix}${name}'"; @@ -173,7 +182,7 @@ let * If ${theirName} provides executables that are called at run time, pass its bin path to makeWrapperArgs: - makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ]; + makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${getName drv } ] }" ]; ${optionalLocation} ''; @@ -191,7 +200,7 @@ let isBootstrapPackage = isBootstrapInstallPackage || builtins.elem (attrs.pname or null) ([ "build" "packaging" "pyproject-hooks" "wheel" - ] ++ lib.optionals (python.pythonOlder "3.11") [ + ] ++ optionals (python.pythonOlder "3.11") [ "tomli" ]); @@ -203,16 +212,16 @@ let attrs.passthru or { } // { updateScript = let - filename = builtins.head (lib.splitString ":" self.meta.position); + filename = head (splitString ":" self.meta.position); in attrs.passthru.updateScript or [ update-python-libraries filename ]; } - // lib.optionalAttrs (dependencies != []) { + // optionalAttrs (dependencies != []) { inherit dependencies; } - // lib.optionalAttrs (optional-dependencies != {}) { + // optionalAttrs (optional-dependencies != {}) { inherit optional-dependencies; } - // lib.optionalAttrs (build-system != []) { + // optionalAttrs (build-system != []) { inherit build-system; }; @@ -230,7 +239,7 @@ let wrapPython ensureNewerSourcesForZipFilesHook # move to wheel installer (pip) or builder (setuptools, flit, ...)? pythonRemoveTestsDirHook - ] ++ lib.optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ + ] ++ optionals (catchConflicts && !isBootstrapPackage && !isSetuptoolsDependency) [ # # 1. When building a package that is also part of the bootstrap chain, we # must ignore conflicts after installation, because there will be one with @@ -240,13 +249,13 @@ let # because the hook that checks for conflicts uses setuptools. # pythonCatchConflictsHook - ] ++ lib.optionals removeBinBytecode [ + ] ++ optionals removeBinBytecode [ pythonRemoveBinBytecodeHook - ] ++ lib.optionals (lib.hasSuffix "zip" (attrs.src.name or "")) [ + ] ++ optionals (hasSuffix "zip" (attrs.src.name or "")) [ unzip - ] ++ lib.optionals (format' == "setuptools") [ + ] ++ optionals (format' == "setuptools") [ setuptoolsBuildHook - ] ++ lib.optionals (format' == "pyproject") [( + ] ++ optionals (format' == "pyproject") [( if isBootstrapPackage then pypaBuildHook.override { inherit (python.pythonOnBuildForHost.pkgs.bootstrap) build; @@ -261,24 +270,24 @@ let } else pythonRuntimeDepsCheckHook - )] ++ lib.optionals (format' == "wheel") [ + )] ++ optionals (format' == "wheel") [ wheelUnpackHook - ] ++ lib.optionals (format' == "egg") [ + ] ++ optionals (format' == "egg") [ eggUnpackHook eggBuildHook eggInstallHook - ] ++ lib.optionals (format' != "other") [( + ] ++ optionals (format' != "other") [( if isBootstrapInstallPackage then pypaInstallHook.override { inherit (python.pythonOnBuildForHost.pkgs.bootstrap) installer; } else pypaInstallHook - )] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ + )] ++ optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ # This is a test, however, it should be ran independent of the checkPhase and checkInputs pythonImportsCheckHook - ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + ] ++ optionals (python.pythonAtLeast "3.3") [ # Optionally enforce PEP420 for python3 pythonNamespacesHook - ] ++ lib.optionals withDistOutput [ + ] ++ optionals withDistOutput [ pythonOutputDistHook ] ++ nativeBuildInputs ++ build-system; @@ -299,7 +308,7 @@ let doCheck = false; doInstallCheck = attrs.doCheck or true; nativeInstallCheckInputs = [ - ] ++ lib.optionals (format' == "setuptools") [ + ] ++ optionals (format' == "setuptools") [ # Longer-term we should get rid of this and require # users of this function to set the `installCheckPhase` or # pass in a hook that sets it. @@ -307,14 +316,14 @@ let ] ++ nativeCheckInputs; installCheckInputs = checkInputs; - postFixup = lib.optionalString (!dontWrapPythonPrograms) '' + postFixup = optionalString (!dontWrapPythonPrograms) '' wrapPythonPrograms '' + attrs.postFixup or ""; # Python packages built through cross-compilation are always for the host platform. - disallowedReferences = lib.optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; + disallowedReferences = optionals (python.stdenv.hostPlatform != python.stdenv.buildPlatform) [ python.pythonOnBuildForHost ]; - outputs = outputs ++ lib.optional withDistOutput "dist"; + outputs = outputs ++ optional withDistOutput "dist"; inherit passthru; @@ -323,15 +332,15 @@ let platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; } // meta; - } // lib.optionalAttrs (attrs?checkPhase) { + } // optionalAttrs (attrs?checkPhase) { # If given use the specified checkPhase, otherwise use the setup hook. # Longer-term we should get rid of `checkPhase` and use `installCheckPhase`. installCheckPhase = attrs.checkPhase; - } // lib.optionalAttrs (disabledTestPaths != []) { - disabledTestPaths = lib.escapeShellArgs disabledTestPaths; + } // optionalAttrs (disabledTestPaths != []) { + disabledTestPaths = escapeShellArgs disabledTestPaths; })); -in lib.extendDerivation +in extendDerivation (disabled -> throw "${name} not supported for interpreter ${python.executable}") passthru self From d77190aeaa376052190f67ad2feaf5e2c3183488 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 14:57:25 +1300 Subject: [PATCH 003/260] mk-python-derivation: Refactor internal function validatePythonMatches We can avoid recreating the same closure for every call by moving arguments around a little. --- .../python/mk-python-derivation.nix | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index c9465c74a5cf..ca145a9af99f 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -35,6 +35,18 @@ let optional optionals optionalAttrs hasSuffix escapeShellArgs extendDerivation head splitString isBool; + leftPadName = name: against: let + len = max (stringLength name) (stringLength against); + in fixedWidthString len " " name; + + isPythonModule = drv: + # all pythonModules have the pythonModule attribute + (drv ? "pythonModule") + # Some pythonModules are turned in to a pythonApplication by setting the field to false + && (!isBool drv.pythonModule); + + isMismatchedPython = drv: drv.pythonModule != python; + in { name ? "${attrs.pname}-${attrs.version}" @@ -139,27 +151,13 @@ let withDistOutput = elem format' ["pyproject" "setuptools" "wheel"]; - name_ = name; - - validatePythonMatches = attrName: let - isPythonModule = drv: - # all pythonModules have the pythonModule attribute - (drv ? "pythonModule") - # Some pythonModules are turned in to a pythonApplication by setting the field to false - && (!isBool drv.pythonModule); - isMismatchedPython = drv: drv.pythonModule != python; - - optionalLocation = let - pos = unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; - in optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; - - leftPadName = name: against: let - len = max (stringLength name) (stringLength against); - in fixedWidthString len " " name; - - throwMismatch = drv: let + validatePythonMatches = let + throwMismatch = attrName: drv: let myName = "'${namePrefix}${name}'"; theirName = "'${drv.name}'"; + optionalLocation = let + pos = unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs; + in optionalString (pos != null) " at ${pos.file}:${toString pos.line}:${toString pos.column}"; in throw '' Python version mismatch in ${myName}: @@ -187,12 +185,11 @@ let ${optionalLocation} ''; - checkDrv = drv: - if (isPythonModule drv) && (isMismatchedPython drv) - then throwMismatch drv + checkDrv = attrName: drv: + if (isPythonModule drv) && (isMismatchedPython drv) then throwMismatch attrName drv else drv; - in inputs: builtins.map (checkDrv) inputs; + in attrName: inputs: map (checkDrv attrName) inputs; isBootstrapInstallPackage = builtins.elem (attrs.pname or null) [ "flit-core" "installer" @@ -232,7 +229,7 @@ let "dependencies" "optional-dependencies" "build-system" ]) // { - name = namePrefix + name_; + name = namePrefix + name; nativeBuildInputs = [ python From 1656fe1bf62224e488057b611e48d588fa8e2eb1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 15:05:17 +1300 Subject: [PATCH 004/260] mk-python-derivation: Precompute static lists --- .../python/mk-python-derivation.nix | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index ca145a9af99f..cb01f67de22b 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -47,6 +47,18 @@ let isMismatchedPython = drv: drv.pythonModule != python; + withDistOutput' = lib.flip elem ["pyproject" "setuptools" "wheel"]; + + isBootstrapInstallPackage' = lib.flip elem [ "flit-core" "installer" ]; + + isBootstrapPackage' = lib.flip elem ([ + "build" "packaging" "pyproject-hooks" "wheel" + ] ++ optionals (python.pythonOlder "3.11") [ + "tomli" + ]); + + isSetuptoolsDependency' = lib.flip elem [ "setuptools" "wheel" ]; + in { name ? "${attrs.pname}-${attrs.version}" @@ -149,7 +161,7 @@ let else "setuptools"; - withDistOutput = elem format' ["pyproject" "setuptools" "wheel"]; + withDistOutput = withDistOutput' format'; validatePythonMatches = let throwMismatch = attrName: drv: let @@ -191,19 +203,11 @@ let in attrName: inputs: map (checkDrv attrName) inputs; - isBootstrapInstallPackage = builtins.elem (attrs.pname or null) [ - "flit-core" "installer" - ]; + isBootstrapInstallPackage = isBootstrapInstallPackage' (attrs.pname or null); - isBootstrapPackage = isBootstrapInstallPackage || builtins.elem (attrs.pname or null) ([ - "build" "packaging" "pyproject-hooks" "wheel" - ] ++ optionals (python.pythonOlder "3.11") [ - "tomli" - ]); + isBootstrapPackage = isBootstrapInstallPackage || isBootstrapPackage' (attrs.pname or null); - isSetuptoolsDependency = builtins.elem (attrs.pname or null) [ - "setuptools" "wheel" - ]; + isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null); passthru = attrs.passthru or { } From de402796a7472113bc3f2bbd53adfa8852748f4a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 Mar 2024 15:09:50 +1300 Subject: [PATCH 005/260] mk-python-derivation: Break out attribute set cleaning into a separate function With precomputed static lists. --- .../interpreters/python/mk-python-derivation.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index cb01f67de22b..4c45d9603be8 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -59,6 +59,12 @@ let isSetuptoolsDependency' = lib.flip elem [ "setuptools" "wheel" ]; + cleanAttrs = lib.flip removeAttrs [ + "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" + "disabledTestPaths" "outputs" "stdenv" + "dependencies" "optional-dependencies" "build-system" + ]; + in { name ? "${attrs.pname}-${attrs.version}" @@ -227,11 +233,7 @@ let }; # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. - self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [ - "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "pyproject" "format" - "disabledTestPaths" "outputs" "stdenv" - "dependencies" "optional-dependencies" "build-system" - ]) // { + self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // { name = namePrefix + name; From 88312612cb5cdc040b7ff26439c083897dc65d6f Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Mon, 11 Mar 2024 19:29:51 -0600 Subject: [PATCH 006/260] maintainers: add n8henrie --- maintainers/maintainer-list.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 81e343e601c6..6c2ad1e16550 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13480,6 +13480,14 @@ fingerprint = "9E6A 25F2 C1F2 9D76 ED00 1932 1261 173A 01E1 0298"; }]; }; + n8henrie = { + name = "Nathan Henrie"; + github = "n8henrie"; + githubId = 1234956; + "keys" = [{ + "fingerprint" = "F21A 6194 C9DB 9899 CD09 E24E 434B 2C14 B8C3 3422"; + }]; + }; nadir-ishiguro = { github = "nadir-ishiguro"; githubId = 23151917; From a89f27b448809afc11e173877157250ee4e6d762 Mon Sep 17 00:00:00 2001 From: yunfachi Date: Tue, 12 Mar 2024 10:03:42 +0300 Subject: [PATCH 007/260] uni-sync: init at 0.2.0 --- pkgs/by-name/un/uni-sync/config_path.patch | 38 +++++++++++++++++++ .../ignore_read-only_filesystem.patch | 14 +++++++ pkgs/by-name/un/uni-sync/package.nix | 35 +++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 pkgs/by-name/un/uni-sync/config_path.patch create mode 100644 pkgs/by-name/un/uni-sync/ignore_read-only_filesystem.patch create mode 100644 pkgs/by-name/un/uni-sync/package.nix diff --git a/pkgs/by-name/un/uni-sync/config_path.patch b/pkgs/by-name/un/uni-sync/config_path.patch new file mode 100644 index 000000000000..c59bf80125ae --- /dev/null +++ b/pkgs/by-name/un/uni-sync/config_path.patch @@ -0,0 +1,38 @@ +diff --git a/src/main.rs b/src/main.rs +index 357a33b..7073497 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -1,4 +1,4 @@ +-use std::env; ++use std::path::PathBuf; + + mod devices; + +@@ -8,12 +8,23 @@ fn main() -> Result<(), std::io::Error> { + configs: vec![] + }; + +- let mut config_path = env::current_exe()?; +- config_path.pop(); +- config_path.push("uni-sync.json"); ++ let mut config_path = PathBuf::from("/etc/uni-sync/uni-sync.json"); + + if !config_path.exists() { +- std::fs::write(&config_path, serde_json::to_string_pretty(&configs).unwrap())?; ++ match std::fs::create_dir_all(config_path.parent().unwrap()) { ++ Ok(result) => result, ++ Err(_) => { ++ println!("Please run uni-sync with elevated permissions."); ++ std::process::exit(0); ++ } ++ }; ++ match std::fs::write(&config_path, serde_json::to_string_pretty(&configs).unwrap()) { ++ Ok(result) => result, ++ Err(_) => { ++ println!("Please run uni-sync with elevated permissions."); ++ std::process::exit(0); ++ } ++ }; + } + + let config_content = std::fs::read_to_string(&config_path).unwrap(); diff --git a/pkgs/by-name/un/uni-sync/ignore_read-only_filesystem.patch b/pkgs/by-name/un/uni-sync/ignore_read-only_filesystem.patch new file mode 100644 index 000000000000..3a0837d1d224 --- /dev/null +++ b/pkgs/by-name/un/uni-sync/ignore_read-only_filesystem.patch @@ -0,0 +1,14 @@ +diff --git a/src/main.rs b/src/main.rs +index f07cc64..357a33b 100644 +--- a/src/main.rs ++++ b/src/main.rs +@@ -20,7 +20,7 @@ fn main() -> Result<(), std::io::Error> { + configs = serde_json::from_str::(&config_content).unwrap(); + + let new_configs = devices::run(configs); +- std::fs::write(&config_path, serde_json::to_string_pretty(&new_configs).unwrap())?; ++ std::fs::write(&config_path, serde_json::to_string_pretty(&new_configs).unwrap()); + + Ok(()) + } +\ No newline at end of file diff --git a/pkgs/by-name/un/uni-sync/package.nix b/pkgs/by-name/un/uni-sync/package.nix new file mode 100644 index 000000000000..6124e621dfb9 --- /dev/null +++ b/pkgs/by-name/un/uni-sync/package.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, libudev-zero +}: +rustPlatform.buildRustPackage rec { + pname = "uni-sync"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "EightB1ts"; + repo = pname; + rev = "ca349942c06fabcc028ce24e79fc6ce7c758452b"; + hash = "sha256-K2zX3rKtTaKO6q76xlxX+rDLL0gEsJ2l8x/s1vsp+ZQ="; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libudev-zero ]; + + patches = [ + ./config_path.patch + ./ignore_read-only_filesystem.patch + ]; + + cargoHash = "sha256-DdmjP0h15cXkHJZxvOcINgoZ/EhTgu/7iYb+bgsIXxU="; + + meta = with lib; { + description = "A synchronization tool for Lian Li Uni Controllers"; + homepage = "https://github.com/EightB1ts/uni-sync"; + license = licenses.mit; + maintainers = with maintainers; [ yunfachi ]; + mainProgram = "uni-sync"; + }; +} From 05901fbaec6e00f9841f62da4bbd72b68096f763 Mon Sep 17 00:00:00 2001 From: yunfachi Date: Tue, 12 Mar 2024 18:03:59 +0300 Subject: [PATCH 008/260] nixos/uni-sync: init --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/hardware/uni-sync.nix | 117 ++++++++++++++++++ nixos/modules/module-list.nix | 1 + 3 files changed, 120 insertions(+) create mode 100644 nixos/modules/hardware/uni-sync.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 0905337de94d..60e304f3b385 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -113,6 +113,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Mealie](https://nightly.mealie.io/), a self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in NuxtJS for a pleasant user experience for the whole family. Available as [services.mealie](#opt-services.mealie.enable) +- [Uni-Sync](https://github.com/EightB1ts/uni-sync), a synchronization tool for Lian Li Uni Controllers. Available as [hardware.uni-sync](#opt-hardware.uni-sync.enable) + ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} diff --git a/nixos/modules/hardware/uni-sync.nix b/nixos/modules/hardware/uni-sync.nix new file mode 100644 index 000000000000..69411619bc94 --- /dev/null +++ b/nixos/modules/hardware/uni-sync.nix @@ -0,0 +1,117 @@ +{ config +, lib +, pkgs +, ... +}: +with lib; let + cfg = config.hardware.uni-sync; +in +{ + meta.maintainers = with maintainers; [ yunfachi ]; + + options.hardware.uni-sync = { + enable = mkEnableOption (mdDoc "udev rules and software for Lian Li Uni Controllers"); + package = mkPackageOption pkgs "uni-sync" { }; + + devices = mkOption { + default = [ ]; + example = literalExpression '' + [ + { + device_id = "VID:1111/PID:11111/SN:1111111111"; + sync_rgb = true; + channels = [ + { + mode = "PWM"; + } + { + mode = "Manual"; + speed = 100; + } + { + mode = "Manual"; + speed = 54; + } + { + mode = "Manual"; + speed = 0; + } + ]; + } + { + device_id = "VID:1010/PID:10101/SN:1010101010"; + sync_rgb = false; + channels = [ + { + mode = "Manual"; + speed = 0; + } + ]; + } + ] + ''; + description = mdDoc "List of controllers with their configurations."; + type = types.listOf (types.submodule { + options = { + device_id = mkOption { + type = types.str; + example = "VID:1111/PID:11111/SN:1111111111"; + description = mdDoc "Unique device ID displayed at each startup."; + }; + sync_rgb = mkOption { + type = types.bool; + default = false; + example = true; + description = mdDoc "Enable ARGB header sync."; + }; + channels = mkOption { + default = [ ]; + example = literalExpression '' + [ + { + mode = "PWM"; + } + { + mode = "Manual"; + speed = 100; + } + { + mode = "Manual"; + speed = 54; + } + { + mode = "Manual"; + speed = 0; + } + ] + ''; + description = mdDoc "List of channels connected to the controller."; + type = types.listOf (types.submodule { + options = { + mode = mkOption { + type = types.enum [ "Manual" "PWM" ]; + default = "Manual"; + example = "PWM"; + description = mdDoc "\"PWM\" to enable PWM sync. \"Manual\" to set speed."; + }; + speed = mkOption { + type = types.int; + default = "50"; + example = "100"; + description = mdDoc "Fan speed as percentage (clamped between 0 and 100)."; + }; + }; + }); + }; + }; + }); + }; + }; + + config = mkIf cfg.enable { + environment.etc."uni-sync/uni-sync.json".text = mkIf (cfg.devices != [ ]) (builtins.toJSON { configs = cfg.devices; }); + + environment.systemPackages = [ cfg.package ]; + services.udev.packages = [ cfg.package ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41e369ac1c65..b0b188f98387 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -98,6 +98,7 @@ ./hardware/tuxedo-keyboard.nix ./hardware/ubertooth.nix ./hardware/uinput.nix + ./hardware/uni-sync.nix ./hardware/usb-modeswitch.nix ./hardware/usb-storage.nix ./hardware/video/amdgpu-pro.nix From d9745239170677aa52b332f83fcb4174061eb411 Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Tue, 19 Mar 2024 17:13:01 +0100 Subject: [PATCH 009/260] fido2luks: move to pkgs/by-name --- .../fido2luks/default.nix => by-name/fi/fido2luks/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/fido2luks/default.nix => by-name/fi/fido2luks/package.nix} (100%) diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/by-name/fi/fido2luks/package.nix similarity index 100% rename from pkgs/tools/security/fido2luks/default.nix rename to pkgs/by-name/fi/fido2luks/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8de3b01656c..decee099dfb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8093,8 +8093,6 @@ with pkgs; flux = callPackage ../development/compilers/flux { }; - fido2luks = callPackage ../tools/security/fido2luks { }; - fierce = callPackage ../tools/security/fierce { }; figlet = callPackage ../tools/misc/figlet { }; From 1e2f8f2a84f459719c5e9d33df9c9ed1cc31df41 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Mar 2024 13:35:51 +1300 Subject: [PATCH 010/260] stdenv/check-meta: Remove outputsToInstall list concat from common meta Normally either of "bin" or "out" will hit first so we can avoid dynamic looping altogether. --- pkgs/stdenv/generic/check-meta.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 63c853e3dc31..4f6011a3d5cb 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -443,6 +443,7 @@ let commonMeta = { validity, attrs, pos ? null, references ? [ ] }: let outputs = attrs.outputs or [ "out" ]; + hasOutput = out: builtins.elem out outputs; in { # `name` derivation attribute includes cross-compilation cruft, @@ -461,10 +462,13 @@ let # Services and users should specify outputs explicitly, # unless they are comfortable with this default. outputsToInstall = - let - hasOutput = out: builtins.elem out outputs; - in - [ (findFirst hasOutput null ([ "bin" "out" ] ++ outputs)) ] + [ + ( + if hasOutput "bin" then "bin" + else if hasOutput "out" then "out" + else findFirst hasOutput null outputs + ) + ] ++ optional (hasOutput "man") "man"; } // attrs.meta or { } From 5ef1bd952c61299878cea030a1acb5b427504ae8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Mar 2024 13:42:02 +1300 Subject: [PATCH 011/260] build-support/lib/cmake: Statically compute default cmake flags --- pkgs/build-support/lib/cmake.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/lib/cmake.nix b/pkgs/build-support/lib/cmake.nix index eff7bbca61a2..57fa586d3455 100644 --- a/pkgs/build-support/lib/cmake.nix +++ b/pkgs/build-support/lib/cmake.nix @@ -3,9 +3,8 @@ let inherit (lib) findFirst isString optional optionals; - makeCMakeFlags = { cmakeFlags ? [], ... }: - cmakeFlags - ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ + cmakeFlags' = + optionals (stdenv.hostPlatform != stdenv.buildPlatform) ([ "-DCMAKE_SYSTEM_NAME=${findFirst isString "Generic" (optional (!stdenv.hostPlatform.isRedox) stdenv.hostPlatform.uname.system)}" ] ++ optionals (stdenv.hostPlatform.uname.processor != null) [ "-DCMAKE_SYSTEM_PROCESSOR=${stdenv.hostPlatform.uname.processor}" @@ -24,6 +23,9 @@ let ] ++ optionals stdenv.hostPlatform.isStatic [ "-DCMAKE_LINK_SEARCH_START_STATIC=ON" ]); + + makeCMakeFlags = { cmakeFlags ? [], ... }: cmakeFlags ++ cmakeFlags'; + in { inherit makeCMakeFlags; From 085c1723480c7afb3d73a86b225f2353a04db6b0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 20 Mar 2024 13:45:45 +1300 Subject: [PATCH 012/260] build-support/lib/meson: Statically compute default meson flags --- pkgs/build-support/lib/meson.nix | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/build-support/lib/meson.nix b/pkgs/build-support/lib/meson.nix index 395b573f8587..456c10fcb8ee 100644 --- a/pkgs/build-support/lib/meson.nix +++ b/pkgs/build-support/lib/meson.nix @@ -9,25 +9,25 @@ let else if isx86_32 then "x86" else platform.uname.processor; - makeMesonFlags = { mesonFlags ? [], ... }: - let - crossFile = builtins.toFile "cross-file.conf" '' - [properties] - bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] - needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} + crossFile = builtins.toFile "cross-file.conf" '' + [properties] + bindgen_clang_arguments = ['-target', '${stdenv.targetPlatform.config}'] + needs_exe_wrapper = ${boolToString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform)} - [host_machine] - system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamily stdenv.targetPlatform}' - cpu = '${stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - [binaries] - llvm-config = 'llvm-config-native' - rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] - ''; - crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; - in crossFlags ++ mesonFlags; + [binaries] + llvm-config = 'llvm-config-native' + rust = ['rustc', '--target', '${stdenv.targetPlatform.rust.rustcTargetSpec}'] + ''; + + crossFlags = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-file=${crossFile}" ]; + + makeMesonFlags = { mesonFlags ? [], ... }: crossFlags ++ mesonFlags; in { From 561eefecdbbfc15efc5c90988d9685b0be551f9a Mon Sep 17 00:00:00 2001 From: Magnus Viernickel Date: Wed, 20 Mar 2024 13:15:42 +0100 Subject: [PATCH 013/260] fused-effects: jailbreak and unbreak dependents --- .../haskell-modules/configuration-common.nix | 9 +++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../transitive-broken.yaml | 6 ------ .../haskell-modules/hackage-packages.nix | 19 ++++++++----------- 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec0545a89281..78eef4126147 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,15 @@ self: super: { # Too strict bounds on optparse-applicative weeder = lib.warnIf (lib.versionAtLeast super.weeder.version "2.8.0") "jailbreak on weeder may be obsolete" doJailbreak super.weeder; + # test dependency has incorrect upper bound but still supports the newer dependency + # https://github.com/fused-effects/fused-effects/issues/451 + # https://github.com/fused-effects/fused-effects/pull/452 + fused-effects = doJailbreak super.fused-effects; + + # support for transformers >= 0.6 + fused-effects-random = doJailbreak super.fused-effects-random; + fused-effects-readline = doJailbreak super.fused-effects-readline; + # Allow scotty < 0.21 # For < 0.22 add https://github.com/taffybar/taffybar/commit/71fe820d892a85e49ad2f2843eac0a59e01f3fd4 taffybar = appendPatches [ diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3d63f4c2ae13..71867acc3ec1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1872,7 +1872,6 @@ broken-packages: - funpat # failure in job https://hydra.nixos.org/build/233222123 at 2023-09-02 - funspection # failure in job https://hydra.nixos.org/build/233227352 at 2023-09-02 - fused-effects-exceptions # failure in job https://hydra.nixos.org/build/233203744 at 2023-09-02 - - fused-effects # failure in job https://hydra.nixos.org/build/252724943 at 2024-03-16 - fused-effects-mwc-random # failure in job https://hydra.nixos.org/build/233253228 at 2023-09-02 - fused-effects-resumable # failure in job https://hydra.nixos.org/build/233242479 at 2023-09-02 - fused-effects-th # failure in job https://hydra.nixos.org/build/233192186 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d315bce3bf6b..865e22e358ce 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1488,10 +1488,6 @@ dont-distribute-packages: - funion - funnyprint - funsat - - fused-effects-lens - - fused-effects-optics - - fused-effects-random - - fused-effects-readline - fused-effects-squeal - fwgl-glfw - fwgl-javascript @@ -2113,7 +2109,6 @@ dont-distribute-packages: - hinduce-classifier - hinduce-classifier-decisiontree - hinduce-examples - - hinit - hinvaders - hinze-streams - hipbot @@ -2813,7 +2808,6 @@ dont-distribute-packages: - monad-metrics-extensible - monad-state - monad-stlike-stm - - monadic-bang - monadiccp-gecode - monarch - monetdb-mapi diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 03301c25a7da..f27f38f07f58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22741,6 +22741,7 @@ self: { ]; description = "A binding to the X11 graphics library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -22812,6 +22813,7 @@ self: { libraryPkgconfigDepends = [ libXft ]; description = "Bindings to the Xft and some Xrender parts"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.slotThe ]; }) {inherit (pkgs.xorg) libXft;}; "X11-xshape" = callPackage @@ -112887,8 +112889,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench transformers ]; description = "A fast, flexible, fused effect system"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "fused-effects-exceptions" = callPackage @@ -112920,7 +112920,6 @@ self: { testHaskellDepends = [ base fused-effects hspec microlens ]; description = "Monadic lens combinators for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-mwc-random" = callPackage @@ -112954,7 +112953,6 @@ self: { libraryHaskellDepends = [ base fused-effects optics-core ]; description = "Bridge between the optics and fused-effects ecosystems"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-random" = callPackage @@ -112966,7 +112964,6 @@ self: { libraryHaskellDepends = [ base fused-effects random transformers ]; description = "Random number generation for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-readline" = callPackage @@ -112986,7 +112983,6 @@ self: { testHaskellDepends = [ base ]; description = "A readline-like effect and carrier for fused-effects"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "fused-effects-resumable" = callPackage @@ -147987,7 +147983,6 @@ self: { ]; description = "Generic project initialization tool"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hi"; maintainers = [ lib.maintainers.poscat ]; }) {}; @@ -161284,6 +161279,7 @@ self: { description = "Utility functions for working with html-parse"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "html-presentation-text" = callPackage @@ -205054,7 +205050,6 @@ self: { testHaskellDepends = [ base ghc ghc-boot ghc-paths transformers ]; description = "GHC plugin to desugar ! into do-notation"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "monadic-recursion-schemes" = callPackage @@ -222219,6 +222214,7 @@ self: { description = "Utility functions for working with optparse-applicative"; license = lib.licenses.agpl3Only; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.slotThe ]; broken = true; }) {}; @@ -328099,7 +328095,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328132,7 +328128,7 @@ self: { mainProgram = "xmonad"; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328179,7 +328175,7 @@ self: { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.dschrempf lib.maintainers.ivanbrennan - lib.maintainers.peti + lib.maintainers.peti lib.maintainers.slotThe ]; }) {}; @@ -328286,6 +328282,7 @@ self: { description = "Third party extensions for xmonad with wacky dependencies"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; + maintainers = [ lib.maintainers.slotThe ]; }) {}; "xmonad-screenshot" = callPackage From 60b53db2614f81d0cc3e36e1c8873e6c14a0d252 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Mar 2024 20:12:37 +0000 Subject: [PATCH 014/260] unciv: 4.10.19 -> 4.10.21 --- pkgs/by-name/un/unciv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix index 0e2f80f09d96..69d1bb8ec7df 100644 --- a/pkgs/by-name/un/unciv/package.nix +++ b/pkgs/by-name/un/unciv/package.nix @@ -27,11 +27,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.10.19"; + version = "4.10.21"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-f9fg2Clz9CjoC8xzCguJ2A3Aczom+KjEyIlMJC2oS/o="; + hash = "sha256-JnuJbmKGqtEdFiMnA5RvCfdox2WTABwxNI3Zdk6wNU8="; }; dontUnpack = true; From 9cf31fa3d38c35fadddb8a0808f43586be386b9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 00:34:16 +0000 Subject: [PATCH 015/260] ocenaudio: 3.13.4 -> 3.13.5 --- pkgs/by-name/oc/ocenaudio/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/oc/ocenaudio/package.nix b/pkgs/by-name/oc/ocenaudio/package.nix index 98852f37c325..592a75b773ff 100644 --- a/pkgs/by-name/oc/ocenaudio/package.nix +++ b/pkgs/by-name/oc/ocenaudio/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "ocenaudio"; - version = "3.13.4"; + version = "3.13.5"; src = fetchurl { url = "https://www.ocenaudio.com/downloads/index.php/ocenaudio_debian9_64.deb?version=v${version}"; - hash = "sha256-vE+xwwkBXIksy+6oygLDsrT8mFfHYIGcb6+8KMZe0no="; + hash = "sha256-9eDDllf6D2hAhjztPhi1MrUky7zQfiE4uLAbfRDx+7s="; }; nativeBuildInputs = [ From 8944725b1e4512c00f5cc2a2c79d6030713e7175 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 22:13:09 +0000 Subject: [PATCH 016/260] subxt: 0.34.0 -> 0.35.0 --- pkgs/development/tools/subxt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/subxt/default.nix b/pkgs/development/tools/subxt/default.nix index 2090fe1aacac..e8ec817ffe57 100644 --- a/pkgs/development/tools/subxt/default.nix +++ b/pkgs/development/tools/subxt/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "subxt"; - version = "0.34.0"; + version = "0.35.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "subxt"; rev = "v${version}"; - hash = "sha256-1SkAYJ6YdZeaD3c1pekd/nwTEI9Zt/2fmA3Y7PPLxoE="; + hash = "sha256-zNgk8muBxKA3YLP42EIuGSZOyUKRNTvzDvLks3IGHZk="; }; - cargoHash = "sha256-a3LPvPCQklmrtC9XpxARgYeL4bmj2vFsLbiRGjNUGio="; + cargoHash = "sha256-2aekzHVmAVWfJH7dQOlyiR6r3NESsu5W7B6osAOBUWY="; # Only build the command line client cargoBuildFlags = [ "--bin" "subxt" ]; From 2f08b4959bdae757261f2395d0895ebbe6176420 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 21 Mar 2024 23:19:20 +0000 Subject: [PATCH 017/260] boundary: 0.15.2 -> 0.15.3 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 44383586b3c8..52771f68433a 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.15.2"; + version = "0.15.3"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-X8bO4kV5+u093TyEFMiKn967U7AsesRzU5YHohWpEdQ="; - aarch64-linux = "sha256-qMu44ecBzSx3knsXIKfRrO0X1BE14FoVFq6Vgw3bD5o="; - x86_64-darwin = "sha256-g2aQc9NUUxTO0BEsg/w4h1tYTUrtXiau62nBj3OM3Is="; - aarch64-darwin = "sha256-w6Vwft5w+aYC7aBndSQia3i7CyTOYG6ln7G6D9b9J90="; + x86_64-linux = "sha256-dY55oJ8SVBuvKqxsJ6OMb7EbGBUNVYydHUX0ONZfW+0="; + aarch64-linux = "sha256-OvI9Ul1hWrZUM3Hbf/LbDPfXQgvArOPy7Umu58xQetU="; + x86_64-darwin = "sha256-sln0CD8o9rwdtnBS8V06p9TAF/XqZwhc+wsVRq1GJVE="; + aarch64-darwin = "sha256-7R6WVqn9FZH6Ss+QpCVHjUw1ASwV3rag76Wh5dC+JvA="; }; in fetchzip { From 088d5a98c6346a3f9956a81e68e86a216f47ffb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 00:21:22 +0000 Subject: [PATCH 018/260] glasskube: 0.0.4 -> 0.1.0 --- pkgs/by-name/gl/glasskube/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/gl/glasskube/package.nix b/pkgs/by-name/gl/glasskube/package.nix index e9130bb321da..07942acbd6ba 100644 --- a/pkgs/by-name/gl/glasskube/package.nix +++ b/pkgs/by-name/gl/glasskube/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "glasskube"; - version = "0.0.4"; + version = "0.1.0"; src = fetchFromGitHub { owner = "glasskube"; repo = "glasskube"; rev = "refs/tags/v${version}"; - hash = "sha256-+5SinF85bU113C9B025DM83v8ApaXqLV4n1P9zZP3ns="; + hash = "sha256-iJjO4V2sK3e/SpDZ5Lfw7gILgZrI4CGg0wLLVKthGUE="; }; - vendorHash = "sha256-DBqO2EyB1TydsdK2GWJoFGGgTS+E62GogysPX4WtzYU="; + vendorHash = "sha256-iFWcTzZP0DKJ9hrmfUWR4U/VX2zsR+3uojI+GRI2R3I="; CGO_ENABLED = 0; From 2d9761c7362d1018213d5923ed3209a357a72219 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 00:28:17 +0000 Subject: [PATCH 019/260] avalanchego: 1.11.2 -> 1.11.3 --- pkgs/applications/networking/avalanchego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/avalanchego/default.nix b/pkgs/applications/networking/avalanchego/default.nix index 83ca257a98b1..d06ced1189ee 100644 --- a/pkgs/applications/networking/avalanchego/default.nix +++ b/pkgs/applications/networking/avalanchego/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "avalanchego"; - version = "1.11.2"; + version = "1.11.3"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-E75lqQkaCub/WpxvVHB5YP1E1ygjUURJ1VWrjvcV96o="; + hash = "sha256-VeszkBExveXmajnVLHDp9Fc9xngnUKBbVY55L260rds="; }; - vendorHash = "sha256-Xrr4QE0FN6sII4xOjPbhwBlNgEwOlogKRNStjrjH7H0="; + vendorHash = "sha256-8K8loSdeISkA06LBkZgro+mEbQEZY1sdzplq7IKZ4kI="; # go mod vendor has a bug, see: https://github.com/golang/go/issues/57529 proxyVendor = true; From d5b4c50a2f6b7fa859cb36365c9ac2aa59ff2ac5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 00:32:21 +0000 Subject: [PATCH 020/260] mendeley: 2.110.2 -> 2.111.0 --- pkgs/applications/office/mendeley/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 2808dd14e2c6..03eee188ac56 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -7,13 +7,13 @@ let pname = "mendeley"; - version = "2.110.2"; + version = "2.111.0"; executableName = "${pname}-reference-manager"; src = fetchurl { url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; - hash = "sha256-AJNNCPEwLAO1+Zub6Yyad5Zcsl35zf4dEboyGE9wSX8="; + hash = "sha256-tN76RKHETTMkJ239I6+a36RPTuWqYlCSs+tEP+BcB+M="; }; appimageContents = appimageTools.extractType2 { From ed061a50724ef618a18af645e7d50ad34f069167 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 01:12:12 +0000 Subject: [PATCH 021/260] libnabo: 1.1.0 -> 1.1.1 --- pkgs/development/libraries/libnabo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix index c6268ea3ee7e..90ed45178d1f 100644 --- a/pkgs/development/libraries/libnabo/default.nix +++ b/pkgs/development/libraries/libnabo/default.nix @@ -1,14 +1,14 @@ {lib, stdenv, fetchFromGitHub, cmake, eigen, boost}: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; pname = "libnabo"; src = fetchFromGitHub { owner = "ethz-asl"; repo = "libnabo"; rev = version; - sha256 = "sha256-KWqNJWdyFFe5zAs1HzGnIshGXkBAKjnbEmBZXxty99E="; + sha256 = "sha256-EVbvNwj1aRhRr5PhF6Kkb/UTn4JzF174WX1C+tvBv2Q="; }; nativeBuildInputs = [ cmake ]; From a351f3ecaa950408371b5a279d21b1db452eeb44 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 05:36:43 +0000 Subject: [PATCH 022/260] memtree: unstable-2024-01-04 -> 0-unstable-2024-01-04 --- pkgs/by-name/me/memtree/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/me/memtree/package.nix b/pkgs/by-name/me/memtree/package.nix index 528323624805..6c40a000d590 100644 --- a/pkgs/by-name/me/memtree/package.nix +++ b/pkgs/by-name/me/memtree/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication { pname = "memtree"; - version = "unstable-2024-01-04"; + version = "0-unstable-2024-01-04"; pyproject = true; src = fetchFromGitHub { From 9a3cd10ad14b60a39f72d8814fade22bd5ab017c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:19:29 +0000 Subject: [PATCH 023/260] blueprint-compiler: 0.10.0 -> 0.12.0 --- pkgs/development/compilers/blueprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 14a901d785fe..c37d5c91c276 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -12,14 +12,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "blueprint-compiler"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jwestman"; repo = "blueprint-compiler"; rev = "v${finalAttrs.version}"; - hash = "sha256-pPrQc2ID84N+50j/A6VAJAOK+D1hjaokhFckOnOaeTw="; + hash = "sha256-pvYSFCiYynH3E6QOTu4RfG+6eucq++yiRu75qucSlZU="; }; nativeBuildInputs = [ From 51adef6fc88c061726ac9f93e52c57f45da1ee81 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:24:49 +0000 Subject: [PATCH 024/260] yaru-theme: 23.10.0 -> 24.04.0 --- pkgs/data/themes/yaru/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 4810bfd55e32..bedf4482f74a 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "23.10.0"; + version = "24.04.0"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - hash = "sha256-+Szk77QeoM4PwusxKflTh83h16qz6Es6UwDXpbydJUE="; + hash = "sha256-KvpA86YL6toVklRPu4hP3j3w+Q0h/n6mZRZgk3HvMfc="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; From d8bfc22089b397f4dff8d446609ee97ee5ae5a5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:37:31 +0000 Subject: [PATCH 025/260] android-tools: 34.0.4 -> 34.0.5 --- pkgs/tools/misc/android-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 891bea3fe474..ed0acaff3a5e 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "34.0.4"; + version = "34.0.5"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-eiL/nOqB/0849WBoeFjo+PtzNiRBJZfjzBqwJi+No6E="; + hash = "sha256-+wnP8Sz7gqz0Ko6+u8A0JnG/zQIRdxY2i9xz/dpgMEo="; }; nativeBuildInputs = [ cmake ninja pkg-config perl go ]; From 9e48631eb9d2c152fb4f07a0ac80901decc33a1f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 12:54:06 +0000 Subject: [PATCH 026/260] vintagestory: 1.19.4 -> 1.19.5 --- pkgs/games/vintagestory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 182f0621bfed..8b9468b81c76 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.19.4"; + version = "1.19.5"; src = fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; - hash = "sha256-A5NIWy902a0W/Y/sJL+qPrEJwCiU/TNIm7G3BtU6gzM="; + hash = "sha256-noweIb+lZhme1kEjU2+tIc0E99iShNngxEEyDMKJcpk="; }; From b594e2e328f69a9e7932a62375f1a2c233a2eb89 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 17:20:26 +0000 Subject: [PATCH 027/260] micronaut: 4.3.6 -> 4.3.7 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7304aa9e3ddb..a126ce98314c 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.3.6"; + version = "4.3.7"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-iwV+yo9NkQr78ZMFiUAnFXPdK4ItB4o+75HNFpd7wpU="; + sha256 = "sha256-TP7Ccv/Krc5l35AxyrkRmeRMSgQP9Q3BpNiHxlqLD4I="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 3585b62658d9389dbaac1997bca37a37b8711279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 17:39:27 +0000 Subject: [PATCH 028/260] vitess: 18.0.2 -> 19.0.1 --- pkgs/development/tools/database/vitess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/vitess/default.nix b/pkgs/development/tools/database/vitess/default.nix index aa0fa687fb82..6ace9ba59251 100644 --- a/pkgs/development/tools/database/vitess/default.nix +++ b/pkgs/development/tools/database/vitess/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vitess"; - version = "18.0.2"; + version = "19.0.1"; src = fetchFromGitHub { owner = "vitessio"; repo = pname; rev = "v${version}"; - hash = "sha256-CKhnP6sTw7rNzqMhJpwuYhoc5F3MNnL58JxnoKPHyl0="; + hash = "sha256-UDqSCAJObKh65/mDupuWzkYfqJyd6XZCi+qA7NwIO9M="; }; - vendorHash = "sha256-FwgKsv5fQSWKa2K2djEwd7lnbE2qtADoiIokR9U5t1k="; + vendorHash = "sha256-YrgWrk+67Vx9L+uFLipyuousj5DQIleqyxbUSqalZyw="; buildInputs = [ sqlite ]; From eca35aef770c2c00d1aefc853af120ae4b448c1d Mon Sep 17 00:00:00 2001 From: Sebastian Neubauer Date: Fri, 2 Feb 2024 15:19:54 +0100 Subject: [PATCH 029/260] vulkan-cts: 1.3.7.3 -> 1.3.8.1 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.8.0 Changelog: https://github.com/KhronosGroup/VK-GL-CTS/releases/tag/vulkan-cts-1.3.8.1 --- pkgs/tools/graphics/vulkan-cts/default.nix | 4 +-- pkgs/tools/graphics/vulkan-cts/sources.nix | 34 +++++++++------------- pkgs/tools/graphics/vulkan-cts/update.sh | 2 +- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index 497fd13df341..58444354666f 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.7.3"; + version = "1.3.8.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-YtfUnrqWZwPMkLr3ovJz8Xr2ES1piW0yB+rBAaiQKoQ="; + hash = "sha256-lDMaJjAusK+Hva4BZnrXNmuGdSL04rh1W9PYsjxF3c8="; }; prePatch = '' diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 3e42e9c4ed7a..e0a197188d66 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -1,25 +1,18 @@ # Autogenerated from vk-cts-sources.py { fetchurl, fetchFromGitHub }: rec { - ESExtractor = fetchFromGitHub { - owner = "Igalia"; - repo = "ESExtractor"; - rev = "v0.3.3"; - hash = "sha256-qqhDv08cLQlLaEj0qfghByK+IohdvQdI2ePfUNFEArQ="; - }; - amber = fetchFromGitHub { owner = "google"; repo = "amber"; - rev = "933ecb4d6288675a92eb1650e0f52b1d7afe8273"; - hash = "sha256-v9z4gv/mTjaCkByZn6uDpMteQuIf0FzZXeKyoXfFjXo="; + rev = "8e90b2d2f532bcd4a80069e3f37a9698209a21bc"; + hash = "sha256-LuNCND/NXoNbbTWv7RYQUkq2QXL1qXR27uHwFIz0DXg="; }; glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3"; - hash = "sha256-4SoET76fCfutttK00JGCKVQUn0ivGdTw6GhndvxbIDU="; + rev = "9fd0fcd737f1369e89fb3aa8b2e62bad57ac46c6"; + hash = "sha256-A3IFW3kOuOGj4AfpdDfAHIySDLdIB9IK+wk8TSBcPrk="; }; jsoncpp = fetchFromGitHub { @@ -32,36 +25,35 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "138bbe048221d315962ddf8413aa6a08cc62a381"; - hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ="; + rev = "ce80453dadeea7b1a6409434f3358ef1e46e4ae7"; + hash = "sha256-zgHMaUA7rdLbmkX8lr4p2TW9g1RDyBmUs5rK++wmUjE="; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c"; - hash = "sha256-gcKwML5ItccAhX+QtR9G86h0JnaiVQEmOQzQpL005dg="; + rev = "d3c2a6fa95ad463ca8044d7fc45557db381a6a64"; + hash = "sha256-POd/TnbVzq/Xyi0O4hU24Qk4LDD5Af2kHJgQ+wPVDsg="; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0"; - hash = "sha256-gju6hJSIWOswGnRxKeJZsU1jgp3HSZAf7wFRxswY+Js="; + rev = "f9184c6501f7e349e0664d281ac93b1db9c1e5ad"; + hash = "sha256-BDnKOUIWZVGPPwmQsMqF1yWy80dl75kdaoztUMnlrqc="; }; vulkan-docs = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Docs"; - rev = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0"; - hash = "sha256-bJ2C1+zjvLiYp5A5AHTevFPU9Yka99imqLwH+uApuoY="; + rev = "d99193d3fcc4b2a0dacc0a9d7e4951ea611a3e96"; + hash = "sha256-pfPErjZ4jSxEg+OgFcELyvqrS0Hm3QWQ3WhQ9T3rJbQ="; }; prePatch = '' - mkdir -p external/ESExtractor external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs + mkdir -p external/amber external/glslang external/jsoncpp external/nvidia-video-samples external/spirv-headers external/spirv-tools external/vulkan-docs - cp -r ${ESExtractor} external/ESExtractor/src cp -r ${amber} external/amber/src cp -r ${glslang} external/glslang/src cp -r ${jsoncpp} external/jsoncpp/src diff --git a/pkgs/tools/graphics/vulkan-cts/update.sh b/pkgs/tools/graphics/vulkan-cts/update.sh index 300fe230264e..11081d8708dc 100755 --- a/pkgs/tools/graphics/vulkan-cts/update.sh +++ b/pkgs/tools/graphics/vulkan-cts/update.sh @@ -3,7 +3,7 @@ set -euo pipefail -rawVersion="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')" +rawVersion="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -s "https://api.github.com/repos/KhronosGroup/VK-GL-CTS/releases" | jq -r 'map(select(.tag_name | startswith("vulkan-cts-"))) | .[0].tag_name')" basedir="$(git rev-parse --show-toplevel)" cd "$basedir" From f0991413e3348dcc13dac2c0c34566e1620b8749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 19:19:58 +0000 Subject: [PATCH 030/260] spleen: 2.0.2 -> 2.1.0 --- pkgs/data/fonts/spleen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index e97d8416610c..ef9e2956b924 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "spleen"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/fcambus/spleen/releases/download/${version}/spleen-${version}.tar.gz"; - hash = "sha256-+TDrAolKoG61CuqqELAEICVNcjIPoow6QPFXqMKUN1U="; + hash = "sha256-i0fFbxpuuFj7z540UwVXQEsC+7NFXjjmT7hEc/0MNy8="; }; nativeBuildInputs = [ xorg.mkfontscale ]; From 009ccf2ce760d27ead3b97faa264e25fb52a6ac7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 19:20:10 +0000 Subject: [PATCH 031/260] questdb: 7.3.10 -> 7.4.0 --- pkgs/servers/nosql/questdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 01d86bdb02ef..73822139302a 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "questdb"; - version = "7.3.10"; + version = "7.4.0"; src = fetchurl { url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz"; - hash = "sha256-diltorfAnyrXZwohrsZHA91AXuSZolxDUajfmOaD5lM="; + hash = "sha256-XpMLT6oBoZv7V69l7XLm7B/ioeNHSqKkl+4UAsMcYao="; }; nativeBuildInputs = [ From d2ccd0b5be5e7d3682d5cccde00025bd7c4b6c13 Mon Sep 17 00:00:00 2001 From: Robert James Hernandez Date: Wed, 6 Mar 2024 21:16:44 +0000 Subject: [PATCH 032/260] aprx: init at 2.9.1-unstable-2021-09-21 --- pkgs/by-name/ap/aprx/package.nix | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ap/aprx/package.nix diff --git a/pkgs/by-name/ap/aprx/package.nix b/pkgs/by-name/ap/aprx/package.nix new file mode 100644 index 000000000000..79cefac7545a --- /dev/null +++ b/pkgs/by-name/ap/aprx/package.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, fetchFromGitHub +, perl +}: + +stdenv.mkDerivation { + pname = "aprx"; + version = "2.9.1-unstable-2021-09-21"; + + src = fetchFromGitHub { + owner = "PhirePhly"; + repo = "aprx"; + rev = "2c84448fe6d897980234961a87ee4c1d4fad69ec"; + sha256 = "sha256-01PB7FaG8GmPm1U15/3g1CfQwdYmf3ThZFdVh2zUAl4="; + }; + + nativeBuildInputs = [ perl ]; + + env.NIX_CFLAGS_COMPILE = toString ([ + "-fcommon" + "-O2" + ] ++ lib.optional stdenv.cc.isClang "-Wno-error=implicit-int"); + + configureFlags = [ + "--with-erlangstorage" + "--sbindir=$(out)/bin" + "--sysconfdir=$(out)/etc" + "--mandir=$(out)/share/man" + ]; + + makeFlags = [ "INSTALL=install" ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man8 $out/etc + ''; + + meta = with lib; { + description = "A multitalented APRS i-gate / digipeater"; + homepage = "http://thelifeofkenneth.com/aprx"; + license = licenses.bsd3; + maintainers = with maintainers; [ sarcasticadmin ]; + mainProgram = "aprx"; + platforms = platforms.unix; + }; +} From c27a1d2fac82c6502fdc4b33e38c21091e3e86ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 22 Mar 2024 22:40:47 +0000 Subject: [PATCH 033/260] tinygo: 0.31.1 -> 0.31.2 --- pkgs/development/compilers/tinygo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 6a572acd62ee..4ff3f9c7379f 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -29,13 +29,13 @@ in buildGoModule rec { pname = "tinygo"; - version = "0.31.1"; + version = "0.31.2"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "sha256-YocRTgGSyjnQsYd4a2nCQ0vdQi/z2gHPguix5xIkkgc="; + sha256 = "sha256-e0zXxIdAtJZXJdP/S6lHRnPm5Rsf638Fhox8XcqOWrk="; fetchSubmodules = true; }; From 3f4d0561dbe964686411c383570421170093eeb7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 00:22:01 +0000 Subject: [PATCH 034/260] pspp: 2.0.0 -> 2.0.1 --- pkgs/applications/science/math/pspp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index 032ae257c564..420b495e736e 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "pspp"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { url = "mirror://gnu/pspp/${pname}-${version}.tar.gz"; - sha256 = "sha256-qPbLiGr1sIOENXm81vsZHAVKzOKMxotY58XwmZai2N8="; + sha256 = "sha256-jtuw8J6M+AEMrZ4FWeAjDX/FquRyHHVsNQVU3zMCTAA="; }; nativeBuildInputs = [ pkg-config texinfo python3 makeWrapper ]; From 1c9ad9d3eb853cde96a18e4dfbcf1f293cad1efa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 01:12:16 +0000 Subject: [PATCH 035/260] aspectj: 1.9.21 -> 1.9.21.2 --- pkgs/development/compilers/aspectj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index ee5528953c41..5e34560f46cf 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "aspectj"; - version = "1.9.21"; + version = "1.9.21.2"; builder = ./builder.sh; src = let versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; in fetchurl { url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; - sha256 = "sha256-/cdfEpUrK39ssVualCKWdGhpymIhq7y2oRxYJAENhU0="; + sha256 = "sha256-wqQtyopS03zX+GJme5YZwWiACqO4GAYFr3XAjzqSFnQ="; }; inherit jre; From 341f75d8f39e71ef97210460922e7c7a4860ddf2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 02:03:33 +0000 Subject: [PATCH 036/260] miniupnpd: 2.3.5 -> 2.3.6 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 1c3cb3f0e592..974fb371bab4 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation rec { pname = "miniupnpd"; - version = "2.3.5"; + version = "2.3.6"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; - sha256 = "sha256-ljekEsM9J3jNrlYQWJM7TgtnRl/xNOlnYaexl1Gy+g8="; + sha256 = "sha256-Ecp79NS6bGuhLHDDBBgH9Rb02fa2aXvqBOg3YmudZ5w="; }; buildInputs = [ iptables-legacy libuuid openssl ] From b4e3816f544b140f00b433fda4ed76e53705c207 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 02:38:11 +0000 Subject: [PATCH 037/260] swww: 0.8.2 -> 0.9.1 --- pkgs/by-name/sw/swww/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sw/swww/package.nix b/pkgs/by-name/sw/swww/package.nix index cf9b878a506d..b0968cd0f6c7 100644 --- a/pkgs/by-name/sw/swww/package.nix +++ b/pkgs/by-name/sw/swww/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.8.2"; + version = "0.9.1"; src = fetchFromGitHub { owner = "LGFae"; repo = "swww"; rev = "refs/tags/v${version}"; - hash = "sha256-n7YdUmIZGu7W7cX6OvVW+wbkKjFvont4hEAhZXYDQd8="; + hash = "sha256-JtwNrdXZbmR7VZeRiXcLEEOq1z7bF8idjp2D1Zpf3Z4="; }; - cargoHash = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; + cargoHash = "sha256-FC3HeqWAMOTm2Tmzg+Sn/j0ZXyd8nsYH64MlwQwr8W0="; buildInputs = [ lz4 From faede06ebb62811a43c34e379ac698efacc49d2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 03:40:29 +0000 Subject: [PATCH 038/260] libcloudproviders: 0.3.5 -> 0.3.6 --- pkgs/development/libraries/libcloudproviders/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 5977ea33bd24..6161ea78174d 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation rec { pname = "libcloudproviders"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "mirror://gnome/sources/libcloudproviders/${lib.versions.majorMinor version}/libcloudproviders-${version}.tar.xz"; - sha256 = "uYdFbt2vcVup1iOqK8UBqxtpff/rEaqng6Y3J13xhto="; + sha256 = "O3URCzpP3vTFxaRA5IcB/gVNKuBh0VbIkTa7W6BedLc="; }; outputs = [ "out" "dev" "devdoc" ]; From d41c24a011f28471a7cfbc13f338297c27fd7e61 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 23 Mar 2024 10:03:51 +0100 Subject: [PATCH 039/260] gpg-tui: 0.10.0 -> 0.11.0 Signed-off-by: Matthias Beyer --- pkgs/tools/security/gpg-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 64a273784540..33084d155ea2 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "gpg-tui"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "orhun"; repo = "gpg-tui"; rev = "v${version}"; - hash = "sha256-zTFWIIqIDMI77lg2CB1ug+GeKPVIT1OQ1p80x6tLgGg="; + hash = "sha256-aHmLcWiDy5GMbcKi285tfBggNmGkpVAoZMm4dt8LKak="; }; - cargoHash = "sha256-5qLrmU/SfUfiQOOpECTEn8K142STnbhqE3XbJFxKPZg="; + cargoHash = "sha256-rtBvo2nX4A6K/TBl6xhW8huLXdR6xDUhzMB3KRXRYMs="; nativeBuildInputs = [ gpgme # for gpgme-config From cff3d4db9700d3722bd39153195b93511f08277d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 23 Mar 2024 10:11:13 +0100 Subject: [PATCH 040/260] gpg-tui: Add meta.mainProgram Signed-off-by: Matthias Beyer --- pkgs/tools/security/gpg-tui/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gpg-tui/default.nix b/pkgs/tools/security/gpg-tui/default.nix index 33084d155ea2..ba07ffb9e67f 100644 --- a/pkgs/tools/security/gpg-tui/default.nix +++ b/pkgs/tools/security/gpg-tui/default.nix @@ -54,5 +54,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/orhun/gpg-tui/blob/${src.rev}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ dotlambda matthiasbeyer ]; + mainProgram = "gpg-tui"; }; } From 9c967fef3244b41c9c9e6554814b9783ad859dff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 09:55:20 +0000 Subject: [PATCH 041/260] kraft: 0.7.5 -> 0.7.14 --- pkgs/applications/virtualization/kraft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/kraft/default.nix b/pkgs/applications/virtualization/kraft/default.nix index ca7384cdd19b..346c6356f1f2 100644 --- a/pkgs/applications/virtualization/kraft/default.nix +++ b/pkgs/applications/virtualization/kraft/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "kraftkit"; - version = "0.7.5"; + version = "0.7.14"; src = fetchFromGitHub { owner = "unikraft"; repo = "kraftkit"; rev = "v${version}"; - hash = "sha256-kuI1RSipPj7e8tsnThAEkL3bpmgAEKSQthubfjtklp0="; + hash = "sha256-5P+tfaT5eCEDCsQmlUUx2dkh/elC6wipbJc1sAhyTYQ="; }; - vendorHash = "sha256-BPpUBGWzW4jkUgy/2oqvqXBNLmglUVTFA9XuGhUE1zo="; + vendorHash = "sha256-tfg5bG/aKxmPyN12AsuK0D9ms6SwdbTh7QFRXmS4QzI="; ldflags = [ "-s" From 152f8696a6b0ddf01013d12c7ec1df1eb33a6e64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 11:30:11 +0000 Subject: [PATCH 042/260] upbound: 0.24.2 -> 0.26.0 --- pkgs/development/tools/upbound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/upbound/default.nix b/pkgs/development/tools/upbound/default.nix index 6d91ea46a969..ef01000065f8 100644 --- a/pkgs/development/tools/upbound/default.nix +++ b/pkgs/development/tools/upbound/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "upbound"; - version = "0.24.2"; + version = "0.26.0"; src = fetchFromGitHub { owner = pname; repo = "up"; rev = "v${version}"; - sha256 = "sha256-MDpe5CM5pgbrdVozh1yXiALLd8BkhrtNjL/su2JubcE="; + sha256 = "sha256-xlPBz0FVG/bAUGH/RlguVG5rDcKMty7rX8Y+1VBbEpI="; }; - vendorHash = "sha256-jHVwI5fQbS/FhRptRXtNezG1djaZKHJgpPJfuEH/zO0="; + vendorHash = "sha256-1NhcP/iEfEMtPSBP6wbTKi/fznoJ8HjaH88BPzVnf7w="; subPackages = [ "cmd/docker-credential-up" "cmd/up" ]; From 768b6a7b81063b283084ceeb711f975012ac51a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 18:41:26 +0000 Subject: [PATCH 043/260] fits-cloudctl: 0.12.16 -> 0.12.17 --- pkgs/tools/admin/fits-cloudctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/fits-cloudctl/default.nix b/pkgs/tools/admin/fits-cloudctl/default.nix index 0bdfbacab571..2e508323d75e 100644 --- a/pkgs/tools/admin/fits-cloudctl/default.nix +++ b/pkgs/tools/admin/fits-cloudctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "fits-cloudctl"; - version = "0.12.16"; + version = "0.12.17"; src = fetchFromGitHub { owner = "fi-ts"; repo = "cloudctl"; rev = "v${version}"; - hash = "sha256-5Uf4glKRbxlC7ZdBW51Ter9SBt5rwas+eD4KYWOqPss="; + hash = "sha256-nKVCYgecrjCfAx+9aiFJYq2m/E1yFh1Ie2vK4HqusUo="; }; - vendorHash = "sha256-GFMnBd5HmjFcMhayL1enQuNxXyVdLb6RLakHNxguXks="; + vendorHash = "sha256-xcwJ1tEOCF9BGjcWZPVY/IZkNc2TUtufa7zQfIU4CQQ="; meta = with lib; { description = "Command-line client for FI-TS Finance Cloud Native services"; From 960c144f167f46380ff1d7808f65696ac6bd0d3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Mar 2024 22:43:54 +0000 Subject: [PATCH 044/260] kubectl-view-secret: 0.11.0 -> 0.12.0 --- .../networking/cluster/kubectl-view-secret/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix index 695d63db8165..7f22523e46bc 100644 --- a/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix +++ b/pkgs/applications/networking/cluster/kubectl-view-secret/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubectl-view-secret"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "elsesiy"; repo = pname; rev = "v${version}"; - hash = "sha256-IdbJQ3YCIPcp09/NORWGezqjbwktObN7TuQdq5uAN4A="; + hash = "sha256-5X5rOoERx6HoG3cOBpYm12anMXXDjTtHZzQOOlJeJSs="; }; - vendorHash = "sha256-Q6OosaHDzq9a2Nt18LGiGJ1C2i1/BRYGaNEBeK0Ohiw="; + vendorHash = "sha256-oQvmS05nev+ypfkKAlTN+JbzPux5iAzHsojW8SxtB70="; subPackages = [ "./cmd/" ]; From 93c638d405d1d6bd86eabcd3eec8497e2bc77895 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 00:19:04 +0000 Subject: [PATCH 045/260] fsverity-utils: 1.5 -> 1.6 --- pkgs/os-specific/linux/fsverity-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fsverity-utils/default.nix b/pkgs/os-specific/linux/fsverity-utils/default.nix index 232fc1470465..7d0f1f48e7e5 100644 --- a/pkgs/os-specific/linux/fsverity-utils/default.nix +++ b/pkgs/os-specific/linux/fsverity-utils/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "fsverity-utils"; - version = "1.5"; + version = "1.6"; outputs = [ "out" "lib" "dev" ] ++ lib.optional enableManpages "man"; src = fetchzip { url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${version}.tar.gz"; - sha256 = "sha256-ygBOkp2PBe8Z2ak6SXEJ6HHuT4NRKmIsbJDHcY+h8PQ="; + sha256 = "sha256-FZN4MKNmymIXZ2Q0woA0SLzPf4SaUJkj4ssKPsY4xXc="; }; patches = lib.optionals (!enableShared) [ From 8c7aa803dac4761781e423752c36aa5da173786d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 02:46:40 +0000 Subject: [PATCH 046/260] stylelint: 16.2.1 -> 16.3.0 --- pkgs/development/tools/analysis/stylelint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index 1149bed3fd5f..fcaaa35fa401 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.2.1"; + version = "16.3.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-ncJ5oCXe23+an2nFOafMEypFUkwRVW3hZf5pWCKkBNE="; + hash = "sha256-N3M+PhoUjCB+5ouOPDI9m4vPnEoI6+Gk8DBNOquFCqY="; }; - npmDepsHash = "sha256-0+jrfXoM6yqkd43lot3JPB+HBTz3XXzqAulGketRsxU="; + npmDepsHash = "sha256-GRGYDt/qkHZrr7tSM3mPAiBLqUZ0FN1DdDHeBAtNG5w="; dontNpmBuild = true; From f182ef3a4f7735594d7b46dfa000878d5aaa2611 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 11:16:08 +0000 Subject: [PATCH 047/260] cloudfoundry-cli: 8.7.8 -> 8.7.9 --- .../networking/cluster/cloudfoundry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 5f1259b351b8..bd640845331f 100644 --- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "cloudfoundry-cli"; - version = "8.7.8"; + version = "8.7.9"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-86FY7SfVZ9aEC72VP7KWj3p+wbAyLXLYtugP+Iv0G80="; + sha256 = "sha256-uFYeiw2hdX25mUBdudNCC4ZuFEoWyfghWmQR8IsQy+w="; }; - vendorHash = "sha256-Y46d8g4KoS5DjMMnX8YjgJYg6ax891vlgH9INZZflJI="; + vendorHash = "sha256-lvSo8kl2du6Sv7zY3uheXaO6Qg+nblW0jpp2q8+1vyk="; subPackages = [ "." ]; From 1c92ae96141390907d63a6a5a315b9d040cbcf17 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Sun, 24 Mar 2024 21:59:09 +0100 Subject: [PATCH 048/260] python3Packages.torchWithRocm: switch back to ROCm 5.7 --- pkgs/development/python-modules/torch/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/torch/default.nix b/pkgs/development/python-modules/torch/default.nix index 10eecd1de99b..82ad61a19167 100644 --- a/pkgs/development/python-modules/torch/default.nix +++ b/pkgs/development/python-modules/torch/default.nix @@ -52,7 +52,7 @@ # ROCm dependencies rocmSupport ? config.rocmSupport, - rocmPackages, + rocmPackages_5, gpuTargets ? [ ] }: @@ -60,6 +60,8 @@ let inherit (lib) attrsets lists strings trivial; inherit (cudaPackages) cudaFlags cudnn nccl; + rocmPackages = rocmPackages_5; + setBool = v: if v then "1" else "0"; # https://github.com/pytorch/pytorch/blob/v2.0.1/torch/utils/cpp_extension.py#L1744 From d347f29dc76687d92a49540698f774c4204609b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 24 Mar 2024 23:36:05 +0000 Subject: [PATCH 049/260] pachyderm: 2.9.0 -> 2.9.2 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 1e381c7470fb..1c123a937451 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-5xC0D7XB1db3mxUkzIyvmVIxOlL8XX8Vxpmtf60BQNM="; + hash = "sha256-/9j7umcIffG5jAaUW/jmIX5CUD9dUq5/ZKhzbKx0Kw4="; }; - vendorHash = "sha256-EW8DURf6URPQQMakHnRuF9Xh5iKh2y4cz6XYgXQwJM4="; + vendorHash = "sha256-6iwiepmzxZ4cGsPeHQDNFd2VuhmjTAX9kBdjaQPBMKU="; subPackages = [ "src/server/cmd/pachctl" ]; From b5244c47aa0c32f2477585216b6f4c153c1b1d9b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 24 Mar 2024 23:37:52 +0000 Subject: [PATCH 050/260] questdb: mark with sourceProvenance binaryBytecode --- pkgs/servers/nosql/questdb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/nosql/questdb/default.nix b/pkgs/servers/nosql/questdb/default.nix index 73822139302a..45a94eef2b3b 100644 --- a/pkgs/servers/nosql/questdb/default.nix +++ b/pkgs/servers/nosql/questdb/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "high-performance, open-source SQL database for applications in financial services, IoT, machine learning, DevOps and observability"; homepage = "https://questdb.io/"; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; license = lib.licenses.asl20; maintainers = [ lib.maintainers.jacfal ]; platforms = lib.platforms.linux; From 014105ee385a6580a05e51f31a71da25c3f6c67a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 01:19:25 +0000 Subject: [PATCH 051/260] fortran-fpm: 0.10.0 -> 0.10.1 --- pkgs/tools/package-management/fortran-fpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/fortran-fpm/default.nix b/pkgs/tools/package-management/fortran-fpm/default.nix index 0945b0c67e32..40e92dd68e84 100644 --- a/pkgs/tools/package-management/fortran-fpm/default.nix +++ b/pkgs/tools/package-management/fortran-fpm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fortran-fpm"; - version = "0.10.0"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90"; - sha256 = "sha256-SOVj23Sva5OW6+Sme9NxIQ4uqMbis8wjDmgYPOdQlCI="; + sha256 = "sha256-dVPQW2DCp+iJojuhCgeEFVFpugG/x+DKhG986QuE4co="; }; dontUnpack = true; From d4ac12d5c20c73cc169de663ec8c2f642dcba9c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 01:26:41 +0000 Subject: [PATCH 052/260] diswall: 0.5.1 -> 0.5.2 --- pkgs/applications/networking/diswall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix index 703b6c7456fa..6afe93fee471 100644 --- a/pkgs/applications/networking/diswall/default.nix +++ b/pkgs/applications/networking/diswall/default.nix @@ -5,20 +5,20 @@ let in rustPlatform.buildRustPackage rec { pname = "diswall"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; rev = "v${version}"; - sha256 = "sha256-6XMw8fnuM1KyInYCw8DTonsj5gV9d+EuYfO5ggZ3YUU="; + sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-So7XBC66y2SKbcjErg4Tnd/NcEpX5zYOEr60RvU9OOU="; + cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I="; doCheck = false; From 69d879dec3bdc4677701b2953ab3b70df6d69022 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 25 Mar 2024 04:20:00 +0000 Subject: [PATCH 053/260] pinentry_mac: fix mainProgram name The `lib.getExe` doesn't allow a nested path in the `mainProgram` attribute. --- pkgs/tools/security/pinentry/mac.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 4620aedecc75..8e808e18edd3 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -5,6 +5,7 @@ , libassuan , libgpg-error , libiconv +, makeBinaryWrapper , texinfo , common-updater-scripts , writers @@ -37,14 +38,17 @@ stdenv.mkDerivation rec { (allow process-exec (literal "/usr/libexec/PlistBuddy")) ''; - nativeBuildInputs = [ autoreconfHook texinfo ]; + nativeBuildInputs = [ autoreconfHook makeBinaryWrapper texinfo ]; buildInputs = [ libassuan libgpg-error libiconv Cocoa ]; configureFlags = [ "--enable-maintainer-mode" "--disable-ncurses" ]; installPhase = '' - mkdir -p $out/Applications + mkdir -p $out/Applications $out/bin mv macosx/pinentry-mac.app $out/Applications + + # Compatibility with `lib.getExe` + makeWrapper $out/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac $out/bin/pinentry-mac ''; enableParallelBuilding = true; @@ -85,6 +89,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = lib.platforms.darwin; - mainProgram = passthru.binaryPath; + mainProgram = "pinentry-mac"; }; } From 54bd4c46e960771f9c427c20bacada7712dbd4f4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 06:06:54 +0000 Subject: [PATCH 054/260] sq: 0.47.4 -> 0.48.3 --- pkgs/development/tools/sq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sq/default.nix b/pkgs/development/tools/sq/default.nix index 97e31162b773..2fe418b2ea49 100644 --- a/pkgs/development/tools/sq/default.nix +++ b/pkgs/development/tools/sq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "sq"; - version = "0.47.4"; + version = "0.48.3"; src = fetchFromGitHub { owner = "neilotoole"; repo = pname; rev = "v${version}"; - hash = "sha256-vOp1F87kg9ydr9caGefcYrRJY5foEbKkpMK0eCUzQpQ="; + hash = "sha256-22N8DEaLmGBA3Rx6VzxplUK9UAydo/gx4EsQzzaRHNE="; }; - vendorHash = "sha256-G623vH7pWpJbPvC8sR1xl6x3pcuBUvQwEj1RENuHnI8="; + vendorHash = "sha256-p0r7TuWFpV81Rnxqdj+UJec60EmvVQISURe43SpOpw0="; proxyVendor = true; From a7266560fdc4601698670a20f424df2fc39c2427 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 25 Mar 2024 01:40:54 +0000 Subject: [PATCH 055/260] pgbackrest: 2.50 -> 2.51 --- pkgs/tools/backup/pgbackrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index a2c727332554..6450840668f3 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.50"; + version = "2.51"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-RjkTg80LAUndSVfTrol9hvgNOG6PMC+OkMVjdtjpdbI="; + sha256 = "sha256-o6UROI+t35lHSFeRMLh0nIkmLMdcclpkKNzjkw/z56Q="; }; nativeBuildInputs = [ pkg-config ]; From 3ed9a873daa4364fbcf9f6c63145ae5eea53cebe Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 25 Mar 2024 14:04:07 -0400 Subject: [PATCH 056/260] pgbackrest: build with meson --- pkgs/tools/backup/pgbackrest/default.nix | 45 +++++++++++++++++++----- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/backup/pgbackrest/default.nix b/pkgs/tools/backup/pgbackrest/default.nix index 6450840668f3..02933fcc63ef 100644 --- a/pkgs/tools/backup/pgbackrest/default.nix +++ b/pkgs/tools/backup/pgbackrest/default.nix @@ -1,16 +1,21 @@ { lib , stdenv , fetchFromGitHub +, meson +, ninja +, python3 , pkg-config -, postgresql -, openssl -, lz4 +, libbacktrace , bzip2 +, lz4 +, postgresql , libxml2 -, zlib -, zstd , libyaml +, zlib +, libssh2 +, zstd }: + stdenv.mkDerivation rec { pname = "pgbackrest"; version = "2.51"; @@ -22,11 +27,33 @@ stdenv.mkDerivation rec { sha256 = "sha256-o6UROI+t35lHSFeRMLh0nIkmLMdcclpkKNzjkw/z56Q="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ postgresql openssl lz4 bzip2 libxml2 zlib zstd libyaml ]; + strictDeps = true; - postUnpack = '' - sourceRoot+=/src + nativeBuildInputs = [ + meson + ninja + python3 + pkg-config + ]; + + buildInputs = [ + libbacktrace + bzip2 + lz4 + postgresql + libxml2 + libyaml + zlib + libssh2 + zstd + ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t "$out/bin" src/pgbackrest + + runHook postInstall ''; meta = with lib; { From 489c200664e393e68ad5756a4c9c5f7c42899af7 Mon Sep 17 00:00:00 2001 From: pongo1231 Date: Thu, 29 Feb 2024 13:10:39 +0100 Subject: [PATCH 057/260] distrobox: 1.6.0.1 -> 1.7.1 --- .../distrobox/always-mount-nix.patch | 137 ------------------ .../virtualization/distrobox/default.nix | 7 +- 2 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 pkgs/applications/virtualization/distrobox/always-mount-nix.patch diff --git a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch b/pkgs/applications/virtualization/distrobox/always-mount-nix.patch deleted file mode 100644 index c5df13294e92..000000000000 --- a/pkgs/applications/virtualization/distrobox/always-mount-nix.patch +++ /dev/null @@ -1,137 +0,0 @@ -diff --git a/distrobox-create b/distrobox-create -index 64e9911..136659d 100755 ---- a/distrobox-create -+++ b/distrobox-create -@@ -74,6 +74,10 @@ unshare_ipc=0 - unshare_netns=0 - unshare_process=0 - unshare_devsys=0 -+ -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Use cd + dirname + pwd so that we do not have relative paths in mount points - # We're not using "realpath" here so that symlinks are not resolved this way - # "realpath" would break situations like Nix or similar symlink based package -@@ -98,6 +102,7 @@ version="1.6.0.1" - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-enter b/distrobox-enter -index 6d8998a..bb05437 100755 ---- a/distrobox-enter -+++ b/distrobox-enter -@@ -75,10 +75,14 @@ skip_workdir=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-generate-entry b/distrobox-generate-entry -index 3243691..6a7910a 100755 ---- a/distrobox-generate-entry -+++ b/distrobox-generate-entry -@@ -45,10 +45,14 @@ icon_default="${HOME}/.local/share/icons/terminal-distrobox-icon.svg" - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-list b/distrobox-list -index aaec85e..235e529 100755 ---- a/distrobox-list -+++ b/distrobox-list -@@ -44,10 +44,14 @@ verbose=0 - version="1.6.0.1" - container_manager="autodetect" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-rm b/distrobox-rm -index 702c1dd..2e37538 100755 ---- a/distrobox-rm -+++ b/distrobox-rm -@@ -54,10 +54,14 @@ rm_home=0 - response_rm_home="N" - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-stop b/distrobox-stop -index fd17cc1..e0dbc8f 100755 ---- a/distrobox-stop -+++ b/distrobox-stop -@@ -52,10 +52,14 @@ non_interactive=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf -diff --git a/distrobox-upgrade b/distrobox-upgrade -index ab5e96f..dc8d295 100755 ---- a/distrobox-upgrade -+++ b/distrobox-upgrade -@@ -39,10 +39,14 @@ rootful=0 - verbose=0 - version="1.6.0.1" - -+self_dir="$(dirname "$(realpath "$0")")" -+nix_config_file="$(realpath "${self_dir}/../share/distrobox/distrobox.conf")" -+ - # Source configuration files, this is done in an hierarchy so local files have - # priority over system defaults - # leave priority to environment variables. - config_files=" -+ $nix_config_file - /usr/share/distrobox/distrobox.conf - /usr/share/defaults/distrobox/distrobox.conf - /usr/etc/distrobox/distrobox.conf diff --git a/pkgs/applications/virtualization/distrobox/default.nix b/pkgs/applications/virtualization/distrobox/default.nix index 912117a016ed..4d5317201ad0 100644 --- a/pkgs/applications/virtualization/distrobox/default.nix +++ b/pkgs/applications/virtualization/distrobox/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "distrobox"; - version = "1.6.0.1"; + version = "1.7.1"; src = fetchFromGitHub { owner = "89luca89"; repo = "distrobox"; rev = finalAttrs.version; - hash = "sha256-UWrXpb20IHcwadPpwbhSjvOP1MBXic5ay+nP+OEVQE4="; + hash = "sha256-mSka8QyoLjnaVEP23TtyzbPTBHDlnrSomVZdfw4PPng="; }; dontConfigure = true; @@ -16,9 +16,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ makeWrapper ]; - # https://github.com/89luca89/distrobox/pull/1080 - patches = [ ./always-mount-nix.patch ]; - installPhase = '' runHook preInstall From 6c4986b4ae2be26fbe46f6ad3b6168c6418689c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Mar 2024 02:13:54 +0000 Subject: [PATCH 058/260] exodus: 24.11.5 -> 24.13.3 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 60189088b201..d1e389dc6140 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "24.11.5"; + version = "24.13.3"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-sh6Ym+Dm5UIEiESIu1cuY8XSsnJcENCzW7b4S562ax8="; + sha256 = "sha256-hhPHWo+nQXgluB6qn57wndX1eslLv3lLpdxm+COGMO8="; }; nativeBuildInputs = [ unzip ]; From 848565e6e11564392ab707c7103d1b9996eb749d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Mar 2024 02:40:31 +0000 Subject: [PATCH 059/260] linuxKernel.packages.linux_6_8.akvcam: 1.2.5 -> 1.2.6 --- pkgs/os-specific/linux/akvcam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/akvcam/default.nix b/pkgs/os-specific/linux/akvcam/default.nix index ddf9fed60bfd..ca36850bdcc6 100644 --- a/pkgs/os-specific/linux/akvcam/default.nix +++ b/pkgs/os-specific/linux/akvcam/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "akvcam"; - version = "1.2.5"; + version = "1.2.6"; src = fetchFromGitHub { owner = "webcamoid"; repo = "akvcam"; rev = version; - sha256 = "sha256-SzyamP6kcJI/GEeFp3uf1APdoBtwoUj0/9Otwtmygvs="; + sha256 = "sha256-8jQxBvWRE9Bsh0oz76gO7o+ROm6Z5QGAIe3WERIouUw="; }; sourceRoot = "${src.name}/src"; From 29457a1b1d0a85887e7ffd8f80a212318a1efebc Mon Sep 17 00:00:00 2001 From: Cezary Siwek Date: Tue, 26 Mar 2024 11:14:53 +0100 Subject: [PATCH 060/260] python311Packages.cantools: add optional-dependencies, rm postPatch --- pkgs/development/python-modules/cantools/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 2b6c0696f155..2b87d4de37ea 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -27,11 +27,6 @@ buildPythonPackage rec { hash = "sha256-WU8q6A3q24xrCOjhMi1C4lj0DULIDWiG2E4BQ/kLWiM="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "setuptools_scm>=8" "setuptools_scm" - ''; - nativeBuildInputs = [ setuptools setuptools-scm @@ -43,14 +38,17 @@ buildPythonPackage rec { can crccheck diskcache - matplotlib textparser ]; + passthru.optional-dependencies.plot = [ + matplotlib + ]; + nativeCheckInputs = [ parameterized pytestCheckHook - ]; + ] ++ passthru.optional-dependencies.plot; pythonImportsCheck = [ "cantools" From d79b9ff7628744bf42bf9a995979406c7d3721fc Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 26 Mar 2024 18:01:34 +0100 Subject: [PATCH 061/260] koreader: 2023.04 -> 2024.03.1 Diff: https://github.com/koreader/koreader/compare/v2023.04...v2024.03.1 --- pkgs/applications/misc/koreader/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/koreader/default.nix b/pkgs/applications/misc/koreader/default.nix index 857ca1d26a8e..b9eea1c602cb 100644 --- a/pkgs/applications/misc/koreader/default.nix +++ b/pkgs/applications/misc/koreader/default.nix @@ -14,15 +14,15 @@ let in stdenv.mkDerivation rec { pname = "koreader"; - version = "2023.04"; + version = "2024.03.1"; src = if stdenv.isAarch64 then fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-arm64.deb"; - sha256 = "sha256-uuspjno0750hQMIB5HEhbV63wCna2izKOHEGIg/X0bU="; + hash = "sha256-9Bu+mWfJuPaH5nV71JMrcGipiZWfcf19KfVauCW92+I="; } else fetchurl { url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-amd64.deb"; - sha256 = "sha256-tRUeRB1+UcWT49dchN0YDvd0L5n1YRdtMSFc8yy6m5o="; + hash = "sha256-EZ3iqp0A2BZwI343nvvp71RGQx6FPesUBy4Lha4Yz4U="; }; src_repo = fetchFromGitHub { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "koreader"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-c3j6hs0W0H2jDg6JVfU6ov7r7kucbqrQqf9PAvYBcJ0="; + sha256 = "sha256-gHn1xqBc7M9wkek1Ja1gry8TKIuUxQP8T45x3z2S4uc="; }; sourceRoot = "."; From bb70068f7b6288668886ecbdd40f73f1b612a532 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 26 Mar 2024 21:53:03 +0300 Subject: [PATCH 062/260] kdePackages.extra-cmake-modules: chop off some of the setup hook Just removing stuff that should never be necessary. --- .../extra-cmake-modules/ecm-hook.sh | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh index 9a4975da8e0d..8f34f5f732e6 100644 --- a/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh +++ b/pkgs/kde/frameworks/extra-cmake-modules/ecm-hook.sh @@ -69,10 +69,7 @@ ecmPostHook() { } postHooks+=(ecmPostHook) -xdgDataSubdirs=( \ - "config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "sounds" "templates" \ - "wallpapers" "applications" "desktop-directories" "mime" "appdata" "dbus-1" \ -) +xdgDataSubdirs=("config.kcfg" "kconf_update" "knotifications6" "icons" "locale" "mime") # ecmHostPathsSeen is an associative array of the paths that have already been # seen by ecmHostPathHook. @@ -108,19 +105,7 @@ ecmHostPathHook() { fi done - local manDir="$1/man" - if [ -d "$manDir" ] - then - qtWrapperArgs+=(--prefix MANPATH : "$manDir") - fi - - local infoDir="$1/info" - if [ -d "$infoDir" ] - then - qtWrapperArgs+=(--prefix INFOPATH : "$infoDir") - fi - - if [ -d "$1/dbus-1" ] + if [ -d "$1/share/dbus-1" ] then propagatedUserEnvPkgs+=" $1" fi From 5d94d229fa81acfdd4d786984254c94637f40c7c Mon Sep 17 00:00:00 2001 From: Nathan Henrie Date: Mon, 11 Mar 2024 19:30:04 -0600 Subject: [PATCH 063/260] single-file-cli: init at 1.1.49 --- pkgs/by-name/si/single-file-cli/package.nix | 56 +++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/si/single-file-cli/package.nix diff --git a/pkgs/by-name/si/single-file-cli/package.nix b/pkgs/by-name/si/single-file-cli/package.nix new file mode 100644 index 000000000000..13da0e896d15 --- /dev/null +++ b/pkgs/by-name/si/single-file-cli/package.nix @@ -0,0 +1,56 @@ +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + chromium, + chromedriver, + python3, +}: +buildNpmPackage { + pname = "single-file-cli"; + version = "1.1.49"; + + src = fetchFromGitHub { + owner = "gildas-lormeau"; + repo = "single-file-cli"; + rev = "af0f6f119edd8bf82bce3860fa55cfad869ac874"; + hash = "sha256-5pozqrIIanoLF4eugLxPRsUaoUYJurliovFFBYO/mC4="; + }; + npmDepsHash = "sha256-wiBpWw9nb/pWVGIc4Vl/IxxR5ic0LzLMMr3WxRNvYdM="; + + nativeCheckInputs = [chromium chromedriver]; + doCheck = stdenv.isLinux; + + postBuild = '' + patchShebangs ./single-file + ''; + + checkPhase = '' + runHook preCheck + + ${python3}/bin/python -m http.server --bind 127.0.0.1 & + pid=$! + + ./single-file \ + --browser-headless \ + --web-driver-executable-path=chromedriver \ + --back-end=webdriver-chromium \ + http://127.0.0.1:8000 + + grep -F 'Page saved with SingleFile' 'Directory listing for'*.html + + kill $pid + wait + + runHook postCheck + ''; + + meta = { + description = "CLI tool for saving a faithful copy of a complete web page in a single HTML file"; + homepage = "https://github.com/gildas-lormeau/single-file-cli"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [n8henrie]; + mainProgram = "single-file"; + }; +} From 665a03f63f844526a184baef2d4488fdee93ef22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 03:36:02 +0000 Subject: [PATCH 064/260] vault: 1.15.6 -> 1.16.0 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 6b5b0d595809..d3a9b1a906e7 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.15.6"; + version = "1.16.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-XqPuikUUm8C02Uv6qZHPz/KEmrvBrr8gOznQ7qbMKnU="; + hash = "sha256-nrpe7GyT2GpnCWdJhHefx1iAvJPzahv4wjQe0xTRSys="; }; - vendorHash = "sha256-97/nNRwTJnoW1gRvWhdsO36TuLdGTX67o0oTiGMotrs="; + vendorHash = "sha256-Bxa0244qowVnFJb9AUdJTp6CRo+GZTswVLg6lF1QITo="; proxyVendor = true; From f18c020f0b9397aa29aa7d869079273aa1d3d864 Mon Sep 17 00:00:00 2001 From: Pyxels <39232833+Pyxels@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:48:47 +0100 Subject: [PATCH 065/260] bartib: 1.0.1 -> 1.1.0 --- pkgs/tools/misc/bartib/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bartib/default.nix b/pkgs/tools/misc/bartib/default.nix index 893fbe7b58a3..0719f8a168bb 100644 --- a/pkgs/tools/misc/bartib/default.nix +++ b/pkgs/tools/misc/bartib/default.nix @@ -2,16 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "bartib"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "nikolassv"; repo = pname; rev = "v${version}"; - sha256 = "0ph3rsrhcyi272bv5018pw185zn7fvp5fqj24yh9rjrz8x7iawib"; + sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk="; }; - cargoSha256 = "sha256-1ZFwX7NKIainer7o9dIMxwyycdGW8K9euLHad/tF95w="; + cargoSha256 = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE="; + preConfigure = '' + cargo metadata --offline + ''; nativeBuildInputs = [ installShellFiles ]; From 1c24f2780eb5f403335b216d4d1cc19635bec96e Mon Sep 17 00:00:00 2001 From: illustris Date: Tue, 19 Mar 2024 22:59:53 +0530 Subject: [PATCH 066/260] spark: 3.5.0->3.5.1 --- .../networking/cluster/spark/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 80f642f9360b..d3c0e1fd3f20 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -62,10 +62,18 @@ let }); in { + # A note on EOL and removing old versions: + # According to spark's versioning policy (https://spark.apache.org/versioning-policy.html), + # minor releases are generally maintained with bugfixes for 18 months. But it doesn't + # make sense to remove a given minor version the moment it crosses this threshold. + # For example, spark 3.3.0 was released on 2022-06-09. It would have to be removed on 2023-12-09 if + # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08). + # A better policy is to keep these versions around, and clean up EOL versions just before + # a new NixOS release. spark_3_5 = spark rec { pname = "spark"; - version = "3.5.0"; - hash = "sha256-f+a4a23aOM0GCDoZlZ7WNXs0Olzyh3yMtO8ZmEoYvZ4="; + version = "3.5.1"; + hash = "sha256-ez6Hm8Ss3nl4mxOHyh67ugYH81/thNRMCja6MQ+9Tpg="; }; spark_3_4 = spark rec { pname = "spark"; From 9508b2a5801259aaddad74e17a1d41425da5a038 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 25 Mar 2024 22:53:30 +0100 Subject: [PATCH 067/260] youtube-music: 3.3.1 -> 3.3.5 Changelog: https://github.com/th-ch/youtube-music/releases/tag/v3.3.5 --- pkgs/applications/audio/youtube-music/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/youtube-music/default.nix b/pkgs/applications/audio/youtube-music/default.nix index 7f6b7865054f..c56e2ba4c48f 100644 --- a/pkgs/applications/audio/youtube-music/default.nix +++ b/pkgs/applications/audio/youtube-music/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "youtube-music"; - version = "3.3.1"; + version = "3.3.5"; src = fetchFromGitHub { owner = "th-ch"; repo = "youtube-music"; rev = "v${finalAttrs.version}"; - hash = "sha256-N6TzDTKvMyasksE0qcEGKeNjGAD08OzxpmpoQ11/ZW4="; + hash = "sha256-JOmcfe7xrKRaxJwj2No3e99HBYbX+ROTjHl5Frc2P9Q="; }; pnpmDeps = stdenvNoCC.mkDerivation { @@ -47,10 +47,10 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; outputHashMode = "recursive"; outputHash = { - x86_64-linux = "sha256-V6CSawxBWFbXmAPbck0xCXqRlANpqFAoqSAB4Duf8qM="; - aarch64-linux = "sha256-cqBn35soV14CmobKt0napRELio4HKKA8Iw3QSWTxzP8="; - x86_64-darwin = "sha256-DY9T1N8Hxr57/XisYT+u2+hQvYMIiyQ3UHeTuA6BhSY="; - aarch64-darwin = "sha256-3Zk0SyhVKaz5QdO69/xzWFZj9ueJS6GLWhfW7odWvHc="; + x86_64-linux = "sha256-K2yJdoi+bJpz0Xf2MHlFzQXbP+H3uVE2hYfkzoB7vBE="; + aarch64-linux = "sha256-ZiA6XKPnkoAl9m2vEJth2wyDxj61Efye4cUk+76znnM="; + x86_64-darwin = "sha256-wh5Y47c5qD2PctROP9AWqLDs7H5S2/8X0zxkSMkr1xQ="; + aarch64-darwin = "sha256-e2h4bLVnSEtZcHERsfkNmawgxQHQXxgXrNlFKB+IRTw="; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); }; From 04359d4f30caf14784bbb888e42c5bb3d6293b53 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 27 Mar 2024 17:31:28 -0400 Subject: [PATCH 068/260] elixir: 1.15 -> 1.16 --- pkgs/development/beam-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index 791f596be416..9e30ec4ef7b1 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -43,7 +43,7 @@ let elvis-erlang = callPackage ./elvis-erlang { }; # BEAM-based languages. - elixir = elixir_1_15; + elixir = elixir_1_16; elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix { inherit erlang; From 92591a1431a62f08abdb4c9367ea9cfc2f2ebb31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 27 Mar 2024 21:54:52 +0000 Subject: [PATCH 069/260] weaviate: 1.24.4 -> 1.24.6 --- pkgs/servers/search/weaviate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix index 75f9e700cc0f..c465125cb0b8 100644 --- a/pkgs/servers/search/weaviate/default.nix +++ b/pkgs/servers/search/weaviate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "weaviate"; - version = "1.24.4"; + version = "1.24.6"; src = fetchFromGitHub { owner = "weaviate"; repo = "weaviate"; rev = "v${version}"; - hash = "sha256-kovhusZ/4/wLr8FeBY6jBPdD1V718yI41fTjbtjGleM="; + hash = "sha256-1IwLHSQxCSGLnva37JNIfaSzVBRAPNw/RYvx6ksFEFU="; }; - vendorHash = "sha256-0CPdBrEjBJiX/Fv0DhFaZqkixuEPW2Pttl5wCNxieYc="; + vendorHash = "sha256-DMzwIxtF267C2OLyVdZ6CrCz44sy6ZeKL2qh8AkhS2I="; subPackages = [ "cmd/weaviate-server" ]; From 9e7e5156e4fd4b23cdcfd84c560051cfcdce7aa0 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 5 Mar 2024 20:57:59 +0100 Subject: [PATCH 070/260] wails: fix build on darwin --- pkgs/development/tools/wails/default.nix | 25 ++++++++++++------------ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 34c4ae6aa371..660944b5bde2 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -5,11 +5,11 @@ , pkg-config , makeWrapper , go -, gcc -, gtk3 -, webkitgtk , nodejs , zlib + # Linux specific dependencies +, gtk3 +, webkitgtk }: buildGoModule rec { @@ -44,10 +44,11 @@ buildGoModule rec { propagatedBuildInputs = [ pkg-config go - gcc + stdenv.cc + nodejs + ] ++ lib.optionals stdenv.isLinux [ gtk3 webkitgtk - nodejs ]; ldflags = [ @@ -58,18 +59,18 @@ buildGoModule rec { # As Wails calls a compiler, certain apps and libraries need to be made available. postFixup = '' wrapProgram $out/bin/wails \ - --prefix PATH : ${lib.makeBinPath [ pkg-config go gcc nodejs ]} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ gtk3 webkitgtk ]} \ + --prefix PATH : ${lib.makeBinPath [ pkg-config go stdenv.cc nodejs ]} \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath (lib.optionals stdenv.isLinux [ gtk3 webkitgtk ])}" \ --set PKG_CONFIG_PATH "$PKG_CONFIG_PATH" \ --set CGO_LDFLAGS "-L${lib.makeLibraryPath [ zlib ]}" ''; - meta = with lib; { + meta = { description = "Build applications using Go + HTML + CSS + JS"; - mainProgram = "wails"; homepage = "https://wails.io"; - license = licenses.mit; - maintainers = with maintainers; [ ianmjones ]; - platforms = platforms.linux; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ianmjones ]; + mainProgram = "wails"; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dfa74365675b..b6e8914272fb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20053,7 +20053,9 @@ with pkgs; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; - wails = callPackage ../development/tools/wails { }; + wails = callPackage ../development/tools/wails { + stdenv = gccStdenv; + }; wasmer-pack = callPackage ../development/tools/misc/wasmer-pack { }; From fa5fd9503c15632025ea986729f4a5af183b19db Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Sat, 16 Mar 2024 13:31:06 +0530 Subject: [PATCH 071/260] maintainers: payas -> bhankas --- maintainers/maintainer-list.nix | 12 ++++++------ pkgs/applications/misc/go-org/default.nix | 2 +- pkgs/by-name/gl/glas/package.nix | 2 +- pkgs/tools/networking/xh/default.nix | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a8177c11ed38..cd3ec8b67336 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2544,6 +2544,12 @@ githubId = 34919100; name = "Brendan Hall"; }; + bhankas = { + email = "payas@relekar.org"; + github = "bhankas"; + githubId = 24254289; + name = "Payas Relekar"; + }; bhipple = { email = "bhipple@protonmail.com"; github = "bhipple"; @@ -15096,12 +15102,6 @@ githubId = 116740; name = "Paweł Pacana"; }; - payas = { - email = "relekarpayas@gmail.com"; - github = "bhankas"; - githubId = 24254289; - name = "Payas Relekar"; - }; pb- = { email = "pbaecher@gmail.com"; github = "pb-"; diff --git a/pkgs/applications/misc/go-org/default.nix b/pkgs/applications/misc/go-org/default.nix index 8aa5a3be717b..4b0a2a9c41a7 100644 --- a/pkgs/applications/misc/go-org/default.nix +++ b/pkgs/applications/misc/go-org/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { description = "Org-mode parser and static site generator in go"; homepage = "https://niklasfasching.github.io/go-org"; license = licenses.mit; - maintainers = with maintainers; [ payas ]; + maintainers = with maintainers; [ bhankas ]; mainProgram = "go-org"; }; } diff --git a/pkgs/by-name/gl/glas/package.nix b/pkgs/by-name/gl/glas/package.nix index 40a0d7f556c8..ef9390bc04c0 100644 --- a/pkgs/by-name/gl/glas/package.nix +++ b/pkgs/by-name/gl/glas/package.nix @@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec { mit ]; mainProgram = "glas"; - maintainers = with lib.maintainers; [ payas ]; + maintainers = with lib.maintainers; [ bhankas ]; }; } diff --git a/pkgs/tools/networking/xh/default.nix b/pkgs/tools/networking/xh/default.nix index a2cbf816fab7..826987af508a 100644 --- a/pkgs/tools/networking/xh/default.nix +++ b/pkgs/tools/networking/xh/default.nix @@ -59,6 +59,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/ducaale/xh"; changelog = "https://github.com/ducaale/xh/blob/v${version}/CHANGELOG.md"; license = licenses.mit; - maintainers = with maintainers; [ figsoda payas ]; + maintainers = with maintainers; [ figsoda bhankas ]; }; } From a0cfe5691b3a05570675f8ff3a0cd8d7ce27947a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 28 Mar 2024 09:46:37 +0100 Subject: [PATCH 072/260] rcu: init at 2024.001n --- .../by-name/rc/rcu/Port-to-paramiko-3.x.patch | 104 ++++++++++++ pkgs/by-name/rc/rcu/package.nix | 152 ++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch create mode 100644 pkgs/by-name/rc/rcu/package.nix diff --git a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch b/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch new file mode 100644 index 000000000000..760d23cea18d --- /dev/null +++ b/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch @@ -0,0 +1,104 @@ +From aad61b320d65953fddec10b019a186fc67f57a5d Mon Sep 17 00:00:00 2001 +From: OPNA2608 +Date: Sat, 10 Feb 2024 12:20:29 +0100 +Subject: [PATCH] src/model/transport.py: Port to paramiko 3.x + +--- + src/model/transport.py | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) + +diff --git a/src/model/transport.py b/src/model/transport.py +index 0c2ee16..5a2bd22 100644 +--- a/src/model/transport.py ++++ b/src/model/transport.py +@@ -117,7 +117,6 @@ from paramiko.kex_gss import KexGSSGex, KexGSSGroup1, KexGSSGroup14 + from paramiko.message import Message + from paramiko.packet import Packetizer, NeedRekeyException + from paramiko.primes import ModulusPack +-from paramiko.py3compat import string_types, long, byte_ord, b, input, PY2 + from paramiko.rsakey import RSAKey + from paramiko.ecdsakey import ECDSAKey + from paramiko.server import ServerInterface +@@ -128,7 +127,7 @@ from paramiko.ssh_exception import ( + ChannelException, + ProxyCommandFailure, + ) +-from paramiko.util import retry_on_signal, ClosingContextManager, clamp_value ++from paramiko.util import ClosingContextManager, clamp_value + + + # for thread cleanup +@@ -396,7 +395,7 @@ class Transport(threading.Thread, ClosingContextManager): + self.active = False + self.hostname = None + +- if isinstance(sock, string_types): ++ if isinstance(sock, str): + # convert "host:port" into (host, port) + hl = sock.split(":", 1) + self.hostname = hl[0] +@@ -419,7 +418,7 @@ class Transport(threading.Thread, ClosingContextManager): + sock = socket.socket(af, socket.SOCK_STREAM) + sock.settimeout(1) + try: +- retry_on_signal(lambda: sock.connect((hostname, port))) ++ sock.connect((hostname, port)) + except socket.error as e: + reason = str(e) + else: +@@ -542,7 +541,7 @@ class Transport(threading.Thread, ClosingContextManager): + """ + Returns a string representation of this object, for debugging. + """ +- id_ = hex(long(id(self)) & xffffffff) ++ id_ = hex(int(id(self)) & xffffffff) + out = " Date: Wed, 27 Mar 2024 20:43:15 +0100 Subject: [PATCH 073/260] uefisettings: unstable-2024-02-20 -> 0-unstable-2024-03-26 --- pkgs/by-name/ue/uefisettings/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix index 9fd585340f96..f23f5d472a19 100644 --- a/pkgs/by-name/ue/uefisettings/package.nix +++ b/pkgs/by-name/ue/uefisettings/package.nix @@ -5,19 +5,25 @@ rustPlatform.buildRustPackage { name = "uefisettings"; - version = "unstable-2024-02-20"; + version = "0-unstable-2024-03-26"; src = fetchFromGitHub { owner = "linuxboot"; repo = "uefisettings"; - rev = "eae8b8b622b7ac3c572eeb3b3513ed623e272fcc"; - hash = "sha256-zLgrxYBj5bEMZRw5sKWqKuV3jQOJ6dnzbzpoqE0OhKs="; + rev = "f90aed759b9c2217bea336e37ab5282616ece390"; + hash = "sha256-Cik8uVdzhMmgXfx23axkUJBg8zd5afMgYvluN0BJsdo="; }; cargoHash = "sha256-FCQ/1E6SZyVOOAlpqyaDWEZx0y0Wk3Caosvr48VamAA="; - # Tests expect filesystem access to directories like /proc - doCheck = false; + checkFlags = [ + # Expects filesystem access to /proc and rootfs + "--skip=hii::efivarfs::tests::test_get_current_mount_flags_for_proc" + "--skip=hii::efivarfs::tests::test_get_current_mount_flags_for_root" + # Expects FHS + "--skip=ilorest::blobstore::Transport" + "--skip=ilorest::chif::IloRestChif" + ]; meta = with lib; { description = "CLI tool to read/get/extract and write/change/modify BIOS/UEFI settings."; From bd98a8a7f19b6f9f747d1892c4bc8592902f6cb3 Mon Sep 17 00:00:00 2001 From: rewine Date: Thu, 28 Mar 2024 18:16:17 +0800 Subject: [PATCH 074/260] deepin.deepin-compressor: 5.12.24 -> 6.0.1 --- .../0001-fix-build-on-new-dtk.diff | 20 ------------------- .../deepin/apps/deepin-compressor/default.nix | 10 +++------- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff b/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff deleted file mode 100644 index 237d5798ecc8..000000000000 --- a/pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h -index 49313744..456a5e96 100644 ---- a/src/source/common/ddesktopservicesthread.h -+++ b/src/source/common/ddesktopservicesthread.h -@@ -8,10 +8,14 @@ - - #include - -+#include -+#include - #include - #include - #include -+ - DWIDGET_USE_NAMESPACE -+DGUI_USE_NAMESPACE - - // 文管打开文件目录线程 - class DDesktopServicesThread : public QThread - diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 60a02851b95a..8943b8423174 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,22 +20,18 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.24"; + version = "6.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k="; + hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI="; }; - patches = [ - ./0001-fix-build-on-new-dtk.diff - ]; - postPatch = '' substituteInPlace src/source/common/pluginmanager.cpp \ - --replace-fail "/usr/lib/" "$out/lib/" + --replace-fail "/usr/lib" "$out/lib" substituteInPlace src/desktop/deepin-compressor.desktop \ --replace-fail "/usr" "$out" ''; From 7114357d695af4c478511278de035ec09647866b Mon Sep 17 00:00:00 2001 From: hacker1024 Date: Sat, 19 Aug 2023 22:04:16 +1000 Subject: [PATCH 075/260] gitkraken: Respect NIXOS_OZONE_WL --- .../applications/version-management/gitkraken/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index cedf8791fa79..a3160f1ce3a5 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -2,7 +2,7 @@ , libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus -, makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid +, makeDesktopItem, openssl, wrapGAppsHook, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid , e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git , libGL, zlib, cacert }: @@ -106,7 +106,7 @@ let comment = "Graphical Git client from Axosoft"; }) ]; - nativeBuildInputs = [ copyDesktopItems makeWrapper wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook.override { makeWrapper = makeShellWrapper; }) ]; buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # avoid double-wrapping @@ -124,6 +124,10 @@ let runHook postInstall ''; + preFixup = '' + gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}") + ''; + postFixup = '' pushd $out/share/${pname} for file in gitkraken chrome-sandbox chrome_crashpad_handler; do From d061e281bf1ad590e65b2e1330d0b2494c961c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=9B=81=20Cryolitia?= Date: Thu, 28 Mar 2024 19:34:55 +0800 Subject: [PATCH 076/260] maa-cli: 0.4.4 -> 0.4.5 --- pkgs/by-name/ma/maa-cli/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ma/maa-cli/package.nix b/pkgs/by-name/ma/maa-cli/package.nix index 263fd085e146..187798382520 100644 --- a/pkgs/by-name/ma/maa-cli/package.nix +++ b/pkgs/by-name/ma/maa-cli/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "maa-cli"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitHub { owner = "MaaAssistantArknights"; repo = "maa-cli"; rev = "v${version}"; - hash = "sha256-pAtv6gCLFKRwUQEF6kD2bCPGpQGzahsfq/tAnQjrZrw="; + hash = "sha256-LeEIbfDQ+GO3gNmdpWGTNkpbhSqLz4fYQ+MdcrcbDk0="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { buildNoDefaultFeatures = true; buildFeatures = [ "git2" "core_installer" ]; - cargoHash = "sha256-KjI/5vl7oKVtXYehGLgi9jcaO4Y/TceL498rCPGHMD0="; + cargoHash = "sha256-tkUJH7oFY5eZ5A7J+qzeyHlqOUnTipf6o+leZz7KOiQ="; # maa-cli would only seach libMaaCore.so and resources in itself's path # https://github.com/MaaAssistantArknights/maa-cli/issues/67 @@ -55,6 +55,10 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/maa complete bash) \ --fish <($out/bin/maa complete fish) \ --zsh <($out/bin/maa complete zsh) + + mkdir -p manpage + $out/bin/maa mangen --path manpage + installManPage manpage/* ''; meta = with lib; { From 849b601c0dbefa19034d34cd6a019d07b0baf117 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 12:44:13 +0000 Subject: [PATCH 077/260] python312Packages.jira: 3.6.0 -> 3.8.0 --- pkgs/development/python-modules/jira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jira/default.nix b/pkgs/development/python-modules/jira/default.nix index b569483f9211..1963fe2e8e89 100644 --- a/pkgs/development/python-modules/jira/default.nix +++ b/pkgs/development/python-modules/jira/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "jira"; - version = "3.6.0"; + version = "3.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "pycontribs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Wv6xjk1nyFIDKAypyQRlqFglzxe9Ems2ON3PEehUP/Q="; + hash = "sha256-zE0fceCnyv0qKak8sRCXPCauC0KeOmczY/ZkVoHNcS8="; }; nativeBuildInputs = [ From fd8e13613e6afdf3e500453bb82351971cbe48bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 12:51:45 +0000 Subject: [PATCH 078/260] autorestic: 1.8.1 -> 1.8.2 --- pkgs/tools/backup/autorestic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 1fcb2dbccc85..5c718603fa98 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e/OBu1tcIxr/ddKhbFyOtvU8Oqr0gpBRNpHRyoFKw6M="; + sha256 = "sha256-g7P/q29LMZEibEP6Pmve2WwuxdmSpdqQpwG6/RPDMAM="; }; - vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; + vendorHash = "sha256-1ya1h/v5uEVoZpPVugxXQC3FCH5GKPhcHIDm8rSY9OU="; nativeBuildInputs = [ installShellFiles ]; From a34255366a2d131b889de5520a15c80c8d7bb70b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 12:51:46 +0000 Subject: [PATCH 079/260] python311Packages.qtawesome: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/qtawesome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index e1bd21ba0054..b5e668c10a68 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "qtawesome"; - version = "1.3.0"; + version = "1.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "spyder-ide"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-CencHIgkiXDmSEasc1EgalhT8RXfyXKx0wy09NDsj54="; + hash = "sha256-dF77vkrEl671fQvsHAX+JY9OmLA29kgAVswY2b3UyTg="; }; propagatedBuildInputs = [ From ef9e1f7ac49418eaf4f3868a17fc4230b035216c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 14:07:06 +0000 Subject: [PATCH 080/260] opengrok: 1.13.6 -> 1.13.7 --- pkgs/development/tools/misc/opengrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 88639c752fab..dec8b3fa8c3d 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "opengrok"; - version = "1.13.6"; + version = "1.13.7"; # binary distribution src = fetchurl { url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-eCTqBdY2mALEo7dPQ7fDNaO2RcbbKIYSi9Y6nfRV1kc="; + hash = "sha256-vGzwXs4i9NiIz5M4JfoweJdpP5vbPKCdeUlE5xueYc4="; }; nativeBuildInputs = [ makeWrapper ]; From e506b0a556d66e774c02bf263917904609f04531 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 14:22:04 +0000 Subject: [PATCH 081/260] python312Packages.flask-paginate: 2023.10.24 -> 2024.3.28 --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index f28579e04a46..ec2082b0ec18 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2023.10.24"; + version = "2024.3.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lixxu"; repo = "flask-paginate"; rev = "refs/tags/v${version}"; - hash = "sha256-9633YLHMF9S1DLK7ZS4qmCOzslXdHLSgpKoJFNvkXlA="; + hash = "sha256-HqjgmqRH83N+CbTnkkEJnuo+c+n5wLwdsPXyY2i5XRg="; }; propagatedBuildInputs = [ From 1059471627f0296cb2a012fa1d8db7f9587d8369 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 14:30:26 +0000 Subject: [PATCH 082/260] python312Packages.irc: 20.3.1 -> 20.4.0 --- pkgs/development/python-modules/irc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index d761a26e7a73..4e724207a26f 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.3.1"; + version = "20.4.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-gGuDr4lNixIe0eFIZqkGQBKFiN5swElcTsssXsJyKAs="; + hash = "sha256-fSUX9VZta/Oqhdf5jHdYth8NY+6RW/2fb1ZxOXNmRPk="; }; nativeBuildInputs = [ From 050f4664b55e1a7f1d405d611cd12677b03b14d0 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Sat, 16 Mar 2024 13:31:28 +0530 Subject: [PATCH 083/260] workout-tracker: init at v0.10.5 --- pkgs/by-name/wo/workout-tracker/package.nix | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/wo/workout-tracker/package.nix diff --git a/pkgs/by-name/wo/workout-tracker/package.nix b/pkgs/by-name/wo/workout-tracker/package.nix new file mode 100644 index 000000000000..43738d4358b2 --- /dev/null +++ b/pkgs/by-name/wo/workout-tracker/package.nix @@ -0,0 +1,32 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + ... +}: + +buildGoModule rec { + pname = "workout-tracker"; + version = "0.10.5"; + + src = fetchFromGitHub { + owner = "jovandeginste"; + repo = "workout-tracker"; + rev = "refs/tags/v${version}"; + hash = "sha256-ekGaNHysY0lXbB5w6AycnLR9/4dqUp0busCcPPvzSVI="; + }; + + vendorHash = null; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/jovandeginste/workout-tracker/releases/tag/v${version}"; + description = "A workout tracking web application for personal use"; + homepage = "https://github.com/jovandeginste/workout-tracker"; + license = lib.licenses.mit; + mainProgram = "workout-tracker"; + maintainers = with lib.maintainers; [ bhankas ]; + }; +} From 466b994af99a23ce1140eedb610199606708d7b0 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Sat, 16 Mar 2024 14:26:22 +0530 Subject: [PATCH 084/260] nixos/workout-tracker: init --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/misc/workout-tracker.nix | 83 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/workout-tracker.nix | 29 +++++++ 5 files changed, 116 insertions(+) create mode 100644 nixos/modules/services/misc/workout-tracker.nix create mode 100644 nixos/tests/workout-tracker.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 92702cce1896..f2ca81f4c445 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -95,6 +95,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [hebbot](https://github.com/haecker-felix/hebbot), a Matrix bot to generate "This Week in X" like blog posts. Available as [services.hebbot](#opt-services.hebbot.enable). +- [Workout-tracker](https://github.com/jovandeginste/workout-tracker), a workout tracking web application for personal use. + - [Python Matter Server](https://github.com/home-assistant-libs/python-matter-server), a Matter Controller Server exposing websocket connections for use with other services, notably Home Assistant. Available as [services.matter-server](#opt-services.matter-server.enable) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d89d294b0469..6f105d6a45c8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -796,6 +796,7 @@ ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/weechat.nix + ./services/misc/workout-tracker.nix ./services/misc/xmr-stak.nix ./services/misc/xmrig.nix ./services/misc/zoneminder.nix diff --git a/nixos/modules/services/misc/workout-tracker.nix b/nixos/modules/services/misc/workout-tracker.nix new file mode 100644 index 000000000000..13555504be30 --- /dev/null +++ b/nixos/modules/services/misc/workout-tracker.nix @@ -0,0 +1,83 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) types; + cfg = config.services.workout-tracker; + stateDir = "workout-tracker"; +in + +{ + options = { + services.workout-tracker = { + enable = lib.mkEnableOption "workout tracking web application for personal use (or family, friends), geared towards running and other GPX-based activities"; + + package = lib.mkPackageOption pkgs "workout-tracker" { }; + + address = lib.mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Web interface address."; + }; + + port = lib.mkOption { + type = types.port; + default = 8080; + description = "Web interface port."; + }; + + environmentFile = lib.mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/keys/workout-tracker.env"; + description = '' + An environment file as defined in {manpage}`systemd.exec(5)`. + + Secrets like `WT_JWT_ENCRYPTION_KEY` may be passed to the service without adding them + to the world-readable Nix store. + ''; + }; + + settings = lib.mkOption { + type = types.attrsOf types.str; + + default = { }; + description = '' + Extra config options. + ''; + example = { + WT_LOGGING = "true"; + WT_DEBUG = "false"; + WT_DATABASE_DRIVER = "sqlite"; + WT_DSN = "./database.db"; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.workout-tracker = { + description = "A workout tracking web application for personal use (or family, friends), geared towards running and other GPX-based activities"; + wantedBy = [ "multi-user.target" ]; + environment = { + WT_BIND = "${cfg.address}:${toString cfg.port}"; + WT_DATABASE_DRIVER = "sqlite"; + WT_DSN = "./database.db"; + } // cfg.settings; + serviceConfig = { + ExecStart = lib.getExe cfg.package; + DynamicUser = true; + StateDirectory = stateDir; + WorkingDirectory = "%S/${stateDir}"; + Restart = "always"; + EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ bhankas ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 9cff268ae1d1..88eaee9a9a53 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -991,6 +991,7 @@ in { wireguard = handleTest ./wireguard {}; without-nix = handleTest ./without-nix.nix {}; wmderland = handleTest ./wmderland.nix {}; + workout-tracker = handleTest ./workout-tracker.nix {}; wpa_supplicant = handleTest ./wpa_supplicant.nix {}; wordpress = handleTest ./wordpress.nix {}; wrappers = handleTest ./wrappers.nix {}; diff --git a/nixos/tests/workout-tracker.nix b/nixos/tests/workout-tracker.nix new file mode 100644 index 000000000000..1ad509edf2d4 --- /dev/null +++ b/nixos/tests/workout-tracker.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ( + { lib, pkgs, ... }: + + { + name = "workout-tracker"; + + meta.maintainers = with lib.maintainers; [ bhankas ]; + + nodes.machine = + { config, ... }: + { + virtualisation.memorySize = 2048; + + services.workout-tracker.enable = true; + }; + + testScript = '' + start_all() + machine.wait_for_unit("workout-tracker.service") + # wait for workout-tracker to fully come up + + with subtest("workout-tracker service starts"): + machine.wait_until_succeeds( + "curl -sSfL http://localhost:8080/ > /dev/null", + timeout=30 + ) + ''; + } +) From b06108483e7272ff7eaa89baad557c65cb9a8553 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Thu, 28 Mar 2024 10:12:43 +0800 Subject: [PATCH 085/260] dioxus-cli: 0.4.3 -> 0.5.0 --- .../tools/rust/dioxus-cli/default.nix | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/rust/dioxus-cli/default.nix b/pkgs/development/tools/rust/dioxus-cli/default.nix index 5243203f1926..ef1bcfee2852 100644 --- a/pkgs/development/tools/rust/dioxus-cli/default.nix +++ b/pkgs/development/tools/rust/dioxus-cli/default.nix @@ -3,6 +3,7 @@ , fetchCrate , rustPlatform , pkg-config +, rustfmt , cacert , openssl , darwin @@ -12,38 +13,31 @@ rustPlatform.buildRustPackage rec { pname = "dioxus-cli"; - version = "0.4.3"; + version = "0.5.0"; src = fetchCrate { inherit pname version; - hash = "sha256-TWcuEobYH2xpuwB1S63HoP/WjH3zHXTnlXXvOcYIZG8="; + hash = "sha256-iNlJLDxb8v7x19q0iaAnGmtmoPjMW8YXzbx5Fcf8Yws="; }; - cargoHash = "sha256-ozbGK46uq3qXZifyTY7DDX1+vQuDJuSOJZw35vwcuxY="; + cargoHash = "sha256-6XKNBLDNWYd5+O7buHupXzVss2jCdh3wu9mXVLivH44="; nativeBuildInputs = [ pkg-config cacert ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; + nativeCheckInputs = [ rustfmt ]; + checkFlags = [ # requires network access "--skip=server::web::proxy::test::add_proxy" "--skip=server::web::proxy::test::add_proxy_trailing_slash" ]; - # Omitted: --doc - # Can be removed after 0.4.3 or when https://github.com/DioxusLabs/dioxus/pull/1706 is resolved - # Matches upstream package test CI https://github.com/DioxusLabs/dioxus/blob/544ca5559654c8490ce444c3cbd85c1bfb8479da/Makefile.toml#L94-L108 - cargoTestFlags = [ - "--lib" - "--bins" - "--tests" - "--examples" - ]; - passthru.tests.version = testers.testVersion { package = dioxus-cli; command = "${meta.mainProgram} --version"; From b665e3629d938a546706c7f04be1736620419a36 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 13 Jul 2023 18:18:54 +0200 Subject: [PATCH 086/260] famistudio-bin: rename from famistudio, move to pkgs/by-name --- .../fa/famistudio-bin/package.nix} | 15 +++++++-------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) rename pkgs/{applications/audio/famistudio/default.nix => by-name/fa/famistudio-bin/package.nix} (79%) diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/by-name/fa/famistudio-bin/package.nix similarity index 79% rename from pkgs/applications/audio/famistudio/default.nix rename to pkgs/by-name/fa/famistudio-bin/package.nix index 9951f0ccfb07..553cff75cb20 100644 --- a/pkgs/applications/audio/famistudio/default.nix +++ b/pkgs/by-name/fa/famistudio-bin/package.nix @@ -9,12 +9,12 @@ , openal }: -stdenv.mkDerivation rec { - pname = "famistudio"; +stdenv.mkDerivation (finalAttrs: { + pname = "famistudio-bin"; version = "4.1.3"; src = fetchzip { - url = "https://github.com/BleuBleu/FamiStudio/releases/download/${version}/FamiStudio${lib.strings.concatStrings (lib.splitVersion version)}-LinuxAMD64.zip"; + url = "https://github.com/BleuBleu/FamiStudio/releases/download/${finalAttrs.version}/FamiStudio${lib.replaceStrings ["."] [""] finalAttrs.version}-LinuxAMD64.zip"; stripRoot = false; hash = "sha256-eAdv0oObczbs8QLGYbxCrdFk/gN5DOCJ1dp/tg8JWIc="; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,lib/famistudio} mv * $out/lib/famistudio - makeWrapper ${lib.getExe dotnet-runtime} $out/bin/famistudio \ + makeWrapper ${lib.getExe dotnet-runtime} $out/bin/FamiStudio \ --add-flags $out/lib/famistudio/FamiStudio.dll \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} @@ -56,16 +56,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://famistudio.org/"; - description = "NES Music Editor"; + description = "NES Music Editor (binary distribution)"; longDescription = '' FamiStudio is very simple music editor for the Nintendo Entertainment System or Famicom. It is targeted at both chiptune artists and NES homebrewers. ''; license = licenses.mit; - # Maybe possible to build from source but I'm not too familiar with C# packaging sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ OPNA2608 ]; platforms = [ "x86_64-linux" ]; - mainProgram = "famistudio"; + mainProgram = "FamiStudio"; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d8ae8d5366f..aec6ee2ada01 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30984,8 +30984,6 @@ with pkgs; faircamp = callPackage ../applications/misc/faircamp { }; - famistudio = callPackage ../applications/audio/famistudio { }; - fasttext = callPackage ../applications/science/machine-learning/fasttext { }; fbmenugen = callPackage ../applications/misc/fbmenugen { }; From 807c7ab3b2db96f7f88aefe88e48c5148be0539a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 15:38:16 +0000 Subject: [PATCH 087/260] python311Packages.pyrevolve: 2.2.3 -> 2.2.4 --- pkgs/development/python-modules/pyrevolve/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index d60b2164051c..a097532e8c97 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2.3"; + version = "2.2.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "devitocodes"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-z1G8DXG06Capd87x02zqrtYyBrX4xmJP94t4bgaR2PE="; + hash = "sha256-fcIq/zuKO3W7K9N2E4f2Q6ZVcssZwN/n8o9cCOYmr3E="; }; postPatch = '' From 4545b437755a91d8fafbd9a7041d3332aab7502f Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 4 Dec 2023 15:11:42 +0100 Subject: [PATCH 088/260] famistudio: init at 4.1.3 --- .../audio/famistudio/build-native-wrapper.nix | 69 ++++++++++ .../applications/audio/famistudio/default.nix | 118 ++++++++++++++++++ pkgs/applications/audio/famistudio/deps.nix | 5 + pkgs/applications/audio/famistudio/update.sh | 23 ++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 217 insertions(+) create mode 100644 pkgs/applications/audio/famistudio/build-native-wrapper.nix create mode 100644 pkgs/applications/audio/famistudio/default.nix create mode 100644 pkgs/applications/audio/famistudio/deps.nix create mode 100755 pkgs/applications/audio/famistudio/update.sh diff --git a/pkgs/applications/audio/famistudio/build-native-wrapper.nix b/pkgs/applications/audio/famistudio/build-native-wrapper.nix new file mode 100644 index 000000000000..ddee5bf5712d --- /dev/null +++ b/pkgs/applications/audio/famistudio/build-native-wrapper.nix @@ -0,0 +1,69 @@ +{ depname +, version +, src +, sourceRoot +, stdenv +, lib +, patches ? [] +, extraPostPatch ? "" +, buildInputs ? [] +}: + +let + rebuildscriptName = if stdenv.hostPlatform.isLinux then + "build_linux" + else if stdenv.hostPlatform.isDarwin then + "build_macos" + else throw "Don't know how to rebuild FamiStudio's vendored ${depname} for ${stdenv.hostPlatform.system}"; +in +stdenv.mkDerivation { + pname = "famistudio-nativedep-${depname}"; + inherit version src sourceRoot patches buildInputs; + + postPatch = let + libnameBase = lib.optionalString stdenv.hostPlatform.isLinux "lib" + depname; + in '' + # Use one name for build script, eases with patching + mv ${rebuildscriptName}.sh build.sh + + # Scripts use hardcoded compilers and try to copy built libraries into FamiStudio's build tree + # Not all scripts use the same compiler, so don't fail on replacing that + substituteInPlace build.sh \ + --replace-fail '../../FamiStudio/' "$out/lib/" \ + --replace-quiet 'g++' "$CXX" + + # Replacing gcc via sed, would break -static-libgcc otherwise + sed -i -e "s/^gcc/$CC/g" build.sh + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Darwin rebuild scripts try to make a universal2 dylib + # - build dylib for non-hostPlatform + # - copy built library into special directory for later packaging script + # - join two dylibs together into a universal2 dylib + # Remove everything we don't need + sed -ri \ + -e '/-target ${if stdenv.hostPlatform.isx86_64 then "arm64" else "x86_64"}/d' \ + -e '/..\/..\/Setup/d' \ + build.sh + + # Replace joining multi-arch dylibs with copying dylib for target arch + substituteInPlace build.sh \ + --replace-fail 'lipo -create -output ${libnameBase}.dylib' 'cp ${libnameBase}_${if stdenv.hostPlatform.isx86_64 then "x86_64" else "arm64"}.dylib ${libnameBase}.dylib #' + '' + extraPostPatch; + + dontConfigure = true; + dontInstall = true; # rebuild script automatically installs + + buildPhase = '' + runHook preBuild + + mkdir -p $out/lib + + # Delete all prebuilt libraries, make sure everything is rebuilt + find . -name '*.so' -or -name '*.dylib' -or -name '*.a' -delete + + # When calling normally, an error won't cause derivation to fail + source ./build.sh + + runHook postBuild + ''; +} diff --git a/pkgs/applications/audio/famistudio/default.nix b/pkgs/applications/audio/famistudio/default.nix new file mode 100644 index 000000000000..7d738065ce3a --- /dev/null +++ b/pkgs/applications/audio/famistudio/default.nix @@ -0,0 +1,118 @@ +{ stdenv +, lib +, buildDotnetModule +, callPackage +, fetchFromGitHub +, ffmpeg +, glfw +, libogg +, libvorbis +, makeWrapper +, openal +, portaudio +, rtmidi +}: + +let + csprojName = if stdenv.hostPlatform.isLinux then + "FamiStudio.Linux" + else if stdenv.hostPlatform.isDarwin then + "FamiStudio.Mac" + else throw "Don't know how to build FamiStudio for ${stdenv.hostPlatform.system}"; +in +buildDotnetModule rec { + pname = "famistudio"; + version = "4.1.3"; + + src = fetchFromGitHub { + owner = "BleuBleu"; + repo = "FamiStudio"; + rev = "refs/tags/${version}"; + hash = "sha256-bryxhminkrTVe5qhGeMStZp3NTHBREXrsUlyQkfPkao="; + }; + + postPatch = let + libname = library: "${library}${stdenv.hostPlatform.extensions.sharedLibrary}"; + buildNativeWrapper = args: callPackage ./build-native-wrapper.nix (args // { + inherit version src; + sourceRoot = "${src.name}/ThirdParty/${args.depname}"; + }); + nativeWrapperToReplaceFormat = args: let + libPrefix = lib.optionalString stdenv.hostPlatform.isLinux "lib"; + in { + package = buildNativeWrapper args; + expectedName = "${libPrefix}${args.depname}"; + ourName = "${libPrefix}${args.depname}"; + }; + librariesToReplace = [ + # Unmodified native libraries that we can fully substitute + { package = glfw; expectedName = "libglfw"; ourName = "libglfw"; } + { package = rtmidi; expectedName = "librtmidi"; ourName = "librtmidi"; } + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + { package = openal; expectedName = "libopenal32"; ourName = "libopenal"; } + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + { package = portaudio; expectedName = "libportaudio.2"; ourName = "libportaudio.2"; } + ] ++ [ + # Native libraries, with extra code for the C# wrapping + (nativeWrapperToReplaceFormat { depname = "GifDec"; }) + (nativeWrapperToReplaceFormat { depname = "NesSndEmu"; }) + (nativeWrapperToReplaceFormat { depname = "NotSoFatso"; extraPostPatch = '' + # C++17 does not allow register storage class specifier + substituteInPlace build.sh \ + --replace-fail "$CXX" "$CXX -std=c++14" + ''; }) + (nativeWrapperToReplaceFormat { depname = "ShineMp3"; }) + (nativeWrapperToReplaceFormat { depname = "Stb"; }) + (nativeWrapperToReplaceFormat { depname = "Vorbis"; buildInputs = [ libogg libvorbis ]; }) + ]; + libraryReplaceArgs = lib.strings.concatMapStringsSep " " + (library: "--replace-fail '${libname library.expectedName}' '${lib.getLib library.package}/lib/${libname library.ourName}'") + librariesToReplace; + in '' + # Don't use any prebuilt libraries + rm FamiStudio/*.{dll,dylib,so*} + + # Replace copying of vendored prebuilt native libraries with copying of our native libraries + substituteInPlace ${projectFile} ${libraryReplaceArgs} + + # Un-hardcode target platform if set + sed -i -e '/PlatformTarget/d' ${projectFile} + + # Don't require a special name to be preserved, our OpenAL isn't 32-bit + substituteInPlace FamiStudio/Source/AudioStreams/OpenALStream.cs \ + --replace-fail 'libopenal32' 'libopenal' + ''; + + projectFile = "FamiStudio/${csprojName}.csproj"; + nugetDeps = ./deps.nix; + + executables = [ "FamiStudio" ]; + + postInstall = '' + mkdir -p $out/share/famistudio + for datdir in Setup/Demo\ {Instruments,Songs}; do + cp -R "$datdir" $out/share/famistudio/ + done + ''; + + postFixup = '' + # FFMpeg looked up from PATH + wrapProgram $out/bin/FamiStudio \ + --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} + ''; + + passthru.updateScript = ./update.sh; + + meta = with lib; { + homepage = "https://famistudio.org/"; + description = "NES Music Editor"; + longDescription = '' + FamiStudio is very simple music editor for the Nintendo Entertainment System + or Famicom. It is targeted at both chiptune artists and NES homebrewers. + ''; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.unix; + mainProgram = "FamiStudio"; + }; +} diff --git a/pkgs/applications/audio/famistudio/deps.nix b/pkgs/applications/audio/famistudio/deps.nix new file mode 100644 index 000000000000..f3a17967e25c --- /dev/null +++ b/pkgs/applications/audio/famistudio/deps.nix @@ -0,0 +1,5 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ +] diff --git a/pkgs/applications/audio/famistudio/update.sh b/pkgs/applications/audio/famistudio/update.sh new file mode 100755 index 000000000000..15657955c025 --- /dev/null +++ b/pkgs/applications/audio/famistudio/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq common-updater-scripts +set -eo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + -s "https://api.github.com/repos/BleuBleu/FamiStudio/releases?per_page=1" | jq -r '.[0].tag_name')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" +if [[ "$new_version" == "$old_version" ]]; then + echo "Up to date" + exit 0 +fi + +cd ../../../.. + +if [[ "$1" != "--deps-only" ]]; then + update-source-version famistudio "$new_version" +fi + +$(nix-build . -A famistudio.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aec6ee2ada01..f23d0e0319bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30984,6 +30984,8 @@ with pkgs; faircamp = callPackage ../applications/misc/faircamp { }; + famistudio = darwin.apple_sdk_11_0.callPackage ../applications/audio/famistudio { }; + fasttext = callPackage ../applications/science/machine-learning/fasttext { }; fbmenugen = callPackage ../applications/misc/fbmenugen { }; From ee6c911964c614b0b09468c64e1c27be0cfc27ca Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 4 Dec 2023 15:13:08 +0100 Subject: [PATCH 089/260] famistudio-bin: Drop Apparently not of use anymore, separate commit for easier revertability. --- pkgs/by-name/fa/famistudio-bin/package.nix | 70 ---------------------- 1 file changed, 70 deletions(-) delete mode 100644 pkgs/by-name/fa/famistudio-bin/package.nix diff --git a/pkgs/by-name/fa/famistudio-bin/package.nix b/pkgs/by-name/fa/famistudio-bin/package.nix deleted file mode 100644 index 553cff75cb20..000000000000 --- a/pkgs/by-name/fa/famistudio-bin/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ lib -, stdenv -, fetchzip -, autoPatchelfHook -, dotnet-runtime -, ffmpeg -, libglvnd -, makeWrapper -, openal -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "famistudio-bin"; - version = "4.1.3"; - - src = fetchzip { - url = "https://github.com/BleuBleu/FamiStudio/releases/download/${finalAttrs.version}/FamiStudio${lib.replaceStrings ["."] [""] finalAttrs.version}-LinuxAMD64.zip"; - stripRoot = false; - hash = "sha256-eAdv0oObczbs8QLGYbxCrdFk/gN5DOCJ1dp/tg8JWIc="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - autoPatchelfHook - makeWrapper - ]; - - buildInputs = [ - dotnet-runtime - ffmpeg - libglvnd - openal - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib/famistudio} - mv * $out/lib/famistudio - - makeWrapper ${lib.getExe dotnet-runtime} $out/bin/FamiStudio \ - --add-flags $out/lib/famistudio/FamiStudio.dll \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]} \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg ]} - - # Bundled openal lib freezes the application - rm $out/lib/famistudio/libopenal32.so - ln -s ${openal}/lib/libopenal.so $out/lib/famistudio/libopenal32.so - - runHook postInstall - ''; - - meta = with lib; { - homepage = "https://famistudio.org/"; - description = "NES Music Editor (binary distribution)"; - longDescription = '' - FamiStudio is very simple music editor for the Nintendo Entertainment System - or Famicom. It is targeted at both chiptune artists and NES homebrewers. - ''; - license = licenses.mit; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "FamiStudio"; - }; -}) From 08c8996686466d2d29559acca2774c52d406aad7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 19:43:04 +0000 Subject: [PATCH 090/260] upx: 4.2.2 -> 4.2.3 --- pkgs/tools/compression/upx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index c9a516705b0e..3a2c6394f90a 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "upx"; repo = "upx"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-0x7SUW+rB5HNRoRkCQIwfOIMpu+kOifxA7Z3SUlY/ME="; + hash = "sha256-3+aOadTqQ1apnrXt2I27j8P6iJF96W90YjxVTPmRhs0="; }; nativeBuildInputs = [ cmake ]; From e2c073711f324ade294896ad4265ad9cd500e404 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 29 Mar 2024 09:47:20 +1300 Subject: [PATCH 091/260] halloy: migrate to pkgs/by-name --- .../networking/irc => by-name/ha}/halloy/Cargo.lock | 0 .../irc/halloy/default.nix => by-name/ha/halloy/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/networking/irc => by-name/ha}/halloy/Cargo.lock (100%) rename pkgs/{applications/networking/irc/halloy/default.nix => by-name/ha/halloy/package.nix} (100%) diff --git a/pkgs/applications/networking/irc/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock similarity index 100% rename from pkgs/applications/networking/irc/halloy/Cargo.lock rename to pkgs/by-name/ha/halloy/Cargo.lock diff --git a/pkgs/applications/networking/irc/halloy/default.nix b/pkgs/by-name/ha/halloy/package.nix similarity index 100% rename from pkgs/applications/networking/irc/halloy/default.nix rename to pkgs/by-name/ha/halloy/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 818a3c4f5e7b..7f00803c2abf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8772,8 +8772,6 @@ with pkgs; halftone = callPackage ../applications/graphics/halftone { }; - halloy = callPackage ../applications/networking/irc/halloy { }; - harminv = callPackage ../development/libraries/science/chemistry/harminv { }; igrep = callPackage ../tools/text/igrep { From 149d01aec57946be7b10ec7e324211ab6a63ab6f Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 28 Mar 2024 13:38:59 -0700 Subject: [PATCH 092/260] git-upstream: init at 1.1.0 --- pkgs/by-name/gi/git-upstream/package.nix | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/gi/git-upstream/package.nix diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix new file mode 100644 index 000000000000..26d63852b61f --- /dev/null +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + nix-update-script, +}: let + pname = "git-upstream"; + version = "1.1.0"; +in + rustPlatform.buildRustPackage { + inherit pname version; + + src = fetchFromGitHub { + owner = "9999years"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Pq0Z1WwrTP7dCwk6V/E0zu9sLLWr3kNuT3aJRZuRzhI="; + }; + + cargoHash = "sha256-jNpleFrOvt1m2TXTeBXfhTSjWNpCknNoKooF2xsO46w="; + + meta = with lib; { + homepage = "https://github.com/9999years/git-upstream"; + description = "A shortcut for `git push --set-upstream`"; + license = [licenses.mit]; + maintainers = [maintainers._9999years]; + mainProgram = "git-upstream"; + }; + + passthru.updateScript = nix-update-script {}; + } From 9488d81a00687bc3533908b46e17e5deb02b06c9 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 29 Mar 2024 11:06:24 +1300 Subject: [PATCH 093/260] halloy: 2024.3 -> 2024.5 Closes #299814 --- pkgs/by-name/ha/halloy/Cargo.lock | 1976 +++++++++++++--------------- pkgs/by-name/ha/halloy/package.nix | 9 +- 2 files changed, 927 insertions(+), 1058 deletions(-) diff --git a/pkgs/by-name/ha/halloy/Cargo.lock b/pkgs/by-name/ha/halloy/Cargo.lock index bd8a9f07c52a..55f2600e614a 100644 --- a/pkgs/by-name/ha/halloy/Cargo.lock +++ b/pkgs/by-name/ha/halloy/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ab_glyph" -version = "0.2.21" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5110f1c78cf582855d895ecd0746b653db010cec6d9f5575293f27934d980a39" +checksum = "80179d7dd5d7e8c285d67c4a1e652972a92de7475beddfb92028c76463b13225" dependencies = [ "ab_glyph_rasterizer", "owned_ttf_parser", @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -35,20 +35,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "getrandom", @@ -59,9 +48,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -80,9 +69,9 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "android-activity" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39b801912a977c3fd52d80511fe1c0c8480c6f957f21ae2ce1b92ffe970cf4b9" +checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", "bitflags 2.4.2", @@ -137,9 +126,9 @@ checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" [[package]] name = "as-raw-xcb-connection" @@ -162,32 +151,34 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c48ccdbf6ca6b121e0f586cbc0e73ae440e56c67c30fa0873b4e110d9c26d2b" dependencies = [ - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-channel" -version = "1.9.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", "futures-core", + "pin-project-lite", ] [[package]] name = "async-executor" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock", + "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 1.9.0", - "futures-lite", + "fastrand 2.0.1", + "futures-lite 2.2.0", "slab", ] @@ -197,10 +188,10 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "279cf904654eeebfa37ac9bb1598880884924aab82e290aa65c9e77a0e142e06" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "blocking", - "futures-lite", + "futures-lite 1.13.0", ] [[package]] @@ -209,80 +200,127 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling 2.8.0", - "rustix 0.37.19", + "rustix 0.37.27", "slab", - "socket2", + "socket2 0.4.10", "waker-fn", ] [[package]] -name = "async-lock" -version = "2.7.0" +name = "async-io" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ - "event-listener", + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite 2.2.0", + "parking", + "polling 3.5.0", + "rustix 0.38.31", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", ] [[package]] name = "async-process" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ - "async-io", - "async-lock", - "autocfg", + "async-io 1.13.0", + "async-lock 2.8.0", + "async-signal", "blocking", "cfg-if", - "event-listener", - "futures-lite", - "rustix 0.37.19", - "signal-hook", + "event-listener 3.1.0", + "futures-lite 1.13.0", + "rustix 0.38.31", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io 2.3.2", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix 0.38.31", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", ] [[package]] name = "async-task" -version = "4.4.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.69" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2d0f03b3640e3a630367e40c468cb7f309529c708ed1d88597047b0e7c6ef7" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -292,24 +330,24 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] name = "base64" -version = "0.21.2" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bit-set" @@ -380,56 +418,57 @@ dependencies = [ [[package]] name = "blocking" -version = "1.3.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel", - "async-lock", + "async-lock 3.3.0", "async-task", - "atomic-waker", - "fastrand 1.9.0", - "futures-lite", - "log", + "fastrand 2.0.1", + "futures-io", + "futures-lite 2.2.0", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.4.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "calloop" @@ -439,8 +478,8 @@ checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ "bitflags 2.4.2", "log", - "polling 3.3.2", - "rustix 0.38.30", + "polling 3.5.0", + "rustix 0.38.31", "slab", "thiserror", ] @@ -452,18 +491,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop", - "rustix 0.38.30", + "rustix 0.38.31", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", ] [[package]] name = "cc" -version = "1.0.79" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -492,25 +532,24 @@ checksum = "77e53693616d3075149f4ead59bdeecd204ac6b8192d8969757601b74bddf00f" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets 0.52.4", ] [[package]] name = "clipboard-win" -version = "5.0.0" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" +checksum = "12f9a0700e0127ba15d1d52dd742097f821cd9c65939303a44d970465040a297" dependencies = [ "error-code", ] @@ -528,21 +567,21 @@ dependencies = [ [[package]] name = "clipboard_wayland" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f6364a9f7a66f2ac1a1a098aa1c7f6b686f2496c6ac5e5c0d773445df912747" +checksum = "003f886bc4e2987729d10c1db3424e7f80809f3fc22dbc16c685738887cb37b8" dependencies = [ "smithay-clipboard", ] [[package]] name = "clipboard_x11" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "983a7010836ecd04dde2c6d27a0cb56ec5d21572177e782bdcb24a600124e921" +checksum = "4274ea815e013e0f9f04a2633423e14194e408a0576c943ce3d14ca56c50031c" dependencies = [ "thiserror", - "x11rb 0.9.0", + "x11rb", ] [[package]] @@ -563,15 +602,14 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931d3837c286f56e3c58423ce4eba12d08db2374461a785c86f672b08b5650d6" +checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" dependencies = [ "bitflags 1.3.2", "block", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", "libc", "objc", ] @@ -635,18 +673,18 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -654,9 +692,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -673,13 +711,12 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", "libc", ] @@ -706,64 +743,46 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" dependencies = [ "cfg-if", ] -[[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-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crunchy" @@ -783,12 +802,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" +checksum = "ad291aa74992b9b7a7e88c38acbbf6ad7e107f1d90ee8775b7bc1fc3394f485c" dependencies = [ "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -804,7 +823,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.4.2", - "libloading 0.8.0", + "libloading 0.8.3", "winapi", ] @@ -827,10 +846,20 @@ dependencies = [ "seahash", "serde", "serde_json", - "serde_yaml", "thiserror", + "timeago", "tokio", "tokio-stream", + "toml", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", ] [[package]] @@ -887,7 +916,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.0", + "libloading 0.8.3", ] [[package]] @@ -906,7 +935,7 @@ dependencies = [ "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.30", + "rustix 0.38.31", ] [[package]] @@ -916,7 +945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.30", + "rustix 0.38.31", ] [[package]] @@ -937,17 +966,18 @@ dependencies = [ [[package]] name = "either" -version = "1.8.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" [[package]] name = "embed-resource" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" +checksum = "c6985554d0688b687c5cb73898a34fbe3ad6c24c58c238a4d91d5e840670ee9d" dependencies = [ "cc", + "memchr", "rustc_version", "toml", "vswhom", @@ -956,9 +986,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" dependencies = [ "enumflags2_derive", "serde", @@ -966,13 +996,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.7" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -993,9 +1023,9 @@ dependencies = [ [[package]] name = "error-code" -version = "3.0.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" +checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" [[package]] name = "etagere" @@ -1023,16 +1053,69 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] -name = "exr" -version = "1.6.4" +name = "event-listener" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "279d3efcc55e19917fff7ab3ddd6c14afb6a90881a0078465196fe2f99d08c56" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] +name = "exr" +version = "1.72.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4" dependencies = [ "bit_field", "flume", "half", "lebe", - "miniz_oxide 0.7.1", + "miniz_oxide", "rayon-core", "smallvec", "zune-inflate", @@ -1061,9 +1144,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -1079,27 +1162,29 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", "spin", ] +[[package]] +name = "font-types" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7f6040d337bd44434ab21fc6509154edf2cece88b23758d9d64654c4e7730b" + [[package]] name = "fontconfig-parser" version = "0.5.6" @@ -1120,7 +1205,7 @@ dependencies = [ "memmap2 0.8.0", "slotmap", "tinyvec", - "ttf-parser 0.19.0", + "ttf-parser 0.19.2", ] [[package]] @@ -1150,7 +1235,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -1167,9 +1252,9 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -1182,9 +1267,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -1192,15 +1277,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -1210,9 +1295,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -1230,33 +1315,46 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "futures-lite" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand 2.0.1", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -1280,16 +1378,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "gethostname" version = "0.4.3" @@ -1297,27 +1385,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", - "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", - "wasm-bindgen", + "wasi", ] [[package]] name = "gif" -version = "0.12.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" +checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" dependencies = [ "color_quant", "weezl", @@ -1325,9 +1411,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gl_generator" @@ -1342,9 +1428,9 @@ dependencies = [ [[package]] name = "glam" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad83ab008a4fa3b31dfa713dd41b5a9bdea1e94e4cf1e2fc274ffbd49b0271d3" +checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" [[package]] name = "glow" @@ -1413,22 +1499,22 @@ dependencies = [ [[package]] name = "gpu-descriptor" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "gpu-descriptor-types", - "hashbrown 0.12.3", + "hashbrown", ] [[package]] name = "gpu-descriptor-types" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", ] [[package]] @@ -1443,9 +1529,9 @@ dependencies = [ [[package]] name = "half" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" dependencies = [ "cfg-if", "crunchy", @@ -1472,22 +1558,13 @@ dependencies = [ "uuid", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] - [[package]] name = "hashbrown" version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.7", + "ahash", "allocator-api2", ] @@ -1500,7 +1577,7 @@ dependencies = [ "bitflags 2.4.2", "com", "libc", - "libloading 0.8.0", + "libloading 0.8.3", "thiserror", "widestring", "winapi", @@ -1514,18 +1591,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" [[package]] name = "hex" @@ -1541,16 +1609,16 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] @@ -1564,10 +1632,9 @@ dependencies = [ [[package]] name = "iced" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ - "iced_core", "iced_futures", "iced_renderer", "iced_widget", @@ -1578,12 +1645,14 @@ dependencies = [ [[package]] name = "iced_core" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", + "glam", "log", "num-traits", + "once_cell", "palette", "raw-window-handle", "smol_str", @@ -1594,8 +1663,8 @@ dependencies = [ [[package]] name = "iced_futures" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "futures", "iced_core", @@ -1607,13 +1676,12 @@ dependencies = [ [[package]] name = "iced_graphics" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "bytemuck", "cosmic-text", - "glam", "half", "iced_core", "iced_futures", @@ -1630,8 +1698,8 @@ dependencies = [ [[package]] name = "iced_renderer" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "iced_graphics", "iced_tiny_skia", @@ -1642,28 +1710,19 @@ dependencies = [ [[package]] name = "iced_runtime" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "iced_core", "iced_futures", + "raw-window-handle", "thiserror", ] -[[package]] -name = "iced_style" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" -dependencies = [ - "iced_core", - "once_cell", - "palette", -] - [[package]] name = "iced_tiny_skia" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "bytemuck", "cosmic-text", @@ -1678,10 +1737,10 @@ dependencies = [ [[package]] name = "iced_wgpu" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "bytemuck", "futures", "glam", @@ -1695,12 +1754,11 @@ dependencies = [ [[package]] name = "iced_widget" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "iced_renderer", "iced_runtime", - "iced_style", "num-traits", "ouroboros", "thiserror", @@ -1709,12 +1767,11 @@ dependencies = [ [[package]] name = "iced_winit" -version = "0.12.0" -source = "git+https://github.com/tarkah/iced?rev=f9db8d1efe68634b7b06ce07f12ea33a3e37d79c#f9db8d1efe68634b7b06ce07f12ea33a3e37d79c" +version = "0.13.0-dev" +source = "git+https://github.com/iced-rs/iced?rev=3d915d3cb30e5d08829aa2928676a53c505a601e#3d915d3cb30e5d08829aa2928676a53c505a601e" dependencies = [ "iced_graphics", "iced_runtime", - "iced_style", "log", "thiserror", "tracing", @@ -1737,9 +1794,9 @@ dependencies = [ [[package]] name = "image" -version = "0.24.6" +version = "0.24.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" +checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" dependencies = [ "bytemuck", "byteorder", @@ -1747,7 +1804,6 @@ dependencies = [ "exr", "gif", "jpeg-decoder", - "num-rational", "num-traits", "png", "qoi", @@ -1756,22 +1812,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.9.3" +version = "2.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown", ] [[package]] @@ -1789,7 +1835,7 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -1835,6 +1881,15 @@ dependencies = [ "once_cell", ] +[[package]] +name = "isolang" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe50d48c77760c55188549098b9a7f6e37ae980c586a24693d6b01c3b2010c3c" +dependencies = [ + "phf", +] + [[package]] name = "itertools" version = "0.12.1" @@ -1846,9 +1901,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1874,27 +1929,27 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" dependencies = [ "libc", ] [[package]] name = "jpeg-decoder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" +checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" dependencies = [ "rayon", ] [[package]] name = "js-sys" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1915,7 +1970,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6aae1df220ece3c0ada96b8153459b67eebe9ae9212258bb0134ae60416fdf76" dependencies = [ "libc", - "libloading 0.8.0", + "libloading 0.8.3", "pkg-config", ] @@ -1927,11 +1982,12 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc" [[package]] name = "kurbo" -version = "0.9.5" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" +checksum = "1618d4ebd923e97d67e7cd363d80aef35fe961005cbbbb3d2dad8bdd1bc63440" dependencies = [ "arrayvec", + "smallvec", ] [[package]] @@ -1948,9 +2004,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" [[package]] name = "libc" -version = "0.2.152" +version = "0.2.153" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" @@ -1964,12 +2020,12 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d580318f95776505201b28cf98eb1fa5e4be3b689633ba6a3e6cd880ff22d8cb" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -1978,6 +2034,28 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + +[[package]] +name = "libredox" +version = "0.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -1998,9 +2076,9 @@ checksum = "f0b5399f6804fbab912acbd8878ed3532d506b7c951b8f9f164ef90fef39e3f4" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -2008,30 +2086,30 @@ dependencies = [ [[package]] name = "log" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" [[package]] name = "lru" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown", ] [[package]] name = "mac-notification-sys" -version = "0.5.6" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e72d50edb17756489e79d52eb146927bec8eba9dd48faadf9ef08bca3791ad5" +checksum = "51fca4d74ff9dbaac16a01b924bc3693fa2bba0862c2c633abc73f9a8ea21f64" dependencies = [ "cc", "dirs-next", "objc-foundation", "objc_id", - "time 0.3.23", + "time", ] [[package]] @@ -2045,18 +2123,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memmap2" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" -dependencies = [ - "libc", -] +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -2076,15 +2145,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -2126,18 +2186,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", "simd-adler32", @@ -2145,12 +2196,12 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -2162,15 +2213,15 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b" [[package]] name = "naga" -version = "0.19.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8878eb410fc90853da3908aebfe61d73d26d4437ef850b70050461f939509899" +checksum = "50e3524642f53d9af419ab5e8dd29d3ba155708267667c2f3f06c88c9e130843" dependencies = [ "bit-set", "bitflags 2.4.2", "codespan-reporting", "hexf-parse", - "indexmap 2.2.1", + "indexmap", "log", "num-traits", "rustc-hash", @@ -2180,15 +2231,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom", -] - [[package]] name = "native-tls" version = "0.2.11" @@ -2239,40 +2281,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.22.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" -dependencies = [ - "bitflags 1.3.2", - "cc", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset 0.6.5", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.7.1", - "static_assertions", ] [[package]] @@ -2287,9 +2303,9 @@ dependencies = [ [[package]] name = "notify-rust" -version = "4.8.0" +version = "4.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bfa211d18e360f08e36c364308f394b5eb23a6629150690e109a916dc6f610e" +checksum = "827c5edfa80235ded4ab3fe8e9dc619b4f866ef16fe9b1c6b8a7f8692c0f2226" dependencies = [ "log", "mac-notification-sys", @@ -2299,42 +2315,27 @@ dependencies = [ ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi", "libc", ] @@ -2353,10 +2354,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2422,9 +2423,9 @@ dependencies = [ [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -2437,9 +2438,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.0.1" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90878fb664448b54c4e592455ad02831e23a3f7e157374a8b95654731aac7349" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -2448,11 +2449,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.55" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "cfg-if", "foreign-types 0.3.2", "libc", @@ -2469,7 +2470,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -2480,9 +2481,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.90" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -2492,11 +2493,11 @@ dependencies = [ [[package]] name = "orbclient" -version = "0.3.45" +version = "0.3.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221d488cd70617f1bd599ed8ceb659df2147d9393717954d82a0f5e8032a6ab1" +checksum = "52f0d54bde9774d3a51dcf281a5def240c71996bc6ca05d2c847ec8b2b216166" dependencies = [ - "redox_syscall 0.3.5", + "libredox 0.0.2", ] [[package]] @@ -2511,9 +2512,9 @@ dependencies = [ [[package]] name = "ouroboros" -version = "0.17.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d813b7b31a82efae94bd30ffaac09aec85efc18db2d5ec3aead1a220ee954351" +checksum = "97b7be5a8a3462b752f4be3ff2b2bf2f7f1d00834902e46be2a4d68b87b0573c" dependencies = [ "aliasable", "ouroboros_macro", @@ -2522,31 +2523,32 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.17.0" +version = "0.18.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a56f651b4dd45ae3ac3d260ced32eaf0620cddaae5f26c69b554a9016594726" +checksum = "b645dcde5f119c2c454a92d0dfa271a2a3b205da92e4292a68ead4bdbfde1f33" dependencies = [ "heck", - "proc-macro-error", + "itertools", "proc-macro2", + "proc-macro2-diagnostics", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "owned_ttf_parser" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +checksum = "d4586edfe4c648c71797a74c84bacb32b52b212eff5dfe2bb9f2c599844023e7" dependencies = [ - "ttf-parser 0.19.0", + "ttf-parser 0.20.0", ] [[package]] name = "palette" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d38e6e5ca1612e2081cc31188f08c3cba630ce4ba44709a153f1a0f38d678f2" +checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a" dependencies = [ "approx", "fast-srgb8", @@ -2556,20 +2558,20 @@ dependencies = [ [[package]] name = "palette_derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d1c929301fee6830dafa764341118829b2535c216b0571e3821ecac5c885b" +checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -2589,7 +2591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", + "parking_lot_core 0.9.9", ] [[package]] @@ -2608,15 +2610,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] @@ -2633,15 +2635,15 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928c6535de93548188ef63bb7c4036bd415cd8f36ad25af44b9789b2ee72a48c" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", @@ -2649,9 +2651,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -2659,51 +2661,31 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92aacdc5f16768709a569e913f7451034034178b05bdc8acda226659a3dccc66" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] name = "phf_shared" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fb5f6f826b772a8d4c0394209441e7d37cbbb967ae9c7e0e8134365c9ee676" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", -] - [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2712,22 +2694,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] -name = "pkg-config" -version = "0.3.27" +name = "piper" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" [[package]] name = "png" -version = "0.17.8" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -2748,18 +2741,24 @@ dependencies = [ [[package]] name = "polling" -version = "3.3.2" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.30", + "rustix 0.38.31", "tracing", "windows-sys 0.52.0", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -2779,47 +2778,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", ] [[package]] -name = "proc-macro-error" -version = "1.0.4" +name = "proc-macro-crate" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn 1.0.109", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", + "toml_edit 0.21.1", ] [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] [[package]] -name = "profiling" -version = "1.0.8" +name = "proc-macro2-diagnostics" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332cd62e95873ea4f41f3dfd6bbbfc5b52aec892d7e8d534197c4720a0bbbab2" +checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.52", + "version_check", + "yansi", +] + +[[package]] +name = "profiling" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58" [[package]] name = "qoi" @@ -2832,9 +2829,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.23.1" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bafc859c6815fbaffbbbf4229ecb767ac913fecb27f9ad4343662e9ef099ea" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" dependencies = [ "memchr", ] @@ -2895,9 +2892,9 @@ checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "rangemap" -version = "1.4.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991" +checksum = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" [[package]] name = "raw-window-handle" @@ -2907,9 +2904,9 @@ checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" [[package]] name = "rayon" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "e4963ed1bc86e4f3ee217022bd855b297cef07fb9eac5dfa1f788b220b49b3bd" dependencies = [ "either", "rayon-core", @@ -2917,14 +2914,21 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", +] + +[[package]] +name = "read-fonts" +version = "0.15.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ea23eedb4d938031b6d4343222444608727a6aa68ec355e13588d9947ffe92" +dependencies = [ + "font-types", ] [[package]] @@ -2956,20 +2960,32 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox 0.0.1", "thiserror", ] [[package]] name = "regex" -version = "1.8.3" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -2978,15 +2994,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "renderdoc-sys" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" +checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" [[package]] name = "roxmltree" @@ -3017,9 +3033,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -3031,9 +3047,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.30" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ "bitflags 2.4.2", "errno", @@ -3061,9 +3077,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "same-file" @@ -3076,11 +3092,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.42.0", + "windows-sys 0.52.0", ] [[package]] @@ -3091,9 +3107,9 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sctk-adwaita" @@ -3104,7 +3120,7 @@ dependencies = [ "ab_glyph", "log", "memmap2 0.9.4", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "tiny-skia", ] @@ -3116,9 +3132,9 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "security-framework" -version = "2.9.1" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fc758eb7bffce5b308734e9b0c1468893cae9ff70ebf13e7090be8dcbcc83a8" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -3129,9 +3145,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.0" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51d0c0d83bec45f16480d0ce0058397a69e48fcdc52d1dc8855fb68acbd31a7" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -3145,35 +3161,35 @@ checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "serde_json" -version = "1.0.99" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46266871c240a00b8f503b877622fe33430b3c7d963bdc0f2adc511e54a1eae3" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -3182,58 +3198,35 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.13" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0a21fba416426ac927b1691996e82079f8b6156e920c85345f135b2e9ba2de" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "serde_spanned" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adf8a49373e98a4c5f0ceb5d05aa7c648d75f63774981ed95b7c7443bbd50c6e" -dependencies = [ - "indexmap 2.2.1", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", "digest", ] -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -3245,63 +3238,45 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238abfbb77c1915110ad968465608b68e869e0772622c9656714e73e5a1a522f" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "siphasher" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "smithay-client-toolkit" -version = "0.16.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" -dependencies = [ - "bitflags 1.3.2", - "dlib", - "lazy_static", - "log", - "memmap2 0.5.10", - "nix 0.24.3", - "pkg-config", - "wayland-client 0.29.5", - "wayland-cursor 0.29.5", - "wayland-protocols 0.29.5", -] - -[[package]] -name = "smithay-client-toolkit" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60e3d9941fa3bacf7c2bf4b065304faa14164151254cd16ce1b1bc8fc381600f" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ "bitflags 2.4.2", "calloop", @@ -3310,26 +3285,27 @@ dependencies = [ "libc", "log", "memmap2 0.9.4", - "rustix 0.38.30", + "rustix 0.38.31", "thiserror", "wayland-backend", - "wayland-client 0.31.2", + "wayland-client", "wayland-csd-frame", - "wayland-cursor 0.31.1", - "wayland-protocols 0.31.2", + "wayland-cursor", + "wayland-protocols", "wayland-protocols-wlr", - "wayland-scanner 0.31.1", + "wayland-scanner", "xkeysym", ] [[package]] name = "smithay-clipboard" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a345c870a1fae0b1b779085e81b51e614767c239e93503588e54c5b17f4b0e8" +checksum = "c091e7354ea8059d6ad99eace06dd13ddeedbb0ac72d40a9a6e7ff790525882d" dependencies = [ - "smithay-client-toolkit 0.16.0", - "wayland-client 0.29.5", + "libc", + "smithay-client-toolkit", + "wayland-backend", ] [[package]] @@ -3343,14 +3319,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", ] +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "softbuffer" version = "0.4.1" @@ -3371,15 +3357,15 @@ dependencies = [ "objc", "raw-window-handle", "redox_syscall 0.4.1", - "rustix 0.38.30", + "rustix 0.38.31", "tiny-xlib", "wasm-bindgen", "wayland-backend", - "wayland-client 0.31.2", - "wayland-sys 0.31.1", + "wayland-client", + "wayland-sys", "web-sys", "windows-sys 0.52.0", - "x11rb 0.13.0", + "x11rb", ] [[package]] @@ -3414,16 +3400,17 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" [[package]] name = "svg_fmt" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" +checksum = "f83ba502a3265efb76efb89b0a2f7782ad6f2675015d4ce37e4b547dda42b499" [[package]] name = "swash" -version = "0.1.8" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b7c73c813353c347272919aa1af2885068b05e625e5532b43049e4f641ae77f" +checksum = "d06ff4664af8923625604261c645f5c4cc610cc83c84bec74b50d76237089de7" dependencies = [ + "read-fonts", "yazi", "zeno", ] @@ -3441,9 +3428,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" dependencies = [ "proc-macro2", "quote", @@ -3461,25 +3448,24 @@ dependencies = [ [[package]] name = "tauri-winrt-notification" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f5bff1d532fead7c43324a0fa33643b8621a47ce2944a633be4cb6c0240898f" +checksum = "006851c9ccefa3c38a7646b8cec804bb429def3da10497bfa977179869c3e8e2" dependencies = [ - "quick-xml 0.23.1", - "windows 0.39.0", + "quick-xml 0.30.0", + "windows 0.51.1", ] [[package]] name = "tempfile" -version = "3.5.0" +version = "3.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 1.9.0", - "redox_syscall 0.3.5", - "rustix 0.37.19", - "windows-sys 0.45.0", + "fastrand 2.0.1", + "rustix 0.38.31", + "windows-sys 0.52.0", ] [[package]] @@ -3493,29 +3479,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "tiff" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" +checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" dependencies = [ "flate2", "jpeg-decoder", @@ -3524,36 +3510,38 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e399c068f43a5d116fedaf73b203fa4f9c519f17e2b34f63221d3792f81446" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ + "deranged", + "num-conv", + "powerfmt", "serde", "time-core", ] [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + +[[package]] +name = "timeago" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1710e589de0a76aaf295cd47a6699f6405737dbfd3cf2b75c92d000b548d0e6" +dependencies = [ + "chrono", + "isolang", +] [[package]] name = "tiny-skia" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6a067b809476893fce6a254cf285850ff69c847e6cfbade6a20b655b6c7e80d" +checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" dependencies = [ "arrayref", "arrayvec", @@ -3566,9 +3554,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de35e8a90052baaaf61f171680ac2f8e925a1e43ea9d2e3a00514772250e541" +checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" dependencies = [ "arrayref", "bytemuck", @@ -3583,7 +3571,7 @@ checksum = "d4098d49269baa034a8d1eae9bd63e9fa532148d772121dace3bcd6a6c98eb6d" dependencies = [ "as-raw-xcb-connection", "ctor", - "libloading 0.8.0", + "libloading 0.8.3", "tracing", ] @@ -3604,11 +3592,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -3617,20 +3604,20 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.6", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -3656,9 +3643,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -3670,45 +3657,66 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.4" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" +checksum = "af06656561d28735e9c1cd63dfd57132c8155426aa6af24f36a00a351f88c48e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.22.7", ] [[package]] name = "toml_datetime" -version = "0.6.2" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.19.10" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 1.9.3", + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +dependencies = [ + "indexmap", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18769cd1cec395d70860ceb4d932812a0b4d06b1a4bb336745a4d21b9496e992" +dependencies = [ + "indexmap", "serde", "serde_spanned", "toml_datetime", - "winnow", + "winnow 0.6.5", ] [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3716,29 +3724,29 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "ttf-parser" -version = "0.19.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44dcf002ae3b32cd25400d6df128c5babec3927cd1eb7ce813cfff20eb6c3746" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" [[package]] name = "ttf-parser" @@ -3748,25 +3756,26 @@ checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uds_windows" -version = "1.0.2" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce65604324d3cce9b966701489fbd0cf318cb1f7bd9dd07ac9a4ee6fb791930d" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ + "memoffset 0.9.0", "tempfile", "winapi", ] [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" @@ -3782,9 +3791,9 @@ checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-linebreak" @@ -3800,21 +3809,21 @@ checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" [[package]] name = "unicode-script" -version = "0.5.5" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" +checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd" [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -3822,17 +3831,11 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unsafe-libyaml" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" - [[package]] name = "uuid" -version = "1.3.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" dependencies = [ "getrandom", ] @@ -3871,26 +3874,20 @@ dependencies = [ [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", ] -[[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" @@ -3899,9 +3896,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -3909,24 +3906,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.40" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -3936,9 +3933,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3946,22 +3943,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.90" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-timer" @@ -3986,26 +3983,10 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.30", + "rustix 0.38.31", "scoped-tls", "smallvec", - "wayland-sys 0.31.1", -] - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix 0.24.3", - "scoped-tls", - "wayland-commons", - "wayland-scanner 0.29.5", - "wayland-sys 0.29.5", + "wayland-sys", ] [[package]] @@ -4015,21 +3996,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ "bitflags 2.4.2", - "rustix 0.38.30", + "rustix 0.38.31", "wayland-backend", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix 0.24.3", - "once_cell", - "smallvec", - "wayland-sys 0.29.5", + "wayland-scanner", ] [[package]] @@ -4043,40 +4012,17 @@ dependencies = [ "wayland-backend", ] -[[package]] -name = "wayland-cursor" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6865c6b66f13d6257bef1cd40cbfe8ef2f150fb8ebbdb1e8e873455931377661" -dependencies = [ - "nix 0.24.3", - "wayland-client 0.29.5", - "xcursor", -] - [[package]] name = "wayland-cursor" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.30", - "wayland-client 0.31.2", + "rustix 0.38.31", + "wayland-client", "xcursor", ] -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client 0.29.5", - "wayland-commons", - "wayland-scanner 0.29.5", -] - [[package]] name = "wayland-protocols" version = "0.31.2" @@ -4085,8 +4031,8 @@ checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-scanner", ] [[package]] @@ -4097,9 +4043,9 @@ checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -4110,20 +4056,9 @@ checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ "bitflags 2.4.2", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", - "wayland-scanner 0.31.1", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", + "wayland-client", + "wayland-protocols", + "wayland-scanner", ] [[package]] @@ -4137,17 +4072,6 @@ dependencies = [ "quote", ] -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "dlib", - "lazy_static", - "pkg-config", -] - [[package]] name = "wayland-sys" version = "0.31.1" @@ -4182,15 +4106,15 @@ dependencies = [ [[package]] name = "weezl" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" +checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" [[package]] name = "wgpu" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bfe9a310dcf2e6b85f00c46059aaeaf4184caa8e29a1ecd4b7a704c3482332d" +checksum = "a4b1213b52478a7631d6e387543ed8f642bc02c578ef4e3b49aca2a29a7df0cb" dependencies = [ "arrayvec", "cfg-if", @@ -4213,16 +4137,16 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.19.0" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b15e451d4060ada0d99a64df44e4d590213496da7c4f245572d51071e8e30ed" +checksum = "f9f6b033c2f00ae0bc8ea872c5989777c60bc241aac4e58b24774faa8b391f78" dependencies = [ "arrayvec", "bit-vec", "bitflags 2.4.2", "cfg_aliases 0.1.1", "codespan-reporting", - "indexmap 2.2.1", + "indexmap", "log", "naga", "once_cell", @@ -4239,9 +4163,9 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.19.1" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bb47856236bfafc0bc591a925eb036ac19cd987624a447ff353e7a7e7e6f72" +checksum = "49f972c280505ab52ffe17e94a7413d9d54b58af0114ab226b9fc4999a47082e" dependencies = [ "android_system_properties", "arrayvec", @@ -4261,10 +4185,11 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.0", + "libloading 0.8.3", "log", "metal", "naga", + "ndk-sys", "objc", "once_cell", "parking_lot 0.12.1", @@ -4283,9 +4208,9 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.19.0" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895fcbeb772bfb049eb80b2d6e47f6c9af235284e9703c96fc0218a42ffd5af2" +checksum = "b671ff9fb03f78b46ff176494ee1ebe7d603393f42664be55b64dc8d53969805" dependencies = [ "bitflags 2.4.2", "js-sys", @@ -4316,18 +4241,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -4340,9 +4256,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "window_clipboard" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6a197337269a469b5b2583d65dd7dfe475fd79a525be0aa647ff6d37ac6612c" +checksum = "f6d692d46038c433f9daee7ad8757e002a4248c20b0a3fbc991d99521d3bcb6d" dependencies = [ "clipboard-win", "clipboard_macos", @@ -4354,24 +4270,12 @@ dependencies = [ [[package]] name = "windows" -version = "0.39.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1c4bd0a50ac6020f65184721f758dba47bb9fbc2133df715ec74a237b26794a" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ - "windows_aarch64_msvc 0.39.0", - "windows_i686_gnu 0.39.0", - "windows_i686_msvc 0.39.0", - "windows_x86_64_gnu 0.39.0", - "windows_x86_64_msvc 0.39.0", -] - -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.0", + "windows-core 0.51.1", + "windows-targets 0.48.5", ] [[package]] @@ -4380,8 +4284,17 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", - "windows-targets 0.52.0", + "windows-core 0.52.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", ] [[package]] @@ -4390,22 +4303,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.0", -] - -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows-targets 0.52.4", ] [[package]] @@ -4423,7 +4321,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.48.5", ] [[package]] @@ -4432,7 +4330,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.4", ] [[package]] @@ -4452,32 +4350,32 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "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 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", ] [[package]] @@ -4488,21 +4386,15 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" [[package]] name = "windows_aarch64_msvc" @@ -4512,21 +4404,15 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" - -[[package]] -name = "windows_i686_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" [[package]] name = "windows_i686_gnu" @@ -4536,21 +4422,15 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" - -[[package]] -name = "windows_i686_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" [[package]] name = "windows_i686_msvc" @@ -4560,21 +4440,15 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" [[package]] name = "windows_x86_64_gnu" @@ -4584,15 +4458,15 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" [[package]] name = "windows_x86_64_gnullvm" @@ -4602,21 +4476,15 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.39.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" [[package]] name = "windows_x86_64_msvc" @@ -4626,22 +4494,22 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" version = "0.29.10" source = "git+https://github.com/iced-rs/winit.git?rev=b91e39ece2c0d378c3b80da7f3ab50e17bb798a5#b91e39ece2c0d378c3b80da7f3ab50e17bb798a5" dependencies = [ - "ahash 0.8.7", + "ahash", "android-activity", "atomic-waker", "bitflags 2.4.2", @@ -4664,42 +4532,51 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.30", + "rustix 0.38.31", "sctk-adwaita", - "smithay-client-toolkit 0.18.0", + "smithay-client-toolkit", "smol_str", "unicode-segmentation", "wasm-bindgen", "wasm-bindgen-futures", "wayland-backend", - "wayland-client 0.31.2", - "wayland-protocols 0.31.2", + "wayland-client", + "wayland-protocols", "wayland-protocols-plasma", "web-sys", "web-time", "windows-sys 0.48.0", "x11-dl", - "x11rb 0.13.0", + "x11rb", "xkbcommon-dl", ] [[package]] name = "winnow" -version = "0.4.6" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" dependencies = [ "memchr", ] [[package]] name = "winreg" -version = "0.11.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -4713,18 +4590,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" -dependencies = [ - "gethostname 0.2.3", - "nix 0.22.3", - "winapi", - "winapi-wsapoll", -] - [[package]] name = "x11rb" version = "0.13.0" @@ -4732,11 +4597,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8f25ead8c7e4cba123243a6367da5d3990e0d3affa708ea19dce96356bd9f1a" dependencies = [ "as-raw-xcb-connection", - "gethostname 0.4.3", + "gethostname", "libc", - "libloading 0.8.0", + "libloading 0.8.3", "once_cell", - "rustix 0.38.30", + "rustix 0.38.31", "x11rb-protocol", ] @@ -4748,28 +4613,25 @@ checksum = "e63e71c4b8bd9ffec2c963173a4dc4cbde9ee96961d4fcb4429db9929b606c34" [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xdg-home" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" dependencies = [ - "nix 0.26.2", + "libc", "winapi", ] [[package]] name = "xkbcommon-dl" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6924668544c48c0133152e7eec86d644a056ca3d09275eb8d5cdb9855f9d8699" +checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ "bitflags 2.4.2", "dlib", @@ -4786,15 +4648,21 @@ checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" [[package]] name = "xml-rs" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d8f380ae16a37b30e6a2cf67040608071384b1450c189e61bea3ff57cde922d" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xxhash-rust" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53be06678ed9e83edb1745eb72efc0bbcd7b5c3c35711a860906aed827a13d61" +checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" [[package]] name = "yazi" @@ -4804,15 +4672,15 @@ checksum = "c94451ac9513335b5e23d7a8a2b61a7102398b8cca5160829d313e84c9d98be1" [[package]] name = "zbus" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31de390a2d872e4cd04edd71b425e29853f786dc99317ed72d73d6fcf5ebb948" +checksum = "675d170b632a6ad49804c8cf2105d7c31eddd3312555cffd4b740e08e97c25e6" dependencies = [ "async-broadcast", "async-executor", "async-fs", - "async-io", - "async-lock", + "async-io 1.13.0", + "async-lock 2.8.0", "async-process", "async-recursion", "async-task", @@ -4821,12 +4689,12 @@ dependencies = [ "byteorder", "derivative", "enumflags2", - "event-listener", + "event-listener 2.5.3", "futures-core", "futures-sink", "futures-util", "hex", - "nix 0.26.2", + "nix", "once_cell", "ordered-stream", "rand", @@ -4845,11 +4713,11 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.14.1" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1794a946878c0e807f55a397187c11fc7a038ba5d868e7db4f3bd7760bc9d" +checksum = "7131497b0f887e8061b430c530240063d33bf9455fa34438f388a245da69e0a5" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "regex", @@ -4859,9 +4727,9 @@ dependencies = [ [[package]] name = "zbus_names" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb80bb776dbda6e23d705cf0123c3b95df99c4ebeaec6c2599d4a5419902b4a9" +checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d" dependencies = [ "serde", "static_assertions", @@ -4870,9 +4738,9 @@ dependencies = [ [[package]] name = "zeno" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c110ba09c9b3a43edd4803d570df0da2414fed6e822e22b976a4e3ef50860701" +checksum = "dd15f8e0dbb966fd9245e7498c7e9e5055d9e5c8b676b95bd67091cd11a1e697" [[package]] name = "zerocopy" @@ -4891,7 +4759,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.48", + "syn 2.0.52", ] [[package]] @@ -4905,9 +4773,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b291bee0d960c53170780af148dca5fa260a63cdd24f1962fa82e03e53338c" +checksum = "4eef2be88ba09b358d3b58aca6e41cd853631d44787f319a1383ca83424fb2db" dependencies = [ "byteorder", "enumflags2", @@ -4919,11 +4787,11 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "3.15.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "934d7a7dfc310d6ee06c87ffe88ef4eca7d3e37bb251dece2ef93da8f17d8ecd" +checksum = "37c24dc0bed72f5f90d1f8bb5b07228cbf63b3c6e9f82d82559d4bae666e7ed9" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 1.0.109", diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 2758914f73cc..dc8124e29480 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -15,19 +15,19 @@ rustPlatform.buildRustPackage rec { pname = "halloy"; - version = "2024.3"; + version = "2024.5"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; rev = "refs/tags/${version}"; - hash = "sha256-9yEkM65c8R71oQ0C54xZqwRh609+HSaq4Hb8izNM52A="; + hash = "sha256-F/yQYLYrq3MZFV6igQe4sQi84ChIKCCPdS5151nD6hs="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "iced-0.12.0" = "sha256-LtmAJDUMp42S4E+CjOM6Q7doAKOZkmJCN/49gsq3v/A="; + "iced-0.13.0-dev" = "sha256-8L0AoHPwRUeCiJK/N0NTs1Nl4BX0wbM7SLgundhvra0="; "winit-0.29.10" = "sha256-YoXJEvEhMvk3pK5EbXceVFeJEJLL6KTjiw0kBJxgHIE="; }; }; @@ -83,7 +83,8 @@ rustPlatform.buildRustPackage rec { ''); postInstall = '' - install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png + install -Dm644 assets/linux/icons/hicolor/128x128/apps/org.squidowl.halloy.png \ + $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png ''; meta = with lib; { From 0ac3540c1215b5bdff6ab96c2039ec27834192bc Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Fri, 1 Mar 2024 22:00:58 +0100 Subject: [PATCH 094/260] wlx-overlay-s: init at 0.3.2 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/wl/wlx-overlay-s/Cargo.lock | 3869 +++++++++++++++++++++ pkgs/by-name/wl/wlx-overlay-s/package.nix | 83 + 2 files changed, 3952 insertions(+) create mode 100644 pkgs/by-name/wl/wlx-overlay-s/Cargo.lock create mode 100644 pkgs/by-name/wl/wlx-overlay-s/package.nix diff --git a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock new file mode 100644 index 000000000000..d7a620223f38 --- /dev/null +++ b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock @@ -0,0 +1,3869 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.8.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +dependencies = [ + "cfg-if", + "getrandom", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +dependencies = [ + "memchr", +] + +[[package]] +name = "alsa" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" +dependencies = [ + "alsa-sys", + "bitflags 2.4.2", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "annotate-snippets" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" +dependencies = [ + "unicode-width", + "yansi-term", +] + +[[package]] +name = "anstream" +version = "0.6.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.81" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" + +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + +[[package]] +name = "aquamarine" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f" +dependencies = [ + "itertools 0.9.0", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "ashpd" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093" +dependencies = [ + "async-fs", + "async-net", + "enumflags2", + "futures-channel", + "futures-util", + "rand", + "serde", + "serde_repr", + "url", + "zbus", +] + +[[package]] +name = "async-broadcast" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" +dependencies = [ + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-channel" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28243a43d821d11341ab73c80bed182dc015c514b951616cf79bd4af39af0c3" +dependencies = [ + "concurrent-queue", + "event-listener 5.2.0", + "event-listener-strategy 0.5.0", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-executor" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" +dependencies = [ + "async-lock 3.3.0", + "async-task", + "concurrent-queue", + "fastrand", + "futures-lite", + "slab", +] + +[[package]] +name = "async-fs" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1" +dependencies = [ + "async-lock 3.3.0", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-io" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" +dependencies = [ + "async-lock 3.3.0", + "cfg-if", + "concurrent-queue", + "futures-io", + "futures-lite", + "parking", + "polling", + "rustix", + "slab", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +dependencies = [ + "event-listener 4.0.3", + "event-listener-strategy 0.4.0", + "pin-project-lite", +] + +[[package]] +name = "async-net" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" +dependencies = [ + "async-io", + "blocking", + "futures-lite", +] + +[[package]] +name = "async-process" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451e3cf68011bd56771c79db04a9e333095ab6349f7e47592b788e9b98720cc8" +dependencies = [ + "async-channel", + "async-io", + "async-lock 3.3.0", + "async-signal", + "blocking", + "cfg-if", + "event-listener 5.2.0", + "futures-lite", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "async-recursion" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "async-signal" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" +dependencies = [ + "async-io", + "async-lock 2.8.0", + "atomic-waker", + "cfg-if", + "futures-core", + "futures-io", + "rustix", + "signal-hook-registry", + "slab", + "windows-sys 0.48.0", +] + +[[package]] +name = "async-task" +version = "4.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" + +[[package]] +name = "async-trait" +version = "0.1.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "autocxx" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba64dd33efd8f09724143d45ab91b48aebcee52f4fb11add3464c998fab47dc" +dependencies = [ + "aquamarine", + "autocxx-macro", + "cxx", + "moveit", +] + +[[package]] +name = "autocxx-bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "itertools 0.10.5", + "lazy_static", + "lazycell", + "log", + "peeking_take_while", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.53", + "which", +] + +[[package]] +name = "autocxx-build" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd" +dependencies = [ + "autocxx-engine", + "env_logger", + "indexmap 1.9.3", + "syn 2.0.53", +] + +[[package]] +name = "autocxx-engine" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5918896fc1d44a647345fd5e8c74208424e394a76bdd2942398f4aff81ec7ab1" +dependencies = [ + "aquamarine", + "autocxx-bindgen", + "autocxx-parser", + "cc", + "cxx-gen", + "indexmap 1.9.3", + "indoc", + "itertools 0.10.5", + "log", + "miette", + "once_cell", + "prettyplease", + "proc-macro2", + "quote", + "regex", + "rustversion", + "serde_json", + "strum_macros 0.24.3", + "syn 2.0.53", + "tempfile", + "thiserror", + "version_check", +] + +[[package]] +name = "autocxx-macro" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e594e68d030b6eb1ce7e2b40958f4f4ae7150c588c76d76b9f8178d41c47d80" +dependencies = [ + "autocxx-parser", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "autocxx-parser" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ef00b2fc378804c31c4fbd693a7fea93f8a90467dce331dae1e4ce41e542953" +dependencies = [ + "indexmap 1.9.3", + "itertools 0.10.5", + "log", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 2.0.53", + "thiserror", +] + +[[package]] +name = "bindgen" +version = "0.69.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +dependencies = [ + "annotate-snippets", + "bitflags 2.4.2", + "cexpr", + "clang-sys", + "itertools 0.12.1", + "lazy_static", + "lazycell", + "proc-macro2", + "quote", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.53", +] + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "blocking" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" +dependencies = [ + "async-channel", + "async-lock 3.3.0", + "async-task", + "fastrand", + "futures-io", + "futures-lite", + "piper", + "tracing", +] + +[[package]] +name = "bumpalo" +version = "3.15.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" + +[[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "calloop" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" +dependencies = [ + "bitflags 2.4.2", + "log", + "polling", + "rustix", + "slab", + "thiserror", +] + +[[package]] +name = "calloop-wayland-source" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" +dependencies = [ + "calloop", + "rustix", + "wayland-backend", + "wayland-client", +] + +[[package]] +name = "cc" +version = "1.0.90" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +dependencies = [ + "jobserver", + "libc", +] + +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + +[[package]] +name = "cexpr" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" +dependencies = [ + "nom", +] + +[[package]] +name = "cfg-expr" +version = "0.15.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" +dependencies = [ + "smallvec", + "target-lexicon", +] + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] +name = "chrono" +version = "0.4.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "js-sys", + "num-traits", + "wasm-bindgen", + "windows-targets 0.52.4", +] + +[[package]] +name = "chrono-tz" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +dependencies = [ + "chrono", + "chrono-tz-build", + "phf", +] + +[[package]] +name = "chrono-tz-build" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +dependencies = [ + "parse-zoneinfo", + "phf", + "phf_codegen", +] + +[[package]] +name = "clang-sys" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" +dependencies = [ + "glob", + "libc", + "libloading 0.8.3", +] + +[[package]] +name = "clap" +version = "4.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", +] + +[[package]] +name = "clap_derive" +version = "4.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "cmake" +version = "0.1.50" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" +dependencies = [ + "cc", +] + +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes", + "memchr", +] + +[[package]] +name = "concurrent-queue" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "const-cstr" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d0b5ff30645a68f35ece8cea4556ca14ef8a1651455f789a099a0513532a6" + +[[package]] +name = "convert_case" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" + +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + +[[package]] +name = "cookie-factory" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "core-graphics-types" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f01585027057ff5f0a5bf276174ae4c1594a2c5bde93d5f46a016d76270f5a9" +dependencies = [ + "bindgen", +] + +[[package]] +name = "cpal" +version = "0.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni 0.21.1", + "js-sys", + "libc", + "mach2", + "ndk", + "ndk-context", + "oboe", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows", +] + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossbeam-queue" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" +dependencies = [ + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" + +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "cstr" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aa998c33a6d3271e3678950a22134cd7dd27cef86dee1b611b5b14207d1d90b" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "ctrlc" +version = "3.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +dependencies = [ + "nix 0.28.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "cursor-icon" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96a6ac251f4a2aca6b3f91340350eab87ae57c3f127ffeb585e92bd336717991" + +[[package]] +name = "cxx" +version = "1.0.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad" +dependencies = [ + "cc", + "cxxbridge-flags", + "cxxbridge-macro", + "link-cplusplus", +] + +[[package]] +name = "cxx-gen" +version = "0.7.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5797d553b95704a6a49394acfdb93e2332b8aaa146713a1e8ebe362e86d9fa68" +dependencies = [ + "codespan-reporting", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "cxxbridge-flags" +version = "1.0.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5" + +[[package]] +name = "cxxbridge-macro" +version = "1.0.119" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "darling" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" +dependencies = [ + "darling_core", + "darling_macro", +] + +[[package]] +name = "darling_core" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "darling_macro" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" +dependencies = [ + "darling_core", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + +[[package]] +name = "derivative" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "derive_more" +version = "0.99.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +dependencies = [ + "convert_case 0.4.0", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", +] + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "dlib" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" +dependencies = [ + "libloading 0.8.3", +] + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + +[[package]] +name = "drm-fourcc" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0aafbcdb8afc29c1a7ee5fbe53b5d62f4565b35a042a662ca9fecd0b54dae6f4" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "endi" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf" + +[[package]] +name = "enumflags2" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d" +dependencies = [ + "enumflags2_derive", + "serde", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "enumset" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d" +dependencies = [ + "enumset_derive", +] + +[[package]] +name = "enumset_derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af" +dependencies = [ + "darling", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "env_logger" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" +dependencies = [ + "atty", + "humantime", + "log", + "regex", + "termcolor", +] + +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + +[[package]] +name = "event-listener" +version = "4.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener" +version = "5.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5fb89194fa3cad959b833185b3063ba881dbfc7030680b314250779fb4cc91" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" +dependencies = [ + "event-listener 4.0.3", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "feedafcaa9b749175d5ac357452a9d41ea2911da598fde46ce1fe02c37751291" +dependencies = [ + "event-listener 5.2.0", + "pin-project-lite", +] + +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + +[[package]] +name = "flexi_logger" +version = "0.27.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469e584c031833564840fb0cdbce99bdfe946fd45480a188545e73a76f45461c" +dependencies = [ + "chrono", + "glob", + "is-terminal", + "lazy_static", + "log", + "nu-ansi-term", + "regex", + "thiserror", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "fontconfig-rs" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb4baadad5111c6820e97fc8bde5077258e6f272b5b38538db4b42e1812f29f3" +dependencies = [ + "const-cstr", + "once_cell", + "thiserror", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "freetype-rs" +version = "0.32.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59c337e64822dd56a3a83ed75a662a470736bdb3a9fabfb588dff276b94a4e0" +dependencies = [ + "bitflags 1.3.2", + "freetype-sys", + "libc", +] + +[[package]] +name = "freetype-sys" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "643148ca6cbad6bec384b52fbe1968547d578c4efe83109e035c43a71734ff88" +dependencies = [ + "cc", + "libc", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-lite" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +dependencies = [ + "fastrand", + "futures-core", + "futures-io", + "parking", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +dependencies = [ + "approx", +] + +[[package]] +name = "glob" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "half" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" +dependencies = [ + "bytemuck", + "cfg-if", + "crunchy", +] + +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" + +[[package]] +name = "hex" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" + +[[package]] +name = "home" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "hound" +version = "3.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62adaabb884c94955b19907d60019f4e145d091c75345379e70d1ee696f7854f" + +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core 0.52.0", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "ident_case" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + +[[package]] +name = "idmap" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dba885f996064df334b1639785897d1c58c0646750101b839b8359664cb26c0e" +dependencies = [ + "fixedbitset", +] + +[[package]] +name = "idmap-derive" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3f44aa1b60e7de7e2833ad2cc3bc79880171d1e1efdb44ca833a1acf8102870" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + +[[package]] +name = "indexmap" +version = "2.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + +[[package]] +name = "indoc" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" + +[[package]] +name = "input-linux" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f403224ea808abe6182696e3a36d9875c0e942ba7c99239f9ef545b96e35606" +dependencies = [ + "input-linux-sys", + "nix 0.26.4", +] + +[[package]] +name = "input-linux-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a687a25a4973027df9153753a5589f97fe1e958f694a34eea5606ae65299ab8" +dependencies = [ + "libc", + "nix 0.26.4", +] + +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi 0.3.9", + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.10.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +dependencies = [ + "either", +] + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + +[[package]] +name = "itoa" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + +[[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] +name = "js-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "json" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazycell" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "pkg-config", +] + +[[package]] +name = "libloading" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +dependencies = [ + "cfg-if", + "winapi", +] + +[[package]] +name = "libloading" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" +dependencies = [ + "cfg-if", + "windows-targets 0.52.4", +] + +[[package]] +name = "libspa" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" +dependencies = [ + "bitflags 2.4.2", + "cc", + "convert_case 0.6.0", + "cookie-factory", + "libc", + "libspa-sys", + "nix 0.27.1", + "nom", + "system-deps", +] + +[[package]] +name = "libspa-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf0d9716420364790e85cbb9d3ac2c950bde16a7dd36f3209b7dfdfc4a24d01f" +dependencies = [ + "bindgen", + "cc", + "system-deps", +] + +[[package]] +name = "link-cplusplus" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9" +dependencies = [ + "cc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" + +[[package]] +name = "mach2" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709" +dependencies = [ + "libc", +] + +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "memmap2" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" +dependencies = [ + "libc", +] + +[[package]] +name = "memmap2" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +dependencies = [ + "libc", +] + +[[package]] +name = "memoffset" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] + +[[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] +name = "miette" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" +dependencies = [ + "miette-derive", + "once_cell", + "thiserror", + "unicode-width", +] + +[[package]] +name = "miette-derive" +version = "5.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] +name = "moveit" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87d7335204cb6ef7bd647fa6db0be3e4d7aa25b5823a7aa030027ddf512cefba" +dependencies = [ + "cxx", +] + +[[package]] +name = "ndk" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" +dependencies = [ + "bitflags 2.4.2", + "jni-sys", + "log", + "ndk-sys", + "num_enum", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.5.0+25.2.9519653" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" +dependencies = [ + "jni-sys", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", + "pin-utils", +] + +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "libc", + "memoffset 0.9.0", +] + +[[package]] +name = "nix" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +dependencies = [ + "bitflags 2.4.2", + "cfg-if", + "cfg_aliases", + "libc", +] + +[[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] +name = "normpath" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04aaf5e9cb0fbf883cc0423159eacdf96a9878022084b35c462c428cab73bcaf" +dependencies = [ + "winapi", +] + +[[package]] +name = "nu-ansi-term" +version = "0.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "num-derive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_enum" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" +dependencies = [ + "num_enum_derive", +] + +[[package]] +name = "num_enum_derive" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" +dependencies = [ + "proc-macro-crate 2.0.2", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "objc" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "oboe" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" +dependencies = [ + "jni 0.21.1", + "ndk", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" +dependencies = [ + "cc", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openxr" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7d5c194407c4fb5d3bf08c34ae57f3ea6cc9d9cfbe0594ce066896c809d9215" +dependencies = [ + "libc", + "libloading 0.7.4", + "ndk-context", + "openxr-sys", +] + +[[package]] +name = "openxr-sys" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8f022053ecd7989d86f867b4fb8c3520347612b9d637e217077a0d6b4a6634" +dependencies = [ + "jni 0.19.0", + "libc", +] + +[[package]] +name = "ordered-stream" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "ovr_overlay" +version = "0.0.0" +source = "git+https://github.com/galister/ovr_overlay_oyasumi#61e0e77770212d64a76775a8c76637d1ca935942" +dependencies = [ + "byteorder", + "derive_more", + "enumset", + "lazy_static", + "log", + "ovr_overlay_sys", + "slice-of-array", + "thiserror", +] + +[[package]] +name = "ovr_overlay_sys" +version = "0.0.0" +source = "git+https://github.com/galister/ovr_overlay_oyasumi#61e0e77770212d64a76775a8c76637d1ca935942" +dependencies = [ + "autocxx", + "autocxx-build", + "cxx", + "normpath", +] + +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + +[[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.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "parse-zoneinfo" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" +dependencies = [ + "regex", +] + +[[package]] +name = "peeking_take_while" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" +dependencies = [ + "phf_generator", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand", + "futures-io", +] + +[[package]] +name = "pipewire" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" +dependencies = [ + "anyhow", + "bitflags 2.4.2", + "libc", + "libspa", + "libspa-sys", + "nix 0.27.1", + "once_cell", + "pipewire-sys", + "thiserror", +] + +[[package]] +name = "pipewire-sys" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "849e188f90b1dda88fe2bfe1ad31fe5f158af2c98f80fb5d13726c44f3f01112" +dependencies = [ + "bindgen", + "libspa-sys", + "system-deps", +] + +[[package]] +name = "pkg-config" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + +[[package]] +name = "polling" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +dependencies = [ + "cfg-if", + "concurrent-queue", + "pin-project-lite", + "rustix", + "tracing", + "windows-sys 0.52.0", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "prettyplease" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a41cf62165e97c7f814d2221421dbb9afcbcdb0a88068e5ea206e19951c2cbb5" +dependencies = [ + "proc-macro2", + "syn 2.0.53", +] + +[[package]] +name = "proc-macro-crate" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" +dependencies = [ + "once_cell", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +dependencies = [ + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "proc-macro-error" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +dependencies = [ + "proc-macro-error-attr", + "proc-macro2", + "quote", + "syn 1.0.109", + "version_check", +] + +[[package]] +name = "proc-macro-error-attr" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +dependencies = [ + "proc-macro2", + "quote", + "version_check", +] + +[[package]] +name = "proc-macro2" +version = "1.0.79" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quick-xml" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" +dependencies = [ + "memchr", +] + +[[package]] +name = "quick-xml" +version = "0.31.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +dependencies = [ + "memchr", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + +[[package]] +name = "raw-window-handle" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a9830a0e1b9fb145ebb365b8bc4ccd75f290f98c0247deafbbe2c75cefb544" + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "regex" +version = "1.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + +[[package]] +name = "rodio" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611" +dependencies = [ + "cpal", + "hound", +] + +[[package]] +name = "rosc" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2e63d9e6b0d090be1485cf159b1e04c3973d2d3e1614963544ea2ff47a4a981" +dependencies = [ + "byteorder", + "nom", +] + +[[package]] +name = "roxmltree" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "921904a62e410e37e215c40381b7117f830d9d89ba60ab5236170541dd25646b" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "rustc-hash" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + +[[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.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "rxscreen" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afbab13f83503a8272b7150d487494992cf6c59c299dcaf5d8ffac75bad9fc96" +dependencies = [ + "libc", +] + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "scoped-tls" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_repr" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + +[[package]] +name = "serde_yaml" +version = "0.9.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" +dependencies = [ + "indexmap 2.2.5", + "itoa", + "ryu", + "serde", + "unsafe-libyaml", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "shaderc" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27e07913ada18607bb60d12431cbe3358d3bbebbe95948e1618851dc01e63b7b" +dependencies = [ + "libc", + "shaderc-sys", +] + +[[package]] +name = "shaderc-sys" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73120d240fe22196300f39ca8547ca2d014960f27b19b47b21288b396272f7f7" +dependencies = [ + "cmake", + "libc", + "roxmltree", +] + +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "siphasher" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "slice-of-array" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4f120bb98cb4cb0dab21c882968c3cbff79dd23b46f07b1cf5c25044945ce84" + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "smithay-client-toolkit" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" +dependencies = [ + "bitflags 2.4.2", + "bytemuck", + "calloop", + "calloop-wayland-source", + "cursor-icon", + "libc", + "log", + "memmap2 0.9.4", + "pkg-config", + "rustix", + "thiserror", + "wayland-backend", + "wayland-client", + "wayland-csd-frame", + "wayland-cursor", + "wayland-protocols", + "wayland-protocols-wlr", + "wayland-scanner", + "xkbcommon", + "xkeysym", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros 0.25.3", +] + +[[package]] +name = "strum_macros" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 1.0.109", +] + +[[package]] +name = "strum_macros" +version = "0.25.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.53", +] + +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "system-deps" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8e9199467bcbc77c6a13cc6e32a6af21721ab8c96aa0261856c4fda5a4433f0" +dependencies = [ + "cfg-expr", + "heck 0.4.1", + "pkg-config", + "toml", + "version-compare", +] + +[[package]] +name = "target-lexicon" +version = "0.12.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "tempfile" +version = "3.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +dependencies = [ + "cfg-if", + "fastrand", + "rustix", + "windows-sys 0.52.0", +] + +[[package]] +name = "termcolor" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thiserror" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "toml" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.20.2", +] + +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.2.5", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.2.5", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "uds_windows" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +dependencies = [ + "memoffset 0.9.0", + "tempfile", + "winapi", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "unsafe-libyaml" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", + "serde", +] + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version-compare" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "vk-parse" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81086c28be67a8759cd80cbb3c8f7b520e0874605fc5eb74d5a1c9c2d1878e79" +dependencies = [ + "xml-rs", +] + +[[package]] +name = "vulkano" +version = "0.34.0" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +dependencies = [ + "ahash", + "ash", + "bytemuck", + "core-graphics-types", + "crossbeam-queue", + "half", + "heck 0.4.1", + "indexmap 2.2.5", + "libloading 0.8.3", + "objc", + "once_cell", + "parking_lot", + "proc-macro2", + "quote", + "raw-window-handle", + "regex", + "serde", + "serde_json", + "smallvec", + "thread_local", + "vk-parse", + "vulkano-macros", +] + +[[package]] +name = "vulkano-macros" +version = "0.34.0" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +dependencies = [ + "proc-macro-crate 2.0.2", + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "vulkano-shaders" +version = "0.34.0" +source = "git+https://github.com/vulkano-rs/vulkano?rev=94f50f1#94f50f18bd25971ea123adb8b5782ad65a8f085c" +dependencies = [ + "ahash", + "heck 0.4.1", + "proc-macro2", + "quote", + "shaderc", + "syn 2.0.53", + "vulkano", +] + +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.53", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +dependencies = [ + "cfg-if", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.92" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" + +[[package]] +name = "wayland-backend" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" +dependencies = [ + "cc", + "downcast-rs", + "rustix", + "scoped-tls", + "smallvec", + "wayland-sys", +] + +[[package]] +name = "wayland-client" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" +dependencies = [ + "bitflags 2.4.2", + "rustix", + "wayland-backend", + "wayland-scanner", +] + +[[package]] +name = "wayland-csd-frame" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" +dependencies = [ + "bitflags 2.4.2", + "cursor-icon", + "wayland-backend", +] + +[[package]] +name = "wayland-cursor" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" +dependencies = [ + "rustix", + "wayland-client", + "xcursor", +] + +[[package]] +name = "wayland-protocols" +version = "0.31.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-scanner", +] + +[[package]] +name = "wayland-protocols-wlr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" +dependencies = [ + "bitflags 2.4.2", + "wayland-backend", + "wayland-client", + "wayland-protocols", + "wayland-scanner", +] + +[[package]] +name = "wayland-scanner" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63b3a62929287001986fb58c789dce9b67604a397c15c611ad9f747300b6c283" +dependencies = [ + "proc-macro2", + "quick-xml 0.31.0", + "quote", +] + +[[package]] +name = "wayland-sys" +version = "0.31.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15a0c8eaff5216d07f226cb7a549159267f3467b289d9a2e52fd3ef5aae2b7af" +dependencies = [ + "dlib", + "log", + "pkg-config", +] + +[[package]] +name = "web-sys" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +dependencies = [ + "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" +dependencies = [ + "windows-core 0.54.0", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +dependencies = [ + "windows_aarch64_gnullvm 0.52.4", + "windows_aarch64_msvc 0.52.4", + "windows_i686_gnu 0.52.4", + "windows_i686_msvc 0.52.4", + "windows_x86_64_gnu 0.52.4", + "windows_x86_64_gnullvm 0.52.4", + "windows_x86_64_msvc 0.52.4", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" + +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" + +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" + +[[package]] +name = "winnow" +version = "0.5.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "wlx-capture" +version = "0.3.1" +source = "git+https://github.com/galister/wlx-capture?tag=v0.3.1#f9c9c98e0752bfbdaa2af69b59376c697c223915" +dependencies = [ + "ashpd", + "drm-fourcc", + "idmap", + "libc", + "log", + "once_cell", + "pipewire", + "rxscreen", + "smithay-client-toolkit", + "wayland-client", + "wayland-protocols", + "xcb", +] + +[[package]] +name = "wlx-overlay-s" +version = "0.3.2" +dependencies = [ + "anyhow", + "ash", + "chrono", + "chrono-tz", + "clap", + "cstr", + "ctrlc", + "dbus", + "flexi_logger", + "fontconfig-rs", + "freetype-rs", + "futures", + "glam", + "idmap", + "idmap-derive", + "input-linux", + "json", + "libc", + "log", + "once_cell", + "openxr", + "ovr_overlay", + "regex", + "rodio", + "rosc", + "serde", + "serde_json", + "serde_yaml", + "smallvec", + "strum", + "thiserror", + "vulkano", + "vulkano-shaders", + "wlx-capture", + "xdg", +] + +[[package]] +name = "xcb" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d27b37e69b8c05bfadcd968eb1a4fe27c9c52565b727f88512f43b89567e262" +dependencies = [ + "bitflags 1.3.2", + "libc", + "quick-xml 0.30.0", +] + +[[package]] +name = "xcursor" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" + +[[package]] +name = "xdg" +version = "2.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xdg-home" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e5a325c3cb8398ad6cf859c1135b25dd29e186679cf2da7581d9679f63b38e" +dependencies = [ + "libc", + "winapi", +] + +[[package]] +name = "xkbcommon" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e" +dependencies = [ + "libc", + "memmap2 0.8.0", + "xkeysym", +] + +[[package]] +name = "xkeysym" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054a8e68b76250b253f671d1268cb7f1ae089ec35e195b2efb2a4e9a836d0621" +dependencies = [ + "bytemuck", +] + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" + +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi", +] + +[[package]] +name = "yeslogic-fontconfig-sys" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bbd69036d397ebbff671b1b8e4d918610c181c5a16073b96f984a38d08c386" +dependencies = [ + "const-cstr", + "dlib", + "once_cell", + "pkg-config", +] + +[[package]] +name = "zbus" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b8e3d6ae3342792a6cc2340e4394334c7402f3d793b390d2c5494a4032b3030" +dependencies = [ + "async-broadcast", + "async-executor", + "async-fs", + "async-io", + "async-lock 3.3.0", + "async-process", + "async-recursion", + "async-task", + "async-trait", + "blocking", + "derivative", + "enumflags2", + "event-listener 5.2.0", + "futures-core", + "futures-sink", + "futures-util", + "hex", + "nix 0.27.1", + "ordered-stream", + "rand", + "serde", + "serde_repr", + "sha1", + "static_assertions", + "tracing", + "uds_windows", + "windows-sys 0.52.0", + "xdg-home", + "zbus_macros", + "zbus_names", + "zvariant", +] + +[[package]] +name = "zbus_macros" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7a3e850ff1e7217a3b7a07eba90d37fe9bb9e89a310f718afcde5885ca9b6d7" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "regex", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zbus_names" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c" +dependencies = [ + "serde", + "static_assertions", + "zvariant", +] + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.53", +] + +[[package]] +name = "zvariant" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e09e8be97d44eeab994d752f341e67b3b0d80512a8b315a0671d47232ef1b65" +dependencies = [ + "endi", + "enumflags2", + "serde", + "static_assertions", + "url", + "zvariant_derive", +] + +[[package]] +name = "zvariant_derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a5857e2856435331636a9fbb415b09243df4521a267c5bedcd5289b4d5799e" +dependencies = [ + "proc-macro-crate 1.3.1", + "proc-macro2", + "quote", + "syn 1.0.109", + "zvariant_utils", +] + +[[package]] +name = "zvariant_utils" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00bedb16a193cc12451873fee2a1bc6550225acece0e36f333e68326c73c8172" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix new file mode 100644 index 000000000000..698404a514f5 --- /dev/null +++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix @@ -0,0 +1,83 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, alsa-lib +, dbus +, fontconfig +, libxkbcommon +, makeWrapper +, openvr +, openxr-loader +, pipewire +, pkg-config +, pulseaudio +, shaderc +, wayland +, xorg +}: + +rustPlatform.buildRustPackage rec { + pname = "wlx-overlay-s"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "galister"; + repo = "wlx-overlay-s"; + rev = "v${version}"; + hash = "sha256-5uvdLBUnc8ba6b/dJNWsuqjnbbidaCcqgvSafFEXaMU="; + }; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ovr_overlay-0.0.0" = "sha256-b2sGzBOB2aNNJ0dsDBjgV2jH3ROO/Cdu8AIHPSXMCPg="; + "vulkano-0.34.0" = "sha256-0ZIxU2oItT35IFnS0YTVNmM775x21gXOvaahg/B9sj8="; + "wlx-capture-0.3.1" = "sha256-kK3OQMdIqCLZlgZuevNtfMDmpR8J2DFFD8jRHHWAvSA="; + }; + }; + + nativeBuildInputs = [ + makeWrapper + pkg-config + rustPlatform.bindgenHook + ]; + + buildInputs = [ + alsa-lib + dbus + fontconfig + libxkbcommon + openvr + openxr-loader + pipewire + xorg.libX11 + xorg.libXext + xorg.libXrandr + ]; + + env.SHADERC_LIB_DIR = "${lib.getLib shaderc}/lib"; + + postPatch = '' + substituteAllInPlace src/res/watch.yaml \ + --replace '"pactl"' '"${lib.getExe' pulseaudio "pactl"}"' + + # TODO: src/res/keyboard.yaml references 'whisper_stt' + ''; + + postInstall = '' + patchelf $out/bin/wlx-overlay-s \ + --add-needed ${lib.getLib wayland}/lib/libwayland-client.so.0 \ + --add-needed ${lib.getLib libxkbcommon}/lib/libxkbcommon.so.0 + ''; + + meta = with lib; { + description = "Wayland/X11 desktop overlay for SteamVR and OpenXR, Vulkan edition"; + homepage = "https://github.com/galister/wlx-overlay-s"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ Scrumplex ]; + platforms = platforms.linux; + broken = stdenv.isAarch64; + mainProgram = "wlx-overlay-s"; + }; +} From f2a5fa82b59bfba0f8a82604ee8c4261be1fe531 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 23:50:56 +0000 Subject: [PATCH 095/260] karmor: 1.2.0 -> 1.2.1 --- pkgs/applications/networking/cluster/karmor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/karmor/default.nix b/pkgs/applications/networking/cluster/karmor/default.nix index 7b61d9390b29..b87c022d67a8 100644 --- a/pkgs/applications/networking/cluster/karmor/default.nix +++ b/pkgs/applications/networking/cluster/karmor/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "karmor"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${version}"; - hash = "sha256-hul348zF81oXTcvcfRpNYiiqfocS3HPwcPdXp7Ij91Y="; + hash = "sha256-NNCV/+Jh/tjc7SC4E9/gtiVthVmAxZBOyW3MFISbkH4="; }; vendorHash = "sha256-CKOZxmUVZWFb7cc+amPwyMv5ScujWeipEqm95m63SYk="; From 41530e7cdabee18873a1476f94656bd384fa1632 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 00:26:21 +0000 Subject: [PATCH 096/260] rofi-calc: 2.2.0 -> 2.2.1 --- pkgs/applications/science/math/rofi-calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 6b15073675f7..be126e5fa397 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SGDORHX+lk6PS5/sPAmKZLfZD99/A7XvDPDnuAygDAM="; + sha256 = "sha256-uXaI8dwTRtg8LnFxopgXr9x/vEl8ixzIGOsSQQkAkoQ="; }; nativeBuildInputs = [ From d526d76fe7efac2619b5cefe7a8bf538f614eeca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 00:39:03 +0000 Subject: [PATCH 097/260] wayfirePlugins.wayfire-shadows: unstable-2023-09-09 -> unstable-2024-03-28 --- .../window-managers/wayfire/wayfire-shadows.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix index 99f11c6fd789..fd91d78285df 100644 --- a/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix +++ b/pkgs/applications/window-managers/wayfire/wayfire-shadows.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayfire-shadows"; - version = "unstable-2023-09-09"; + version = "unstable-2024-03-28"; src = fetchFromGitHub { owner = "timgott"; repo = "wayfire-shadows"; - rev = "de3239501fcafd1aa8bd01d703aa9469900004c5"; - hash = "sha256-oVlSzpddPDk6pbyLFMhAkuRffkYpinP7jRspVmfLfyA="; + rev = "81699f6e4be65dcf3f7ad5155dfb4247b37b7997"; + hash = "sha256-H9pqpHoeDfNBrtVLax57CUXVhU2XT+syAUZTYSJizxw="; }; nativeBuildInputs = [ From 4f3886e6c789e9f563195a9c407be2c8e16e4010 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 01:00:43 +0000 Subject: [PATCH 098/260] sqlc: 1.25.0 -> 1.26.0 --- pkgs/development/tools/database/sqlc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlc/default.nix b/pkgs/development/tools/database/sqlc/default.nix index 68e75f602549..ea65552bf3cf 100644 --- a/pkgs/development/tools/database/sqlc/default.nix +++ b/pkgs/development/tools/database/sqlc/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitHub }: let - version = "1.25.0"; + version = "1.26.0"; in buildGoModule { pname = "sqlc"; @@ -11,11 +11,11 @@ buildGoModule { owner = "sqlc-dev"; repo = "sqlc"; rev = "v${version}"; - hash = "sha256-VrR/oSGyKtbKHfQaiLQ9oKyWC1Y7lTZO1aUSS5bCkKY="; + hash = "sha256-o23FQytw+zpkmTTxxxunHx3NvLF5q0ZSl1NV+D+XKww="; }; proxyVendor = true; - vendorHash = "sha256-C5OOTAYoSt4anz1B/NGDHY5NhxfyTZ6EHis04LFnMPM="; + vendorHash = "sha256-T4DUuZg1yVxSgw/SXgajpvYwzfYZYxzLE3F7U9bpUTw="; subPackages = [ "cmd/sqlc" ]; From 2cd3340315b6d4a44113834abd95c73a18fd8202 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 01:59:40 +0000 Subject: [PATCH 099/260] vopono: 0.10.9 -> 0.10.10 --- pkgs/tools/networking/vopono/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/vopono/default.nix b/pkgs/tools/networking/vopono/default.nix index d2bb8fec3aa0..9e62a465bb69 100644 --- a/pkgs/tools/networking/vopono/default.nix +++ b/pkgs/tools/networking/vopono/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "vopono"; - version = "0.10.9"; + version = "0.10.10"; src = fetchCrate { inherit pname version; - hash = "sha256-j8o9UxyBE7uML/7gw9UYbXLNYK9ka2jhUw5/v7pxIc8="; + hash = "sha256-HjubzbRsmRU33oI1p1kzCFUjC2YQJhVqljd/FHzAnMw="; }; - cargoHash = "sha256-foJSaifllpGNMfxWMGm4BWwItOdtAmUcaOO1j1JMCpo="; + cargoHash = "sha256-YBDB1g8cUOo1hS8Fi03Bvpe63bolbPmhGbvT16G73js="; meta = with lib; { description = "Run applications through VPN connections in network namespaces"; From f4e439246e8a19a7be6cc3800ac405c2927dce87 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 29 Mar 2024 04:20:00 +0000 Subject: [PATCH 100/260] rqbit: 5.5.3 -> 5.5.4 Diff: https://github.com/ikatson/rqbit/compare/v5.5.3...v5.5.4 Changelog: https://github.com/ikatson/rqbit/releases/tag/v5.5.4 --- pkgs/by-name/rq/rqbit/Cargo.lock | 20 +++++++++----------- pkgs/by-name/rq/rqbit/package.nix | 4 ++-- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/rq/rqbit/Cargo.lock b/pkgs/by-name/rq/rqbit/Cargo.lock index eef80d693560..73a64e8e8f98 100644 --- a/pkgs/by-name/rq/rqbit/Cargo.lock +++ b/pkgs/by-name/rq/rqbit/Cargo.lock @@ -1265,7 +1265,7 @@ dependencies = [ [[package]] name = "librqbit" -version = "5.5.3" +version = "5.5.4" dependencies = [ "anyhow", "async-stream", @@ -1318,7 +1318,7 @@ dependencies = [ [[package]] name = "librqbit-bencode" -version = "2.2.1" +version = "2.2.2" dependencies = [ "anyhow", "librqbit-buffers", @@ -1329,7 +1329,7 @@ dependencies = [ [[package]] name = "librqbit-buffers" -version = "2.2.1" +version = "3.0.0" dependencies = [ "librqbit-clone-to-owned", "serde", @@ -1341,7 +1341,7 @@ version = "2.2.1" [[package]] name = "librqbit-core" -version = "3.6.1" +version = "3.6.2" dependencies = [ "anyhow", "directories", @@ -1362,7 +1362,7 @@ dependencies = [ [[package]] name = "librqbit-dht" -version = "5.0.1" +version = "5.0.2" dependencies = [ "anyhow", "backoff", @@ -1388,7 +1388,7 @@ dependencies = [ [[package]] name = "librqbit-peer-protocol" -version = "3.5.0" +version = "3.5.1" dependencies = [ "anyhow", "bincode", @@ -1403,16 +1403,14 @@ dependencies = [ [[package]] name = "librqbit-sha1-wrapper" -version = "2.2.1" +version = "3.0.0" dependencies = [ "crypto-hash", - "openssl", - "sha1", ] [[package]] name = "librqbit-tracker-comms" -version = "1.0.0" +version = "1.0.1" dependencies = [ "anyhow", "async-stream", @@ -2070,7 +2068,7 @@ dependencies = [ [[package]] name = "rqbit" -version = "5.5.3" +version = "5.5.4" dependencies = [ "anyhow", "bytes", diff --git a/pkgs/by-name/rq/rqbit/package.nix b/pkgs/by-name/rq/rqbit/package.nix index bfdd4ae380ef..06ff09e5cc37 100644 --- a/pkgs/by-name/rq/rqbit/package.nix +++ b/pkgs/by-name/rq/rqbit/package.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "rqbit"; - version = "5.5.3"; + version = "5.5.4"; src = fetchFromGitHub { owner = "ikatson"; repo = "rqbit"; rev = "v${version}"; - hash = "sha256-r/ff/Z/nsmQEWCVvmS0hGKXRuzIoDGhzfIRAxC6EaZk="; + hash = "sha256-o+v/h51F9xXzMLSkRJfmXddKskMXTF2p5LEIcoXvh74="; }; cargoLock = { From 184dc964c83e6ae5a15cc05dbd2c69d7356d3bc5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 04:51:50 +0000 Subject: [PATCH 101/260] python312Packages.gspread: 6.0.2 -> 6.1.0 --- pkgs/development/python-modules/gspread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 8ed4c6d9beea..e8c54b19788e 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "gspread"; - version = "6.0.2"; + version = "6.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "burnash"; repo = "gspread"; rev = "refs/tags/v${version}"; - hash = "sha256-NY6Q45/XuidDUeBG0QfVaStwp2+BqMSgefDifHu2erU="; + hash = "sha256-kuXPX+VY0qz4fldGYPbzZMFx+blzsmueews1W+AjQb0="; }; nativeBuildInputs = [ From 75201b5bea628ebc2e7880d6ca053100ccab3f61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 05:03:55 +0000 Subject: [PATCH 102/260] argocd: 2.10.4 -> 2.10.5 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index d40532db8a16..32005b5ae8c6 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.4"; + version = "2.10.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-D7vkVvYLImC9dtqPU3Gxe5sQO92qxnx4533ykBm7u7c="; + hash = "sha256-koTNC6ClKgmrgrELxtGz4rKe/VV/9kPK99Cmm50aB94="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-O13zMtrXgW3SiJmAn64/QW/CJN0+d0h0MMyEWKsy9WE="; + vendorHash = "sha256-BqXTjmeKfCCwdwJ3gSOyvKfuqkjN+0S/1xe5vM406Ig="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From f44e1bfeff2a907ee0ea0e78ba6849a0cecd7827 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 05:35:01 +0000 Subject: [PATCH 103/260] devbox: 0.10.1 -> 0.10.2 --- pkgs/development/tools/devbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix index 3b25558a4266..c035f1ad498c 100644 --- a/pkgs/development/tools/devbox/default.nix +++ b/pkgs/development/tools/devbox/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "devbox"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "jetpack-io"; repo = pname; rev = version; - hash = "sha256-iKWOGp5Clk+YFXHv/5k+7DZMA9TQzyIQoTlQs4IMbu4="; + hash = "sha256-mZwvNNwB+btDbjVUQNucDXsBATGfjCvV1odAgkFkiSc="; }; ldflags = [ From 53a578ca8c74732d8bc2683eec43ad9ec70cf603 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 11:12:10 +0100 Subject: [PATCH 104/260] python312Packages.pytimeparse: refactor --- .../python-modules/pytimeparse/default.nix | 49 +++++++++++++------ 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pytimeparse/default.nix b/pkgs/development/python-modules/pytimeparse/default.nix index 41cfa632dd2e..ec7dac91c12a 100644 --- a/pkgs/development/python-modules/pytimeparse/default.nix +++ b/pkgs/development/python-modules/pytimeparse/default.nix @@ -1,21 +1,40 @@ -{ lib, fetchPypi, buildPythonPackage, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, pynose +, pythonOlder +, setuptools +}: buildPythonPackage rec { - pname = "pytimeparse"; - version = "1.1.8"; - format = "setuptools"; + pname = "pytimeparse"; + version = "1.1.8"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "e86136477be924d7e670646a98561957e8ca7308d44841e21f5ddea757556a0a"; - }; + disabled = pythonOlder "3.7"; - nativeCheckInputs = [ nose ]; + src = fetchPypi { + inherit pname version; + hash = "sha256-6GE2R3vpJNfmcGRqmFYZV+jKcwjUSEHiH13ep1dVago="; + }; - meta = with lib; { - description = "A small Python library to parse various kinds of time expressions"; - homepage = "https://github.com/wroberts/pytimeparse"; - license = licenses.mit; - maintainers = with maintainers; [ vrthra ]; - }; + build-system = [ + setuptools + ]; + + nativeCheckInputs = [ + pynose + ]; + + pythonImportsCheck = [ + "pytimeparse" + ]; + + meta = with lib; { + description = "Library to parse various kinds of time expressions"; + homepage = "https://github.com/wroberts/pytimeparse"; + changelog = "https://github.com/wroberts/pytimeparse/releases/tag/${version}"; + license = licenses.mit; + maintainers = with maintainers; [ vrthra ]; + }; } From d316ef5e408fa52728ec15e17c7d2e3c1b59ba4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 11:13:00 +0100 Subject: [PATCH 105/260] python312Packages.agate: refactor - Python 3.12 support --- .../python-modules/agate/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index 9c464014bb61..48a30b9a40ef 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -7,30 +7,35 @@ , isodate , leather , lxml -, nose , parsedatetime , pyicu +, pynose , python-slugify -, pytimeparse , pythonOlder +, pytimeparse , pytz +, setuptools }: buildPythonPackage rec { pname = "agate"; version = "1.9.1"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wireservice"; - repo = pname; + repo = "agate"; rev = "refs/tags/${version}"; hash = "sha256-I7jvZA/m06kUuUcfglySaroDbJ5wbgiF2lb84EFPmpw="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ babel isodate leather @@ -43,7 +48,7 @@ buildPythonPackage rec { cssselect glibcLocales lxml - nose + pynose pyicu pytz ]; From 4dc098872b34ad83f766f9c9130baa31947f4ea4 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 29 Mar 2024 11:57:27 +0100 Subject: [PATCH 106/260] masterpdfeditor: 5.9.35 -> 5.9.82 --- .../ma/masterpdfeditor/package.nix} | 37 ++++++++++++++----- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 28 insertions(+), 11 deletions(-) rename pkgs/{applications/misc/masterpdfeditor/default.nix => by-name/ma/masterpdfeditor/package.nix} (58%) diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/by-name/ma/masterpdfeditor/package.nix similarity index 58% rename from pkgs/applications/misc/masterpdfeditor/default.nix rename to pkgs/by-name/ma/masterpdfeditor/package.nix index 192b3dd7c73e..5d75cfb335c4 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/by-name/ma/masterpdfeditor/package.nix @@ -1,17 +1,35 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook, lib, wrapQtAppsHook }: +{ stdenv +, fetchurl +, sane-backends +, nss +, autoPatchelfHook +, lib +, libsForQt5 +, pkcs11helper +}: stdenv.mkDerivation rec { pname = "masterpdfeditor"; - version = "5.9.35"; + version = "5.9.82"; src = fetchurl { url = "https://code-industry.net/public/master-pdf-editor-${version}-qt5.x86_64.tar.gz"; - sha256 = "sha256-c5DYS0PQemZ8Sql2KjnuMspCLDJzU95rsbuIdoxWDM0="; + sha256 = "sha256-CbrhhQJ0iiXz8hUJEi+/xb2ZGbunuPuIIgmCRgJhNVU="; }; - nativeBuildInputs = [ autoPatchelfHook wrapQtAppsHook ]; + nativeBuildInputs = [ + autoPatchelfHook + libsForQt5.wrapQtAppsHook + ]; - buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; + buildInputs = with libsForQt5; [ + nss + qtbase + qtsvg + sane-backends + stdenv.cc.cc + pkcs11helper + ]; dontStrip = true; @@ -22,14 +40,14 @@ stdenv.mkDerivation rec { mkdir -p $out/bin substituteInPlace masterpdfeditor5.desktop \ - --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" + --replace-fail 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace-fail 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace-fail 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png install -Dm644 -t $out/share/applications masterpdfeditor5.desktop install -Dm755 -t $p masterpdfeditor5 - install -Dm644 license.txt $out/share/$name/LICENSE + install -Dm644 license_en.txt $out/share/$name/LICENSE ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 cp -v -r stamps templates lang fonts $p @@ -43,5 +61,6 @@ stdenv.mkDerivation rec { license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ cmcdragonkai ]; + mainProgram = "masterpdfeditor5"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4eb8ffd9795e..4c86a679a967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -29843,8 +29843,6 @@ with pkgs; anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { }; - masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { }; - masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { }; master_me = callPackage ../applications/audio/master_me { From 8873c496a20aff277e50aa0bb34d498527c1faf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Sat, 4 Nov 2023 11:05:54 +0100 Subject: [PATCH 107/260] libpulsar: 2.10.2 -> 3.5.0 --- .../libraries/libpulsar/default.nix | 55 ++++++++----------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/pkgs/development/libraries/libpulsar/default.nix b/pkgs/development/libraries/libpulsar/default.nix index d87ef2b72802..56132920147a 100644 --- a/pkgs/development/libraries/libpulsar/default.nix +++ b/pkgs/development/libraries/libpulsar/default.nix @@ -1,10 +1,7 @@ { lib -, clang-tools -, llvmPackages -, boost179 -, protobuf -, python3Support ? false -, python3 +, asioSupport ? true +, asio +, boost180 , log4cxxSupport ? false , log4cxx , snappySupport ? false @@ -17,7 +14,8 @@ , gtestSupport ? false , cmake , curl -, fetchurl +, fetchFromGitHub +, protobuf , jsoncpp , openssl , pkg-config @@ -37,48 +35,39 @@ let */ enableCmakeFeature = p: if (p == null || p == false) then "OFF" else "ON"; - # Not really sure why I need to do this.. If I call clang-tools without the override it defaults to a different version and fails - clangTools = clang-tools.override { inherit stdenv llvmPackages; }; - # If boost has python enabled, then boost-python package will be installed which is used by libpulsars python wrapper - boost = if python3Support then boost179.override { inherit stdenv; enablePython = python3Support; python = python3; } else boost179; - defaultOptionals = [ boost protobuf ] - ++ lib.optional python3Support python3 + defaultOptionals = [ protobuf ] ++ lib.optional snappySupport snappy.dev ++ lib.optional zlibSupport zlib ++ lib.optional zstdSupport zstd - ++ lib.optional log4cxxSupport log4cxx; + ++ lib.optional log4cxxSupport log4cxx + ++ lib.optional asioSupport asio + ++ lib.optional (!asioSupport) boost180; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "libpulsar"; - version = "2.10.2"; + version = "3.5.0"; - src = fetchurl { - hash = "sha256-IONnsSDbnX2qz+Xya0taHYSViTOiRI36AfcxmY3dNpo="; - url = "mirror://apache/pulsar/pulsar-${version}/apache-pulsar-${version}-src.tar.gz"; + src = fetchFromGitHub { + owner = "apache"; + repo = "pulsar-client-cpp"; + rev = "v${version}"; + hash = "sha256-pNeoStDryyMtBolpp5nT5GFjYPuXg2ks1Ka1mjjN/9k="; }; - sourceRoot = "apache-pulsar-${version}-src/pulsar-client-cpp"; - - # clang-tools needed for clang-format - nativeBuildInputs = [ cmake pkg-config clangTools ] + nativeBuildInputs = [ cmake pkg-config ] ++ defaultOptionals ++ lib.optional gtestSupport gtest.dev; buildInputs = [ jsoncpp openssl curl ] ++ defaultOptionals; - # Needed for GCC on Linux - env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=return-type" ]; - cmakeFlags = [ "-DBUILD_TESTS=${enableCmakeFeature gtestSupport}" - "-DBUILD_PYTHON_WRAPPER=${enableCmakeFeature python3Support}" "-DUSE_LOG4CXX=${enableCmakeFeature log4cxxSupport}" - "-DClangTools_PATH=${clangTools}/bin" + "-DUSE_ASIO=${enableCmakeFeature asioSupport}" ]; - enableParallelBuilding = true; doInstallCheck = true; installCheckPhase = '' echo ${lib.escapeShellArg '' @@ -92,11 +81,11 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://pulsar.apache.org/docs/en/client-libraries-cpp"; + homepage = "https://pulsar.apache.org/docs/next/client-libraries-cpp/"; description = "Apache Pulsar C++ library"; - + changelog = "https://github.com/apache/pulsar-client-cpp/releases/tag/v${version}"; platforms = platforms.all; license = licenses.asl20; - maintainers = [ maintainers.corbanr ]; + maintainers = with maintainers; [ corbanr gaelreyrol ]; }; -} +}) From 46f48e86a8b7f0ff2535e0ec55cb767c3a296c98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Sat, 4 Nov 2023 11:06:07 +0100 Subject: [PATCH 108/260] pythonPackages.pulsar: init at 3.4.0 --- .../python-modules/pulsar/default.nix | 60 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/python-modules/pulsar/default.nix diff --git a/pkgs/development/python-modules/pulsar/default.nix b/pkgs/development/python-modules/pulsar/default.nix new file mode 100644 index 000000000000..472b9cb0527a --- /dev/null +++ b/pkgs/development/python-modules/pulsar/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, cmake +, pkg-config +, libpulsar +, pybind11 +, certifi +}: + +buildPythonPackage rec { + pname = "pulsar"; + version = "3.4.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "apache"; + repo = "pulsar-client-python"; + rev = "v${version}"; + hash = "sha256-WcD88s8V4AT/juW0qmYHdtYzrS3hWeom/4r8TETlmFE="; + }; + + disabled = pythonOlder "3.7"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + libpulsar + pybind11 + ]; + + preBuild = '' + make -j$NIX_BUILD_CORES + make install + cd .. + ''; + + propagatedBuildInputs = [ + certifi + ]; + + # Requires to setup a cluster + doCheck = false; + + pythonImportsCheck = [ + "pulsar" + ]; + + meta = with lib; { + description = "Apache Pulsar Python client library"; + homepage = "https://pulsar.apache.org/docs/next/client-libraries-python/"; + changelog = "https://github.com/apache/pulsar-client-python/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ gaelreyrol ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b030a14a79b4..d7b1bca45799 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10297,6 +10297,8 @@ self: super: with self; { pulsectl-asyncio = callPackage ../development/python-modules/pulsectl-asyncio { }; + pulsar = callPackage ../development/python-modules/pulsar { }; + pulsectl = callPackage ../development/python-modules/pulsectl { }; pure-cdb = callPackage ../development/python-modules/pure-cdb { }; From fa592ac67c6bf7252a9221e2b527b11a04d94dc5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 12:37:45 +0100 Subject: [PATCH 109/260] python312Packages.apricot-select: migrate to pynose --- .../python-modules/apricot-select/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/apricot-select/default.nix b/pkgs/development/python-modules/apricot-select/default.nix index 5680b15530e9..80e12792f162 100644 --- a/pkgs/development/python-modules/apricot-select/default.nix +++ b/pkgs/development/python-modules/apricot-select/default.nix @@ -1,15 +1,15 @@ { lib , buildPythonPackage , fetchFromGitHub -, nose , numba , numpy +, pynose , pytestCheckHook , pythonOlder -, torchvision , scikit-learn , scipy , setuptools +, torchvision , tqdm }: @@ -31,11 +31,11 @@ buildPythonPackage rec { sed -i '/"nose"/d' setup.py ''; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ numba numpy scipy @@ -43,10 +43,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - nose + pynose pytestCheckHook - torchvision scikit-learn + torchvision ]; pythonImportsCheck = [ From 34405fbe2a96e1053eef9d0b3e15898732f8030c Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Fri, 29 Mar 2024 11:40:42 +0000 Subject: [PATCH 110/260] emacsPackages.texpresso: init --- .../emacs/elisp-packages/manual-packages.nix | 2 ++ .../manual-packages/texpresso/default.nix | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix index 9a908039b8f5..02cf40eb9639 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix @@ -85,6 +85,8 @@ in sv-kalender = callPackage ./manual-packages/sv-kalender { }; + texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; }; + tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; }; treesit-grammars = callPackage ./manual-packages/treesit-grammars { }; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix new file mode 100644 index 000000000000..cd449ab0f5d9 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix @@ -0,0 +1,19 @@ +{ lib +, trivialBuild +, texpresso +}: +trivialBuild { + pname = "texpresso"; + version = texpresso.version; + src = texpresso.src; + + preInstall = '' + cd emacs + ''; + + meta = { + inherit (texpresso.meta) homepage license; + description = "Emacs mode for TeXpresso"; + maintainers = [ lib.maintainers.alexarice ]; + }; +} From ae2196c3cf63c33f43734b83556bc7c11ba0c36a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 14:50:40 +0100 Subject: [PATCH 111/260] python312Packages.annoy: refactor - migrate to pynose --- .../python-modules/annoy/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 2dc3afa56a6f..4de8d0adacb9 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -2,14 +2,16 @@ , buildPythonPackage , fetchPypi , h5py -, nose +, numpy +, pynose , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "annoy"; version = "1.17.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +20,22 @@ buildPythonPackage rec { hash = "sha256-nL/r7+Cl+EPropxr5MhNYB9PQa1N7QSG8biMOwdznBU="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail "'nose>=1.0'" "" + ''; + + build-system = [ + setuptools + ]; + nativeBuildInputs = [ h5py ]; nativeCheckInputs = [ - nose + numpy + pynose ]; pythonImportsCheck = [ From 71bc9833330727e78f94448be8ba9fb31acdca2b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 14:13:08 +0000 Subject: [PATCH 112/260] iamb: 0.0.8 -> 0.0.9 --- .../networking/instant-messengers/iamb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/iamb/default.nix b/pkgs/applications/networking/instant-messengers/iamb/default.nix index 6e4e5276e582..03d8b1cc13db 100644 --- a/pkgs/applications/networking/instant-messengers/iamb/default.nix +++ b/pkgs/applications/networking/instant-messengers/iamb/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "iamb"; - version = "0.0.8"; + version = "0.0.9"; src = fetchFromGitHub { owner = "ulyssa"; repo = "iamb"; rev = "v${version}"; - hash = "sha256-Mt4/UWySC6keoNvb1VDCVPoK24F0rmd0R47ZRPADkaw="; + hash = "sha256-UYc7iphpzqZPwhOn/ia7XvnnlIUvM7nSFBz67ZkXmNs="; }; - cargoHash = "sha256-UbmeEcmUr3zx05Hk36tjsl0Y9ay7DNM1u/3lPqlXN2o="; + cargoHash = "sha256-982FdK6ej3Bbg4R9e43VSwlni837ZK4rkMkoeYMyW8E="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ From 28526cb67f2f408a78b2b0850e76cef8d294895b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 14:25:07 +0000 Subject: [PATCH 113/260] librime: 1.10.0 -> 1.11.0 --- pkgs/development/libraries/librime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librime/default.nix b/pkgs/development/libraries/librime/default.nix index 95d88384b79e..acf779f3304c 100644 --- a/pkgs/development/libraries/librime/default.nix +++ b/pkgs/development/libraries/librime/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "librime"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "rime"; repo = pname; rev = version; - sha256 = "sha256-tflWBfH1+1AFvkq0A6mgsKl+jq6m5c83GA56LWxdnlw="; + sha256 = "sha256-yP7YmmeA3k0/NI4XPsC/k2BX4mMnyMJvguiFZIWo8I8="; }; nativeBuildInputs = [ cmake pkg-config ]; From 7f308fc2f7e910e624cb1628cd7de5013d5ce1c8 Mon Sep 17 00:00:00 2001 From: quantenzitrone <74491719+quantenzitrone@users.noreply.github.com> Date: Sun, 24 Mar 2024 15:17:12 +0000 Subject: [PATCH 114/260] fido2luks: remove prusnak as maintainer Co-authored-by: Pavol Rusnak --- pkgs/by-name/fi/fido2luks/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix index 123b73819bdc..c3ce48cd17f4 100644 --- a/pkgs/by-name/fi/fido2luks/package.nix +++ b/pkgs/by-name/fi/fido2luks/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; homepage = "https://github.com/shimunn/fido2luks"; license = licenses.mpl20; - maintainers = with maintainers; [ prusnak mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = platforms.linux; }; } From fedd84da415fe0226acb7d75cdad130ebb1e3fdc Mon Sep 17 00:00:00 2001 From: Quantenzitrone Date: Tue, 19 Mar 2024 18:38:23 +0100 Subject: [PATCH 115/260] fido2luks: fix build --- ...cryptsetup-rs-bump-version-to-0.9-55.patch | 343 +++++++++ .../fi/fido2luks/0002-cargo-update.patch | 654 ++++++++++++++++++ pkgs/by-name/fi/fido2luks/package.nix | 32 +- 3 files changed, 1017 insertions(+), 12 deletions(-) create mode 100644 pkgs/by-name/fi/fido2luks/0001-libcryptsetup-rs-bump-version-to-0.9-55.patch create mode 100644 pkgs/by-name/fi/fido2luks/0002-cargo-update.patch diff --git a/pkgs/by-name/fi/fido2luks/0001-libcryptsetup-rs-bump-version-to-0.9-55.patch b/pkgs/by-name/fi/fido2luks/0001-libcryptsetup-rs-bump-version-to-0.9-55.patch new file mode 100644 index 000000000000..0d40ae23f345 --- /dev/null +++ b/pkgs/by-name/fi/fido2luks/0001-libcryptsetup-rs-bump-version-to-0.9-55.patch @@ -0,0 +1,343 @@ +From 21d57c61575e76d80f812ff332b808bcc714a47b Mon Sep 17 00:00:00 2001 +From: Quantenzitrone +Date: Tue, 19 Mar 2024 17:46:17 +0100 +Subject: [PATCH 1/2] libcryptsetup-rs: bump version to 0.9 #55 + +--- + Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++++------------- + Cargo.toml | 2 +- + 2 files changed, 111 insertions(+), 37 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 530d1d4..343390f 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -73,25 +73,51 @@ version = "0.59.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "regex", + "rustc-hash", + "shlex", + ] + ++[[package]] ++name = "bindgen" ++version = "0.68.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" ++dependencies = [ ++ "bitflags 2.5.0", ++ "cexpr", ++ "clang-sys", ++ "lazy_static", ++ "lazycell", ++ "peeking_take_while", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", ++ "regex", ++ "rustc-hash", ++ "shlex", ++ "syn 2.0.53", ++] ++ + [[package]] + name = "bitflags" + version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + ++[[package]] ++name = "bitflags" ++version = "2.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" ++ + [[package]] + name = "bstr" + version = "0.2.17" +@@ -166,7 +192,7 @@ checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" + dependencies = [ + "ansi_term", + "atty", +- "bitflags", ++ "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", +@@ -179,7 +205,7 @@ version = "0.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" + dependencies = [ +- "bitflags", ++ "bitflags 1.3.2", + ] + + [[package]] +@@ -317,8 +343,8 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" + dependencies = [ + "fnv", + "ident_case", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "strsim 0.9.3", + "syn 1.0.101", + ] +@@ -330,7 +356,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" + dependencies = [ + "darling_core", +- "quote 1.0.21", ++ "quote 1.0.35", + "syn 1.0.101", + ] + +@@ -342,8 +368,8 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0" + dependencies = [ + "darling", + "derive_builder_core", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + ] + +@@ -354,8 +380,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef" + dependencies = [ + "darling", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + ] + +@@ -381,8 +407,8 @@ version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" + dependencies = [ +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + "synstructure", + ] +@@ -394,7 +420,8 @@ dependencies = [ + "ctap_hmac", + "failure", + "hex", +- "libcryptsetup-rs", ++ "libcryptsetup-rs 0.5.1", ++ "libcryptsetup-rs 0.9.2", + "ring", + "rpassword", + "serde", +@@ -500,9 +527,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" + + [[package]] + name = "libc" +-version = "0.2.133" ++version = "0.2.153" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0f80d65747a3e43d1596c7c5492d95d5edddaabd45a7fcdb02b95f644164966" ++checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + + [[package]] + name = "libcryptsetup-rs" +@@ -513,7 +540,25 @@ dependencies = [ + "either", + "lazy_static", + "libc", +- "libcryptsetup-rs-sys", ++ "libcryptsetup-rs-sys 0.2.1", ++ "pkg-config", ++ "semver", ++ "serde_json", ++ "uuid", ++] ++ ++[[package]] ++name = "libcryptsetup-rs" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "67dd3f8d51b4feb4acc765c063d45434fb7926fe979b20ee6f95dcd974b4dc0c" ++dependencies = [ ++ "bitflags 2.5.0", ++ "either", ++ "lazy_static", ++ "libc", ++ "libcryptsetup-rs-sys 0.3.0", ++ "log", + "pkg-config", + "semver", + "serde_json", +@@ -526,7 +571,19 @@ version = "0.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe" + dependencies = [ +- "bindgen", ++ "bindgen 0.59.2", ++ "cc", ++ "pkg-config", ++ "semver", ++] ++ ++[[package]] ++name = "libcryptsetup-rs-sys" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "20fc299fd05078d353a895d940fc463d1008d94258fc8096c095467549324707" ++dependencies = [ ++ "bindgen 0.68.1", + "cc", + "pkg-config", + "semver", +@@ -542,6 +599,12 @@ dependencies = [ + "winapi", + ] + ++[[package]] ++name = "log" ++version = "0.4.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" ++ + [[package]] + name = "maybe-uninit" + version = "2.0.0" +@@ -636,8 +699,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" + dependencies = [ + "proc-macro-error-attr", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + "version_check", + ] +@@ -648,8 +711,8 @@ version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" + dependencies = [ +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "version_check", + ] + +@@ -664,9 +727,9 @@ dependencies = [ + + [[package]] + name = "proc-macro2" +-version = "1.0.44" ++version = "1.0.79" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58" ++checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" + dependencies = [ + "unicode-ident", + ] +@@ -682,11 +745,11 @@ dependencies = [ + + [[package]] + name = "quote" +-version = "1.0.21" ++version = "1.0.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" ++checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" + dependencies = [ +- "proc-macro2 1.0.44", ++ "proc-macro2 1.0.79", + ] + + [[package]] +@@ -931,8 +994,8 @@ version = "1.0.145" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" + dependencies = [ +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + ] + +@@ -984,8 +1047,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" + dependencies = [ + "heck", + "proc-macro-error", +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + ] + +@@ -1006,8 +1069,19 @@ version = "1.0.101" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" + dependencies = [ +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "syn" ++version = "2.0.53" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" ++dependencies = [ ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "unicode-ident", + ] + +@@ -1017,8 +1091,8 @@ version = "0.12.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" + dependencies = [ +- "proc-macro2 1.0.44", +- "quote 1.0.21", ++ "proc-macro2 1.0.79", ++ "quote 1.0.35", + "syn 1.0.101", + "unicode-xid 0.2.4", + ] +diff --git a/Cargo.toml b/Cargo.toml +index 7edf572..9386e13 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -31,7 +31,7 @@ hex = "0.3.2" + ring = "0.13.5" + failure = "0.1.5" + rpassword = "4.0.1" +-libcryptsetup-rs = "0.5.1" ++libcryptsetup-rs = "0.9" + structopt = "0.3.2" + + [profile.release] +-- +2.43.2 + diff --git a/pkgs/by-name/fi/fido2luks/0002-cargo-update.patch b/pkgs/by-name/fi/fido2luks/0002-cargo-update.patch new file mode 100644 index 000000000000..3e8ca4baaf9b --- /dev/null +++ b/pkgs/by-name/fi/fido2luks/0002-cargo-update.patch @@ -0,0 +1,654 @@ +From 3b097c545c3e6ffd1cd91d5ea73f20853b11d645 Mon Sep 17 00:00:00 2001 +From: Quantenzitrone +Date: Tue, 19 Mar 2024 17:46:55 +0100 +Subject: [PATCH 2/2] cargo update + +--- + Cargo.lock | 281 ++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 170 insertions(+), 111 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 343390f..036047d 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -4,9 +4,9 @@ version = 3 + + [[package]] + name = "addr2line" +-version = "0.17.0" ++version = "0.21.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" ++checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" + dependencies = [ + "gimli", + ] +@@ -17,6 +17,15 @@ version = "1.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + ++[[package]] ++name = "aho-corasick" ++version = "1.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" ++dependencies = [ ++ "memchr", ++] ++ + [[package]] + name = "ansi_term" + version = "0.12.1" +@@ -54,9 +63,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + + [[package]] + name = "backtrace" +-version = "0.3.66" ++version = "0.3.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" ++checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" + dependencies = [ + "addr2line", + "cc", +@@ -69,9 +78,9 @@ dependencies = [ + + [[package]] + name = "bindgen" +-version = "0.59.2" ++version = "0.63.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" ++checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" + dependencies = [ + "bitflags 1.3.2", + "cexpr", +@@ -84,6 +93,7 @@ dependencies = [ + "regex", + "rustc-hash", + "shlex", ++ "syn 1.0.109", + ] + + [[package]] +@@ -118,23 +128,11 @@ version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + +-[[package]] +-name = "bstr" +-version = "0.2.17" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +-dependencies = [ +- "lazy_static", +- "memchr", +- "regex-automata", +- "serde", +-] +- + [[package]] + name = "byteorder" +-version = "1.4.3" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "cbor-codec" +@@ -148,9 +146,9 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.73" ++version = "1.0.90" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" + + [[package]] + name = "cexpr" +@@ -175,9 +173,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "clang-sys" +-version = "1.4.0" ++version = "1.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" ++checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1" + dependencies = [ + "glob", + "libc", +@@ -282,22 +280,21 @@ dependencies = [ + + [[package]] + name = "csv" +-version = "1.1.6" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" ++checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" + dependencies = [ +- "bstr", + "csv-core", +- "itoa 0.4.8", ++ "itoa", + "ryu", + "serde", + ] + + [[package]] + name = "csv-core" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" + dependencies = [ + "memchr", + ] +@@ -346,7 +343,7 @@ dependencies = [ + "proc-macro2 1.0.79", + "quote 1.0.35", + "strsim 0.9.3", +- "syn 1.0.101", ++ "syn 1.0.109", + ] + + [[package]] +@@ -357,7 +354,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" + dependencies = [ + "darling_core", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + ] + + [[package]] +@@ -370,7 +367,7 @@ dependencies = [ + "derive_builder_core", + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + ] + + [[package]] +@@ -382,14 +379,14 @@ dependencies = [ + "darling", + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + ] + + [[package]] + name = "either" +-version = "1.8.0" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" ++checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + + [[package]] + name = "failure" +@@ -409,7 +406,7 @@ checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" + dependencies = [ + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + "synstructure", + ] + +@@ -450,9 +447,9 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + + [[package]] + name = "getrandom" +-version = "0.2.7" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" ++checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" + dependencies = [ + "cfg-if 1.0.0", + "libc", +@@ -461,15 +458,15 @@ dependencies = [ + + [[package]] + name = "gimli" +-version = "0.26.2" ++version = "0.28.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" ++checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + + [[package]] + name = "glob" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" ++checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + + [[package]] + name = "heck" +@@ -503,15 +500,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" + + [[package]] + name = "itoa" +-version = "0.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +- +-[[package]] +-name = "itoa" +-version = "1.0.3" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c8af84674fe1f223a982c933a0ee1086ac4d4052aa0fb8060c12c6ad838e754" ++checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + + [[package]] + name = "lazy_static" +@@ -540,7 +531,7 @@ dependencies = [ + "either", + "lazy_static", + "libc", +- "libcryptsetup-rs-sys 0.2.1", ++ "libcryptsetup-rs-sys 0.2.4", + "pkg-config", + "semver", + "serde_json", +@@ -567,11 +558,11 @@ dependencies = [ + + [[package]] + name = "libcryptsetup-rs-sys" +-version = "0.2.1" ++version = "0.2.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0af91b644699911c839309edbb8c8f6addd61e6b9553aa6d02ba71c37597afbe" ++checksum = "d7c355c283a470a1a09924182b3606999786979697753df3c2206948dcd8f4eb" + dependencies = [ +- "bindgen 0.59.2", ++ "bindgen 0.63.0", + "cc", + "pkg-config", + "semver", +@@ -591,12 +582,12 @@ dependencies = [ + + [[package]] + name = "libloading" +-version = "0.7.3" ++version = "0.8.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" ++checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" + dependencies = [ + "cfg-if 1.0.0", +- "winapi", ++ "windows-targets", + ] + + [[package]] +@@ -613,9 +604,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + + [[package]] + name = "memchr" +-version = "2.5.0" ++version = "2.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" ++checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + + [[package]] + name = "memoffset" +@@ -634,18 +625,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + + [[package]] + name = "miniz_oxide" +-version = "0.5.4" ++version = "0.7.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" ++checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" + dependencies = [ + "adler", + ] + + [[package]] + name = "nom" +-version = "7.1.1" ++version = "7.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" ++checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" + dependencies = [ + "memchr", + "minimal-lexical", +@@ -664,18 +655,18 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.15" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" ++checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" + dependencies = [ + "autocfg 1.1.0", + ] + + [[package]] + name = "object" +-version = "0.29.0" ++version = "0.32.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "21158b2c33aa6d4561f1c0a6ea283ca92bc54802a93b263e910746d679a7eb53" ++checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" + dependencies = [ + "memchr", + ] +@@ -688,9 +679,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" + + [[package]] + name = "pkg-config" +-version = "0.3.25" ++version = "0.3.30" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" ++checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" + + [[package]] + name = "proc-macro-error" +@@ -701,7 +692,7 @@ dependencies = [ + "proc-macro-error-attr", + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + "version_check", + ] + +@@ -892,24 +883,32 @@ dependencies = [ + + [[package]] + name = "regex" +-version = "1.6.0" ++version = "1.10.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" ++checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" + dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", + "regex-syntax", + ] + + [[package]] + name = "regex-automata" +-version = "0.1.10" ++version = "0.4.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" ++checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++] + + [[package]] + name = "regex-syntax" +-version = "0.6.27" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" ++checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" + + [[package]] + name = "ring" +@@ -948,9 +947,9 @@ dependencies = [ + + [[package]] + name = "rustc-demangle" +-version = "0.1.21" ++version = "0.1.23" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" ++checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + + [[package]] + name = "rustc-hash" +@@ -960,61 +959,64 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "ryu" +-version = "1.0.11" ++version = "1.0.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" ++checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + + [[package]] + name = "scopeguard" +-version = "1.1.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "semver" +-version = "1.0.14" ++version = "1.0.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" ++checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + + [[package]] + name = "serde" +-version = "1.0.145" ++version = "1.0.197" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" ++checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" ++dependencies = [ ++ "serde_derive", ++] + + [[package]] + name = "serde_derive" +-version = "1.0.145" ++version = "1.0.197" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" ++checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" + dependencies = [ + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 2.0.53", + ] + + [[package]] + name = "serde_json" +-version = "1.0.85" ++version = "1.0.114" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e55a28e3aaef9d5ce0506d0a14dbba8054ddc7e499ef522dd8b26859ec9d4a44" ++checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" + dependencies = [ +- "itoa 1.0.3", ++ "itoa", + "ryu", + "serde", + ] + + [[package]] + name = "shlex" +-version = "1.1.0" ++version = "1.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + + [[package]] + name = "strsim" +@@ -1049,7 +1051,7 @@ dependencies = [ + "proc-macro-error", + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1065,9 +1067,9 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.101" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ + "proc-macro2 1.0.79", + "quote 1.0.35", +@@ -1093,7 +1095,7 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" + dependencies = [ + "proc-macro2 1.0.79", + "quote 1.0.35", +- "syn 1.0.101", ++ "syn 1.0.109", + "unicode-xid 0.2.4", + ] + +@@ -1108,9 +1110,9 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.1.44" ++version = "0.1.45" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" ++checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" + dependencies = [ + "libc", + "wasi 0.10.0+wasi-snapshot-preview1", +@@ -1119,21 +1121,21 @@ dependencies = [ + + [[package]] + name = "unicode-ident" +-version = "1.0.4" ++version = "1.0.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" ++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + + [[package]] + name = "unicode-segmentation" +-version = "1.10.0" ++version = "1.11.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" ++checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + + [[package]] + name = "unicode-width" +-version = "0.1.10" ++version = "0.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" ++checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + + [[package]] + name = "unicode-xid" +@@ -1155,9 +1157,9 @@ checksum = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f" + + [[package]] + name = "uuid" +-version = "1.1.2" ++version = "1.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dd6469f4314d5f1ffec476e05f17cc9a78bc7a27a6a857842170bdf8d6f98d2f" ++checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" + dependencies = [ + "getrandom", + ] +@@ -1207,3 +1209,60 @@ 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-targets" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" ++dependencies = [ ++ "windows_aarch64_gnullvm", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", ++ "windows_x86_64_gnullvm", ++ "windows_x86_64_msvc", ++] ++ ++[[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" ++ ++[[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" ++ ++[[package]] ++name = "windows_i686_gnu" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" ++ ++[[package]] ++name = "windows_i686_msvc" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" ++ ++[[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" ++ ++[[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +-- +2.43.2 + diff --git a/pkgs/by-name/fi/fido2luks/package.nix b/pkgs/by-name/fi/fido2luks/package.nix index c3ce48cd17f4..0504959697c6 100644 --- a/pkgs/by-name/fi/fido2luks/package.nix +++ b/pkgs/by-name/fi/fido2luks/package.nix @@ -1,10 +1,10 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cryptsetup -, pkg-config +{ + lib, + rustPlatform, + fetchFromGitHub, + cryptsetup, + pkg-config, }: - rustPlatform.buildRustPackage rec { pname = "fido2luks"; version = "0.2.21"; @@ -16,17 +16,25 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-bXwaFiRHURvS5KtTqIj+3GlGNbEulDgMDP51ZiO1w9o="; }; - nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; + cargoPatches = [ + ./0001-libcryptsetup-rs-bump-version-to-0.9-55.patch + ./0002-cargo-update.patch + ]; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; buildInputs = [ cryptsetup ]; - cargoSha256 = "sha256-MPji87jYJjYtDAXO+v/Z4XRtCKo+ftsNvmlBrM9iMTk="; + cargoHash = "sha256-BcwcgQzNH1p9pOVbelaGTN7bKqDgvxD4Red2JeavpJQ="; - meta = with lib; { + meta = { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; homepage = "https://github.com/shimunn/fido2luks"; - license = licenses.mpl20; - maintainers = with maintainers; [ mmahut ]; - platforms = platforms.linux; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ mmahut ]; + platforms = lib.platforms.linux; }; } From de6412caddbc0307144ec8c5e91918e921653d39 Mon Sep 17 00:00:00 2001 From: Olivia Crain Date: Fri, 29 Mar 2024 10:29:38 -0500 Subject: [PATCH 116/260] nixseparatedebuginfod: use system jemalloc Currently, this package uses a vendored version of jemalloc by way of the `jemalloc-sys` crate. The vendored version is not compatible with non-4k page sizes on aarch64, but nixpkgs' version of jemalloc is configured for such compatibility. To use nixpkgs' version of jemalloc, we need to pull in the `rust-jemalloc-sys` dependency when building nixseparatedebuginfod. --- pkgs/by-name/ni/nixseparatedebuginfod/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix index 263f4f736706..7ed8f61bb2c7 100644 --- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix +++ b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix @@ -3,6 +3,7 @@ , rustPlatform , libarchive , openssl +, rust-jemalloc-sys , sqlite , pkg-config , nixosTests @@ -27,6 +28,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ libarchive openssl + rust-jemalloc-sys sqlite ]; From 46149042db61bbc8f5c9592b46816e3404654a98 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 29 Mar 2024 13:38:14 +0100 Subject: [PATCH 117/260] scalapack: fix generated cmake files cmake files pointed to libscalpack.so in $dev output instead of $out. --- .../libraries/science/math/scalapack/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index 85aa5c4a8736..2f8d3dbe15de 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -63,6 +63,14 @@ stdenv.mkDerivation rec { # sometimes fail due to this checkFlagsArray = [ "ARGS=--timeout 10000" ]; + postFixup = '' + # _IMPORT_PREFIX, used to point to lib, points to dev output. Every package using the generated + # cmake file will thus look for the library in the dev output instead of out. + # Use the absolute path to $out instead to fix the issue. + substituteInPlace $dev/lib/cmake/scalapack-${version}/scalapack-targets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}" "$out" + ''; + meta = with lib; { homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; From 927d6ca7e43eeabfb750ed39a071b0060bb51a50 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 29 Mar 2024 13:39:18 +0100 Subject: [PATCH 118/260] octopus: 13.0 -> 14.0, switch to cmake --- .../science/chemistry/octopus/default.nix | 44 +++++++------------ 1 file changed, 16 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 93fec7149604..a3a385802aaa 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,6 +1,9 @@ { lib , stdenv , fetchFromGitLab +, cmake +, pkg-config +, ninja , gfortran , which , perl @@ -14,15 +17,12 @@ , gsl , netcdf , arpack -, autoreconfHook +, spglib +, metis , scalapack , mpi , enableMpi ? true , python3 -, enableFma ? stdenv.hostPlatform.fmaSupport -, enableFma4 ? stdenv.hostPlatform.fma4Support -, enableAvx ? stdenv.hostPlatform.avx2Support -, enableAvx512 ? stdenv.hostPlatform.avx512Support }: assert (!blas.isILP64) && (!lapack.isILP64); @@ -30,21 +30,23 @@ assert (blas.isILP64 == arpack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "13.0"; + version = "14.0"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "sha256-CZ+Qmv6aBQ6w11mLvTP6QAJzaGs+vmmXuNGnSyAqVDU="; + sha256 = "sha256-wQ2I+10ZHLKamW3j6AUtq2KZVm6d29+JxYgwvBKz9DU="; }; nativeBuildInputs = [ which perl procps - autoreconfHook + cmake gfortran + pkg-config + ninja ]; buildInputs = [ @@ -57,34 +59,20 @@ stdenv.mkDerivation rec { netcdf arpack libvdwxc + spglib + metis (python3.withPackages (ps: [ ps.pyyaml ])) ] ++ lib.optional enableMpi scalapack; propagatedBuildInputs = lib.optional enableMpi mpi; propagatedUserEnvPkgs = lib.optional enableMpi mpi; - configureFlags = with lib; [ - "--with-yaml-prefix=${lib.getDev libyaml}" - "--with-blas=-lblas" - "--with-lapack=-llapack" - "--with-fftw-prefix=${lib.getDev fftw}" - "--with-gsl-prefix=${lib.getDev gsl}" - "--with-libxc-prefix=${lib.getDev libxc}" - "--with-libvdwxc" - "--enable-openmp" - ] - ++ optional enableFma "--enable-fma3" - ++ optional enableFma4 "--enable-fma4" - ++ optional enableAvx "--enable-avx" - ++ optional enableAvx512 "--enable-avx512" - ++ optionals enableMpi [ - "--enable-mpi" - "--with-scalapack=-lscalapack" - "CC=mpicc" - "FC=mpif90" + cmakeFlags = [ + (lib.cmakeBool "OCTOPUS_MPI" enableMpi) + (lib.cmakeBool "OCTOPUS_ScaLAPACK" enableMpi) + (lib.cmakeBool "OCTOPUS_OpenMP" true) ]; - nativeCheckInputs = lib.optional.enableMpi mpi; doCheck = false; checkTarget = "check-short"; From c4d54403cb4d18e53ccb6e8c484bd1e33850f796 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 16:34:17 +0000 Subject: [PATCH 119/260] buttercup-desktop: 2.26.1 -> 2.26.3 --- pkgs/tools/security/buttercup-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/buttercup-desktop/default.nix b/pkgs/tools/security/buttercup-desktop/default.nix index e38aaea42a4b..3926a3ee81c3 100644 --- a/pkgs/tools/security/buttercup-desktop/default.nix +++ b/pkgs/tools/security/buttercup-desktop/default.nix @@ -2,10 +2,10 @@ let pname = "buttercup-desktop"; - version = "2.26.1"; + version = "2.26.3"; src = fetchurl { url = "https://github.com/buttercup/buttercup-desktop/releases/download/v${version}/Buttercup-linux-x86_64.AppImage"; - sha256 = "sha256-usyq9qf6bBJHKreGzKzMdZYNmpZGtkUQScHyk1nvFQI="; + sha256 = "sha256-jX8U+DcuoYGfxQgYOIn03Vg/OesMVLHZ1gbGBSlgIbI="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; From 08edcc88254cc6aa79483b300cb08c926f57101d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 16:39:33 +0000 Subject: [PATCH 120/260] python312Packages.clarifai-grpc: 10.2.2 -> 10.2.3 --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 172392f4567f..3ef0366d9e29 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.2.2"; + version = "10.2.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Clarifai"; repo = "clarifai-python-grpc"; rev = "refs/tags/${version}"; - hash = "sha256-beBUluOTu90H2pinBWhb0Q1KmQ0vq23k+ZyCJVoc7ls="; + hash = "sha256-Dim0ZRYNzmlBqrqqs0CG+I/XQYpH9DuPISXoYxi92Dc="; }; nativeBuildInputs = [ From 1f51dae3cbfe198fe2f0000099184f53fff3bf9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 16:52:07 +0000 Subject: [PATCH 121/260] biome: 1.6.1 -> 1.6.3 --- pkgs/development/tools/biome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index dc49507bb96f..2072adf22641 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.6.1"; + version = "1.6.3"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-JApGz2vDGU1IFmhyaT1noCRIP0YoucVvHq395/CJ1zA="; + hash = "sha256-DooUOp+fr5oOrx04SLlTGro8xc2LieVPNtdvDyTLL/s="; }; - cargoHash = "sha256-4m2xtj3FHd8DTS3BeUMVoo8Pzjkol96B6tvNyzqPhEo="; + cargoHash = "sha256-zMMfLDhiqG8Ahe+7PFjpOtwaBXbKkLDIIoHS329/4uQ="; nativeBuildInputs = [ pkg-config @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p=biome_cli" ]; cargoTestFlags = cargoBuildFlags ++ - # skip a broken test from v1.6.1 release + # skip a broken test from v1.6.3 release # this will be removed on the next version [ "-- --skip=diagnostics::test::termination_diagnostic_size" ]; From a08461255bcba77ab2ddb840ffecf28a4955dafa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 17:00:45 +0000 Subject: [PATCH 122/260] python311Packages.snakemake-interface-executor-plugins: 8.2.0 -> 9.1.0 --- .../snakemake-interface-executor-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix index 38b42fc9d1e8..b493c4bcee96 100644 --- a/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix +++ b/pkgs/development/python-modules/snakemake-interface-executor-plugins/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "snakemake-interface-executor-plugins"; - version = "8.2.0"; + version = "9.1.0"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ZkhayXWy83/INRH7FYwFkhgHL+nSj7ReYC9I97SEeTM="; + hash = "sha256-DW8fxBBP6U7N0Hgk/enOzUz68L7pCjVl/8MFCy6PKxg="; }; nativeBuildInputs = [ From a74d6c775b033359212fa141dbc59e7deae427e5 Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Fri, 29 Mar 2024 11:09:38 -0400 Subject: [PATCH 123/260] grandperspective: set mainProgram, link $out/bin --- pkgs/os-specific/darwin/grandperspective/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/grandperspective/default.nix b/pkgs/os-specific/darwin/grandperspective/default.nix index 0d57d4f27714..d1f468b9806b 100644 --- a/pkgs/os-specific/darwin/grandperspective/default.nix +++ b/pkgs/os-specific/darwin/grandperspective/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, undmg }: +{ stdenv, lib, fetchurl, undmg, makeWrapper }: stdenv.mkDerivation (finalAttrs: { version = "3.4.1"; @@ -12,9 +12,13 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "GrandPerspective.app"; buildInputs = [ undmg ]; + nativeBuildInputs = [ makeWrapper ]; + # Create a trampoline script in $out/bin/ because a symlink doesn’t work for + # this app. installPhase = '' - mkdir -p "$out/Applications/GrandPerspective.app"; - cp -R . "$out/Applications/GrandPerspective.app"; + mkdir -p "$out/Applications/GrandPerspective.app" "$out/bin" + cp -R . "$out/Applications/GrandPerspective.app" + makeWrapper "$out/Applications/GrandPerspective.app/Contents/MacOS/GrandPerspective" "$out/bin/grandperspective" ''; meta = with lib; { @@ -25,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { space. It uses a so called tree map for visualisation. Each file is shown as a rectangle with an area proportional to the file's size. Files in the same folder appear together, but their placement is otherwise arbitrary. ''; + mainProgram = "grandperspective"; homepage = "https://grandperspectiv.sourceforge.net"; license = licenses.gpl2Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; From 90d9ce0e26a39d72be0789fb01d788abc41f7071 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:03:54 -0300 Subject: [PATCH 124/260] cue: internalize writeCueValidator via passthru A small step to by-name migration. --- pkgs/development/tools/cue/default.nix | 12 +++++++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index ee9af03bb888..fd82fc9df869 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -4,6 +4,7 @@ , installShellFiles , testers , cue +, callPackage }: buildGoModule rec { @@ -38,9 +39,14 @@ buildGoModule rec { $out/bin/cue eval - <<<'a: "all good"' > /dev/null ''; - passthru.tests.version = testers.testVersion { - package = cue; - command = "cue version"; + passthru = { + writeCueValidator = callPackage ./validator.nix { }; + tests = { + version = testers.testVersion { + package = cue; + command = "cue version"; + }; + }; }; meta = with lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039950c8bc9e..fa0a34e2ab76 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3680,7 +3680,7 @@ with pkgs; cue = callPackage ../development/tools/cue { }; - writeCueValidator = callPackage ../development/tools/cue/validator.nix { }; + inherit (cue) writeCueValidator; cuelsp = callPackage ../development/tools/cuelsp { }; From 1861d88ec84e9a918480ec36eedaaa789fa3b964 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:43:10 -0300 Subject: [PATCH 125/260] cue: move custom installCheckPhase to passthru.tests As recommended by the Nixpkgs documentation, custom tests are better served by passthru.tests, whilst installCheckPhase is recommended for tests that come from the upstream. --- pkgs/development/tools/cue/default.nix | 7 +------ pkgs/development/tools/cue/tests/001-all-good.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/cue/tests/001-all-good.nix diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index fd82fc9df869..6f86bd745a24 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -27,21 +27,16 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; postInstall = '' - # Completions installShellCompletion --cmd cue \ --bash <($out/bin/cue completion bash) \ --fish <($out/bin/cue completion fish) \ --zsh <($out/bin/cue completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - $out/bin/cue eval - <<<'a: "all good"' > /dev/null - ''; - passthru = { writeCueValidator = callPackage ./validator.nix { }; tests = { + test-001-all-good = callPackage ./tests/001-all-good.nix { }; version = testers.testVersion { package = cue; command = "cue version"; diff --git a/pkgs/development/tools/cue/tests/001-all-good.nix b/pkgs/development/tools/cue/tests/001-all-good.nix new file mode 100644 index 000000000000..d9919cd7fee4 --- /dev/null +++ b/pkgs/development/tools/cue/tests/001-all-good.nix @@ -0,0 +1,11 @@ +{ lib +, cue +, runCommand +}: + +runCommand "cue-test-001-all-good-${cue.version}" { + nativeBuildInputs = [ cue ]; + meta.timeout = 10; +} '' + cue eval - <<<'a: "all good"' > $out + '' From 4653fbade9b5b242da3deedf9430f2c40685709a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 29 Mar 2024 15:49:50 -0300 Subject: [PATCH 126/260] cue: migrate to by-name --- .../tools/cue/default.nix => by-name/cu/cue/package.nix} | 0 .../tools => by-name/cu}/cue/tests/001-all-good.nix | 0 pkgs/{development/tools => by-name/cu}/cue/validator.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 4 files changed, 2 deletions(-) rename pkgs/{development/tools/cue/default.nix => by-name/cu/cue/package.nix} (100%) rename pkgs/{development/tools => by-name/cu}/cue/tests/001-all-good.nix (100%) rename pkgs/{development/tools => by-name/cu}/cue/validator.nix (100%) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/by-name/cu/cue/package.nix similarity index 100% rename from pkgs/development/tools/cue/default.nix rename to pkgs/by-name/cu/cue/package.nix diff --git a/pkgs/development/tools/cue/tests/001-all-good.nix b/pkgs/by-name/cu/cue/tests/001-all-good.nix similarity index 100% rename from pkgs/development/tools/cue/tests/001-all-good.nix rename to pkgs/by-name/cu/cue/tests/001-all-good.nix diff --git a/pkgs/development/tools/cue/validator.nix b/pkgs/by-name/cu/cue/validator.nix similarity index 100% rename from pkgs/development/tools/cue/validator.nix rename to pkgs/by-name/cu/cue/validator.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa0a34e2ab76..71b1e419aa93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3678,8 +3678,6 @@ with pkgs; cudd = callPackage ../development/libraries/cudd { }; - cue = callPackage ../development/tools/cue { }; - inherit (cue) writeCueValidator; cuelsp = callPackage ../development/tools/cuelsp { }; From 6e39d3bdbcb4eb17b68b68602e7f6c2760277a1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 19:11:52 +0000 Subject: [PATCH 127/260] netbird: 0.26.3 -> 0.26.6 --- pkgs/tools/networking/netbird/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index 6349b170706d..bbd6f238000d 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -31,16 +31,16 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.26.3"; + version = "0.26.6"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - hash = "sha256-StZDhCBuwmJk8VimbsVO9Sfxlv5NcpV689YPUZRgOLk="; + hash = "sha256-LsgkUQ6uYdd1qPaINeza4MDDG0ynGhJ7jiZoAy8pjEE="; }; - vendorHash = "sha256-n5n9bIQ026WlvwatMmEIBaLGfquTgek1eiQDb0xDAdI="; + vendorHash = "sha256-SSTpXila4eze3XA3vrTczBwt5XEjtLDvaCiQ5oi4FXg="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config; From fac20e14d7c9af30d9a2fd60d5f98ae472d4633c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Fri, 29 Mar 2024 20:59:47 +0100 Subject: [PATCH 128/260] usql: 0.17.5 -> 0.18.1 https://github.com/xo/usql/releases/tag/v0.18.0 https://github.com/xo/usql/releases/tag/v0.18.1 https://github.com/xo/usql/compare/v0.17.5...v0.18.1 --- pkgs/by-name/us/usql/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/us/usql/package.nix b/pkgs/by-name/us/usql/package.nix index 21a5bc99e67b..27ea4e6bb9e3 100644 --- a/pkgs/by-name/us/usql/package.nix +++ b/pkgs/by-name/us/usql/package.nix @@ -11,28 +11,24 @@ buildGoModule rec { pname = "usql"; - version = "0.17.5"; + version = "0.18.1"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-Lh5CProffPB/GEYvU1h7St8zgmnS1QOjBgvdUXlsGzc="; + hash = "sha256-2/qB05LQGw4XjnODn0dzuTVqkc9X6YACJ45z+/juHXk="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-IdqSTwQeMRjB5sE53VvTVAXPyIyN+pMj4XziIT31rV0="; + vendorHash = "sha256-PFXULlYMSUoJ23jDA3CTImiUAlcoqHoh1zq+749qO2g="; proxyVendor = true; - # Exclude broken genji, hive & impala drivers (bad group) + # Exclude drivers from the bad group # These drivers break too often and are not used. # - # See https://github.com/xo/usql/pull/347 - # excludedPackages = [ - "genji" - "hive" "impala" ]; From 38c7df605e19bb25165a81a75bbfee725726b128 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 20:00:19 +0000 Subject: [PATCH 129/260] python311Packages.tox: 4.14.1 -> 4.14.2 --- pkgs/development/python-modules/tox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 28176021d3bf..e130ff069863 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "tox"; - version = "4.14.1"; + version = "4.14.2"; format = "pyproject"; src = fetchFromGitHub { owner = "tox-dev"; repo = "tox"; rev = "refs/tags/${version}"; - hash = "sha256-b+HOv0xMIE3k0u39YAAyVbiJPnOAamATZeZYTBUyAZM="; + hash = "sha256-+ed47GK76Wn8PwXsd0qo1xYWJTcZ5wNXnFEEQEZ7CMM="; }; postPatch = '' From 45cccd284355b768279256ebb4f3b5c00edef6d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 20:34:26 +0000 Subject: [PATCH 130/260] python311Packages.flask-paginate: 2023.10.24 -> 2024.3.28 --- pkgs/development/python-modules/flask-paginate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index f28579e04a46..ec2082b0ec18 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flask-paginate"; - version = "2023.10.24"; + version = "2024.3.28"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "lixxu"; repo = "flask-paginate"; rev = "refs/tags/v${version}"; - hash = "sha256-9633YLHMF9S1DLK7ZS4qmCOzslXdHLSgpKoJFNvkXlA="; + hash = "sha256-HqjgmqRH83N+CbTnkkEJnuo+c+n5wLwdsPXyY2i5XRg="; }; propagatedBuildInputs = [ From e13959136e4bf082b4d1ec67f505ee62a1e1841d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 20:35:32 +0000 Subject: [PATCH 131/260] signal-desktop: 7.3.1 -> 7.4.0 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 3cb0d3572515..0d4d46be06b4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.3.1"; + version = "7.4.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-J99mSSzl+TxWb6whzJ4oZs8a7NnKFVL3iNvWmvlQIaw="; + hash = "sha256-9a8Y8ncatynKspC/q0YxUWJj+nENr1ArwCZA9Ng8Mxk="; } From d7f0e554831ff218093bd8fac6ac6b0eb4bc458d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:30:28 +0100 Subject: [PATCH 132/260] python312Packages.pygatt: refactor --- .../python-modules/pygatt/default.nix | 43 ++++++++++++------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/pygatt/default.nix b/pkgs/development/python-modules/pygatt/default.nix index b2bf9416508d..67a7fea6b334 100644 --- a/pkgs/development/python-modules/pygatt/default.nix +++ b/pkgs/development/python-modules/pygatt/default.nix @@ -2,27 +2,43 @@ , buildPythonPackage , fetchFromGitHub , mock -, nose +, pynose , pexpect , pyserial , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pygatt"; version = "4.0.5"; - format = "setuptools"; + pyproject = true; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "peplin"; - repo = pname; - rev = "v${version}"; - sha256 = "1zdfxidiw0l8n498sy0l33n90lz49n25x889cx6jamjr7frlcihd"; + repo = "pygatt"; + rev = "refs/tags/v${version}"; + hash = "sha256-DUZGsztZViVNZwmhXoRN5FOQ7BgUeI0SsYgCHlvsrv0="; }; - propagatedBuildInputs = [ + postPatch = '' + # Not support for Python < 3.4 + substituteInPlace setup.py \ + --replace-fail "'enum-compat'" "" \ + --replace-fail "'coverage >= 3.7.1'," "" \ + --replace-fail "'nose >= 1.3.7'" "" + substituteInPlace tests/bgapi/test_bgapi.py \ + --replace-fail "assertEquals" "assertEqual" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ pyserial ]; @@ -34,25 +50,22 @@ buildPythonPackage rec { # For cross compilation the doCheck is false and therefor the # nativeCheckInputs not included. We have to include nose here, since # setup.py requires nose unconditionally. - nose + pynose ]; nativeCheckInputs = [ mock pytestCheckHook - ] - ++ passthru.optional-dependencies.GATTTOOL; + ] ++ passthru.optional-dependencies.GATTTOOL; - postPatch = '' - # Not support for Python < 3.4 - substituteInPlace setup.py --replace "'enum-compat'" "" - ''; - - pythonImportsCheck = [ "pygatt" ]; + pythonImportsCheck = [ + "pygatt" + ]; meta = with lib; { description = "Python wrapper the BGAPI for accessing Bluetooth LE Devices"; homepage = "https://github.com/peplin/pygatt"; + changelog = "https://github.com/peplin/pygatt/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ fab ]; }; From 5559282b101ba3dca92170f60e8bc661b5fe4970 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:47:08 +0100 Subject: [PATCH 133/260] python312Packages.meshtastic: 2.3.0 -> 2.3.3 Changelog: https://github.com/meshtastic/python/releases/tag/2.3.3 --- .../python-modules/meshtastic/default.nix | 60 ++++--------------- 1 file changed, 12 insertions(+), 48 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index c531b78130bc..bc00d859f6b8 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.3.0"; + version = "2.3.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,14 +30,14 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-HiksPxV5VTIOV71J0zlC8iiXmF85a0dTYjjnWthhdGY="; + hash = "sha256-kydZgOiQHDovQ5RwyLru2nyHoCEVZClq8wJit/mnbvU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ bleak dotmap pexpect @@ -73,50 +73,14 @@ buildPythonPackage rec { ]; disabledTests = [ - # AttributeError: 'HardwareMessage'... - "test_handleFromRadio_with_my_info" - "test_handleFromRadio_with_node_info" - "test_main_ch_longsfast_on_non_primary_channel" - "test_main_ch_set_name_with_ch_index" - "test_main_configure_with_camel_case_keys" - "test_main_configure_with_snake_case" - "test_main_export_config_called_from_main" - "test_main_export_config_use_camel" - "test_main_export_config" - "test_main_get_with_invalid" - "test_main_get_with_valid_values_camel" - "test_main_getPref_invalid_field_camel" - "test_main_getPref_invalid_field" - "test_main_getPref_valid_field_bool_camel" - "test_main_getPref_valid_field_bool" - "test_main_getPref_valid_field_camel" - "test_main_getPref_valid_field_string_camel" - "test_main_getPref_valid_field_string" - "test_main_getPref_valid_field" - "test_main_set_invalid_wifi_passwd" - "test_main_set_valid_camel_case" - "test_main_set_valid_wifi_passwd" - "test_main_set_valid" - "test_main_set_with_invalid" - "test_main_setPref_ignore_incoming_0" - "test_main_setPref_ignore_incoming_123" - "test_main_setPref_invalid_field_camel" - "test_main_setPref_invalid_field" - "test_main_setPref_valid_field_int_as_string" - "test_readGPIOs" - "test_onGPIOreceive" - "test_setURL_empty_url" - "test_watchGPIOs" - "test_writeConfig_with_no_radioConfig" - "test_writeGPIOs" - "test_reboot" - "test_shutdown" - "test_main_sendtext" - "test_main_sendtext_with_channel" - "test_MeshInterface" - "test_getNode_not_local" - "test_getNode_not_local_timeout" - "test_main_onConnected_exception" + # TypeError + "test_main_info" + "test_main_support" + "test_main_info_with_tcp_interfa" + "test_main_no_proto" + "test_main_info_with_seriallog_stdout" + "test_main_info_with_seriallog_output_txt" + "test_support_info" ]; meta = with lib; { From bb0f16553ff40bf1615520993d9ba0fe495dc4d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:51:42 +0100 Subject: [PATCH 134/260] python312Packages.playwrightcapture: 1.23.14 -> 1.24.1 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.23.14...v1.24.1 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.24.1 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index cf424e9af822..e619ebeb89d8 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.23.14"; + version = "1.24.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-ZOElXI2JSo+/wPw58WjCO7hiOUutfC2TvBFAP2DpT7I="; + hash = "sha256-+2BxXgIC595FM3FDIbFjFpWIEkqQrDILWFjQkyN5nao="; }; pythonRelaxDeps = [ From 215fb23aed23939fe7d751d283cc03a561eab04d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:52:03 +0100 Subject: [PATCH 135/260] python312Packages.lacuscore: 1.8.10 -> 1.9.1 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.8.10...v1.9.1 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.9.1 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index fa7949eff097..7bf59e72eb8a 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.8.10"; + version = "1.9.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-X3Bs/eMkpobRqiGB70ujvaIO1xWftEBZFyR9i5eN7/A="; + hash = "sha256-DUgMql/KCy8g63HvA7qbrv9qia+nchPLIkufWmUXKDg="; }; pythonRelaxDeps = [ From 993486dfc13e92dd131851eb56b7f028d0b23f40 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:56:54 +0100 Subject: [PATCH 136/260] python312Packages.censys: 2.2.11 -> 2.2.12 Diff: https://github.com/censys/censys-python/compare/refs/tags/v2.2.11...v2.2.12 Changelog: https://github.com/censys/censys-python/releases/tag/v2.2.12 --- pkgs/development/python-modules/censys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 97b4f7085387..26cb308b05f2 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.2.11"; + version = "2.2.12"; pyproject = true; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "refs/tags/v${version}"; - hash = "sha256-/aB8rsyymNTXJLsf/IkA6o7M/mzyao10cl7kbxHEzGc="; + hash = "sha256-Gw3JbAdg/ObWdD6vl8Wuct6VCcP4GAZbiesXSSnW1Mg="; }; nativeBuildInputs = [ From 2119fb6f84879ee6847aef3db57866b861d369e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 22:59:21 +0100 Subject: [PATCH 137/260] python312Packages.censys: refactor --- .../python-modules/censys/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix index 26cb308b05f2..70c7a6c4a0d2 100644 --- a/pkgs/development/python-modules/censys/default.nix +++ b/pkgs/development/python-modules/censys/default.nix @@ -30,12 +30,17 @@ buildPythonPackage rec { hash = "sha256-Gw3JbAdg/ObWdD6vl8Wuct6VCcP4GAZbiesXSSnW1Mg="; }; - nativeBuildInputs = [ + postPatch = '' + substituteInPlace pytest.ini \ + --replace-fail "--cov" "" + ''; + + build-system = [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + dependencies = [ argcomplete backoff requests @@ -57,11 +62,6 @@ buildPythonPackage rec { "rich" ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace "--cov" "" - ''; - # The tests want to write a configuration file preCheck = '' export HOME=$(mktemp -d) @@ -74,10 +74,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python API wrapper for the Censys Search Engine (censys.io)"; - mainProgram = "censys"; homepage = "https://github.com/censys/censys-python"; changelog = "https://github.com/censys/censys-python/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "censys"; }; } From 44642361a3339191e453e3fcb3ebf2b71c8c3513 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 23:49:26 +0100 Subject: [PATCH 138/260] python312Packages.clarifai-grpc: refactor --- pkgs/development/python-modules/clarifai-grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 3ef0366d9e29..abea00d20798 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-Dim0ZRYNzmlBqrqqs0CG+I/XQYpH9DuPISXoYxi92Dc="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ googleapis-common-protos grpcio protobuf From 68c2b061fe60ec2d1abaea3006af6159cc020c51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Mar 2024 23:56:46 +0000 Subject: [PATCH 139/260] git-town: 11.1.0 -> 13.0.1 --- 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 ca63fb9b4c1e..993b9150abda 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 = "11.1.0"; + version = "13.0.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-QQ+sIZzkzecs+pZBzsmCL048JZpMPvdYi0PRtMN4AhY="; + hash = "sha256-Ds3N5KUpB0HLRrKH/kpcBqtOtBD1fizYPsfKedBorTo="; }; vendorHash = null; From 1e3508771875e7748d698fbaaaefb2fd7ba9d40f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 00:18:38 +0000 Subject: [PATCH 140/260] python311Packages.phonopy: 2.22.0 -> 2.22.1 --- pkgs/development/python-modules/phonopy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index fc39ba10083f..0cdd9d8bff13 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.22.0"; + version = "2.22.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9opygqCRxKGNQo52cS7BiUYdmknIk9ygubPgpylcy8o="; + hash = "sha256-nux6/1z1xBr+4+fWrR/oOc+zVOI9j60p/SHHAPZ+hWI="; }; nativeBuildInputs = [ From aa7ffdd1e5c1bf27b773e02e579b5492c082dd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:33:18 -0700 Subject: [PATCH 141/260] nextcloud26: 26.0.12 -> 26.0.13 Changelog: https://nextcloud.com/changelog/#26-0-13 --- pkgs/servers/nextcloud/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 6745fc87dda8..65f1c72eba4b 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -43,13 +43,13 @@ let }; in { nextcloud26 = generic { - version = "26.0.12"; - hash = "sha256-fuTAIAJB9pRfMd0Ewh19FmY0Vj4MuH1iMkkS1BiTI0w="; + version = "26.0.13"; + hash = "sha256-CjYt96EjM0j5nRhT/X558GZ7VSwUXcRQEvq1SsMcea4="; packages = nextcloud26Packages; }; nextcloud27 = generic { - version = "27.1.7"; + version = "27.1.8"; hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; packages = nextcloud27Packages; }; From 2264eda25431b453264a7cc5afa1b69163b7e341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:33:22 -0700 Subject: [PATCH 142/260] nextcloud27: 27.1.7 -> 27.1.8 Changelog: https://nextcloud.com/changelog/#27-1-8 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 65f1c72eba4b..c5494b22f103 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -50,12 +50,12 @@ in { nextcloud27 = generic { version = "27.1.8"; - hash = "sha256-hEPi0bsojcQU+q0Kb+/i41uznt0359pcXzTexsDdG+s="; + hash = "sha256-Ciy5vRKCnlOq8XNUPsrQFPCeganXL6YeTEYNhOO47fs="; packages = nextcloud27Packages; }; nextcloud28 = generic { - version = "28.0.3"; + version = "28.0.4"; hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; packages = nextcloud28Packages; }; From 51c9db4e57ef5b10a5ca829e214f82c19c0f1262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:34:01 -0700 Subject: [PATCH 143/260] nextcloud28: 28.0.3 -> 28.0.4 Changelog: https://nextcloud.com/changelog/#28-0-4 --- pkgs/servers/nextcloud/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index c5494b22f103..3b549e194d88 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -56,7 +56,7 @@ in { nextcloud28 = generic { version = "28.0.4"; - hash = "sha256-ntQTwN4W9bAzzu/8ypnA1h/GmNvrjbhRrJrfnu+VGQY="; + hash = "sha256-m/7O4eEvukjEnppxyqgcS6ELKIR4f6t11kzP0SKhMBk="; packages = nextcloud28Packages; }; From 9119e4c9dee5efeaaf9c455d9108b21e078f3907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:34:39 -0700 Subject: [PATCH 144/260] nextcloudPackages: update --- pkgs/servers/nextcloud/packages/26.json | 12 ++++++------ pkgs/servers/nextcloud/packages/27.json | 16 ++++++++-------- pkgs/servers/nextcloud/packages/28.json | 24 ++++++++++++------------ 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/nextcloud/packages/26.json b/pkgs/servers/nextcloud/packages/26.json index 7531577da7c2..d795245939df 100644 --- a/pkgs/servers/nextcloud/packages/26.json +++ b/pkgs/servers/nextcloud/packages/26.json @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "19j2iqn3fjlzcswgbxwvxggzqc3aili8br4vjpr8dd9h1rzm453y", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.7/groupfolders-v14.0.7.tar.gz", - "version": "14.0.7", + "sha256": "1icpj855ib6cx7b57njvhdkcwgd4jmndm3gwh8qgq0mvdlkqpmd0", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v14.0.8/groupfolders-v14.0.8.tar.gz", + "version": "14.0.8", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -190,9 +190,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/27.json b/pkgs/servers/nextcloud/packages/27.json index f0b30f3d2c32..acf8763b62d2 100644 --- a/pkgs/servers/nextcloud/packages/27.json +++ b/pkgs/servers/nextcloud/packages/27.json @@ -110,9 +110,9 @@ ] }, "groupfolders": { - "sha256": "0p3g19cmfjn1zql6cr3bv0cvfj078vh6ian024iwvc6ir8fmsni0", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.5/groupfolders-v15.3.5.tar.gz", - "version": "15.3.5", + "sha256": "00pjva8hc36mnawvbpsi6lizzdhclp30z92vaz8j24xmhf21yvh9", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v15.3.6/groupfolders-v15.3.6.tar.gz", + "version": "15.3.6", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -150,8 +150,8 @@ ] }, "maps": { - "sha256": "049hrp79fj1bp9nk9isjrk427k238974x7gsj68jplxfrgq3sdkz", - "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0-2-nightly/maps-1.2.0-2-nightly.tar.gz", + "sha256": "1gyxg5xp4mpdrw8630nqcf5yk8cs7a0kvfik2q01p05d533phc4d", + "url": "https://github.com/nextcloud/maps/releases/download/v1.2.0/maps-1.2.0.tar.gz", "version": "1.2.0", "description": "**The whole world fits inside your cloud!**\n\n- **🗺 Beautiful map:** Using [OpenStreetMap](https://www.openstreetmap.org) and [Leaflet](https://leafletjs.com), you can choose between standard map, satellite, topographical, dark mode or even watercolor! 🎨\n- **⭐ Favorites:** Save your favorite places, privately! Sync with [GNOME Maps](https://github.com/nextcloud/maps/issues/30) and mobile apps is planned.\n- **🧭 Routing:** Possible using either [OSRM](http://project-osrm.org), [GraphHopper](https://www.graphhopper.com) or [Mapbox](https://www.mapbox.com).\n- **🖼 Photos on the map:** No more boring slideshows, just show directly where you were!\n- **🙋 Contacts on the map:** See where your friends live and plan your next visit.\n- **📱 Devices:** Lost your phone? Check the map!\n- **〰 Tracks:** Load GPS tracks or past trips. Recording with [PhoneTrack](https://f-droid.org/en/packages/net.eneiluj.nextcloud.phonetrack/) or [OwnTracks](https://owntracks.org) is planned.", "homepage": "https://github.com/nextcloud/maps", @@ -190,9 +190,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ diff --git a/pkgs/servers/nextcloud/packages/28.json b/pkgs/servers/nextcloud/packages/28.json index 52a4c241fd55..ef885c7b7a0e 100644 --- a/pkgs/servers/nextcloud/packages/28.json +++ b/pkgs/servers/nextcloud/packages/28.json @@ -60,9 +60,9 @@ ] }, "end_to_end_encryption": { - "sha256": "1h9is67lbnvgnv6n9p07si0qcp6hgymlq7f07z8s2ckf04p0nzad", - "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.4/end_to_end_encryption-v1.14.4.tar.gz", - "version": "1.14.4", + "sha256": "04b2hj96gpb4sf1w5r1sxa4fmxrk36vr3pia8i5w2pfi6fbhd9mc", + "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.14.5/end_to_end_encryption-v1.14.5.tar.gz", + "version": "1.14.5", "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption", "homepage": "https://github.com/nextcloud/end_to_end_encryption", "licenses": [ @@ -90,9 +90,9 @@ ] }, "groupfolders": { - "sha256": "00237wdfn7yj31mjpv6crnk0lrazy9iljfcpxjhy4g91d8sc3f5d", - "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.4/groupfolders-v16.0.4.tar.gz", - "version": "16.0.4", + "sha256": "0cg81d75dg96zp09jy4yzg65v14wf99c2snnj304v4dia410c8a3", + "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v16.0.5/groupfolders-v16.0.5.tar.gz", + "version": "16.0.5", "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.", "homepage": "https://github.com/nextcloud/groupfolders", "licenses": [ @@ -160,9 +160,9 @@ ] }, "notes": { - "sha256": "02893azzq507frb3x7h13ypx09yn9rx740hgfw7q1a2il2ixww5f", - "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.2/notes.tar.gz", - "version": "4.9.2", + "sha256": "1ii3ii2062wklss3mxsfbvqi4hvi96a20i20lbwm6z2x6q7fqqi3", + "url": "https://github.com/nextcloud-releases/notes/releases/download/v4.9.4/notes-v4.9.4.tar.gz", + "version": "4.9.4", "description": "The Notes app is a distraction free notes taking app for [Nextcloud](https://www.nextcloud.com/). It provides categories for better organization and supports formatting using [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax. Notes are saved as files in your Nextcloud, so you can view and edit them with every Nextcloud client. Furthermore, a separate [REST API](https://github.com/nextcloud/notes/blob/master/docs/api/README.md) allows for an easy integration into third-party apps (currently, there are notes apps for [Android](https://github.com/nextcloud/notes-android), [iOS](https://github.com/nextcloud/notes-ios) and the [console](https://git.danielmoch.com/nncli/about) which allow convenient access to your Nextcloud notes). Further features include marking notes as favorites.", "homepage": "https://github.com/nextcloud/notes", "licenses": [ @@ -200,9 +200,9 @@ ] }, "polls": { - "sha256": "1a5fyx1wvgwm2mjqmg5kah3x2y77zw8ly1zvcx6m4x50s113rkbi", - "url": "https://github.com/nextcloud/polls/releases/download/v6.1.6/polls.tar.gz", - "version": "6.1.6", + "sha256": "0gym2sx9lx6nvyby9pj1xml4n9fa7q91rl1i33kb70fclv622ca3", + "url": "https://github.com/nextcloud/polls/releases/download/v7.0.0/polls.tar.gz", + "version": "7.0.0", "description": "A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).", "homepage": "https://github.com/nextcloud/polls", "licenses": [ From 527a8747b105ac3f85ebbc8e346c90b20efe6d69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 00:36:07 +0000 Subject: [PATCH 145/260] python312Packages.pytest-relaxed: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/pytest-relaxed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 84f7edb2b6e4..8a541c74e5f6 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pytest-relaxed"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-U6c3Lj/qpSdAm7QDU/gTxZt2Dl2L1H5vb88YfF2W3Qw="; + hash = "sha256-lW6gKOww27+2gN2Oe0p/uPgKI5WV6Ius4Bi/LA1xgkg="; }; buildInputs = [ From 3506d24084a6f9c52010f85f4c0bf673eef3637b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 00:53:16 +0000 Subject: [PATCH 146/260] f3d: 2.3.0 -> 2.3.1 --- pkgs/applications/graphics/f3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 12076557acfb..84d8c6291573 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "2.3.0"; + version = "2.3.1"; outputs = [ "out" "man" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; + hash = "sha256-A6PD++wZZfVp/3hV7yefQPhxTpvpZHN0h0pRCxA6vkU="; }; nativeBuildInputs = [ From 81aecc512a8c85ef535870ca8a95ea6e43f5660f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 01:43:03 +0000 Subject: [PATCH 147/260] python311Packages.tempest: 37.0.0 -> 38.0.0 --- pkgs/development/python-modules/tempest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index ef2cb1b75569..ad8ad53dafad 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "tempest"; - version = "37.0.0"; + version = "38.0.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-z9DCHlBetJ4wWcwfzIWf+TLKKNcCTKzpVs+2zgmuAyc="; + hash = "sha256-2WmSN4NrH5/y5iAuYaaVuZkuh1ym14jFj7OXw8Jfxtc="; }; nativeBuildInputs = [ From 4816fa452a5f5749dc6abeb83f88bfc56a888b52 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 29 Mar 2024 04:20:00 +0000 Subject: [PATCH 148/260] starship: 1.18.1 -> 1.18.2 Diff: https://github.com/starship/starship/compare/v1.18.1...v1.18.2 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index e80b5ec6d12b..1d2f484d34e4 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-MaOlLOdZM6rSnIj98gzuxVICSGUAqXNE8oIzsHAY6E0="; + hash = "sha256-84FyKhSP2EZZkQJRhNPTYs2BYppylk50GiIck8pN3l4="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-EuCls/xxMpith92lu8vADDTeQUTaBEEYsQ994lDPGqQ="; + cargoHash = "sha256-Fu8KfWHCQUPSiT1aMSS0Il/S02YXdEqKMA2nsliUu8E="; nativeCheckInputs = [ git ]; From 6d98f510746c5c0db64976f33a3457b58dc41b67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 02:01:23 +0000 Subject: [PATCH 149/260] python311Packages.py3status: 3.56 -> 3.57 --- pkgs/development/python-modules/py3status/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index 004487bebbcd..6ec4405a0368 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "py3status"; - version = "3.56"; + version = "3.57"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-dHc5t8QO4wtwFlLkiaSu5Ern/MsxNHZMd5aeqWdKwNo="; + hash = "sha256-6l0l7sbPspdF/TYTOKaWsgOdpfDUs0PyFVKGUBNPwIA="; }; nativeBuildInputs = [ From 19b7c482df4ecee4d736dd2048d008d658c97712 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 02:17:10 +0000 Subject: [PATCH 150/260] adwsteamgtk: 0.6.9 -> 0.6.10 --- pkgs/by-name/ad/adwsteamgtk/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ad/adwsteamgtk/package.nix b/pkgs/by-name/ad/adwsteamgtk/package.nix index f40843624fa8..419541b28ed7 100644 --- a/pkgs/by-name/ad/adwsteamgtk/package.nix +++ b/pkgs/by-name/ad/adwsteamgtk/package.nix @@ -12,15 +12,15 @@ python3Packages.buildPythonApplication rec { pname = "adwsteamgtk"; - version = "0.6.9"; + version = "0.6.10"; # built with meson, not a python format format = "other"; src = fetchFromGitHub { owner = "Foldex"; repo = "AdwSteamGtk"; - rev = "v${version}"; - hash = "sha256-aHJxgSb7oZTRrfFVYdLimwhSGzdRjGf7dGTRA+ANQiM="; + rev = "refs/tags/v${version}"; + hash = "sha256-sh4FLXG78i20Bt8pCCbhO6Sx815stjAZRLCD+X5Zk40="; }; buildInputs = [ From 3af083202c6dab1a96459e7f891dab746f20c87b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 02:19:55 +0000 Subject: [PATCH 151/260] kuma-dp: 2.6.2 -> 2.6.3 --- pkgs/applications/networking/cluster/kuma/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix index 865bc27f8b63..d8da50b9f524 100644 --- a/pkgs/applications/networking/cluster/kuma/default.nix +++ b/pkgs/applications/networking/cluster/kuma/default.nix @@ -15,17 +15,17 @@ buildGoModule rec { inherit pname; - version = "2.6.2"; + version = "2.6.3"; tags = lib.optionals enableGateway [ "gateway" ]; src = fetchFromGitHub { owner = "kumahq"; repo = "kuma"; rev = version; - hash = "sha256-BYnrDB86O2I1DliHpDU65dDbGVmzBhfus4cgb2HpPQ4="; + hash = "sha256-m/mCnX/VFUPd3+DY+7znes55myIiJ8+T51NPcgWOiZc="; }; - vendorHash = "sha256-p3r0LXqv7X7OyDIlZKfe964fD+E+5lmrToP4rqborlo="; + vendorHash = "sha256-otrm8avM35/8WqjSO8V8hMAzsh51unyrMVDv4321xoY="; # no test files doCheck = false; From c16b28422d58f0e5536d196cf3fb2b2c5d47592e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 02:30:27 +0000 Subject: [PATCH 152/260] nestopia-ue: 1.52.0 -> 1.52.1 --- pkgs/by-name/ne/nestopia-ue/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nestopia-ue/package.nix b/pkgs/by-name/ne/nestopia-ue/package.nix index c0d94f315fd5..78c15e6dfe83 100644 --- a/pkgs/by-name/ne/nestopia-ue/package.nix +++ b/pkgs/by-name/ne/nestopia-ue/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nestopia"; - version = "1.52.0"; + version = "1.52.1"; src = fetchFromGitHub { owner = "0ldsk00l"; repo = "nestopia"; rev = finalAttrs.version; - hash = "sha256-kd5hZ88fCLL8ysGMj7HsrSA7eCI5SL2xxiRXJiZqBZ8="; + hash = "sha256-r8Z0Ejf5vWcdvxkUkUKJtipQIRoiwoRj0Bx06Gnxd08="; }; buildInputs = [ From ab5000d98fe4e2943294a88d40ad7317d15df3da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 02:35:42 +0000 Subject: [PATCH 153/260] libremines: 2.0.0 -> 2.0.1 --- pkgs/games/libremines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/libremines/default.nix b/pkgs/games/libremines/default.nix index 9177e337593e..f1a79e54bd62 100644 --- a/pkgs/games/libremines/default.nix +++ b/pkgs/games/libremines/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libremines"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "Bollos00"; repo = pname; rev = "v${version}"; - hash = "sha256-LejDXjli+AEVGp23y+ez/NyJY/8w7uHcOij6RsDwIH4="; + hash = "sha256-TQwjEgtqAvKnrpia6VloRgFwtq5TNDmxU+ZWjtEK/n8="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ]; From 2a90fb936848811fd40da52755acb515e5ca1878 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 03:03:32 +0000 Subject: [PATCH 154/260] pupdate: 3.9.0 -> 3.9.1 --- pkgs/by-name/pu/pupdate/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix index b9671c7bc930..0e8ae1565418 100644 --- a/pkgs/by-name/pu/pupdate/package.nix +++ b/pkgs/by-name/pu/pupdate/package.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "pupdate"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-T37zIYtfnoNJ/aHMfqKIx/zj6mqmY/3sN3LmxJglxHM="; + hash = "sha256-3Bts/jTyivZ+ch7UjFo3oGVRmVK2QhCYh8NkeQhDYDY="; }; buildInputs = [ From 26425f36033dd75741d5b1451791b02a165f1277 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 29 Mar 2024 23:07:32 -0400 Subject: [PATCH 155/260] consul: 1.18.0 -> 1.8.1 --- .../co/consul/package.nix} | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) rename pkgs/{servers/consul/default.nix => by-name/co/consul/package.nix} (72%) diff --git a/pkgs/servers/consul/default.nix b/pkgs/by-name/co/consul/package.nix similarity index 72% rename from pkgs/servers/consul/default.nix rename to pkgs/by-name/co/consul/package.nix index 7b29967c91b1..523edd32333e 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -1,8 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ + lib, + buildGoModule, + fetchFromGitHub, + nixosTests, + nix-update-script, +}: buildGoModule rec { pname = "consul"; - version = "1.18.0"; + version = "1.18.1"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -16,16 +22,17 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Xhh6Rrcv/FoBjzhWR59gQ/R4A3ynqWYS8djNe3CnGCE="; + hash = "sha256-r1xdz1rjvbvB93hRpvTNQwSqQLOJwqMhqCiXdIttY10="; }; - passthru.tests.consul = nixosTests.consul; - # This corresponds to paths with package main - normally unneeded but consul # has a split module structure in one repo - subPackages = ["." "connect/certgen"]; + subPackages = [ + "." + "connect/certgen" + ]; - vendorHash = "sha256-pNFjLXjtgsK8fjCCmjYclZw1GM4BfyzkTuaRCRIMJ3c="; + vendorHash = "sha256-DcpEHJ88Ehz5m+ddMd44mYTz0agwYhoels5jWJzu1EM="; doCheck = false; @@ -35,13 +42,26 @@ buildGoModule rec { "-X github.com/hashicorp/consul/version.VersionPrerelease=" ]; + passthru = { + tests = { + inherit (nixosTests) consul; + }; + + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Tool for service discovery, monitoring and configuration"; changelog = "https://github.com/hashicorp/consul/releases/tag/v${version}"; homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsl11; - maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick]; + maintainers = with maintainers; [ + pradeepchhetri + vdemeester + nh2 + techknowlogick + ]; mainProgram = "consul"; }; } From 41bf8e94ed8d4ad2470a187654b3fa2b67ac0ac7 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 29 Mar 2024 23:07:59 -0400 Subject: [PATCH 156/260] consul: add adamcstephens as maintainer --- pkgs/by-name/co/consul/package.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 523edd32333e..1a5eb769016d 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -57,6 +57,7 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsl11; maintainers = with maintainers; [ + adamcstephens pradeepchhetri vdemeester nh2 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3bab087bf0a..963448a3daca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4709,8 +4709,6 @@ with pkgs; protobuf = protobuf_21; }; - consul = callPackage ../servers/consul { }; - consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; consul-template = callPackage ../tools/system/consul-template { }; From da8e0b4e7cf15c305b3e687dbd5a75b689eaffb2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Mar 2024 04:20:00 +0000 Subject: [PATCH 157/260] rubyPackages: update --- pkgs/top-level/ruby-packages.nix | 56 ++++++++++++++++---------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 232c48c739b1..c220d1275051 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -835,10 +835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ffcxmrm1dnqip6xq9hsrycz4dggk8pj3cd6q99ji6024npjaal6"; + sha256 = "0vpj7mxfyjjyhqmxrbwgf03b4m4wq4bmcbka66jarp1nsqsxya28"; type = "gem"; }; - version = "7.8.0"; + version = "8.0.0"; }; dnsruby = { dependencies = ["simpleidn"]; @@ -846,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15zh7qi60zwzy184rdmmp55d857ss96f2lad78gcwnpr1223q4mj"; + sha256 = "069402nn1sb63bslp9p5mcbn90zzzj6549ykxa4km0klb1l1klxr"; type = "gem"; }; - version = "1.71.0"; + version = "1.72.0"; }; do_sqlite3 = { dependencies = ["data_objects"]; @@ -2429,10 +2429,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0csspzqrg7s2v2wdp6vqqs1rra6w5ilpgnps5h52ig6rp7x2i389"; + sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z"; type = "gem"; }; - version = "0.4.0.1"; + version = "0.5.0"; }; net-ssh = { groups = ["default"]; @@ -2459,10 +2459,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; + sha256 = "15iwbiij52x6jhdbl0rkcldnhfndmsy0sbnsygkr9vhskfqrp72m"; type = "gem"; }; - version = "2.7.0"; + version = "2.7.1"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -2470,10 +2470,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "173zavvxlwyi48lfskk48wcrdbkvjlhjhvy4jpcrfx72rpjjx4k8"; + sha256 = "0j72sg8n8834vbw2x8glcp46y5r2dls2pj64ll7rmf6mri9s52j9"; type = "gem"; }; - version = "1.16.2"; + version = "1.16.3"; }; observer = { groups = ["default"]; @@ -2807,10 +2807,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m76b32zh6mgql7mzfx36rijnygjl2nzkdj909mn87isfgzdf9jl"; + sha256 = "0x3mijjklsrlzfmwqp7x58fla7sk8pfwijhk988nmba787r8rf9g"; type = "gem"; }; - version = "3.0.9.1"; + version = "3.0.10"; }; rack-protection = { dependencies = ["base64" "rack"]; @@ -2988,10 +2988,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14wnrpd1kl43ynk1wwwgv9avsw84d1lrvlfyrjy3d4h7h7ndnqzp"; + sha256 = "0ib3cnf4yllvw070gr4bz94sbmqx3haqc5f846fsvdcs494vgxrr"; type = "gem"; }; - version = "6.6.2"; + version = "6.6.3.1"; }; re2 = { dependencies = ["mini_portile2"]; @@ -3042,10 +3042,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1swaj27qiix9r92hcvjxf6fzd817i7lfgfg2r50ifs41407rzhq3"; + sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; type = "gem"; }; - version = "0.21.0"; + version = "0.21.1"; }; redis-rack = { dependencies = ["rack-session" "redis-store"]; @@ -3085,10 +3085,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zx7sdh11p4z77c3f9ka6f065mgl6xwbamnsq4rrgwk310qhn41n"; + sha256 = "1dr6dl0fsj66z3w0q90v467nswn5shmfq1rfsqjh4wzyldq4ak9c"; type = "gem"; }; - version = "0.4.3"; + version = "0.5.0"; }; rest-client = { dependencies = ["http-accept" "http-cookie" "mime-types" "netrc"]; @@ -3235,10 +3235,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cf7fn4dwf45r3nhnda0dhnwn8qghswyqbfxr2ippb3z8a6gmc8v"; + sha256 = "16jayzjaaglhx69s6b83acpdzcxxccfkcn69gfpkimf2j64zlm7c"; type = "gem"; }; - version = "1.20.2"; + version = "1.21.0"; }; ruby-graphviz = { dependencies = ["rexml"]; @@ -3278,10 +3278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0scavp3jlgzbg7bh6y5rd110aak03l9zw56smazahq3lcjxgfc49"; + sha256 = "1548gmj14xrc91lp7yzn0q23g6cjn8r7xfdlv2qarzi9k2a92l5m"; type = "gem"; }; - version = "0.14.5"; + version = "0.15.0"; }; ruby-lxc = { groups = ["default"]; @@ -3604,10 +3604,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xnq3zdrnwhncfxvrhvkil26dq9v1h196i54l936l36zxdhnf383"; + sha256 = "10fja24vp16ggxdaw77hcdk0rcz47qpdv8nn2wsgqdr04rrfjjvd"; type = "gem"; }; - version = "0.5.11292"; + version = "0.5.11319"; }; sqlite3 = { dependencies = ["mini_portile2"]; @@ -3615,10 +3615,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "137xkh8jnk3xyajvzmn2390yzs13hnb37jylr0sm02d3zrshf18n"; + sha256 = "073hd24qwx9j26cqbk0jma0kiajjv9fb8swv9rnz8j4mf0ygcxzs"; type = "gem"; }; - version = "1.7.2"; + version = "1.7.3"; }; stringio = { groups = ["default"]; @@ -3708,10 +3708,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17cwh2ivvkfzv7m0m3rpyagwqz20mcincvjvz7cg3g21xzannqys"; + sha256 = "0i686137n188lj75nnhfpjz5zs8b4iak8iwpwciwb8lywm860nmv"; type = "gem"; }; - version = "0.19.0"; + version = "0.20.0"; }; tilt = { groups = ["default"]; From 44c8e316ddf5103b8958a4f08e07c7744d429a4f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 30 Mar 2024 04:20:00 +0000 Subject: [PATCH 158/260] python311Packages.apprise: 1.7.4 -> 1.7.5 Changelog: https://github.com/caronc/apprise/releases/tag/v1.7.5 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 0ae5af5730a2..9f71aac25354 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.7.4"; + version = "1.7.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-716DAFEUDUIop1nFvC1oV7zH+GZN8+RPMPZGF84MenM="; + hash = "sha256-CsNLJwCdXGJeh9M+yF+ldwYrV/O87W1yI+F8Wvu0Dmg="; }; nativeBuildInputs = [ From 3f971d9676dbb54518ef2d610ffdd822fca31820 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 04:43:06 +0000 Subject: [PATCH 159/260] refinery-cli: 0.8.12 -> 0.8.13 --- pkgs/development/tools/refinery-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/refinery-cli/default.nix b/pkgs/development/tools/refinery-cli/default.nix index 7e3f7c0f4c8d..e5d9abd12dbf 100644 --- a/pkgs/development/tools/refinery-cli/default.nix +++ b/pkgs/development/tools/refinery-cli/default.nix @@ -2,15 +2,15 @@ rustPlatform.buildRustPackage rec { pname = "refinery-cli"; - version = "0.8.12"; + version = "0.8.13"; src = fetchCrate { pname = "refinery_cli"; inherit version; - sha256 = "sha256-ftti/+Zl9/8CsrlEI5gZQF0M33vzl5aK3X/EfCujtY4="; + sha256 = "sha256-5PncxxJ63WGwJk4MexqOJZQEhdoe4WMz8gsHZgjxBPM="; }; - cargoHash = "sha256-KlZTgg/Y4cXy5DR8iT4olVTF0kq1g5AQm3Sjpmrl6lk="; + cargoHash = "sha256-C0/11Ky5mXcEFPxa72jkJLg/DDxPz/Jmmfa2oHpHF6k="; nativeBuildInputs = [ pkg-config ]; From 6496340434b489d6e80cba541a3cc948c86aa581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 04:55:48 +0000 Subject: [PATCH 160/260] python311Packages.plaid-python: 19.0.0 -> 20.0.1 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index a49adbc2acbf..dfc981b615e6 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "19.0.0"; + version = "20.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-mwWE5AZjqoUkPzyvuARotcRU2mKnqkoBh6priXLzE/I="; + hash = "sha256-TSydetm05gELugfRr6IGEfSrDhCOHzm73BTqbGkAXpk="; }; propagatedBuildInputs = [ From e681e17ad2bd41cde29386967addd7e39a4aa45e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 04:58:22 +0000 Subject: [PATCH 161/260] heroku: 8.11.0 -> 8.11.1 --- pkgs/development/tools/heroku/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/heroku/default.nix b/pkgs/development/tools/heroku/default.nix index da7b0b196893..aa9cc6b7eb75 100644 --- a/pkgs/development/tools/heroku/default.nix +++ b/pkgs/development/tools/heroku/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "heroku"; - version = "8.11.0"; + version = "8.11.1"; src = fetchzip { - url = "https://cli-assets.heroku.com/versions/8.11.0/a525d5e/heroku-v8.11.0-a525d5e-linux-x64.tar.xz"; - hash = "sha256-0G/ZRffPUHQy5iU64x92pjLd6pFCfEABugnSfYiUXHQ="; + url = "https://cli-assets.heroku.com/versions/8.11.1/6dbf5e0/heroku-v8.11.1-6dbf5e0-linux-x64.tar.xz"; + hash = "sha256-/gZnVxnWqxz1vp+FXpTnlqF8Z8mdkNbh/eUsJcIq+II="; }; nativeBuildInputs = [ makeWrapper ]; From 210d7aa90a217b828da73cbb3e78304c7f95c5d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 05:43:06 +0000 Subject: [PATCH 162/260] terragrunt: 0.55.19 -> 0.55.20 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index c2b51dbf5a01..b8a4be10f0f0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.55.19"; + version = "0.55.20"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ag5EmgX4xWbKBhXVsGTu5EtjXV3deGETPtsM9IpOr7s="; + hash = "sha256-F1+V99MxwPmtF4QHQ6/T1d8ss33R5qZOOP0B+xnGgzI="; }; vendorHash = "sha256-ijAg0Y/dfNxDS/Jov7QYjlTZ4N4/jDMH/zCV0jdVXRc="; From e372d44587ecf91c65e62d08a8d3ba3170451eb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 06:06:41 +0000 Subject: [PATCH 163/260] python312Packages.asf-search: 7.0.7 -> 7.0.8 --- pkgs/development/python-modules/asf-search/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asf-search/default.nix b/pkgs/development/python-modules/asf-search/default.nix index e454101b2512..cffe2c064622 100644 --- a/pkgs/development/python-modules/asf-search/default.nix +++ b/pkgs/development/python-modules/asf-search/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "asf-search"; - version = "7.0.7"; + version = "7.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "asfadmin"; repo = "Discovery-asf_search"; rev = "refs/tags/v${version}"; - hash = "sha256-4DqZGDg9VZsBWaVb3WpAegZVW1lk/5f9AR5Gxgik1gQ="; + hash = "sha256-wmTt6JFuigpFo/0s9DmKfAZT0dPPyoNeVRlh8vz/jkY="; }; propagatedBuildInputs = [ From ac648a7d2670046186c3ac9298bfeacd9f8e122a Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 28 Mar 2024 11:58:43 +0300 Subject: [PATCH 164/260] kdePackages.k3b: add dynamically loaded dependencies, fix wrapper Fixes #299248 --- pkgs/kde/gear/k3b/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/kde/gear/k3b/default.nix b/pkgs/kde/gear/k3b/default.nix index 9eba27da8639..ba4a1fc6aab4 100644 --- a/pkgs/kde/gear/k3b/default.nix +++ b/pkgs/kde/gear/k3b/default.nix @@ -13,8 +13,10 @@ libsamplerate, cdrdao, cdrtools, + cdparanoia, dvdplusrwtools, libburn, + libdvdcss, normalize, sox, transcode, @@ -38,7 +40,7 @@ mkKdeDerivation { ]; qtWrapperArgs = [ - "--prefix PATH ':' ${lib.makeBinPath [ + "--prefix PATH : ${lib.makeBinPath [ cdrdao cdrtools dvdplusrwtools @@ -49,6 +51,10 @@ mkKdeDerivation { vcdimager flac ]}" + + # FIXME: this should really be done with patchelf --add-rpath, but it breaks the binary somehow + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ cdparanoia libdvdcss ]}" ]; + meta.mainProgram = "k3b"; } From 4adf3fe22fd9db57ba331f63ac0794ddab307f1e Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Mar 2024 09:15:12 +0300 Subject: [PATCH 165/260] path-of-building.data: 2.41.0 -> 2.42.0 Diff: https://github.com/PathOfBuildingCommunity/PathOfBuilding/compare/v2.41.0...v2.42.0 --- pkgs/games/path-of-building/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix index 2e996f975487..1e2a2811769a 100644 --- a/pkgs/games/path-of-building/default.nix +++ b/pkgs/games/path-of-building/default.nix @@ -2,13 +2,13 @@ let data = stdenv.mkDerivation(finalAttrs: { pname = "path-of-building-data"; - version = "2.41.0"; + version = "2.42.0"; src = fetchFromGitHub { owner = "PathOfBuildingCommunity"; repo = "PathOfBuilding"; rev = "v${finalAttrs.version}"; - hash = "sha256-XoRoKvlfBtlKyur1AZ+VjYc5URyX2/fof05h6Vs+vok="; + hash = "sha256-OxAyB+tMszQktGvxlGL/kc+Wt0iInFYY0qHNjK6EnSg="; }; nativeBuildInputs = [ unzip ]; From a293bb51b9e34fdd6aeb0198fb28c4c08d2e6f75 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 06:18:45 +0000 Subject: [PATCH 166/260] crowdin-cli: 3.19.0 -> 3.19.1 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index a640b11d3808..712da353282f 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.19.0"; + version = "3.19.1"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - hash = "sha256-E8I5yWOEGZwiM3oHhmZhvppuCAWLDFx7X7DVfo29W+U="; + hash = "sha256-ydkVdPhd9c5VPI6T9i+/yfbLHjOGNJbMw02AJCyuTGs="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From f8b091d53fdb339a9489551e21ceb4bad84c79e9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 30 Mar 2024 19:17:57 +1300 Subject: [PATCH 167/260] stdenv/check-meta: Don't create new environments when computing meta.repository --- pkgs/stdenv/generic/check-meta.nix | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index eb4482be7894..b5a40ca12b96 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -10,7 +10,9 @@ let concatMapStrings concatMapStringsSep concatStrings + filter findFirst + head isDerivation length concatMap @@ -436,6 +438,18 @@ let # ----- else { valid = "yes"; }); + getRepository = let + getSrcs = attrs: + if attrs ? src + then + [ attrs.src ] + else + filter (src: src ? meta.homepage) attrs.srcs; + getHomePages = map (src: src.meta.homepage); + unlist = list: + if length list == 1 then head list + else list; + in attrs: unlist (getHomePages (getSrcs attrs)); # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not @@ -454,22 +468,7 @@ let # this could be handled a lot easier if we nulled it instead # of having it be undefined, but that wouldn't match the # other attributes. - repository = let - getSrcs = attrs: - if attrs ? src - then - [ attrs.src ] - else - lib.filter (src: src ? meta.homepage) attrs.srcs; - getHomePages = srcs: map (src: src.meta.homepage) srcs; - unlist = list: - if lib.length list == 1 - then - lib.elemAt list 0 - else - list; - in - unlist (getHomePages (getSrcs attrs)); + repository = getRepository attrs; } // { # `name` derivation attribute includes cross-compilation cruft, # is under assert, and is sanitized. From 4b0576b803e850cd5c6840b420852a35cbd367fc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 06:20:11 +0000 Subject: [PATCH 168/260] clickhouse-backup: 2.4.34 -> 2.4.35 --- pkgs/development/tools/database/clickhouse-backup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 79b4f6ea9dc5..ca597e47f66f 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.4.34"; + version = "2.4.35"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-aRNPkgkWmVCzHaOHzIAPdZyofqIWX5w5U+bsO1MrKow="; + hash = "sha256-SE4+NUH1W0YPjx59yjOun1tLbn6Je2nG2wcfb8+YSfw="; }; vendorHash = "sha256-5da3Tt4rKbzFPwYVhkkxCY/YpJePdE7WLDlTtPI8w1Q="; From dc49349c84cc05f9cb50c9f46e4330f053803d0b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 30 Mar 2024 19:20:59 +1300 Subject: [PATCH 169/260] stdenv/check-meta: Inherit remaining lib access into scope Hopefully this will result in people not adding new `lib.xxx` to check-meta.nix. --- pkgs/stdenv/generic/check-meta.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index b5a40ca12b96..1653e9cf3193 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -31,6 +31,14 @@ let toList isList elem + ; + + inherit (lib.meta) + availableOn + ; + + inherit (lib.generators) + toPretty ; # If we're in hydra, we can dispense with the more verbose error @@ -86,7 +94,7 @@ let # was `licenses: lib.lists.any (l: !l.free or true) licenses;` # which always evaluates to `!true` for strings. else if isString licenses then false - else lib.lists.any (l: !l.free or true) licenses; + else any (l: !l.free or true) licenses; hasUnfreeLicense = attrs: hasLicense attrs && isUnfree attrs.meta.license; @@ -96,7 +104,7 @@ let isMarkedBroken = attrs: attrs.meta.broken or false; hasUnsupportedPlatform = - pkg: !(lib.meta.availableOn hostPlatform pkg); + pkg: !(availableOn hostPlatform pkg); isMarkedInsecure = attrs: (attrs.meta.knownVulnerabilities or []) != []; @@ -366,7 +374,7 @@ let [ ] else [ "key 'meta.${k}' has invalid value; expected ${metaTypes.${k}.name}, got\n ${ - lib.generators.toPretty { indent = " "; } v + toPretty { indent = " "; } v }" ] else [ "key 'meta.${k}' is unrecognized; expected one of: \n [${concatMapStringsSep ", " (x: "'${x}'") (attrNames metaTypes)}]" ]; @@ -416,7 +424,7 @@ let else if !allowBroken && attrs.meta.broken or false then { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; } else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then - let toPretty = lib.generators.toPretty { + let toPretty = toPretty { allowPrettyValues = true; indent = " "; }; From 6800014aaba19196b61cc2d6e793a3244e75a42d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 06:35:06 +0000 Subject: [PATCH 170/260] fend: 1.4.5 -> 1.4.6 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 774fe78ec605..9b977f6d0d47 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-l4AZpvLMmNuUWHqm5b0ngBxSHh5CV0SMOyKSF4LaxSI="; + hash = "sha256-xqWAL1xMUUL2AtxnZ4oXWmNoks0pL63uqKoNc0Vvw/4="; }; - cargoHash = "sha256-mx0KXGbSxn54JUyLVJms/AdPseKA9QH1Ixi7XKydf2w="; + cargoHash = "sha256-0ov/uzBEa8Wzw5T0mSMnnmJYucBLUe0Qlwel6pVRorc="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 4c1ccd8a9fc1d45d572de34e76853274aef4e0c8 Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 30 Mar 2024 02:07:49 -0500 Subject: [PATCH 171/260] wormhole-william: allow local networking in darwin sandbox This is needed for the tests to pass with the sandbox enabled. --- pkgs/tools/networking/wormhole-william/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/wormhole-william/default.nix b/pkgs/tools/networking/wormhole-william/default.nix index e08c0e51a58a..aeecc73e64d9 100644 --- a/pkgs/tools/networking/wormhole-william/default.nix +++ b/pkgs/tools/networking/wormhole-william/default.nix @@ -13,6 +13,8 @@ buildGoModule rec { vendorHash = "sha256-oJz7HgtjuP4ooXdpofIKaDndGg4WqVZgbT8Yb1AyaMs="; + __darwinAllowLocalNetworking = true; + preCheck = '' # wormhole_test.go:692: failed to establish connection substituteInPlace wormhole/wormhole_test.go \ From 38cee3ef97d5f4d3bf4996a84d2756e4dd633fc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 07:15:23 +0000 Subject: [PATCH 172/260] trufflehog: 3.70.3 -> 3.71.2 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index c40f80b0caa5..205a94cd87f1 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.70.3"; + version = "3.71.2"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-eTxqNsTcdYqflY5i6tV/4uL9jV2MPwVeWspXfjX8Xmc="; + hash = "sha256-PxaZl3OV3bAbZzKVxHO8MuwqO2c16w4MNypsZpVOQTU="; }; - vendorHash = "sha256-VYF9QIlshfFkNbfEQlJsp1SbGsGVTwnGLdKprKOeB74="; + vendorHash = "sha256-xU6mUhSgB9DMyVMo2tTd5uNyrDoFsY2zMaTKSPBcgwM="; ldflags = [ "-s" From e7b14aa49f56d45983e2172d5f598ffa1dcd5932 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:51:33 +0100 Subject: [PATCH 173/260] python312Packages.boto3-stubs: 1.34.73 -> 1.34.74 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index a796c7d5017e..1e1a3ce4f0e7 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.73"; + version = "1.34.74"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ok9aPF2xGPxYxkh/GozIpKggYmB5Fr+pcxKXygspBpc="; + hash = "sha256-Lvsns5qA9BtPc/kk3VKWtkcRrJpfVTTCvw4SUOZFJh0="; }; nativeBuildInputs = [ From b39c38a5b677f403226f9ae374a3984bb2798a94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:52:23 +0100 Subject: [PATCH 174/260] python312Packages.llama-index-graph-stores-neo4j: 0.1.3 -> 0.1.4 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 8561c2299ebe..bc2664e53012 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-AUWezvdONxz5H42VpTjh7NrBkTdWjtBJyMvA8kSh5w4="; + hash = "sha256-zr3EAFuLzbQKnGPVE6BsLEtNpnfYhDq9brxWPFtQiG8="; }; build-system = [ From 0a7244fda0a10a25ec9da849aa3067918a7b1f0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:52:42 +0100 Subject: [PATCH 175/260] python312Packages.llama-index-llms-openai: 0.1.13 -> 0.1.14 --- .../python-modules/llama-index-llms-openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 24085ab77603..fbb23ae82bdc 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-index-llms-openai"; - version = "0.1.13"; + version = "0.1.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_llms_openai"; inherit version; - hash = "sha256-wP2TIlWsm/crawLDgR7rvzQxqnYDrqqzHIEVR/REsco="; + hash = "sha256-frpmiCroT6QrGIlBI0uEJnxI5EnvIU9RF1bcrT+fC2I="; }; build-system = [ From abfff76bd50f159861434e3522c5f27f1296f52a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:52:56 +0100 Subject: [PATCH 176/260] python312Packages.llama-index-readers-file: 0.1.12 -> 0.1.13 --- .../python-modules/llama-index-readers-file/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index f4b441142bfb..18a126dd3822 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "llama-index-readers-file"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_readers_file"; inherit version; - hash = "sha256-YGXL+AsPtdGJVYuLkK273JKsuGFH/KGS2I/MJwStKvM="; + hash = "sha256-gw8G7Hs0Q3/Du18mjSNcXHZAKWrbFI2Pkid9zrfwhG0="; }; pythonRelaxDeps = [ From fdb84546c3c7b9069c03d7ad2557abd2bc65c2ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:53:26 +0100 Subject: [PATCH 177/260] python312Packages.llama-index-vector-stores-google: 0.1.4 -> 0.1.5 --- .../llama-index-vector-stores-google/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix index 9d5a33ebc7d9..419357ea30b9 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-google"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_google"; inherit version; - hash = "sha256-5HjbymV7wdcu/C+ndWCxj3j10QIgVqUaSaZ4cRMJ46U="; + hash = "sha256-E6RNf2DzktoZW89P0VKfmeZ5SEslGkyFLRxVtnsQOYc="; }; pythonRelaxDeps = [ From a53ce1de35b3d70768ea46fe65c3f08bcea15caa Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:53:41 +0100 Subject: [PATCH 178/260] python312Packages.llama-index-vector-stores-postgres: 0.1.3 -> 0.1.4.post1 --- .../llama-index-vector-stores-postgres/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix index 4751a0fce866..0fa3a9b23736 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-postgres"; - version = "0.1.3"; + version = "0.1.4.post1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_postgres"; inherit version; - hash = "sha256-vWqCcda9dDPLceoOEgMivpBmkLbKs/poEjzCk/q4HwI="; + hash = "sha256-E75oSh9MH8aX00y//jhNbehqYdIm5HfEjb5Swn7J/cQ="; }; pythonRemoveDeps = [ From bc4fe62df668644791c220867ffff991cbfad78c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:53:55 +0100 Subject: [PATCH 179/260] python312Packages.llama-index-vector-stores-qdrant: 0.1.4 -> 0.1.5 --- .../llama-index-vector-stores-qdrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index e0c34a935c76..39727d6ef7f3 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.1.4"; + version = "0.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-UIiEL7ZUcGQusyhs9cFsPOZ8qxH7ouoCnQMemlho0lA="; + hash = "sha256-Q4+ehywPz+jrA36AtU9yiicRr2nU6BCO6Y42j0SKPdI="; }; build-system = [ From 38b06b5ae46f375f64fa733a19beb7783a545838 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:55:49 +0100 Subject: [PATCH 180/260] python311Packages.mypy-boto3-codebuild: 1.34.70 -> 1.34.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c0909c69a4f4..941341edc3c9 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -161,7 +161,7 @@ rec { mypy-boto3-codeartifact = buildMypyBoto3Package "codeartifact" "1.34.68" "sha256-Ey0cmx0OxN1/VXIyvn0EOBP9qYIuc/XyFVZniHLaNEY="; - mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.70" "sha256-lv69lhMKJHRnooVrmGinfDEi7eVEe7O12GNNo5uZQQc="; + mypy-boto3-codebuild = buildMypyBoto3Package "codebuild" "1.34.74" "sha256-A8SRNosqzXQab2J9gnYUWNkIdju8QqX44GJnFSNE4DQ="; mypy-boto3-codecatalyst = buildMypyBoto3Package "codecatalyst" "1.34.73" "sha256-jQ/DIoWXQWo1oVWi4Gn88cxr78QCs45EVtgfc6fZkFk="; From 6902359c7dc401a8cab690362bbf6ba306986c59 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:56:23 +0100 Subject: [PATCH 181/260] python311Packages.mypy-boto3-internetmonitor: 1.34.48 -> 1.34.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 941341edc3c9..566d5b9ab19a 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -347,7 +347,7 @@ rec { mypy-boto3-inspector2 = buildMypyBoto3Package "inspector2" "1.34.29" "sha256-ZMdNVgKXQnEHyK4tV/XegvFX7xdk5A1AiSfpTKWCtcY="; - mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.34.48" "sha256-tJ5Hu8ojUahG1YbNHgwDjYWqbSPCZEUyYM/dOObmArg="; + mypy-boto3-internetmonitor = buildMypyBoto3Package "internetmonitor" "1.34.74" "sha256-VFIeJqQHHvbB+mLyzxHpZUvgGS5dJJen4AAJAMJTDqE="; mypy-boto3-iot = buildMypyBoto3Package "iot" "1.34.52" "sha256-YWGotOPKljY4B0JL1I+axk4MJZIk84rVxoZu9tzBGss="; From 460107752aa0c2db52c256b76eeaf6b4e5518ace Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:56:30 +0100 Subject: [PATCH 182/260] python311Packages.mypy-boto3-iotwireless: 1.34.0 -> 1.34.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 566d5b9ab19a..c2b9aaced196 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -381,7 +381,7 @@ rec { mypy-boto3-iottwinmaker = buildMypyBoto3Package "iottwinmaker" "1.34.0" "sha256-K5LEh8wdXvftxGstThSBN73K+1FUVlE40JxvjWv6GMA="; - mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.34.0" "sha256-g2Ab6AQ0fvmEuSqAHlvAPe3TYSz/Nai1U8srjT0QWHw="; + mypy-boto3-iotwireless = buildMypyBoto3Package "iotwireless" "1.34.74" "sha256-57ZO7LlQ9/itiynqSjXu7SJrNLNaFo5WCJBqSXEYeLs="; mypy-boto3-ivs = buildMypyBoto3Package "ivs" "1.34.45" "sha256-Ilrtk6ZF1p3GNuZrtiEiNXi3bHI3MYNr6bDpJ8sf4Fg="; From a20fd8a10b843a76855370f0b1a3f5b16c4a4dfe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:57:03 +0100 Subject: [PATCH 183/260] python311Packages.mypy-boto3-marketplace-catalog: 1.34.41 -> 1.34.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index c2b9aaced196..10189c63f242 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -459,7 +459,7 @@ rec { mypy-boto3-managedblockchain-query = buildMypyBoto3Package "managedblockchain-query" "1.34.67" "sha256-c2BoAKpgurKaNOTkl3cqc3X1CiaQVfQL5kvQV3/WLww="; - mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.41" "sha256-SZqNZO/36iGuf0jqNIZrbD1BOE7p6xMWhs5Y5VkUl8c="; + mypy-boto3-marketplace-catalog = buildMypyBoto3Package "marketplace-catalog" "1.34.74" "sha256-+ehJMgzEt0R0sV1IL4/eEEltEIcFDqr4GzeTraabW90="; mypy-boto3-marketplace-entitlement = buildMypyBoto3Package "marketplace-entitlement" "1.34.0" "sha256-yGaeDZLEmp/Nap++wI6GgQvVW3HxQFcM+ipk7RAuG4g="; From 6299182d1b1d0dfa489740cc91c8fbff567c93fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 08:57:37 +0100 Subject: [PATCH 184/260] python311Packages.mypy-boto3-sagemaker: 1.34.70 -> 1.34.74 --- pkgs/development/python-modules/mypy-boto3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix index 10189c63f242..987d26ca0676 100644 --- a/pkgs/development/python-modules/mypy-boto3/default.nix +++ b/pkgs/development/python-modules/mypy-boto3/default.nix @@ -625,7 +625,7 @@ rec { mypy-boto3-s3outposts = buildMypyBoto3Package "s3outposts" "1.34.0" "sha256-xLuGP9Fe0S7zRimt1AKd9KOrytmNd/GTRg5OVi5Xpos="; - mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.70" "sha256-WON2j0ZQ9x3qq1mOOzMvT8jJSuJipDHDp4IxsB88GCg="; + mypy-boto3-sagemaker = buildMypyBoto3Package "sagemaker" "1.34.74" "sha256-gTSksOsEH4IRLqw+AZ/CNLO28Ir18oy7iP2h6a38rmE="; mypy-boto3-sagemaker-a2i-runtime = buildMypyBoto3Package "sagemaker-a2i-runtime" "1.34.0" "sha256-jMZ3aWKQPhNec4A/02S1waQi6Mx9JVdENc3kblhsKjA="; From 0fcaf0027e43b3ab497fb49badb55d8c164f3e72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 09:01:45 +0100 Subject: [PATCH 185/260] python312Packages.pyoverkiz: 1.13.9 -> 1.13.10 Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.13.9...v1.13.10 Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.13.10 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index 0b22058a8463..a2d5ab0b66b5 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.9"; + version = "1.13.10"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-J1nsRB9KYg3yUuxQV79/Udjjkux+BE4YcawpRJcSYHI="; + hash = "sha256-05S0tCfCXgvkheUBVDGX8my0c7SCi/ran2emjaGWd9s="; }; postPatch = '' From 347310ed315b807ea467553ee1de2d7df142919c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 09:02:39 +0100 Subject: [PATCH 186/260] python312Packages.pyoverkiz: refactor --- pkgs/development/python-modules/pyoverkiz/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index a2d5ab0b66b5..ce40b9c2a9ec 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; version = "1.13.10"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -30,14 +30,14 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' + --replace-fail 'pyhumps = "^3.0.2,!=3.7.3"' 'pyhumps = "^3.0.2"' ''; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp attrs backoff From f92d7f0c870ecace5bca9dd1a85e2c000427e34b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 09:04:55 +0100 Subject: [PATCH 187/260] python312Packages.wsgidav: 4.3.1 -> 4.3.2 Diff: https://github.com/mar10/wsgidav/compare/refs/tags/v4.3.1...v4.3.2 Changelog: https://github.com/mar10/wsgidav/blob/v4.3.2/CHANGELOG.md --- pkgs/development/python-modules/wsgidav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wsgidav/default.nix b/pkgs/development/python-modules/wsgidav/default.nix index 132af924c3d2..db7e85e1937e 100644 --- a/pkgs/development/python-modules/wsgidav/default.nix +++ b/pkgs/development/python-modules/wsgidav/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "wsgidav"; - version = "4.3.1"; + version = "4.3.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mar10"; repo = "wsgidav"; rev = "refs/tags/v${version}"; - hash = "sha256-jgn4bculVIXfMx3Or3pKF478UOzCL8nhEeNvOeGyjPI="; + hash = "sha256-93+8h+vRLnspQ/lmdjKYpzSEJSKcqCkB4qRqTuKHNRA="; }; build-system = [ From 35065fb264c7dc29b249eb2fd5946c18e7dd37f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 28 Mar 2024 14:42:13 +0000 Subject: [PATCH 188/260] python312Packages.speechrecognition: 3.10.1 -> 3.10.2 --- pkgs/development/python-modules/speechrecognition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 4e50e8260a0f..1b1f871c1bef 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "speechrecognition"; - version = "3.10.1"; + version = "3.10.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "Uberi"; repo = "speech_recognition"; rev = "refs/tags/${version}"; - hash = "sha256-lO1CW4j5aBnPtemNGsW8cytSa/H+Tb4Jpbfh4Z/0WHk="; + hash = "sha256-yMitfMfCGgfq4sgzPstxNYDkAQ4VCewT2jgumODvAnE="; }; nativeBuildInputs = [ From ffdf7f26d86160c344fb223b9129116e73c002b8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 00:20:22 +0100 Subject: [PATCH 189/260] python312Packages.speechrecognition: refactor --- pkgs/development/python-modules/speechrecognition/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/speechrecognition/default.nix b/pkgs/development/python-modules/speechrecognition/default.nix index 1b1f871c1bef..130d0809a64c 100644 --- a/pkgs/development/python-modules/speechrecognition/default.nix +++ b/pkgs/development/python-modules/speechrecognition/default.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { hash = "sha256-yMitfMfCGgfq4sgzPstxNYDkAQ4VCewT2jgumODvAnE="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ requests typing-extensions ]; From 9fc370d8ad0ae29a609e0bbcd62d1a1e8fb56350 Mon Sep 17 00:00:00 2001 From: Emilio Ziniades Date: Thu, 28 Mar 2024 17:47:32 +0200 Subject: [PATCH 190/260] dotnet-outdated: init at 4.6.0 --- pkgs/by-name/do/dotnet-outdated/deps.nix | 313 ++++++++++++++++++++ pkgs/by-name/do/dotnet-outdated/package.nix | 41 +++ 2 files changed, 354 insertions(+) create mode 100644 pkgs/by-name/do/dotnet-outdated/deps.nix create mode 100644 pkgs/by-name/do/dotnet-outdated/package.nix diff --git a/pkgs/by-name/do/dotnet-outdated/deps.nix b/pkgs/by-name/do/dotnet-outdated/deps.nix new file mode 100644 index 000000000000..c441ad718156 --- /dev/null +++ b/pkgs/by-name/do/dotnet-outdated/deps.nix @@ -0,0 +1,313 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Castle.Core"; version = "5.0.0"; sha256 = "1f6qd0zy4s3dvi4f3sp9f3fx25rj16sib9hcha456z8i5nrlnix3"; }) + (fetchNuGet { pname = "CsvHelper"; version = "30.0.1"; sha256 = "0v01s672zcrd3fjwzh14dihbal3apzyg3dc80k05a90ljk8yh9wl"; }) + (fetchNuGet { pname = "dotnet-xunit"; version = "2.3.1"; sha256 = "0w1zslkig6qk6rhw6ckfy331rnbfbnxr0gdy2pxgnc8rz2fj2s54"; }) + (fetchNuGet { pname = "Libuv"; version = "1.9.0"; sha256 = "0ag6l9h1h4knf3hy1fjfrqm6mavr9zw35i0qrnnm8la4mdbcnd0f"; }) + (fetchNuGet { pname = "McMaster.Extensions.CommandLineUtils"; version = "4.0.2"; sha256 = "1x2a60vjq0n6mb7bfjlggbvp8vpq0m7ls5x4bwff2g2qxhw09rbv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.27"; sha256 = "11sfm0vb8grybwdfzl9y3y1v9jg94rn3fpsf0995xm1qgk57piiv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.16"; sha256 = "1nrk00w3jkb1r3m8zn7c05snan02b6s7n5s93aq2dl9kz0bm530c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "078vz7l3sw25jxkhxf646hwc1csasna4n04rjq6vcv30c9kx3lp9"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "0g4zxka97q3bdc72yql296hx2laim5b4rfb8vxmknzdpzj0ydiks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1bxsrlsyvia4v3fswxl9pnf9107zwf1n1hlwffyxs0kd5iq7jabr"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "0cdvdbvvbky0y60732j2n2jjycgpm2ngx38hl6zq198xm1d4g43x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "0zy1zarikg4d1g06ax3zdjvfysw2393b9fgg7xnracqi17hr38ah"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "11l2a80xxinf08m9i6jdy0nkjpdjs9llqb8gs7x0762cnyhds7la"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "1wgmbbn81rbqlx44hg9zqrrcmiinss1qhgfsq37vzy2i8ycyn59w"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "0xfwnqbbzg1xb6zxlms5v1dj3jh46lh6vzfjbqxj55fj87qr73yi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0r7qqwkqm9lraqwc25aadbg856v006h17yj8cxmp800iz7288k07"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "1ggcy57k31bxqk6k1hsbmzxkyly9bzch7dw7fgl2yx4a439nkh54"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0ihhhsypb0f8lffl5lbm4nw0l9cwcv6dgylxbgvs10yfpvpix8av"; }) + (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "7.0.0"; sha256 = "1waiggh3g1cclc81gmjrqbh128kwfjky3z79ma4bd2ms9pa3gvfm"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "1.1.0"; sha256 = "08r667hj2259wbim1p3al5qxkshydykmb7nd9ygbjlg4mmydkapc"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "1.3.0"; sha256 = "097qi36jhyllpqj313nxzwc64a4f65p014gaj6fz4z5jcphkkk15"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "1.3.0"; sha256 = "0vpslncd5lk88ijb42qbp88dfrd0fg4kri44w6jpmxb3fcqazais"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.VisualBasic"; version = "1.3.0"; sha256 = "186chky80rryhzh5dh8j318ghyvn1a7r2876rlyadxdrs7aqv0ll"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; sha256 = "173wjadp3gan4x2jfjchngnc4ca4mb95h1sbb28jydfkfw0z1zvj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "7.0.0"; sha256 = "121zs4jp8iimgbpzm3wsglhjwkc06irg1pxy8c1zcdlsg34cfq1p"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "7.0.0"; sha256 = "181d7mp9307fs17lyy42f8cxnjwysddmpsalky4m0pqxcimnr6g7"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; sha256 = "1syvl3g0hbrcgfi9rq6pld8s8hqqww4dflf1lxn59ccddyyx0gmv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App"; version = "1.0.0"; sha256 = "0i09cs7a7hxn9n1nx49382csvc7560j4hbxr2c8bwa69nhf2rrjp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.27"; sha256 = "0p0apwm7xpwwvjl453livb8ngvc0izjp5yfpgv116vhig2mxszsa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.16"; sha256 = "0wxa2mm34l32324rywns3bphxrkxm265wxck93z030klwvxdalri"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.2"; sha256 = "1pi4s9sn64cyvarba1vgb17k92ank7q95xmn7dz9zb1z9n6v19hm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.27"; sha256 = "1vglh2l7brp6qbdngiiwsjwsp3cyzbzjcjw7dwqhfk0whc7n96kg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.16"; sha256 = "1xiq43br5lk1xa4d4wzhdpn9lz3mixmyxggzbsf4i4q5692rv35f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.27"; sha256 = "14zd7mgl866bhqqrcb6q3xbwrllks1nmfzhnbm8rf7h5cqqrqwbn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.16"; sha256 = "0ln013191h2rkhm8xss4aqbb52ywp44rjfnn7pip99wdx66bkazs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.2"; sha256 = "1v8nngksh0cp51g221bizz52jjpc4rzm1avcy5psl81ywmkwmj93"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.27"; sha256 = "1kf3sm7hkqz5a4y5rb49yna10041f1h3lcqx885xlbhyb4q67gi9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.16"; sha256 = "1b8w278n8hcxysjs56ghx4pdbfall66nnmk1kx5a0my7lp7yp6xf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.2"; sha256 = "1xlnlp4ckqn0myl5pzsqhmpall1pnbmqhb62rr7m61dy83xhvm6l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.27"; sha256 = "15fwbjq2r406fq175j2lsh4f91iiipmvaq96nsba3q2fh0c433zm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.16"; sha256 = "19lnkab2p8nkfc4jag0whkv51v3qabwdyzjk6xgj61i6s8lnnz1f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.27"; sha256 = "1dxvssf7rx05bipj03g8jm36j2mmdm13sg8rdwn6aa6whbwpip0r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.16"; sha256 = "1qb3pk1kgvwjc2n4kqfx4bqjmaihjf8cd9cfkqkkwmnnw9jd7f83"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.2"; sha256 = "1g2n69s8sa9ik9jhkc6xcdjcvghwr5m9glbxr1f22dbj6nw433c4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.27"; sha256 = "1j913pm78h35kvcm70276cnfvjn1r7r6jsc3jm1y0vb395qy6nfd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.16"; sha256 = "1w41xwdikkyplxr1kqfn1fwjvbglgsaripgdglhdx9qdxgr3nfi3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.27"; sha256 = "1mbjbj9c7sxw0hfq25ypv56hi9kik3vrrvr8ika3wcwv1ilpvczj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.16"; sha256 = "0xgd5nj5nx3w3m9cbh3b6r0c2w5svxjkslwqq35w445vjhq435fz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.2"; sha256 = "116rkq5ri5dbhp5g7zyc71ml2v92vb5bw5f3nx96llb1pqk74grh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.27"; sha256 = "0dr1y76wgkqnkjxk5m8ps2g086sn4kp3a04v0ynarw5j0cipg994"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.16"; sha256 = "0mghc3ihk2j60yyrb57k200ddmhj5impl81lldpxxx9821pb0qha"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.2"; sha256 = "0x3fsfkv2gcilhsj31pjgg2vfibq2xvqhprw3hpm4gig4c2qi4fg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "1.0.1"; sha256 = "1qr4gnzlpwzv8jr7ijmdg13x2s9m35g4ma0bh18kci4ml7h9jb6a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "1.0.1"; sha256 = "0vbqww1bmlkz7xq05zxykv27xdrkl6nrjhs1iiszaa9ivf7nklz1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "1.0.1"; sha256 = "109zs3bqhzh6mhbf2rfpwxmpb8fq57jr7wriyylynirsqh1lnql4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Jit"; version = "1.0.2"; sha256 = "0jaan2wmg80lr0mhgfy70kb5cqjwv1a2ikmxgd0glpcxp7wr7pag"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2"; sha256 = "1hxgsjyzh7hdgd34xwpn5s2myy1b1y9ms7xhvs6mkb75wap49bpc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1"; sha256 = "16k8chghkr25jf49banhzl839vs8n3vbfpg4wn4idi0hzjipix78"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; sha256 = "0b0i7lmkrcfvim8i3l93gwqvkhhhfzd53fqfnygdqvkg6np0cg7m"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; sha256 = "0f5jah93kjkvxwmhwb78lw11m9pkkq9fvf135hpymmmpxqbdh97q"; }) + (fetchNuGet { pname = "Microsoft.VisualBasic"; version = "10.0.1"; sha256 = "0q6vv9qfkbwn7gz8qf1gfcn33r87m260hsxdsk838mcbqmjz6wgc"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.0"; sha256 = "0nmmv4yw7gw04ik8ialj3ak0j6pxa9spih67hnn1h2c38ba8h58k"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; }) + (fetchNuGet { pname = "NSubstitute"; version = "5.0.0"; sha256 = "1iacc39nz8pzxay5fs9mzrflmr9mvwjd3lrn61yc7kmamqs87rqk"; }) + (fetchNuGet { pname = "NuGet.Common"; version = "6.8.0"; sha256 = "0l3ij8iwy7wj6s7f93lzi9168r4wz8zyin6a08iwgk7hvq44cia1"; }) + (fetchNuGet { pname = "NuGet.Configuration"; version = "6.8.0"; sha256 = "0x03p408smkmv1gv7pmvsia4lkn0xaj4wfrkl58pjf8bbv51y0yw"; }) + (fetchNuGet { pname = "NuGet.Credentials"; version = "6.8.0"; sha256 = "0dypmdkibgm5d9imhjnpgpdi6kmg6cnlvc7lc9w4v7ijflril15l"; }) + (fetchNuGet { pname = "NuGet.DependencyResolver.Core"; version = "6.8.0"; sha256 = "0da44ni1g6s3fkzmhymbcv98fcpd31bfmivq4cg90d0wiig85wvw"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; sha256 = "0s37d1p4md0k6d4cy6sq36f2dgkd9qfbzapxhkvi8awwh0vrynhj"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.8.0"; sha256 = "0i2xvhgkjkjr496i3pg8hamwv6505fia45qhn7jg5m01wb3cvsjl"; }) + (fetchNuGet { pname = "NuGet.LibraryModel"; version = "6.8.0"; sha256 = "13qn64jckc9fd7yx5nwsxpj1i9gndlks35w0bdsfy8gc791wqdy4"; }) + (fetchNuGet { pname = "NuGet.Packaging"; version = "6.8.0"; sha256 = "031z4s905bxi94h3f0qy4j1b6jxdxgqgpkzqvvpfxch07szxcbim"; }) + (fetchNuGet { pname = "NuGet.ProjectModel"; version = "6.8.0"; sha256 = "1619jxp12cggspnwpk2x99s6h4z7gbc6kyngkij5cjd5wwc05haj"; }) + (fetchNuGet { pname = "NuGet.Protocol"; version = "6.8.0"; sha256 = "1d7hpdhrwv2fj7kzhqs6bp03vq9krv87jgxdhz0n9mih3zank4y0"; }) + (fetchNuGet { pname = "NuGet.Versioning"; version = "6.8.0"; sha256 = "1sd25h46fd12ng780r02q4ijcx1imkb53kj1y2y7cwg5myh537ks"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0"; sha256 = "0d720z4lzyfcabmmnvh0bnj76ll7djhji2hmfh3h44sdkjnlkknk"; }) + (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.0.1"; sha256 = "1hgv2bmbaskx77v8glh7waxws973jn4ah35zysnkxmf0196sfxg6"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Security"; version = "4.0.1"; sha256 = "1nk4pf8vbrgf73p0skhwmzhgz1hax3j123ilhwdncr47l3x1dbhk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography"; version = "4.0.0"; sha256 = "0k57aa2c3b10wl3hfqbgrl7xq7g8hh3a3ir44b31dn5p61iiw3z9"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.0.0"; sha256 = "13s659bcmg9nwb6z78971z1lr6bmh2wghxi1ayqyzl4jijd351gr"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.2.0"; sha256 = "1jm4pc666yiy7af1mcf7766v710gp0h40p228ghj6bavx7xfa38m"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.0.1"; sha256 = "0v4qpmqlzyfad2kswxxj2frnaqqhz9201c3yn8fmmarx5vlzg52z"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.1.0"; sha256 = "0l6m3z6h2qjjam1rp1fzk7zz5czjjazmw78rbh72x25y6kmyn6wf"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; sha256 = "08y1x2d5w2hnhkh9r1998pjc7r4qp0rmzax062abha85s11chifd"; }) + (fetchNuGet { pname = "System.Diagnostics.FileVersionInfo"; version = "4.0.0"; sha256 = "1s5vxhy7i09bmw51kxqaiz9zaj9am8wsjyz13j85sp23z267hbv3"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) + (fetchNuGet { pname = "System.Diagnostics.StackTrace"; version = "4.0.1"; sha256 = "0q29axqklpl36vvyni5h1cyb02lfvvkqprb9wfvcdca3181q5al2"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "6.0.0"; sha256 = "1vvr7hs4qzjqb37r0w1mxq7xql2b17la63jwvmgv65s1hj00g8r9"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.Abstractions"; version = "19.2.64"; sha256 = "1hgii2s97wima8cx2nabvmsg7ij6rl23x436zb9naj97kssfyxw4"; }) + (fetchNuGet { pname = "System.IO.Abstractions.TestingHelpers"; version = "19.2.64"; sha256 = "003n5a0jxgmwlw3vk0ljkmj4vgryqyi949mblh5asxf3457zn328"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) + (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) + (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; sha256 = "0ixl68plva0fsj3byv76bai7vkin86s6wyzr8vcav3szl862blvk"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Watcher"; version = "4.0.0"; sha256 = "0rgfjiqz8dqy8hmbfsls4sa46ss6p9vh86cvn1vqx7zg45pf3hir"; }) + (fetchNuGet { pname = "System.IO.MemoryMappedFiles"; version = "4.0.0"; sha256 = "1ahp27llf76ngc0fngl8zy4y1sgflzrkmxddilnd0l0cbbq1lm6m"; }) + (fetchNuGet { pname = "System.IO.UnmanagedMemoryStream"; version = "4.0.1"; sha256 = "012g8nwbfv94rhblsb3pxn1bazfpgjiy3kmy00679gg3651b87jb"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Linq.Parallel"; version = "4.0.1"; sha256 = "0i33x9f4h3yq26yvv6xnq4b0v51rl5z8v1bm7vk972h5lvf4apad"; }) + (fetchNuGet { pname = "System.Linq.Queryable"; version = "4.0.1"; sha256 = "11jn9k34g245yyf260gr3ldzvaqa9477w2c5nhb1p8vjx4xm3qaw"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; sha256 = "08jsfwimcarfzrhlyvjjid61j02irx6xsklf32rv57x2aaikvx0h"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.0.0"; sha256 = "0dj3pvpv069nyia28gkl4a0fb7q33hbxz2dg25qvpah3l7pbl0qh"; }) + (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Net.Requests"; version = "4.0.11"; sha256 = "13mka55sa6dg6nw4zdrih44gnp8hnj5azynz47ljsh2791lz3d9h"; }) + (fetchNuGet { pname = "System.Net.Security"; version = "4.0.0"; sha256 = "0ybyfssnm0cri37byhxnkfrzprz77nizbfj553x7s1vry2pnm5gb"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) + (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; }) + (fetchNuGet { pname = "System.Net.WebHeaderCollection"; version = "4.0.1"; sha256 = "10bxpxj80c4z00z3ksrfswspq9qqsw8jwxcbzvymzycb97m9b55q"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.1.1"; sha256 = "1xkzrpl700pp0l6dc9fx7cj318i596w0i0qixsbrz5v65fnhbzia"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.0.1"; sha256 = "1maglcnvm3h8bfmx3rvwg4wjda7527iqp38cg1r6vh9japrw1n0r"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.3.0"; sha256 = "1y5m6kryhjpqqm2g3h3b6bzig13wkiw954x3b7icqjm6xypm1x3b"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.Reader"; version = "4.0.0"; sha256 = "1jafi73dcf1lalrir46manq3iy6xnxk2z7gpdpwg4wqql7dv3ril"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.0.0"; sha256 = "0lpfi3psqcp6zxsjk2qyahal7zaawviimc8lhrlswhip2mx7ykl0"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.0.1"; sha256 = "03dw0ls49bvsrffgwycyifjgz0qzr9r85skqhdyhfd51fqf398n6"; }) + (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.2.0"; sha256 = "148s9g5dgm33ri7dnh19s4lgnlxbpwvrw2jnzllq2kijj4i4vs85"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.2.0"; sha256 = "118jijz446kix20blxip0f0q8mhsh9bz118mwc2ch1p6g7facpzc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.0.0"; sha256 = "1cwv8lqj8r15q81d2pz2jwzzbaji0l28xfrpw29kdpsaypm92z2q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.0.0"; sha256 = "0a8y1a5wkmpawc787gfmnrnbzdgxmx1a14ax43jf3rj9gxmy3vk4"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.0.0"; sha256 = "16sx3cig3d0ilvzl8xxgffmxbiqx87zdi8fc73i3i7zjih1a7f4q"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "6.0.4"; sha256 = "0hh5h38pnxmlrnvs72f2hzzpz4b2caiiv6xf8y7fzdg84r3imvfr"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.0.0"; sha256 = "0i7cfnwph9a10bm26m538h5xcr8b36jscp9sy1zhgifksxz4yixh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.1.0"; sha256 = "0clg1bv55mfv5dq00m19cp634zx6inm31kf8ppbq1jgyjf2185dh"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.0.1"; sha256 = "1nbzdfqvzzbgsfdd5qsh94d7dbg2v4sw0yx6himyn52zf8z6007p"; }) + (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.0.0"; sha256 = "1d3vc8i0zss9z8p4qprls4gbh7q4218l9845kclx7wvw41809k6z"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.0.1"; sha256 = "00wpm3b9y0k996rm9whxprngm8l500ajmzgy2ip9pgwk0icp06y3"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; sha256 = "1151hbyrcf8kyg1jz8k9awpbic98lwz9x129rg7zk1wrs6vjlpxl"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "7.0.3"; sha256 = "0zjrnc9lshagm6kdb9bdh45dmlnkpwcpyssa896sda93ngbmj8k9"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Overlapped"; version = "4.0.1"; sha256 = "0fi79az3vmqdp9mv3wh2phblfjls89zlj6p9nc3i9f6wmfarj188"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Dataflow"; version = "4.6.0"; sha256 = "0a1davr71wssyn4z1hr75lk82wqa0daz0vfwkmg1fm3kckfd72k1"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Parallel"; version = "4.0.1"; sha256 = "114wdg32hr46dfsnns3pgs67kcha5jn47p5gg0mhxfn5vrkr2p75"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.0.10"; sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.0.1"; sha256 = "0ihsnkvyc76r4dcky7v3ansnbyqjzkbyyia0ir5zvqirzan0bnl1"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.0.1"; sha256 = "0fjqgb6y66d72d5n8qq1h213d9nv2vi8mpv8p28j3m9rccmsh04m"; }) + (fetchNuGet { pname = "System.Xml.XPath.XDocument"; version = "4.0.1"; sha256 = "1fndc70lbjvh8kxs71c7cidfm8plznd61bg4fwpiyq3mq0qg5z0z"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions"; version = "19.2.64"; sha256 = "0ayrz1n777cgjgnp4iff90z43s9w3df62r93nkxg6wkga8v0dyr5"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.TestingHelpers"; version = "19.2.64"; sha256 = "1s4bbj48iyvc638lmadg3mhflgihjfihb448fmi1y176gvlwwxy8"; }) + (fetchNuGet { pname = "TestableIO.System.IO.Abstractions.Wrappers"; version = "19.2.64"; sha256 = "0l2lv45mcr54b8h37bwqag9n9qbh8vyyxz88mw6pcdz2k3z475jc"; }) + (fetchNuGet { pname = "xunit"; version = "2.6.2"; sha256 = "0g5j0xwrv9cwrx91cjb9gas3wnkcwwk8krhdzsv50vlyp71pqqgz"; }) + (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; }) + (fetchNuGet { pname = "xunit.analyzers"; version = "1.6.0"; sha256 = "1nwrz0mxk2hk2rwwabgr0a4wa3j22qwm94xvrzci39l58hmzxpbi"; }) + (fetchNuGet { pname = "xunit.assert"; version = "2.6.2"; sha256 = "1nxg9m8qhh05i9linap7a8bdhxnr7x2pg7piw8hh76cshx0402ql"; }) + (fetchNuGet { pname = "xunit.core"; version = "2.6.2"; sha256 = "0q0kzjdb0hxq4bajl11pvnwl1dp47b2adqx47j30bi2llj21ihj6"; }) + (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.6.2"; sha256 = "1a27ng02piwjr3ggff4mg0r92b6rabd1339clnxzqxwcyf620q2c"; }) + (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.6.2"; sha256 = "1lhhlrq6lzd4w61x78dhxjz1453lnipjgph8sc52izgwq9d5xp1n"; }) + (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.4"; sha256 = "0mp3z8m5l4q09lr17142hff6p05zl189cwz3iavfqk8dpspyjgvd"; }) +] diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix new file mode 100644 index 000000000000..d044540bc8fb --- /dev/null +++ b/pkgs/by-name/do/dotnet-outdated/package.nix @@ -0,0 +1,41 @@ +{ lib +, fetchFromGitHub +, buildDotnetModule +, dotnetCorePackages +}: +buildDotnetModule rec { + pname = "dotnet-outdated"; + version = "4.6.0"; + + src = fetchFromGitHub { + owner = "dotnet-outdated"; + repo = pname; + rev = "v${version}"; + hash = "sha256-U5qCM+Um8bRafrDpbI5TnSN1nQ8mQpZ5W8Jao2hdAPw="; + }; + + dotnet-sdk = dotnetCorePackages.dotnet_8.sdk; + dotnet-runtime = dotnetCorePackages.dotnet_8.runtime; + useDotnetFromEnv = true; + + nugetDeps = ./deps.nix; + + projectFile = "src/DotNetOutdated/DotNetOutdated.csproj"; + executables = "dotnet-outdated"; + + dotnetInstallFlags = [ "--framework" "net8.0" ]; + + meta = with lib; { + description = "A .NET Core global tool to display and update outdated NuGet packages in a project"; + homepage = "https://github.com/dotnet-outdated/dotnet-outdated"; + sourceProvenance = with sourceTypes; [ + fromSource + # deps + binaryBytecode + binaryNativeCode + ]; + license = licenses.mit; + maintainers = with maintainers; [ emilioziniades ]; + mainProgram = "dotnet-outdated"; + }; +} From 02910df6a5616ae0694d7986385ad7e62313d839 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 30 Mar 2024 11:08:46 +0100 Subject: [PATCH 191/260] typst-live: move to `pkgs/by-name` --- .../default.nix => by-name/ty/typst-live/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/typesetting/typst-live/default.nix => by-name/ty/typst-live/package.nix} (100%) diff --git a/pkgs/tools/typesetting/typst-live/default.nix b/pkgs/by-name/ty/typst-live/package.nix similarity index 100% rename from pkgs/tools/typesetting/typst-live/default.nix rename to pkgs/by-name/ty/typst-live/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 039950c8bc9e..d133beae8152 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14104,8 +14104,6 @@ with pkgs; typos = callPackage ../development/tools/typos { }; - typst-live = callPackage ../tools/typesetting/typst-live { }; - tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; From 5eca3b06e77995448ae29a95efe79b2d0e6a0e65 Mon Sep 17 00:00:00 2001 From: gbtb Date: Sun, 18 Feb 2024 23:41:53 +1000 Subject: [PATCH 192/260] dotnet: added shell completion scripts --- pkgs/development/compilers/dotnet/common.nix | 11 +++++++++++ .../compilers/dotnet/completions/dotnet.bash | 13 +++++++++++++ .../compilers/dotnet/completions/dotnet.fish | 1 + .../compilers/dotnet/completions/dotnet.zsh | 18 ++++++++++++++++++ 4 files changed, 43 insertions(+) create mode 100644 pkgs/development/compilers/dotnet/completions/dotnet.bash create mode 100644 pkgs/development/compilers/dotnet/completions/dotnet.fish create mode 100644 pkgs/development/compilers/dotnet/completions/dotnet.zsh diff --git a/pkgs/development/compilers/dotnet/common.nix b/pkgs/development/compilers/dotnet/common.nix index 63b3a7de374e..e88ddfb3e37f 100644 --- a/pkgs/development/compilers/dotnet/common.nix +++ b/pkgs/development/compilers/dotnet/common.nix @@ -6,6 +6,7 @@ , runCommand , expect , curl +, installShellFiles }: type: args: stdenv.mkDerivation (finalAttrs: args // { doInstallCheck = true; @@ -27,6 +28,16 @@ export DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=1 # Skip integrity check on first run, which fails due to read-only directory '' + args.setupHook or ""); + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ installShellFiles ]; + + postInstall = '' + # completions snippets taken from https://learn.microsoft.com/en-us/dotnet/core/tools/enable-tab-autocomplete + installShellCompletion --cmd dotnet \ + --bash ${./completions/dotnet.bash} \ + --zsh ${./completions/dotnet.zsh} \ + --fish ${./completions/dotnet.fish} + ''; + } // lib.optionalAttrs (type == "sdk") { passthru = { tests = let diff --git a/pkgs/development/compilers/dotnet/completions/dotnet.bash b/pkgs/development/compilers/dotnet/completions/dotnet.bash new file mode 100644 index 000000000000..56c599e4358d --- /dev/null +++ b/pkgs/development/compilers/dotnet/completions/dotnet.bash @@ -0,0 +1,13 @@ +# bash parameter completion for the dotnet CLI + +function _dotnet_bash_complete() +{ + local cur="${COMP_WORDS[COMP_CWORD]}" IFS=$'\n' # On Windows you may need to use use IFS=$'\r\n' + local candidates + + read -d '' -ra candidates < <(dotnet complete --position "${COMP_POINT}" "${COMP_LINE}" 2>/dev/null) + + read -d '' -ra COMPREPLY < <(compgen -W "${candidates[*]:-}" -- "$cur") +} + +complete -f -F _dotnet_bash_complete dotnet diff --git a/pkgs/development/compilers/dotnet/completions/dotnet.fish b/pkgs/development/compilers/dotnet/completions/dotnet.fish new file mode 100644 index 000000000000..2d5e2b5cf106 --- /dev/null +++ b/pkgs/development/compilers/dotnet/completions/dotnet.fish @@ -0,0 +1 @@ +complete -f -c dotnet -a "(dotnet complete (commandline -cp))" diff --git a/pkgs/development/compilers/dotnet/completions/dotnet.zsh b/pkgs/development/compilers/dotnet/completions/dotnet.zsh new file mode 100644 index 000000000000..0d8569b9391b --- /dev/null +++ b/pkgs/development/compilers/dotnet/completions/dotnet.zsh @@ -0,0 +1,18 @@ +# zsh parameter completion for the dotnet CLI + +_dotnet_zsh_complete() +{ + local completions=("$(dotnet complete "$words")") + + # If the completion list is empty, just continue with filename selection + if [ -z "$completions" ] + then + _arguments '*::arguments: _normal' + return + fi + + # This is not a variable assignment, don't remove spaces! + _values = "${(ps:\n:)completions}" +} + +compdef _dotnet_zsh_complete dotnet From ba79149c6658336e533376c26e80cabba781ea24 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Mar 2024 14:30:20 +0300 Subject: [PATCH 193/260] stdenv/check-meta: don't infrec on unsupported platforms --- pkgs/stdenv/generic/check-meta.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 26f6427d7181..fd46029ff442 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -424,7 +424,7 @@ let else if !allowBroken && attrs.meta.broken or false then { valid = "no"; reason = "broken"; errormsg = "is marked as broken"; } else if !allowUnsupportedSystem && hasUnsupportedPlatform attrs then - let toPretty = toPretty { + let toPretty' = toPretty { allowPrettyValues = true; indent = " "; }; @@ -432,8 +432,8 @@ let errormsg = '' is not available on the requested hostPlatform: hostPlatform.config = "${hostPlatform.config}" - package.meta.platforms = ${toPretty (attrs.meta.platforms or [])} - package.meta.badPlatforms = ${toPretty (attrs.meta.badPlatforms or [])} + package.meta.platforms = ${toPretty' (attrs.meta.platforms or [])} + package.meta.badPlatforms = ${toPretty' (attrs.meta.badPlatforms or [])} ''; } else if !(hasAllowedInsecure attrs) then From 1dabbf30637cd623d0f2d25f79eefd3ca324a323 Mon Sep 17 00:00:00 2001 From: Yaya Date: Wed, 20 Mar 2024 16:06:04 +0100 Subject: [PATCH 194/260] gitlab: 16.9.2 -> 16.10.1 https://gitlab.com/gitlab-org/gitlab/-/blob/v16.10.1-ee/CHANGELOG.md Fixes CVE-2023-6371 Fixes CVE-2024-2818 --- .../version-management/gitlab/data.json | 18 +- .../version-management/gitlab/default.nix | 4 +- .../gitlab/gitaly/default.nix | 6 +- .../gitlab-elasticsearch-indexer/default.nix | 6 +- .../gitlab/gitlab-pages/default.nix | 6 +- .../gitlab/gitlab-shell/default.nix | 6 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 74 ++--- .../gitlab/rubyEnv/Gemfile.lock | 276 +++++++++--------- .../gitlab/rubyEnv/gemset.nix | 269 ++++++++--------- 10 files changed, 322 insertions(+), 347 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c0e35b7298b1..c0d38801216b 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.9.2", - "repo_hash": "sha256-pvmbxCySSc+Ug4W3cpXA6L7E3/I6J2A0BpcjFbR3YEI=", - "yarn_hash": "02vchjx17h6kk268pwrjqmrri0wa6vrljm7y5s23hwzir4v86slq", + "version": "16.10.1", + "repo_hash": "sha256-Bd2BvdWUJJm+hJZHFaW2PyMdaNTZWArpaQ3nY06BBBY=", + "yarn_hash": "0yzywfg4lqxjwm5cqsm4bn97zcrfvpnrs8rjrv9wv3xqvi9h9skd", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.9.2-ee", + "rev": "v16.10.1-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.9.2", - "GITLAB_PAGES_VERSION": "16.9.2", - "GITLAB_SHELL_VERSION": "14.33.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.7.0", - "GITLAB_WORKHORSE_VERSION": "16.9.2" + "GITALY_SERVER_VERSION": "16.10.1", + "GITLAB_PAGES_VERSION": "16.10.1", + "GITLAB_SHELL_VERSION": "14.34.0", + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.8.0", + "GITLAB_WORKHORSE_VERSION": "16.10.1" } } diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 37789c27abef..7782116bbdf9 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -49,7 +49,7 @@ let cp Cargo.lock $out ''; }; - hash = "sha256-csasA2RH1vwRdF/9/BpFmh0AKsP3xtGmrhCx6mbVf6k="; + hash = "sha256-7q2xWAsFkXHxkYNzIjPwJRy72xMXF278cpVzqGLt/9Y="; }; dontBuild = false; @@ -112,6 +112,8 @@ let GITLAB_LOG_PATH = "log"; FOSS_ONLY = !gitlabEnterprise; + SKIP_YARN_INSTALL = 1; + configurePhase = '' runHook preConfigure diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 94e3648a0c87..7cdcebb5ba4d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -6,7 +6,7 @@ }: let - version = "16.9.2"; + version = "16.10.1"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -18,10 +18,10 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-YlSZq7+YtV9mhZDoNZ7QStbZLQ/Vtt8H2ZW84ONvCq8="; + hash = "sha256-YMvxSQcvFj/ugTGjTThmwi1V9M+rc3fldrmChWzXKR8="; }; - vendorHash = "sha256-aqwdeBjR8IGa1DsAXY1h7vq7OkuTgoDim5m40YKlcmo="; + vendorHash = "sha256-zaldiRg7fk/HncpfR7k+dDprsOp1ziQHgX8B4l7bwe0="; ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix index b3c29fe0ddc1..9b31c3b300a2 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-elasticsearch-indexer"; - version = "4.7.0"; + version = "4.8.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-elasticsearch-indexer"; rev = "v${version}"; - sha256 = "sha256-xkCG8PyOXQl2xqsq3INqYWGdcJpJgRsi/hB9creGTSM="; + sha256 = "sha256-JHUDZmGlZGyvsB4wgAnNyIEtosZG4ajZ4eBGumH97ZI="; }; - vendorHash = "sha256-1eyIRlrgEQ6iiM2tom5S92BlsyaPVKZzSU3+Mmdxi+4="; + vendorHash = "sha256-ztRKXoXncY66XJVwlPn4ShLWTD4Cr0yYHoUdquJItDM="; buildInputs = [ icu ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index 2a4bbb893099..92ca11e7884b 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.9.2"; + version = "16.10.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-1ygIMatPcqvhjN5Zkuk0WXd9iW6fv3bLK9EZsIII/WM="; + hash = "sha256-jUTUYbkUad2WrI8lkktd2pr3+GPraEUXT+efOb7JcKw="; }; - vendorHash = "sha256-ZjIjGZaZhxa3OvdaA4qD+Qza604mxe1u+zAUtIAKouo="; + vendorHash = "sha256-WrR4eZRAuYkhr7ZqP7OXqJ6uwvxzn+t+3OdBNcNaq0M="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index ab79f9fac00a..2b99cc36ba7e 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "gitlab-shell"; - version = "14.33.0"; + version = "14.34.0"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "sha256-0C3ODs2NElJQ+A6x9lZxSParTZc3q4YqWsw7DxwhODo="; + sha256 = "sha256-0LzZZn4kS5uRcj/uJgHvLvd6ZOLi1l4yaSqqRhmTYZs="; }; buildInputs = [ ruby libkrb5 ]; patches = [ ./remove-hardcoded-locations.patch ]; - vendorHash = "sha256-sTAd/AbPx5WzBCzTDLvo/bDZcmz/xVhIhz9nFGBEYx4="; + vendorHash = "sha256-RtZ9d3cempY8PxaCPFJ2uEEorem6NDURHZPirr0SUjU="; postInstall = '' cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 8e58210af06a..213989465b52 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "16.9.2"; + version = "16.10.1"; # nixpkgs-update: no auto update src = fetchFromGitLab { @@ -17,7 +17,7 @@ buildGoModule rec { sourceRoot = "${src.name}/workhorse"; - vendorHash = "sha256-RJ/CT8p1DpxmZcJLBeMDG77Zsn0Q6MiXsDcMK/LM2DA="; + vendorHash = "sha256-bbKX22Tb2pM+Wnyl1ojdA1nmT40Z5R99mDP1hLD+lco="; buildInputs = [ git ]; ldflags = [ "-X main.Version=${version}" ]; doCheck = false; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index f60cd85d493d..dccd147ca501 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -24,7 +24,7 @@ gem 'bundler-checksum', '~> 0.1.0', path: 'vendor/gems/bundler-checksum', requir # https://gitlab.com/gitlab-org/gitlab/-/issues/375713 # # See https://docs.gitlab.com/ee/development/gemfile.html#upgrade-rails for guidelines when upgrading Rails -gem 'rails', '~> 7.0.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rails', '~> 7.0.8.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory @@ -49,10 +49,10 @@ gem 'responders', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'sprockets', '~> 3.7.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'view_component', '~> 3.8.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'view_component', '~> 3.11.0' # rubocop:todo Gemfile/MissingFeatureCategory # Supported DBs -gem 'pg', '~> 1.5.4' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'pg', '~> 1.5.6' # rubocop:todo Gemfile/MissingFeatureCategory gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/MissingFeatureCategory @@ -134,10 +134,10 @@ gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory # API gem 'grape', '~> 2.0.0', feature_category: :api -gem 'grape-entity', '~> 0.10.0', feature_category: :api +gem 'grape-entity', '~> 0.10.2', feature_category: :api gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api -gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api +gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory # GraphQL API @@ -148,7 +148,7 @@ gem 'apollo_upload_server', '~> 2.1.5', feature_category: :api gem 'graphlient', '~> 0.6.0', feature_category: :importers # Used by BulkImport feature (group::import) # Generate Fake data -gem 'ffaker', '~> 2.10' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'ffaker', '~> 2.23' # rubocop:todo Gemfile/MissingFeatureCategory gem 'hashie', '~> 5.0.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -207,15 +207,15 @@ gem 'seed-fu', '~> 2.3.7' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-core', '~> 3.191.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-core', '~> 3.191.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'aws-sdk-s3', '~> 1.143.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'aws-sdk-s3', '~> 1.144.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory # Markdown and HTML processing gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning -gem 'deckar01-task_list', '2.3.3', feature_category: :team_planning +gem 'deckar01-task_list', '2.3.4', feature_category: :team_planning gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -230,7 +230,7 @@ gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/Missi gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'gitlab-glfm-markdown', '~> 0.0.12', feature_category: :team_planning +gem 'gitlab-glfm-markdown', '~> 0.0.13', feature_category: :team_planning # Calendar rendering gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory @@ -240,7 +240,7 @@ gem 'diffy', '~> 3.4' # rubocop:todo Gemfile/MissingFeatureCategory gem 'diff_match_patch', '~> 0.1.0', path: 'vendor/gems/diff_match_patch', feature_category: :team_planning # Application server -gem 'rack', '~> 2.2.8' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'rack', '~> 2.2.8.1' # rubocop:todo Gemfile/MissingFeatureCategory # https://github.com/zombocom/rack-timeout/blob/master/README.md#rails-apps-manually gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory @@ -277,7 +277,7 @@ gem 're2', '2.7.0' # rubocop:todo Gemfile/MissingFeatureCategory # Misc -gem 'semver_dialects', '~> 1.6.1', feature_category: :static_application_security_testing +gem 'semver_dialects', '~> 2.0', feature_category: :static_application_security_testing gem 'version_sorter', '~> 2.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'csv_builder', path: 'gems/csv_builder' # rubocop:todo Gemfile/MissingFeatureCategory @@ -288,19 +288,20 @@ gem 'js_regex', '~> 3.8' # rubocop:todo Gemfile/MissingFeatureCategory gem 'device_detector' # rubocop:todo Gemfile/MissingFeatureCategory # Redis -gem 'redis', '~> 4.8.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'redis-namespace', '~> 1.10.0' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'redis-namespace', '~> 1.10.0', feature_category: :redis +gem 'redis', '~> 5.0.0', feature_category: :redis +gem 'redis-clustering', '~> 5.0.0', feature_category: :redis gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory # Redis session store gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory # Discord integration -gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations +gem 'discordrb-webhooks', '~> 3.5', require: false, feature_category: :integrations # Jira integration -gem 'jira-ruby', '~> 2.1.4', feature_category: :integrations -gem 'atlassian-jwt', '~> 0.2.0', feature_category: :integrations +gem 'jira-ruby', '~> 2.3.0', feature_category: :integrations +gem 'atlassian-jwt', '~> 0.2.1', feature_category: :integrations # Slack integration gem 'slack-messenger', '~> 2.3.4', feature_category: :integrations @@ -340,9 +341,7 @@ gem 'gitlab_chronic_duration', '~> 0.12' # rubocop:todo Gemfile/MissingFeatureCa gem 'rack-proxy', '~> 0.7.7' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'sassc-rails', '~> 2.1.0', feature_category: :shared, require: false -gem 'cssbundling-rails', '1.3.3', feature_category: :shared, require: false -gem 'autoprefixer-rails', '10.2.5.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'cssbundling-rails', '1.4.0', feature_category: :shared gem 'terser', '1.0.2' # rubocop:todo Gemfile/MissingFeatureCategory gem 'click_house-client', path: 'gems/click_house-client', require: 'click_house/client' # rubocop:todo Gemfile/MissingFeatureCategory @@ -378,7 +377,10 @@ gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory # I18n gem 'rails-i18n', '~> 7.0', feature_category: :internationalization gem 'gettext_i18n_rails', '~> 1.11.0', feature_category: :internationalization -gem 'gettext', '~> 3.3', require: false, group: [:development, :test], feature_category: :internationalization +gem 'gettext', '~> 3.4', '>= 3.4.9', + require: false, + group: [:development, :test], + feature_category: :internationalization gem 'batch-loader', '~> 2.0.1' # rubocop:todo Gemfile/MissingFeatureCategory @@ -412,11 +414,11 @@ group :development do gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'ruby-lsp', "~> 0.13.3", require: false, feature_category: :tooling + gem 'ruby-lsp', "~> 0.14.4", require: false, feature_category: :tooling - gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling + gem 'ruby-lsp-rails', "~> 0.3.0", feature_category: :tooling - gem 'ruby-lsp-rspec', "~> 0.1.8", require: false, feature_category: :tooling + gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling end group :development, :test do @@ -431,7 +433,7 @@ group :development, :test do gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'rspec-rails', '~> 6.1.0', feature_category: :shared + gem 'rspec-rails', '~> 6.1.1', feature_category: :shared # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) gem 'minitest', '~> 5.11.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -451,7 +453,7 @@ group :development, :test do # Profiling data from CI/CD pipelines gem 'influxdb-client', '~> 2.9', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'knapsack', '~> 1.21.1', feature_category: :tooling + gem 'knapsack', '~> 1.22.0', feature_category: :tooling gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling gem 'test_file_finder', '~> 0.2.1', feature_category: :tooling @@ -474,7 +476,7 @@ group :development, :test do end group :development, :test, :danger do - gem 'gitlab-dangerfiles', '~> 4.6.0', require: false, feature_category: :tooling + gem 'gitlab-dangerfiles', '~> 4.7.0', require: false, feature_category: :tooling end group :development, :test, :coverage do @@ -498,31 +500,31 @@ end group :test do gem 'fuubar', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec-retry', '~> 0.6.2', feature_category: :tooling - gem 'rspec_profiling', '~> 0.0.6', feature_category: :tooling + gem 'rspec_profiling', '~> 0.0.8', feature_category: :tooling gem 'rspec-benchmark', '~> 0.6.0', feature_category: :tooling gem 'rspec-parameterized', '~> 1.0', require: false, feature_category: :tooling - gem 'os', '~> 1.1', feature_category: :tooling + gem 'os', '~> 1.1', '>= 1.1.4', feature_category: :tooling gem 'capybara', '~> 3.40' # rubocop:todo Gemfile/MissingFeatureCategory gem 'capybara-screenshot', '~> 1.0.26' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'selenium-webdriver', '~> 4.17' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'selenium-webdriver', '~> 4.18', '>= 4.18.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'graphlyte', '~> 1.0.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'shoulda-matchers', '~> 5.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory gem 'email_spec', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'webmock', '~> 3.20.0' # rubocop:todo Gemfile/MissingFeatureCategory + gem 'webmock', '~> 3.22.0' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rails-controller-testing' # rubocop:todo Gemfile/MissingFeatureCategory gem 'concurrent-ruby', '~> 1.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory - gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling + gem 'axe-core-rspec', '~> 4.8.2', feature_category: :tooling # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory - gem 'gitlab_quality-test_tooling', '~> 1.14.2', require: false, feature_category: :tooling + gem 'gitlab_quality-test_tooling', '~> 1.17.0', require: false, feature_category: :tooling end gem 'octokit', '~> 8.0', feature_category: :importers @@ -557,14 +559,14 @@ gem 'ssh_data', '~> 1.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory # Gitaly GRPC protocol definitions -gem 'gitaly', '~> 16.9.0-rc3', feature_category: :gitaly +gem 'gitaly', '~> 16.10.0-rc1', feature_category: :gitaly # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.4.0', feature_category: :deployment_management gem 'grpc', '~> 1.60.0' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory +gem 'google-protobuf', '~> 3.25', '>= 3.25.3' # rubocop:todo Gemfile/MissingFeatureCategory gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory @@ -577,7 +579,7 @@ gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared # Structured logging gem 'lograge', '~> 0.5' # rubocop:todo Gemfile/MissingFeatureCategory -gem 'grape_logging', '~> 1.8', feature_category: :api +gem 'grape_logging', '~> 1.8', '>= 1.8.4', feature_category: :api # DNS Lookup gem 'gitlab-net-dns', '~> 0.9.2' # rubocop:todo Gemfile/MissingFeatureCategory diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index 8648c235f491..e00e49f2f69e 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -203,70 +203,70 @@ GEM acme-client (2.0.11) faraday (>= 1.0, < 3.0.0) faraday-retry (~> 1.0) - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actionmailbox (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.0.8.1) + actionpack (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activesupport (= 7.0.8.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) + actionpack (7.0.8.1) + actionview (= 7.0.8.1) + activesupport (= 7.0.8.1) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + actiontext (7.0.8.1) + actionpack (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.0.8.1) + activesupport (= 7.0.8.1) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.0.8.1) + activesupport (= 7.0.8.1) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.0.8.1) + activesupport (= 7.0.8.1) + activerecord (7.0.8.1) + activemodel (= 7.0.8.1) + activesupport (= 7.0.8.1) activerecord-explain-analyze (0.1.0) activerecord (>= 4) pg - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activestorage (7.0.8.1) + actionpack (= 7.0.8.1) + activejob (= 7.0.8.1) + activerecord (= 7.0.8.1) + activesupport (= 7.0.8.1) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.0.8.1) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -302,8 +302,6 @@ GEM atlassian-jwt (0.2.1) jwt (~> 2.1) attr_required (1.0.1) - autoprefixer-rails (10.2.5.1) - execjs (> 0) awesome_print (1.9.2) awrence (1.2.1) aws-eventstream (1.3.0) @@ -311,7 +309,7 @@ GEM aws-sdk-cloudformation (1.41.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-core (3.191.1) + aws-sdk-core (3.191.3) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.8) @@ -319,7 +317,7 @@ GEM aws-sdk-kms (1.76.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.143.0) + aws-sdk-s3 (1.144.0) aws-sdk-core (~> 3, >= 3.191.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.8) @@ -328,7 +326,7 @@ GEM axe-core-api (4.8.0) dumb_delegator virtus - axe-core-rspec (4.8.0) + axe-core-rspec (4.8.2) axe-core-api dumb_delegator virtus @@ -392,7 +390,7 @@ GEM activesupport (>= 4.0.0) mime-types (>= 1.16) ssrf_filter (~> 1.0, < 1.1.0) - cbor (0.5.9.6) + cbor (0.5.9.8) character_set (1.8.0) charlock_holmes (0.7.7) chef-config (18.3.0) @@ -435,7 +433,7 @@ GEM git css_parser (1.14.0) addressable - cssbundling-rails (1.3.3) + cssbundling-rails (1.4.0) railties (>= 6.0.0) cvss-suite (3.0.1) danger (9.4.2) @@ -463,8 +461,8 @@ GEM dead_end (3.1.1) deb_version (1.0.2) debug_inspector (1.1.0) - deckar01-task_list (2.3.3) - html-pipeline + deckar01-task_list (2.3.4) + html-pipeline (~> 2.0) declarative (0.0.20) declarative_policy (1.1.0) deprecation_toolkit (1.5.1) @@ -501,7 +499,7 @@ GEM diffy (3.4.2) digest-crc (0.6.5) rake (>= 12.0.0, < 14.0.0) - discordrb-webhooks (3.4.2) + discordrb-webhooks (3.5.0) rest-client (>= 2.0.0) docile (1.4.0) domain_name (0.5.20190701) @@ -602,7 +600,7 @@ GEM faraday (>= 0.15) fast_blank (1.0.1) fast_gettext (2.3.0) - ffaker (2.10.0) + ffaker (2.23.0) ffi (1.15.5) ffi-compiler (1.0.1) ffi (>= 1.0.0) @@ -685,14 +683,14 @@ GEM git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - gitaly (16.9.0.pre.rc3) + gitaly (16.10.0.pre.rc1) grpc (~> 1.0) gitlab (4.19.0) httparty (~> 0.20) terminal-table (>= 1.5.1) gitlab-chronic (0.10.5) numerizer (~> 0.2) - gitlab-dangerfiles (4.6.0) + gitlab-dangerfiles (4.7.0) danger (>= 9.3.0) danger-gitlab (>= 8.0.0) rake (~> 13.0) @@ -705,7 +703,7 @@ GEM fog-core (= 2.1.0) fog-json (~> 1.2.0) mime-types - gitlab-glfm-markdown (0.0.12) + gitlab-glfm-markdown (0.0.13) rb_sys (~> 0.9.86) gitlab-labkit (0.35.1) actionpack (>= 5.0.0, < 8.0.0) @@ -741,7 +739,7 @@ GEM omniauth (>= 1.3, < 3) pyu-ruby-sasl (>= 0.0.3.3, < 0.1) rubyntlm (~> 0.5) - gitlab_quality-test_tooling (1.14.2) + gitlab_quality-test_tooling (1.17.0) activesupport (>= 6.1, < 7.1) amatch (~> 0.4.1) gitlab (~> 4.19) @@ -828,7 +826,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - google-protobuf (3.25.2) + google-protobuf (3.25.3) googleapis-common-protos (1.4.0) google-protobuf (~> 3.14) googleapis-common-protos-types (~> 1.2) @@ -850,7 +848,7 @@ GEM mustermann-grape (~> 1.0.0) rack (>= 1.3.0) rack-accept - grape-entity (0.10.0) + grape-entity (0.10.2) activesupport (>= 3.0.0) multi_json (>= 1.3.2) grape-path-helpers (2.0.1) @@ -968,8 +966,8 @@ GEM jaeger-client (1.1.0) opentracing (~> 0.3) thrift - jaro_winkler (1.5.4) - jira-ruby (2.1.4) + jaro_winkler (1.5.6) + jira-ruby (2.3.0) activesupport atlassian-jwt multipart-post @@ -1011,7 +1009,7 @@ GEM kaminari-core (1.2.2) kas-grpc (0.4.0) grpc (~> 1.0) - knapsack (1.21.1) + knapsack (1.22.0) rake kramdown (2.3.2) rexml @@ -1270,7 +1268,7 @@ GEM tty-color (~> 0.5) peek (1.1.0) railties (>= 4.0.0) - pg (1.5.4) + pg (1.5.6) pg_query (5.1.0) google-protobuf (>= 3.22.3) plist (3.7.0) @@ -1285,7 +1283,7 @@ GEM prime (0.1.2) forwardable singleton - prism (0.19.0) + prism (0.24.0) proc_to_ast (0.1.0) coderay parser @@ -1312,7 +1310,7 @@ GEM pyu-ruby-sasl (0.0.3.3) raabro (1.4.0) racc (1.6.2) - rack (2.2.8) + rack (2.2.8.1) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.7.0) @@ -1334,20 +1332,20 @@ GEM rack-test (2.1.0) rack (>= 1.3) rack-timeout (0.6.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails (7.0.8.1) + actioncable (= 7.0.8.1) + actionmailbox (= 7.0.8.1) + actionmailer (= 7.0.8.1) + actionpack (= 7.0.8.1) + actiontext (= 7.0.8.1) + actionview (= 7.0.8.1) + activejob (= 7.0.8.1) + activemodel (= 7.0.8.1) + activerecord (= 7.0.8.1) + activestorage (= 7.0.8.1) + activesupport (= 7.0.8.1) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.0.8.1) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -1361,9 +1359,9 @@ GEM rails-i18n (7.0.3) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + railties (7.0.8.1) + actionpack (= 7.0.8.1) + activesupport (= 7.0.8.1) method_source rake (>= 12.2) thor (~> 1.0) @@ -1374,7 +1372,7 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb_sys (0.9.86) - rbtrace (0.4.14) + rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) @@ -1385,13 +1383,19 @@ GEM json recursive-open-struct (1.1.3) redcarpet (3.6.0) - redis (4.8.0) + redis (5.0.8) + redis-client (>= 0.17.0) redis-actionpack (5.4.0) actionpack (>= 5, < 8) redis-rack (>= 2.1.0, < 4) redis-store (>= 1.1.0, < 2) - redis-client (0.19.0) + redis-client (0.21.1) connection_pool + redis-cluster-client (0.7.5) + redis-client (~> 0.12) + redis-clustering (5.0.8) + redis (= 5.0.8) + redis-cluster-client (>= 0.7.0) redis-namespace (1.10.0) redis (>= 4) redis-rack (3.0.0) @@ -1454,7 +1458,7 @@ GEM rspec-parameterized-table_syntax (1.0.0) binding_of_caller rspec-parameterized-core (< 2) - rspec-rails (6.1.0) + rspec-rails (6.1.1) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) @@ -1467,11 +1471,10 @@ GEM rspec-support (3.12.0) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rspec_profiling (0.0.6) + rspec_profiling (0.0.8) activerecord - pg + get_process_mem rails - sqlite3 rubocop (1.57.2) json (~> 2.3) language_server-protocol (>= 3.17.0) @@ -1505,18 +1508,18 @@ GEM ruby-fogbugz (0.3.0) crack (~> 0.4) multipart-post (~> 2.0) - ruby-lsp (0.13.3) + ruby-lsp (0.14.4) language_server-protocol (~> 3.17.0) - prism (>= 0.19.0, < 0.20) - sorbet-runtime (>= 0.5.5685) - ruby-lsp-rails (0.2.8) + prism (>= 0.22.0, < 0.25) + sorbet-runtime (>= 0.5.10782) + ruby-lsp-rails (0.3.1) actionpack (>= 6.0) activerecord (>= 6.0) railties (>= 6.0) - ruby-lsp (>= 0.13.0, < 0.14.0) + ruby-lsp (>= 0.14.2, < 0.15.0) sorbet-runtime (>= 0.5.9897) - ruby-lsp-rspec (0.1.8) - ruby-lsp (~> 0.13.0) + ruby-lsp-rspec (0.1.10) + ruby-lsp (~> 0.14.0) ruby-magic (0.6.0) mini_portile2 (~> 2.8) ruby-openai (3.7.0) @@ -1540,14 +1543,6 @@ GEM sanitize (6.0.2) crass (~> 1.0.2) nokogiri (>= 1.12.0) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) @@ -1555,12 +1550,12 @@ GEM seed-fu (2.3.7) activerecord (>= 3.1) activesupport (>= 3.1) - selenium-webdriver (4.17.0) + selenium-webdriver (4.18.1) base64 (~> 0.2) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - semver_dialects (1.6.1) + semver_dialects (2.0.0) deb_version (~> 1.0.1) pastel (~> 0.8.0) thor (~> 1.3) @@ -1622,7 +1617,7 @@ GEM thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9, >= 0.9.24) - sorbet-runtime (0.5.11144) + sorbet-runtime (0.5.11266) spamcheck (1.3.0) grpc (~> 1.0) spring (4.1.0) @@ -1636,8 +1631,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.0) - mini_portile2 (~> 2.8.0) ssh_data (1.3.0) ssrf_filter (1.0.8) stackprof (0.2.25) @@ -1678,7 +1671,7 @@ GEM test_file_finder (0.2.1) faraday (>= 1.0, < 3.0, != 2.0.0) text (1.3.1) - thor (1.3.0) + thor (1.3.1) thread_safe (0.3.6) thrift (0.16.0) tilt (2.0.11) @@ -1759,7 +1752,7 @@ GEM activesupport (>= 3.0) version_gem (1.1.0) version_sorter (2.3.0) - view_component (3.8.0) + view_component (3.11.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1790,7 +1783,7 @@ GEM webfinger (1.2.0) activesupport httpclient (>= 2.4) - webmock (3.20.0) + webmock (3.22.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -1833,14 +1826,13 @@ DEPENDENCIES asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.8.0) asciidoctor-plantuml (~> 0.0.16) - atlassian-jwt (~> 0.2.0) + atlassian-jwt (~> 0.2.1) attr_encrypted (~> 3.2.4)! - autoprefixer-rails (= 10.2.5.1) awesome_print aws-sdk-cloudformation (~> 1) - aws-sdk-core (~> 3.191.1) - aws-sdk-s3 (~> 1.143.0) - axe-core-rspec (~> 4.8.0) + aws-sdk-core (~> 3.191.3) + aws-sdk-s3 (~> 1.144.0) + axe-core-rspec (~> 4.8.2) babosa (~> 2.0) base32 (~> 0.3.0) batch-loader (~> 2.0.1) @@ -1866,11 +1858,11 @@ DEPENDENCIES countries (~> 4.0.0) creole (~> 0.5.0) crystalball (~> 0.7.0) - cssbundling-rails (= 1.3.3) + cssbundling-rails (= 1.4.0) csv_builder! cvss-suite (~> 3.0.1) database_cleaner-active_record (~> 2.1.0) - deckar01-task_list (= 2.3.3) + deckar01-task_list (= 2.3.4) declarative_policy (~> 1.1.0) deprecation_toolkit (~> 1.5.1) derailed_benchmarks @@ -1881,7 +1873,7 @@ DEPENDENCIES devise-two-factor (~> 4.1.1) diff_match_patch (~> 0.1.0)! diffy (~> 3.4) - discordrb-webhooks (~> 3.4) + discordrb-webhooks (~> 3.5) doorkeeper (~> 5.6, >= 5.6.6) doorkeeper-openid_connect (~> 1.8, >= 1.8.7) duo_api (~> 1.3) @@ -1896,7 +1888,7 @@ DEPENDENCIES faraday (~> 1.0) faraday_middleware-aws-sigv4 (~> 0.3.0) fast_blank (~> 1.0.1) - ffaker (~> 2.10) + ffaker (~> 2.23) flipper (~> 0.26.2) flipper-active_record (~> 0.26.2) flipper-active_support_cache_store (~> 0.26.2) @@ -1907,15 +1899,15 @@ DEPENDENCIES fog-local (~> 0.8) fugit (~> 1.8.1) fuubar (~> 2.2.0) - gettext (~> 3.3) + gettext (~> 3.4, >= 3.4.9) gettext_i18n_rails (~> 1.11.0) - gitaly (~> 16.9.0.pre.rc3) + gitaly (~> 16.10.0.pre.rc1) gitlab-backup-cli! gitlab-chronic (~> 0.10.5) - gitlab-dangerfiles (~> 4.6.0) + gitlab-dangerfiles (~> 4.7.0) gitlab-experiment (~> 0.9.1) gitlab-fog-azure-rm (~> 1.8.0) - gitlab-glfm-markdown (~> 0.0.12) + gitlab-glfm-markdown (~> 0.0.13) gitlab-housekeeper! gitlab-http! gitlab-labkit (~> 0.35.1) @@ -1934,7 +1926,7 @@ DEPENDENCIES gitlab-utils! gitlab_chronic_duration (~> 0.12) gitlab_omniauth-ldap (~> 2.2.0) - gitlab_quality-test_tooling (~> 1.14.2) + gitlab_quality-test_tooling (~> 1.17.0) gon (~> 6.4.0) google-apis-androidpublisher_v3 (~> 0.34.0) google-apis-cloudbilling_v1 (~> 0.21.0) @@ -1950,15 +1942,15 @@ DEPENDENCIES google-cloud-artifact_registry-v1 (~> 0.11.0) google-cloud-compute-v1 (~> 2.6.0) google-cloud-storage (~> 1.45.0) - google-protobuf (~> 3.25, >= 3.25.1) + google-protobuf (~> 3.25, >= 3.25.3) googleauth (~> 1.8.1) gpgme (~> 2.0.23) grape (~> 2.0.0) - grape-entity (~> 0.10.0) - grape-path-helpers (~> 2.0.0) + grape-entity (~> 0.10.2) + grape-path-helpers (~> 2.0.1) grape-swagger (~> 2.0.1) grape-swagger-entity (~> 0.5.1) - grape_logging (~> 1.8) + grape_logging (~> 1.8, >= 1.8.4) graphiql-rails (~> 1.8.0) graphlient (~> 0.6.0) graphlyte (~> 1.0.0) @@ -1980,7 +1972,7 @@ DEPENDENCIES ipaddr (~> 1.2.5) ipaddress (~> 0.8.3) ipynbdiff! - jira-ruby (~> 2.1.4) + jira-ruby (~> 2.3.0) js_regex (~> 3.8) json (~> 2.6.3) json_schemer (~> 0.2.18) @@ -1988,7 +1980,7 @@ DEPENDENCIES jwt (~> 2.5) kaminari (~> 1.2.2) kas-grpc (~> 0.4.0) - knapsack (~> 1.21.1) + knapsack (~> 1.22.0) kramdown (~> 2.3.1) kubeclient (~> 4.11.0) lefthook (~> 1.5.6) @@ -2041,13 +2033,13 @@ DEPENDENCIES openid_connect (= 1.3.0) openssl (~> 3.0) org-ruby (~> 0.9.12) - os (~> 1.1) + os (~> 1.1, >= 1.1.4) pact (~> 1.64) parallel (~> 1.19) parser (~> 3.3, >= 3.3.0.2) parslet (~> 1.8) peek (~> 1.1) - pg (~> 1.5.4) + pg (~> 1.5.6) pg_query (~> 5.1.0) png_quantizator (~> 0.2.1) premailer-rails (~> 1.10.3) @@ -2056,21 +2048,22 @@ DEPENDENCIES pry-rails (~> 0.3.9) pry-shell (~> 0.6.4) puma (= 6.4.0) - rack (~> 2.2.8) + rack (~> 2.2.8.1) rack-attack (~> 6.7.0) rack-cors (~> 2.0.1) rack-oauth2 (~> 1.21.3) rack-proxy (~> 0.7.7) rack-timeout (~> 0.6.3) - rails (~> 7.0.8) + rails (~> 7.0.8.1) rails-controller-testing rails-i18n (~> 7.0) rainbow (~> 3.0) rbtrace (~> 0.4) re2 (= 2.7.0) recaptcha (~> 5.12) - redis (~> 4.8.0) + redis (~> 5.0.0) redis-actionpack (~> 5.4.0) + redis-clustering (~> 5.0.0) redis-namespace (~> 1.10.0) request_store (~> 1.5.1) responders (~> 3.0) @@ -2080,15 +2073,15 @@ DEPENDENCIES rqrcode (~> 2.0) rspec-benchmark (~> 0.6.0) rspec-parameterized (~> 1.0) - rspec-rails (~> 6.1.0) + rspec-rails (~> 6.1.1) rspec-retry (~> 0.6.2) rspec_junit_formatter - rspec_profiling (~> 0.0.6) + rspec_profiling (~> 0.0.8) rubocop ruby-fogbugz (~> 0.3.0) - ruby-lsp (~> 0.13.3) - ruby-lsp-rails (~> 0.2.8) - ruby-lsp-rspec (~> 0.1.8) + ruby-lsp (~> 0.14.4) + ruby-lsp-rails (~> 0.3.0) + ruby-lsp-rspec (~> 0.1.10) ruby-magic (~> 0.6) ruby-openai (~> 3.7) ruby-progressbar (~> 1.10) @@ -2096,11 +2089,10 @@ DEPENDENCIES rubyzip (~> 2.3.2) rugged (~> 1.6) sanitize (~> 6.0.2) - sassc-rails (~> 2.1.0) sd_notify (~> 0.1.0) seed-fu (~> 2.3.7) - selenium-webdriver (~> 4.17) - semver_dialects (~> 1.6.1) + selenium-webdriver (~> 4.18, >= 4.18.1) + semver_dialects (~> 2.0) sentry-rails (~> 5.10.0) sentry-raven (~> 3.1) sentry-ruby (~> 5.10.0) @@ -2140,16 +2132,16 @@ DEPENDENCIES valid_email (~> 0.1) validates_hostname (~> 1.0.13) version_sorter (~> 2.3) - view_component (~> 3.8.0) + view_component (~> 3.11.0) vite_rails (~> 3.0.17) vite_ruby (~> 3.5.0) vmstat (~> 2.3.0) warning (~> 1.3.0) webauthn (~> 3.0) - webmock (~> 3.20.0) + webmock (~> 3.22.0) webrick (~> 1.8.1) wikicloth (= 0.8.1) yajl-ruby (~> 1.4.3) BUNDLED WITH - 2.5.5 + 2.5.6 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 06b5399a0836..2520955593de 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -17,10 +17,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "117vxic67jnw6q637kmsb3ryj0x485295pz9a9y4z8xn9bdlsl0z"; + sha256 = "0j86qjs1zw34p0p7d5napa1vvwqlvm9nmv7ckxxhcba1qv4dspmw"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -28,10 +28,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r8ldj2giaz8cn49qkdqn5zc29gbsr5ky4fg6r7ali0yh1xh684l"; + sha256 = "1f68h8cl6dqbz7mq3x43s0s82291nani3bz1hrxkk2qpgda23mw9"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -39,10 +39,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w6gvj7ybniq89834hqww9rj2xypz9l91f8niwaws2yq1qklymr2"; + sha256 = "077j47jsg0wqwx5b13n4h0g3g409b6kfrlazpzgjpa3pal74f7sc"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -50,10 +50,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; + sha256 = "0jh83rqd6glys1b2wsihzsln8yk6zdwgiyn9xncyiav9rcwjpkax"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -61,10 +61,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i47r3n2m8qm002gx7c0lx1pv15pr2zy57dm8j38x960rsb655pp"; + sha256 = "044qi3zhzxlfq7slc2pb9ky9mdivp1m1sjyhjvnsi64ggq7cvr22"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -72,10 +72,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; + sha256 = "1ygpg75f3ffdcbxvf7s14xw3hcjin1nnx1nk3mg9mj2xc1nb60aa"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -83,32 +83,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1cn1ic7ml75jm0c10s7cm5mvcgfnafj0kjvvjavpjcxgz6lxcqyb"; + sha256 = "0yql9v4cd1xbqgnzlf3cv4a6sm26v2y4gsgcbbfgvfc0hhlfjklg"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activemodel = { dependencies = ["activesupport"]; - groups = ["default" "development" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; + sha256 = "0grdpvglh0cj96qhlxjj9bcfqkh13c1pfpcwc9ld3aw0yzvsw5a1"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; - groups = ["default" "test"]; + groups = ["default" "development" "monorepo" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; + sha256 = "0rlky1cr5kcdl0jad3nk5jpim6vjzbgkfhxnk7y492b3j2nznpcf"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activerecord-explain-analyze = { dependencies = ["activerecord" "pg"]; @@ -137,10 +137,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d6vm6alsp0g6f3548b615zxbz8l2wrmaikwgsf8kv11wf6swb4c"; + sha256 = "0f4g3589i5ii4gdfazv6d9rjinr16aarh6g12v8378ck7jll3mhz"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -148,10 +148,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; + sha256 = "0ff3x7q400flzhml131ix8zfwmh13h70rs6yzbzf513g781gbbxh"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; acts-as-taggable-on = { dependencies = ["activerecord"]; @@ -343,17 +343,6 @@ src: }; version = "1.0.1"; }; - autoprefixer-rails = { - dependencies = ["execjs"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1vlqwy2qkp39ibp7llj7ps53nvxav29c2yl451v1qdhj25zxc49p"; - type = "gem"; - }; - version = "10.2.5.1"; - }; awesome_print = { groups = ["development" "test"]; platforms = []; @@ -411,10 +400,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fy80878z21j8py03ddf1ycsndzmnmw4jkbzw1mlrglwav08yq7q"; + sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns"; type = "gem"; }; - version = "3.191.1"; + version = "3.191.3"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -433,10 +422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s"; + sha256 = "0ypg31pfzbd43n1m20cyf6gyrlv6m0c8hmk2p5hidy1y4pi34f6g"; type = "gem"; }; - version = "1.143.0"; + version = "1.144.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -466,10 +455,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj"; + sha256 = "14h4abf5h242a0vn2r05pkr8311qbxgkl63py7vbhx8bfpk1kq3i"; type = "gem"; }; - version = "4.8.0"; + version = "4.8.2"; }; axiom-types = { dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; @@ -772,10 +761,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0511idr8xps9625nh3kxr68sdy6l3xy2kcz7r57g47fxb1v18jj3"; + sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y"; type = "gem"; }; - version = "0.5.9.6"; + version = "0.5.9.8"; }; CFPropertyList = { dependencies = ["rexml"]; @@ -1058,10 +1047,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m8qgrh70982xfdcylrm4zgh7pxq9ps539icnc7bqh1awl8k78aa"; + sha256 = "1nzp4j1ll6llgbrvqk81gkz6fqgk33sx4k1fcvbm7v7h79jk8808"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.0"; }; csv_builder = { groups = ["default"]; @@ -1181,10 +1170,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n67q9rb4gsfs8k2fsd08xcfx13z7mcyyyrb9hi0sv0yz3rvm2li"; + sha256 = "0rqn9jh45gsw045c6fm05875bpj2xbhnff5m5drmk9wy01zdrav6"; type = "gem"; }; - version = "2.3.3"; + version = "2.3.4"; }; declarative = { groups = ["default"]; @@ -1337,10 +1326,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0viw73jd9vs9f92a9q2vxcd29755h7w8jwz36jmvcdl2najainyg"; + sha256 = "1c933kq48sqja1a2fc4ki9w8x5ajl6lp67hslka5k05hwfyaiysj"; type = "gem"; }; - version = "3.4.2"; + version = "3.5.0"; }; docile = { groups = ["coverage" "default" "development" "test"]; @@ -1876,14 +1865,14 @@ src: version = "2.3.0"; }; ffaker = { - groups = ["development" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01z5lpssjc0n8lm4xrlja0hh8lv4ngzbybjvd4rdkc5x9ddvh8s3"; + sha256 = "1644hpjg7k08dsjhljwg4grs49riaw6bxp5xf62jrac4q9fgnbcx"; type = "gem"; }; - version = "2.10.0"; + version = "2.23.0"; }; ffi = { groups = ["default" "development" "kerberos" "puma" "test"]; @@ -2160,10 +2149,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07q9fmk4mddfn12vl3jvj80rxmhixkl99hxff7zi385rwphki8an"; + sha256 = "1nwc8mlpznq9b7rgcbxwzaj936pn0syjasxdhplpiz3iqbr64ca8"; type = "gem"; }; - version = "16.9.0.pre.rc3"; + version = "16.10.0.pre.rc1"; }; gitlab = { dependencies = ["httparty" "terminal-table"]; @@ -2203,10 +2192,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07kl43xcjfwdlcfvr7ifzggl6zpmm8q0lj8phlk3db8xgnqkf6s4"; + sha256 = "1jj5w7h457cm2q0ds63kp29ybkq1h02gibn37y2r0wnbimm8fxi5"; type = "gem"; }; - version = "4.6.0"; + version = "4.7.0"; }; gitlab-experiment = { dependencies = ["activesupport" "request_store"]; @@ -2236,10 +2225,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mqwz2a4k9894d160k5a3mqm5g6p9rncgi4kx8w8dymbnz34bcli"; + sha256 = "0nk9kp3zb2x1hpqirq7x2qqpmfsqq4izprbicxjb20bqvm4mvvdb"; type = "gem"; }; - version = "0.0.12"; + version = "0.0.13"; }; gitlab-housekeeper = { dependencies = ["activesupport" "awesome_print" "httparty" "rubocop"]; @@ -2433,10 +2422,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n7ndhxkjkz7pfdqvcp90lxxias3lz2ssabpv5a5nxayilr47qwy"; + sha256 = "1d59k5c0y8vkmz7fjh7x455d4d19fpw4r9agv02vqyvp7glrbm34"; type = "gem"; }; - version = "1.14.2"; + version = "1.17.0"; }; globalid = { dependencies = ["activesupport"]; @@ -2728,10 +2717,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw"; + sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r"; type = "gem"; }; - version = "3.25.2"; + version = "3.25.3"; }; googleapis-common-protos = { dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; @@ -2790,14 +2779,14 @@ src: }; grape-entity = { dependencies = ["activesupport" "multi_json"]; - groups = ["default"]; + groups = ["default" "development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zic5fx8s0424vdarhslmxdqmfnlfv3k4prfyxrrwvf9pdy1xvcs"; + sha256 = "0wdm44s7l6jxqszybf58ar7699vlq7vj2zfsi8f9sh9mh5a89dcy"; type = "gem"; }; - version = "0.10.0"; + version = "0.10.2"; }; grape-path-helpers = { dependencies = ["activesupport" "grape" "rake" "ruby2_keywords"]; @@ -3293,10 +3282,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; + sha256 = "10fd3i92897blalxfkgc0jjv0qqx31v7cm7j2b6a3b97an0bfz80"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; jira-ruby = { dependencies = ["activesupport" "atlassian-jwt" "multipart-post" "oauth"]; @@ -3304,10 +3293,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17nv98nz3jp7q5hbnniscavqh4xv53mnda1vxyg3ncn8raaw0rs2"; + sha256 = "0qpbc97sag426h4hgcizqq2njxx5fridzxq6mq5s93jazxmnxwmb"; type = "gem"; }; - version = "2.1.4"; + version = "2.3.0"; }; jmespath = { groups = ["default"]; @@ -3454,10 +3443,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "056g86ndhq51303k4g3fhdfwhpr6cpzypxhlnp0wxjpbmli09xw2"; + sha256 = "1jqs9shqg3nd6j3kzbh8gxv7ix1n877y64kdjzbrwjgz6ksqs9mx"; type = "gem"; }; - version = "1.21.1"; + version = "1.22.0"; }; kramdown = { dependencies = ["rexml"]; @@ -4614,14 +4603,14 @@ src: version = "1.1.0"; }; pg = { - groups = ["default" "test"]; + groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; + sha256 = "071b55bhsz7mivlnp2kv0a11msnl7xg5awvk8mlflpl270javhsb"; type = "gem"; }; - version = "1.5.4"; + version = "1.5.6"; }; pg_query = { dependencies = ["google-protobuf"]; @@ -4692,10 +4681,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; + sha256 = "0pgxgng905jbhp0pr54w4w2pr4nqcq80ijj48204bj4x4nigj8ji"; type = "gem"; }; - version = "0.19.0"; + version = "0.24.0"; }; proc_to_ast = { dependencies = ["coderay" "parser" "unparser"]; @@ -4830,10 +4819,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15rdwbyk71c9nxvd527bvb8jxkcys8r3dj3vqra5b3sa63qs30vv"; + sha256 = "10mpk0hl6hnv324fp1pfimi2nw9acj0z4gyhrph36qg84pk1s4m7"; type = "gem"; }; - version = "2.2.8"; + version = "2.2.8.1"; }; rack-accept = { dependencies = ["rack"]; @@ -4939,10 +4928,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rsqin156dawz7gzpy1ijs02afqcr4704vqj56s6yxng3a9ayhwf"; + sha256 = "1v9dp9sgh8kk32r23mj66zjni7w1dv2h7mbaxgmazsf59a43gsvx"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rails-controller-testing = { dependencies = ["actionpack" "actionview" "activesupport"]; @@ -4994,10 +4983,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; + sha256 = "08ga56kz6a37dnlmi7y45r19fcc7jzb62mrc3ifavbzggmhy7r62"; type = "gem"; }; - version = "7.0.8"; + version = "7.0.8.1"; }; rainbow = { groups = ["coverage" "default" "development" "test"]; @@ -5056,10 +5045,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s8prj0klfgpmpfcpdzbf149qrrsdxgnb6w6kkqc9gyars4vyaqn"; + sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8"; type = "gem"; }; - version = "0.4.14"; + version = "0.5.1"; }; rchardet = { groups = ["default" "development"]; @@ -5124,14 +5113,15 @@ src: version = "4.3.3"; }; redis = { + dependencies = ["redis-client"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4a8hxxcxci3n8hhlm9a8wa7a9m58r6sjvh4749v7362i8cy010"; + sha256 = "1n7k4sgx5vzsigp8c15flz4fclqy4j2a33vim7b2c2w5jyjhwxrv"; type = "gem"; }; - version = "4.8.0"; + version = "5.0.8"; }; redis-actionpack = { dependencies = ["actionpack" "redis-rack" "redis-store"]; @@ -5150,10 +5140,32 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9jaqsdc2s2qm713pdv19dawk1b11vxnfclsps7ra2szwisznbf"; + sha256 = "0irk5j73aqhyv54q3vs88y5rp9a5fkvbdif7zn5q7m5d51h2375w"; type = "gem"; }; - version = "0.19.0"; + version = "0.21.1"; + }; + redis-cluster-client = { + dependencies = ["redis-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12p7wi39zaldk8lr484j4j6w49502fxayinfs9f7l58pvag1rz8j"; + type = "gem"; + }; + version = "0.7.5"; + }; + redis-clustering = { + dependencies = ["redis" "redis-cluster-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rp1yrqpvi29ar6mlqsyk36nxgh1drijb4f5xa76c057n7iksbwf"; + type = "gem"; + }; + version = "5.0.8"; }; redis-namespace = { dependencies = ["redis"]; @@ -5428,10 +5440,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dpmbq2awsjiwn300cafp9fbvv86dl7zrb760anhmm1qw8yzg1my"; + sha256 = "1clmx6qzdbpm1g8ycg38gjbqsbr8ccqi6hqyx88g8yckz1hrx55x"; type = "gem"; }; - version = "6.1.0"; + version = "6.1.1"; }; rspec-retry = { dependencies = ["rspec-core"]; @@ -5466,15 +5478,15 @@ src: version = "0.6.0"; }; rspec_profiling = { - dependencies = ["activerecord" "pg" "rails" "sqlite3"]; + dependencies = ["activerecord" "get_process_mem" "rails"]; groups = ["test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vkfizrwxgs029s9imz8g3p55ggncls709hf98brmv6wg5znjibs"; + sha256 = "0icl94f0mmw7g4h1qnsil0cw6zw7b5wv0ilxda01928vh5bf87mk"; type = "gem"; }; - version = "0.0.6"; + version = "0.0.8"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -5581,10 +5593,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b9aj7d1wh4s83mkfsvjgkikx83c7afyzy6k2940fx08hfrdqgb8"; + sha256 = "1v0dwirw4mq7qkf5a7wvagil4ppvk4dw4ln8hs6rmf2xrf56ga5f"; type = "gem"; }; - version = "0.13.3"; + version = "0.14.4"; }; ruby-lsp-rails = { dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; @@ -5592,10 +5604,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1j2pb9d9frdh6rpz5qcvhmqswqdmmxa392z2nv1rnk60cpxclc0p"; + sha256 = "033kxj55pywnc4cjqcfb2jvn96nsa93m93qd2p636jf5hkqazq41"; type = "gem"; }; - version = "0.2.8"; + version = "0.3.1"; }; ruby-lsp-rspec = { dependencies = ["ruby-lsp"]; @@ -5603,10 +5615,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18qfm86bafybm93kz1bn2z86gwaax3c57i25g4lzgv6pp9aj5nr1"; + sha256 = "0npxb9146yqfwpyx3bw375q8vx60ph2zgbvpai1dmgq8dfs3idki"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.10"; }; ruby-magic = { dependencies = ["mini_portile2"]; @@ -5754,28 +5766,6 @@ src: }; version = "6.0.2"; }; - sassc = { - dependencies = ["ffi"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gpqv48xhl8mb8qqhcifcp0pixn206a7imc07g48armklfqa4q2c"; - type = "gem"; - }; - version = "2.4.0"; - }; - sassc-rails = { - dependencies = ["railties" "sassc" "sprockets" "sprockets-rails" "tilt"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1d9djmwn36a5m8a83bpycs48g8kh1n2xkyvghn7dr6zwh4wdyksz"; - type = "gem"; - }; - version = "2.1.2"; - }; sawyer = { dependencies = ["addressable" "faraday"]; groups = ["danger" "default" "development" "test"]; @@ -5814,10 +5804,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g3l3invk95w1f72mpp0r4hc3vsc3070c1xd1wg76kfg2r182xnq"; + sha256 = "1asysih4l1mv24wqxrbnz0c0454kw3dhqaj6nsa8pyn9fjjdms5b"; type = "gem"; }; - version = "4.17.0"; + version = "4.18.1"; }; semver_dialects = { dependencies = ["deb_version" "pastel" "thor" "tty-command"]; @@ -5825,10 +5815,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13jmbqzswvkq0xds2s1r6wnh78gfy2zbn35qvalhwj2qi4nmjpvf"; + sha256 = "11s5nr5v81qjlf2glgqjisvnv12vmwsmi9abbzqkb1nqjhw43691"; type = "gem"; }; - version = "1.6.1"; + version = "2.0.0"; }; sentry-rails = { dependencies = ["railties" "sentry-ruby"]; @@ -6076,10 +6066,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18280l1wgdmr9xhr4mzxr4ycskwbgjzd91vmdzx0dlp6xp2dydnb"; + sha256 = "1fsq1k58isarg6ycg2ix9sw9a6391y12ss48m3hcryqi902w7cny"; type = "gem"; }; - version = "0.5.11144"; + version = "0.5.11266"; }; spamcheck = { dependencies = ["grpc"]; @@ -6145,17 +6135,6 @@ src: }; version = "3.4.2"; }; - sqlite3 = { - dependencies = ["mini_portile2"]; - groups = ["default" "test"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0f24qp50mc1qg8yvv7b3x73mh78d6mzd3b7rqib1ixfbsdiayx1x"; - type = "gem"; - }; - version = "1.6.0"; - }; ssh_data = { groups = ["default"]; platforms = []; @@ -6398,14 +6377,14 @@ src: version = "1.3.1"; }; thor = { - groups = ["default" "development" "monorepo" "omnibus" "test"]; + groups = ["default" "development" "omnibus" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; + sha256 = "1vq1fjp45az9hfp6fxljhdrkv75cvbab1jfrwcw738pnsiqk8zps"; type = "gem"; }; - version = "1.3.0"; + version = "1.3.1"; }; thread_safe = { groups = ["default" "test"]; @@ -6812,10 +6791,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xn5q1mbhwalx16mj441pzbm8hkxdmwxwzdjcj86f3bfnpipzh9y"; + sha256 = "1zy51z0whkm3fdpsbi8v4j8h5h3ia1zkc2j28amiznpqqvfc7539"; type = "gem"; }; - version = "3.8.0"; + version = "3.11.0"; }; virtus = { dependencies = ["axiom-types" "coercible" "descendants_tracker"]; @@ -6909,10 +6888,10 @@ src: platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rc3g9hhxi6v2l1cp9q3kcjd92bhmdbrb517l4v5pyzwq2nflcyc"; + sha256 = "13jb9q0qv9ajw1ajr4cawnqj4h0dws3w5j4v5n6v3xk7a8rnjzr7"; type = "gem"; }; - version = "3.20.0"; + version = "3.22.0"; }; webrick = { groups = ["default" "development" "test"]; From 500b187bb95b57cb4e63adabb9bfb44d12761508 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 28 Mar 2024 09:59:07 +0100 Subject: [PATCH 195/260] gitlab-container-registry: 3.90.0 -> 3.91.0 https://gitlab.com/gitlab-org/container-registry/-/blob/v3.91.0-gitlab/CHANGELOG.md --- .../gitlab/gitlab-container-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix index 2d192219d895..fbea45b432bd 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "gitlab-container-registry"; - version = "3.90.0"; + version = "3.91.0"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-bHRvvmVQFsdgYmVVucu1warn+SvCoIVh+C/U2uwi12E="; + hash = "sha256-C6tCwVfVZ9CMP0X5NiOdPAuSz5yeu9LAnvOPrq2QLJo="; }; - vendorHash = "sha256-Zv5Xz1T/ZUM/kyEgZJKbDuIN2nufoHVAn4kD3SuvJCg="; + vendorHash = "sha256-KZWdM8Q8ipsgm7OoLyOuHo+4Vg2Nve+yZtTSUDgjOW4="; patches = [ ./Disable-inmemory-storage-driver-test.patch From 774056a4e6ba519797eecf08ba1b1ddcb0f3104a Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 28 Mar 2024 10:01:56 +0100 Subject: [PATCH 196/260] nixos/gitlab: Rename workhorse binary --- nixos/modules/services/misc/gitlab.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index e95ab0a112bc..db62d6f90901 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1578,7 +1578,9 @@ in { rm "${cfg.statePath}/config/gitlab-workhorse.json" ''; ExecStart = - "${cfg.packages.gitlab-workhorse}/bin/workhorse " + "${cfg.packages.gitlab-workhorse}/bin/${ + optionalString (lib.versionAtLeast (lib.getVersion cfg.packages.gitlab-workhorse) "16.10") "gitlab-" + }workhorse " + "-listenUmask 0 " + "-listenNetwork unix " + "-listenAddr /run/gitlab/gitlab-workhorse.socket " From afce1683c09ff117d1c15d083f7fe2655662c6d2 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 28 Mar 2024 10:09:47 +0100 Subject: [PATCH 197/260] gitlab: Simplify gitlab-assets build instructions --- pkgs/applications/version-management/gitlab/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 7782116bbdf9..ad63b76f114f 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -144,11 +144,7 @@ let buildPhase = '' runHook preBuild - bundle exec rake gettext:compile RAILS_ENV=production NODE_ENV=production - bundle exec rake rake:assets:precompile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:fix_urls RAILS_ENV=production NODE_ENV=production - bundle exec rake gitlab:assets:check_page_bundle_mixins_css_for_sideeffects RAILS_ENV=production NODE_ENV=production + bundle exec rake gitlab:assets:compile RAILS_ENV=production NODE_ENV=production SKIP_YARN_INSTALL=true runHook postBuild ''; From 4363f16d8fc29ed6c177c8b28901801d8b0a3d10 Mon Sep 17 00:00:00 2001 From: teto sse Date: Sat, 30 Mar 2024 13:26:11 +0100 Subject: [PATCH 198/260] luaPackages.luadbi-mysql: fix overrides => fix build we previously dropped the generated config, thus breaking the build --- pkgs/development/lua-modules/overrides.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index a397e59b8922..e470bef93aad 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -321,10 +321,13 @@ with prev; }); luadbi-mysql = prev.luadbi-mysql.overrideAttrs (oa: { - luarocksConfig.variables = { - # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' - MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; - MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; + + luarocksConfig = lib.recursiveUpdate oa.luarocksConfig { + variables = { + # Can't just be /include and /lib, unfortunately needs the trailing 'mysql' + MYSQL_INCDIR = "${libmysqlclient.dev}/include/mysql"; + MYSQL_LIBDIR = "${libmysqlclient}/lib/mysql"; + }; }; buildInputs = oa.buildInputs ++ [ mariadb.client From 01e1f71fdfd12faa2d6f772a710f42114a141231 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Mar 2024 10:06:46 +0100 Subject: [PATCH 199/260] vimPlugins.improved-search-nvim: init at 2023-12-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b486da092b66..06245a424013 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17057,5 +17057,17 @@ final: prev: meta.homepage = "https://github.com/GCBallesteros/jupytext.nvim/"; }; + improved-search-nvim = buildVimPlugin { + pname = "improved-search-nvim"; + version = "2023-12-21"; + src = fetchFromGitHub { + owner = "backdround"; + repo = "improved-search.nvim"; + rev = "9480bfb0e05f990a1658464c1d349dd2acfb9c34"; + sha256 = "sha256-k35uJZfarjRskS9MgCjSQ3gfl57d+r8vWvw0Uq16Z30="; + }; + meta.homepage = "https://github.com/backdround/improved-search.nvim/"; + }; + } diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7a36bbf12a30..abef949aead0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -395,6 +395,7 @@ https://github.com/edwinb/idris2-vim/,, https://github.com/3rd/image.nvim/,HEAD, https://github.com/samodostal/image.nvim/,HEAD,samodostal-image-nvim https://github.com/lewis6991/impatient.nvim/,, +https://github.com/backdround/improved-search.nvim/,HEAD, https://github.com/smjonas/inc-rename.nvim/,HEAD, https://github.com/nishigori/increment-activator/,, https://github.com/haya14busa/incsearch-easymotion.vim/,, From ef3bb68717e943bf364b4ce147313773de2a6d62 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 28 Mar 2024 10:10:44 +0100 Subject: [PATCH 200/260] vimPlugins.jupytext-nvim: fix typo in pname --- pkgs/applications/editors/vim/plugins/generated.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 06245a424013..109bf9fe1589 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -17046,7 +17046,7 @@ final: prev: }; jupytext-nvim = buildVimPlugin { - pname = "jupytest-nvim"; + pname = "jupytext-nvim"; version = "2024-01-24"; src = fetchFromGitHub { owner = "GCBallesteros"; From 204ccc2323d88dfde90c7111ee54dcd370cbbed8 Mon Sep 17 00:00:00 2001 From: Matt Leon Date: Thu, 28 Mar 2024 19:31:40 -0400 Subject: [PATCH 201/260] python-matter-server: 5.8.1 -> 5.9.0 Release notes: https://github.com/home-assistant-libs/python-matter-server/releases/tag/5.9.0 --- .../python-matter-server/default.nix | 4 +-- .../link-paa-root-certs.patch | 25 +++++++++---------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix index 034a90844508..b157eba228ac 100644 --- a/pkgs/development/python-modules/python-matter-server/default.nix +++ b/pkgs/development/python-modules/python-matter-server/default.nix @@ -55,7 +55,7 @@ in buildPythonPackage rec { pname = "python-matter-server"; - version = "5.8.1"; + version = "5.9.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -64,7 +64,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "python-matter-server"; rev = "refs/tags/${version}"; - hash = "sha256-iisDEopaKklLvvGDTo2fv0Fpkhuhd+7KoNnQA+QmjB8="; + hash = "sha256-O3AJ7vBjuwRGa4AMwWIdxn5m2F45rLCjCHeff18b/5E="; }; patches = [ diff --git a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch index 217fe42339ec..6c5271595056 100644 --- a/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch +++ b/pkgs/development/python-modules/python-matter-server/link-paa-root-certs.patch @@ -1,22 +1,21 @@ diff --git a/matter_server/server/const.py b/matter_server/server/const.py -index 2a6140b..275353a 100644 +index 8cca3cf..43f02f5 100644 --- a/matter_server/server/const.py +++ b/matter_server/server/const.py -@@ -15,7 +15,8 @@ DATA_MODEL_SCHEMA_VERSION = 6 - # and always uses the development subfolder - # regardless of anything you pass into instantiating the controller - # revisit this once matter 1.1 is released --PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = ( -+PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = pathlib.Path("@paacerts@") +@@ -14,6 +14,8 @@ DATA_MODEL_SCHEMA_VERSION = 6 + # Keep default location inherited from early version of the Python + # bindings. + DEFAULT_PAA_ROOT_CERTS_DIR: Final[pathlib.Path] = ( ++ pathlib.Path("@paacerts@")) +( pathlib.Path(__file__) .parent.resolve() .parent.resolve() diff --git a/matter_server/server/helpers/paa_certificates.py b/matter_server/server/helpers/paa_certificates.py -index d186be1..d2cef54 100644 +index e530838..fdd6025 100644 --- a/matter_server/server/helpers/paa_certificates.py +++ b/matter_server/server/helpers/paa_certificates.py -@@ -62,6 +62,8 @@ async def fetch_dcl_certificates( +@@ -64,6 +64,8 @@ async def fetch_dcl_certificates( fetch_production_certificates: bool = True, ) -> int: """Fetch DCL PAA Certificates.""" @@ -25,16 +24,16 @@ index d186be1..d2cef54 100644 LOGGER.info("Fetching the latest PAA root certificates from DCL.") fetch_count: int = 0 base_urls = set() -@@ -121,6 +123,8 @@ async def fetch_dcl_certificates( +@@ -124,6 +126,8 @@ async def fetch_dcl_certificates( - async def fetch_git_certificates() -> int: + async def fetch_git_certificates(paa_root_cert_dir: Path) -> int: """Fetch Git PAA Certificates.""" + return 0 + fetch_count = 0 LOGGER.info("Fetching the latest PAA root certificates from Git.") -@@ -162,6 +166,8 @@ async def fetch_certificates( +@@ -159,6 +163,8 @@ async def fetch_certificates( fetch_production_certificates: bool = True, ) -> int: """Fetch PAA Certificates.""" @@ -42,4 +41,4 @@ index d186be1..d2cef54 100644 + loop = asyncio.get_running_loop() - if not PAA_ROOT_CERTS_DIR.is_dir(): + if not paa_root_cert_dir.is_dir(): From 5e00ea43420a52f8a64fa43a3cd60ae363611391 Mon Sep 17 00:00:00 2001 From: Matt Leon Date: Thu, 28 Mar 2024 19:53:45 -0400 Subject: [PATCH 202/260] python3Packages.home-assistant-chip-core: 2024.2.2 -> 2024.3.2 Release notes: https://github.com/home-assistant-libs/chip-wheels/releases/tag/2024.3.2 --- .../python-modules/home-assistant-chip-core/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix index b7ca71bbb257..8f05913fbd83 100644 --- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-core"; - version = "2024.2.2"; + version = "2024.3.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -37,11 +37,11 @@ buildPythonPackage rec { system = { "aarch64-linux" = { name = "aarch64"; - hash = "sha256-lo6upkkZYQCtggNU+4/S/JTUqJnAWaWFA6NTt4C2gEM="; + hash = "sha256-li+fmEikVnTAkgQnoiWjoZaVRwGRadTYuQySR5s8VB4="; }; "x86_64-linux" = { name = "x86_64"; - hash = "sha256-VwiIH/PK4fOQCc+KSHXP1VwHVK1gYnmBXTgKDT1Yt58="; + hash = "sha256-iUKtAz00qFklTW2ilUPGAWhpqDmnLb6D3Zdy1oHpQl0="; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); in fetchPypi { From 6e1bb51954d504a224b7c5a39c49dd7a226b6a7e Mon Sep 17 00:00:00 2001 From: Matt Leon Date: Thu, 28 Mar 2024 19:54:00 -0400 Subject: [PATCH 203/260] python3Packages.home-assistant-chip-clusters: 2024.2.2 -> 2024.3.2 Release notes: https://github.com/home-assistant-libs/chip-wheels/releases/tag/2024.3.2 --- .../python-modules/home-assistant-chip-clusters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix index 969bc3a9533c..396ff052182e 100644 --- a/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-clusters/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "home-assistant-chip-clusters"; - version = "2024.2.2"; + version = "2024.3.2"; format = "wheel"; src = fetchPypi { @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "home_assistant_chip_clusters"; dist = "py3"; python = "py3"; - hash = "sha256-OWDOJfVQJSJFng5xAQqBNpqB0nXnYVCTq1MwyPtwfIM="; + hash = "sha256-Imdpqy7m81oxfkzj+82afSX9juK/SOCBIMoaPjK8G+Y="; }; propagatedBuildInputs = [ From c6411f87ae997fc04e1c0dd0034c88cc30c7b872 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 12:38:17 +0000 Subject: [PATCH 204/260] tgpt: 2.7.2 -> 2.7.3 --- pkgs/by-name/tg/tgpt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/tg/tgpt/package.nix b/pkgs/by-name/tg/tgpt/package.nix index d63ff34c21d3..0719016d1e8f 100644 --- a/pkgs/by-name/tg/tgpt/package.nix +++ b/pkgs/by-name/tg/tgpt/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "tgpt"; - version = "2.7.2"; + version = "2.7.3"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "tgpt"; rev = "refs/tags/v${version}"; - hash = "sha256-FbnweHiKfxqFegZnRlvdVbTmH4ImjddVOBlbGRT/SGw="; + hash = "sha256-tInbOCrGXZkyGrkXSppK7Qugh0E2CdjmybMeH49Wc5s="; }; vendorHash = "sha256-docq/r6yyMPsuUyFbtCMaYfEVL0gLmyTy4PbrAemR00="; From 26538d4700c60b9be5329859eae6e8a57e762f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 29 Mar 2024 15:32:40 +0100 Subject: [PATCH 205/260] nixos/partition-manager: remove with with lib, cleanup --- nixos/modules/programs/partition-manager.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nixos/modules/programs/partition-manager.nix b/nixos/modules/programs/partition-manager.nix index cf0491ff028f..bb7c91c941e2 100644 --- a/nixos/modules/programs/partition-manager.nix +++ b/nixos/modules/programs/partition-manager.nix @@ -1,17 +1,13 @@ { config, lib, pkgs, ... }: -with lib; - { - meta.maintainers = [ maintainers.oxalica ]; + meta.maintainers = [ lib.maintainers.oxalica ]; - ###### interface options = { - programs.partition-manager.enable = mkEnableOption (lib.mdDoc "KDE Partition Manager"); + programs.partition-manager.enable = lib.mkEnableOption (lib.mdDoc "KDE Partition Manager"); }; - ###### implementation - config = mkIf config.programs.partition-manager.enable { + config = lib.mkIf config.programs.partition-manager.enable { services.dbus.packages = [ pkgs.libsForQt5.kpmcore ]; # `kpmcore` need to be installed to pull in polkit actions. environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.libsForQt5.partitionmanager ]; From 94805a3d21e407908ebf1d6de7d21028f01776db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 29 Mar 2024 15:33:46 +0100 Subject: [PATCH 206/260] nixos/partition-manager: use qt6 when plasma6 is activated This also fixes System Settings > Windows Shares complaining about the wrong QT version under Plasma6. --- nixos/modules/programs/partition-manager.nix | 14 ++++++++++---- .../modules/services/desktop-managers/plasma6.nix | 1 + pkgs/applications/kde/partitionmanager/default.nix | 5 ++++- pkgs/kde/gear/partitionmanager/default.nix | 5 +++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/nixos/modules/programs/partition-manager.nix b/nixos/modules/programs/partition-manager.nix index bb7c91c941e2..63b637f9952b 100644 --- a/nixos/modules/programs/partition-manager.nix +++ b/nixos/modules/programs/partition-manager.nix @@ -1,15 +1,21 @@ { config, lib, pkgs, ... }: -{ +let + cfg = config.programs.partition-manager; +in { meta.maintainers = [ lib.maintainers.oxalica ]; options = { - programs.partition-manager.enable = lib.mkEnableOption (lib.mdDoc "KDE Partition Manager"); + programs.partition-manager = { + enable = lib.mkEnableOption (lib.mdDoc "KDE Partition Manager"); + + package = lib.mkPackageOption pkgs [ "libsForQt5" "partitionmanager" ] { }; + }; }; config = lib.mkIf config.programs.partition-manager.enable { - services.dbus.packages = [ pkgs.libsForQt5.kpmcore ]; + services.dbus.packages = [ cfg.package.kpmcore ]; # `kpmcore` need to be installed to pull in polkit actions. - environment.systemPackages = [ pkgs.libsForQt5.kpmcore pkgs.libsForQt5.partitionmanager ]; + environment.systemPackages = [ cfg.package.kpmcore cfg.package ]; }; } diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index e20b431f0b58..5f1f2cec79e8 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -286,6 +286,7 @@ in { }; programs.kdeconnect.package = kdePackages.kdeconnect-kde; + programs.partition-manager.package = kdePackages.partitionmanager; # FIXME: ugly hack. See #292632 for details. system.userActivationScripts.rebuildSycoca = activationScript; diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index a898984d4502..90adde782c7f 100644 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -1,5 +1,4 @@ { mkDerivation -, fetchurl , lib , extra-cmake-modules , kdoctools @@ -80,6 +79,10 @@ mkDerivation { ) ''; + passthru = { + inherit kpmcore; + }; + meta = with lib; { description = "KDE Partition Manager"; longDescription = '' diff --git a/pkgs/kde/gear/partitionmanager/default.nix b/pkgs/kde/gear/partitionmanager/default.nix index 3d0215cb5e64..68cb09a01a5a 100644 --- a/pkgs/kde/gear/partitionmanager/default.nix +++ b/pkgs/kde/gear/partitionmanager/default.nix @@ -6,5 +6,10 @@ mkKdeDerivation { pname = "partitionmanager"; propagatedUserEnvPkgs = [kpmcore]; + + passthru = { + inherit kpmcore; + }; + meta.mainProgram = "partitionmanager"; } From 10c0931872d7055bbca97b3b715626dec35c34c2 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 30 Mar 2024 14:33:37 +0100 Subject: [PATCH 207/260] vencord: 1.7.3 -> 1.7.4 Signed-off-by: Sefa Eyeoglu --- .../ve}/vencord/package-lock.json | 35 ++++++++----------- .../ve/vencord/package.nix} | 8 ++--- pkgs/{misc => by-name/ve}/vencord/update.sh | 0 pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 19 insertions(+), 28 deletions(-) rename pkgs/{misc => by-name/ve}/vencord/package-lock.json (99%) rename pkgs/{misc/vencord/default.nix => by-name/ve/vencord/package.nix} (89%) rename pkgs/{misc => by-name/ve}/vencord/update.sh (100%) diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/by-name/ve/vencord/package-lock.json similarity index 99% rename from pkgs/misc/vencord/package-lock.json rename to pkgs/by-name/ve/vencord/package-lock.json index 5accca8740bf..6c301b195570 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/by-name/ve/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.7.3", + "version": "1.7.4", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -824,9 +824,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.26", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.26.tgz", - "integrity": "sha512-+wiMJsIwLOYCvUqSdKTrfkS8mpTp+MPINe6+Np4TAGFWWRWiBQ5kSq9nZGCSPkzx9mvT+uEukzpX4MOSCydcvw==", + "version": "18.19.28", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.28.tgz", + "integrity": "sha512-J5cOGD9n4x3YGgVuaND6khm5x07MMdAKkRyXnjVR6KFhLMNh2yONGiP7Z+4+tBOt5mK+GvDTiacTOVGGpqiecw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -845,31 +845,24 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.69", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.69.tgz", - "integrity": "sha512-W1HOMUWY/1Yyw0ba5TkCV+oqynRjG7BnteBB+B7JmAK7iw3l2SW+VGOxL+akPweix6jk2NNJtyJKpn4TkpfK3Q==", + "version": "18.2.73", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz", + "integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==", "dev": true, "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.22", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.22.tgz", - "integrity": "sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==", + "version": "18.2.23", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.23.tgz", + "integrity": "sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==", "dev": true, "dependencies": { "@types/react": "*" } }, - "node_modules/@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", - "dev": true - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", @@ -4968,9 +4961,9 @@ "dev": true }, "node_modules/table": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz", - "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==", + "version": "6.8.2", + "resolved": "https://registry.npmjs.org/table/-/table-6.8.2.tgz", + "integrity": "sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==", "dev": true, "dependencies": { "ajv": "^8.0.1", diff --git a/pkgs/misc/vencord/default.nix b/pkgs/by-name/ve/vencord/package.nix similarity index 89% rename from pkgs/misc/vencord/default.nix rename to pkgs/by-name/ve/vencord/package.nix index 3a3ea19b7c04..5a227196cee7 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/by-name/ve/vencord/package.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.7.3"; - gitHash = "caa14ec"; + version = "1.7.4"; + gitHash = "bdef47e"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-BsM7Gt1NEsZu/rxK58+Tix1xIJr6RvgbdjxVnro2soA="; + hash = "sha256-Ub8VzeTkka0oq0CYN/UHjOIH2y3F7Oy9QZpTi6glehI="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-XRVxF0dW0HIsLtijvxM/feW6rI/c4LsnA6Tmrp51arE="; + npmDepsHash = "sha256-/iUNvTk51aoh0TmDXgFG425I37xFuIddkrceF0pNBcE="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/update.sh b/pkgs/by-name/ve/vencord/update.sh similarity index 100% rename from pkgs/misc/vencord/update.sh rename to pkgs/by-name/ve/vencord/update.sh diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5b454bfcb0e..37c4b0a18a49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25048,9 +25048,7 @@ with pkgs; vcg = callPackage ../development/libraries/vcg { }; - vencord = callPackage ../misc/vencord { }; - - vencord-web-extension = callPackage ../misc/vencord { buildWebExtension = true; }; + vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; }; vid-stab = callPackage ../development/libraries/vid-stab { inherit (llvmPackages) openmp; From 0e8bcaa661f602db11bbe8347fb46bb271e8e58b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Mar 2024 17:18:47 +0300 Subject: [PATCH 208/260] Revert "stdenv/check-meta: Don't create new environments when computing meta.repository" This reverts commit f8b091d53fdb339a9489551e21ceb4bad84c79e9. --- pkgs/stdenv/generic/check-meta.nix | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index fd46029ff442..abaa97dd8ea8 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -10,9 +10,7 @@ let concatMapStrings concatMapStringsSep concatStrings - filter findFirst - head isDerivation length concatMap @@ -446,18 +444,6 @@ let # ----- else { valid = "yes"; }); - getRepository = let - getSrcs = attrs: - if attrs ? src - then - [ attrs.src ] - else - filter (src: src ? meta.homepage) attrs.srcs; - getHomePages = map (src: src.meta.homepage); - unlist = list: - if length list == 1 then head list - else list; - in attrs: unlist (getHomePages (getSrcs attrs)); # The meta attribute is passed in the resulting attribute set, # but it's not part of the actual derivation, i.e., it's not @@ -477,7 +463,22 @@ let # this could be handled a lot easier if we nulled it instead # of having it be undefined, but that wouldn't match the # other attributes. - repository = getRepository attrs; + repository = let + getSrcs = attrs: + if attrs ? src + then + [ attrs.src ] + else + lib.filter (src: src ? meta.homepage) attrs.srcs; + getHomePages = srcs: map (src: src.meta.homepage) srcs; + unlist = list: + if lib.length list == 1 + then + lib.elemAt list 0 + else + list; + in + unlist (getHomePages (getSrcs attrs)); } // { # `name` derivation attribute includes cross-compilation cruft, # is under assert, and is sanitized. From 59bccda1532d677d5f69f07d677489f3a995b744 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Mar 2024 17:19:21 +0300 Subject: [PATCH 209/260] Revert "stdenv: add meta.repository field" This reverts commit 7e1443abbba99e9dac29ce2ad01c1c4e4fb66070. --- doc/stdenv/meta.chapter.md | 4 --- .../coq-modules/serapi/default.nix | 3 +- pkgs/stdenv/generic/check-meta.nix | 28 +------------------ 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index cfcc5549e8d1..7f57eda791ea 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -47,10 +47,6 @@ Release branch. Used to specify that a package is not going to receive updates t The package’s homepage. Example: `https://www.gnu.org/software/hello/manual/` -### `repository` {#var-meta-repository} - -A webpage where the package's source code can be viewed. `https` links are preferred if available. Automatically set to a default value if the package uses a `fetchFrom*` fetcher for its `src`. Example: `https://github.com/forthy42/gforth` - ### `downloadPage` {#var-meta-downloadPage} The page where a link to the current version can be found. Example: `https://ftp.gnu.org/gnu/hello/` diff --git a/pkgs/development/coq-modules/serapi/default.nix b/pkgs/development/coq-modules/serapi/default.nix index d993bbdf1020..f48cce55d4dc 100644 --- a/pkgs/development/coq-modules/serapi/default.nix +++ b/pkgs/development/coq-modules/serapi/default.nix @@ -71,8 +71,7 @@ in if version == "8.11.0+0.11.1" then version else builtins.replaceStrings [ "+" ] [ "." ] version }.tbz"; - # abort/syntax error will fail package set eval, but throw is "fine" - sha256 = release."${version}".sha256 or (throw "Unknown version '${version}'"); + sha256 = release."${version}".sha256; }; patches = diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index abaa97dd8ea8..1cd1ae6dd72e 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -304,10 +304,6 @@ let str ]; downloadPage = str; - repository = union [ - (listOf str) - str - ]; changelog = union [ (listOf str) str @@ -457,29 +453,7 @@ let outputs = attrs.outputs or [ "out" ]; hasOutput = out: builtins.elem out outputs; in - optionalAttrs (attrs ? src.meta.homepage || attrs ? srcs && isList attrs.srcs && any (src: src ? meta.homepage) attrs.srcs) { - # should point to an http-browsable source tree, if available. - # fetchers like fetchFromGitHub set it automatically. - # this could be handled a lot easier if we nulled it instead - # of having it be undefined, but that wouldn't match the - # other attributes. - repository = let - getSrcs = attrs: - if attrs ? src - then - [ attrs.src ] - else - lib.filter (src: src ? meta.homepage) attrs.srcs; - getHomePages = srcs: map (src: src.meta.homepage) srcs; - unlist = list: - if lib.length list == 1 - then - lib.elemAt list 0 - else - list; - in - unlist (getHomePages (getSrcs attrs)); - } // { + { # `name` derivation attribute includes cross-compilation cruft, # is under assert, and is sanitized. # Let's have a clean always accessible version here. From 1a0acec61c41714d9b8b680f2321deb448cc0687 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Sat, 30 Mar 2024 15:45:48 +0100 Subject: [PATCH 210/260] helix: 23.10 -> 24.03 --- pkgs/applications/editors/helix/default.nix | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/helix/default.nix b/pkgs/applications/editors/helix/default.nix index 323218f9437b..698b4f8a1b16 100644 --- a/pkgs/applications/editors/helix/default.nix +++ b/pkgs/applications/editors/helix/default.nix @@ -1,29 +1,18 @@ -{ fetchpatch, fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: +{ fetchzip, lib, rustPlatform, git, installShellFiles, makeWrapper }: rustPlatform.buildRustPackage rec { pname = "helix"; - version = "23.10"; + version = "24.03"; # This release tarball includes source code for the tree-sitter grammars, # which is not ordinarily part of the repository. src = fetchzip { url = "https://github.com/helix-editor/helix/releases/download/${version}/helix-${version}-source.tar.xz"; - hash = "sha256-PH4n+zm5ShwOrzzQm0Sn8b8JzAW/CF8UzzKZYE3e2WA="; + hash = "sha256-1myVGFBwdLguZDPo1jrth/q2i5rn5R2+BVKIkCCUalc="; stripRoot = false; }; - patches = [ - # Fixes implicit int error in rescript grammar when building with clang 16. - # https://github.com/nkrkv/tree-sitter-rescript/pull/227. - (fetchpatch { - url = "https://github.com/nkrkv/tree-sitter-rescript/commit/ea93cbf7d9c52f925ed296b4714737e8088f3a19.patch"; - hash = "sha256-gpGPiy+yEs+dMJEnE5O3WC7iSB/6PLJYBYRcdTx//+o="; - extraPrefix = "runtime/grammars/sources/rescript/"; - stripLen = 1; - }) - ]; - - cargoHash = "sha256-B8RO6BADDbPchowSfNVgviGvVgH23iF42DdhEBKBQzs="; + cargoHash = "sha256-THzPUVcmboVJHu3rJ6rev3GrkNilZRMlitCx7M1+HBE="; nativeBuildInputs = [ git installShellFiles makeWrapper ]; From 9a215265e0922881aab2d47f72f6f6fac1a9e75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 15:34:03 +0000 Subject: [PATCH 211/260] labwc-menu-generator: unstable-2024-03-12 -> unstable-2024-03-27 --- pkgs/by-name/la/labwc-menu-generator/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix index 1d84dbd4eeb9..17254a077d5d 100644 --- a/pkgs/by-name/la/labwc-menu-generator/package.nix +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc-menu-generator"; - version = "unstable-2024-03-12"; + version = "unstable-2024-03-27"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc-menu-generator"; - rev = "85a014db7214103c14c2bfbb5fc09a349ad64992"; - hash = "sha256-nt/K00cr1dKEk547J/6w1j6O3WSgGqVt1+Jdw95K28s="; + rev = "7b62ce9c25db9ee21c9f93e536615569378bcb20"; + hash = "sha256-CZ+p06D3/Ou29f2RRL9MBvzM+Qisdq0h8ySjzUqhGZM="; }; nativeBuildInputs = [ From 588fbb1c5327f31eb00abe817fd6ab2698a21f3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 15:54:03 +0000 Subject: [PATCH 212/260] mise: 2024.3.7 -> 2024.3.10 --- pkgs/tools/misc/mise/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mise/default.nix b/pkgs/tools/misc/mise/default.nix index c08de9afd8f1..3321f40b9518 100644 --- a/pkgs/tools/misc/mise/default.nix +++ b/pkgs/tools/misc/mise/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.3.7"; + version = "2024.3.10"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-vwbg/OY7w9+5KvLp+BN2Ive9khVTUnWgnWD1T09iVR8="; + hash = "sha256-Vx6BI2GmnyvBlDGAkNDJaEMXBphbaIxB5npD/o5c48M="; }; - cargoHash = "sha256-su8kyq+H42cYcQcoDYaTKAhLSykYOTXdkDQeCgScnp0="; + cargoHash = "sha256-uhpF5jKWtwEx2HkkHd+88HIao4rqvnSQblinVc4ip44="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From c14ac40d8e526c07d67171861b98be76c95f4791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=9B=81=20Cryolitia?= Date: Sun, 31 Mar 2024 00:16:02 +0800 Subject: [PATCH 213/260] labelImg: 1.8.3 -> 1.8.6 Co-Authored-By: Fabian Freihube --- .../machine-learning/labelimg/default.nix | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 244eaa05d695..190e56131f10 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,21 +1,33 @@ -{ lib, python3Packages, fetchFromGitHub, qt5 }: +{ lib +, python3Packages +, fetchFromGitHub +, fetchpatch +, qt5 +}: python3Packages.buildPythonApplication rec { pname = "labelImg"; - version = "1.8.3"; + version = "1.8.6"; src = fetchFromGitHub { owner = "tzutalin"; repo = "labelImg"; rev = "v${version}"; - sha256 = "07v106fzlmxrbag4xm06m4mx9m0gckb27vpwsn7sap1bbgc1pap5"; + hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; }; nativeBuildInputs = with python3Packages; [ pyqt5 qt5.wrapQtAppsHook ]; + patches = [ + # fixes https://github.com/heartexlabs/labelImg/issues/838 + # can be removed after next upstream version bump + (fetchpatch { + url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; + hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; + }) + ]; propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip4 ]; preBuild = '' make qt5py3 From 8ce3c897a6e2bfca885ce71fff434667b9f471d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8C=97=E9=9B=81=20Cryolitia?= Date: Sun, 31 Mar 2024 00:33:13 +0800 Subject: [PATCH 214/260] labelImg: re-format with `nixfmt-rfc-style` --- .../machine-learning/labelimg/default.nix | 99 ++++++++++--------- 1 file changed, 50 insertions(+), 49 deletions(-) diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 190e56131f10..21174305b9e3 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -1,50 +1,51 @@ -{ lib -, python3Packages -, fetchFromGitHub -, fetchpatch -, qt5 +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch, + qt5, }: - python3Packages.buildPythonApplication rec { - pname = "labelImg"; - version = "1.8.6"; - src = fetchFromGitHub { - owner = "tzutalin"; - repo = "labelImg"; - rev = "v${version}"; - hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; - }; - nativeBuildInputs = with python3Packages; [ - pyqt5 - qt5.wrapQtAppsHook - ]; - patches = [ - # fixes https://github.com/heartexlabs/labelImg/issues/838 - # can be removed after next upstream version bump - (fetchpatch { - url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; - hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; - }) - ]; - propagatedBuildInputs = with python3Packages; [ - pyqt5 - lxml - ]; - preBuild = '' - make qt5py3 - ''; - postInstall = '' - cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs - ''; - dontWrapQtApps = true; - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with lib; { - description = "A graphical image annotation tool and label object bounding boxes in images"; - mainProgram = "labelImg"; - homepage = "https://github.com/tzutalin/labelImg"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.cmcdragonkai ]; - }; - } +python3Packages.buildPythonApplication rec { + pname = "labelImg"; + version = "1.8.6"; + src = fetchFromGitHub { + owner = "tzutalin"; + repo = "labelImg"; + rev = "v${version}"; + hash = "sha256-RJxCtiDOePajlrjy9cpKETSKsWlH/Dlu1iFMj2aO4XU="; + }; + nativeBuildInputs = with python3Packages; [ + pyqt5 + qt5.wrapQtAppsHook + ]; + patches = [ + # fixes https://github.com/heartexlabs/labelImg/issues/838 + # can be removed after next upstream version bump + (fetchpatch { + url = "https://github.com/heartexlabs/labelImg/commit/5c38b6bcddce895d646e944e3cddcb5b43bf8b8b.patch"; + hash = "sha256-BmbnJS95RBfoNQT0E6JDJ/IZfBa+tv1C69+RVOSFdRA="; + }) + ]; + propagatedBuildInputs = with python3Packages; [ + pyqt5 + lxml + ]; + preBuild = '' + make qt5py3 + ''; + postInstall = '' + cp libs/resources.py $out/${python3Packages.python.sitePackages}/libs + ''; + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + meta = with lib; { + description = "A graphical image annotation tool and label object bounding boxes in images"; + mainProgram = "labelImg"; + homepage = "https://github.com/tzutalin/labelImg"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.cmcdragonkai ]; + }; +} From df7c06fe940c83d735a8d4bcfe7185d1ac9c9222 Mon Sep 17 00:00:00 2001 From: matthewcroughan Date: Wed, 27 Mar 2024 12:26:55 +0000 Subject: [PATCH 215/260] scion-bootstrapper: init at 0.0.7 --- .../by-name/sc/scion-bootstrapper/package.nix | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/sc/scion-bootstrapper/package.nix diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix new file mode 100644 index 000000000000..8b6e6f115c19 --- /dev/null +++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix @@ -0,0 +1,34 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "scion-bootstrapper"; + version = "0.0.7"; + + src = fetchFromGitHub { + owner = "netsec-ethz"; + repo = "bootstrapper"; + rev = "v${version}"; + hash = "sha256-X4lNgd6klIw0NW9NVG+d1JK+WNfOclbu43GYucelB7o="; + }; + + vendorHash = "sha256-X4bOIvNlyQoAWOd3L6suE64KnlCV6kuE1ieVecVYWOw="; + + doCheck = false; + + ldflags = [ "-s" "-w" ]; + + postInstall = '' + mv $out/bin/bootstrapper $out/bin/scion-bootstrapper + ''; + + meta = with lib; { + description = "bootstrapper for SCION network configuration"; + homepage = "https://github.com/netsec-ethz/bootstrapper"; + license = licenses.asl20; + maintainers = with maintainers; [ matthewcroughan sarcasticadmin ]; + mainProgram = "scion-bootstrapper"; + }; +} From 11387afc0dd84421f6cd7f0f5641088707141f0b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 19 Mar 2024 09:35:08 -0700 Subject: [PATCH 216/260] cudaPackages/aliases: init --- pkgs/development/cuda-modules/aliases.nix | 4 ++++ pkgs/top-level/cuda-packages.nix | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/cuda-modules/aliases.nix diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix new file mode 100644 index 000000000000..3c4a791ebd71 --- /dev/null +++ b/pkgs/development/cuda-modules/aliases.nix @@ -0,0 +1,4 @@ +# Packges which have been deprecated or removed from cudaPackages +final: prev: { + +} diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 4b8ad4646485..53c5bd82e564 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -26,6 +26,7 @@ lib, newScope, pkgs, + config, __attrsFailEvaluation ? true, }: let @@ -85,7 +86,7 @@ let (strings.replaceStrings ["."] ["_"] (versions.majorMinor version)) ]; - composedExtension = fixedPoints.composeManyExtensions [ + composedExtension = fixedPoints.composeManyExtensions ([ (import ../development/cuda-modules/setup-hooks/extension.nix) (callPackage ../development/cuda-modules/cuda/extension.nix {inherit cudaVersion;}) (callPackage ../development/cuda-modules/cuda/overrides.nix {inherit cudaVersion;}) @@ -108,7 +109,9 @@ let }) (callPackage ../development/cuda-modules/cuda-samples/extension.nix {inherit cudaVersion;}) (callPackage ../development/cuda-modules/cuda-library-samples/extension.nix {}) - ]; + ] ++ lib.optionals config.allowAliases [ + (import ../development/cuda-modules/aliases.nix) + ]); cudaPackages = customisation.makeScope newScope ( fixedPoints.extends composedExtension passthruFunction From 659a67f9e09d4b2139fe55beb2601e5bc9ec146c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 19 Mar 2024 23:58:03 -0700 Subject: [PATCH 217/260] autoFixElfFiles: init --- .../au/autoFixElfFiles/auto-fix-elf-files.sh | 64 +++++++++++++++++++ pkgs/by-name/au/autoFixElfFiles/package.nix | 5 ++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/by-name/au/autoFixElfFiles/auto-fix-elf-files.sh create mode 100644 pkgs/by-name/au/autoFixElfFiles/package.nix diff --git a/pkgs/by-name/au/autoFixElfFiles/auto-fix-elf-files.sh b/pkgs/by-name/au/autoFixElfFiles/auto-fix-elf-files.sh new file mode 100644 index 000000000000..045ddd15b1dc --- /dev/null +++ b/pkgs/by-name/au/autoFixElfFiles/auto-fix-elf-files.sh @@ -0,0 +1,64 @@ +# shellcheck shell=bash +# List all dynamically linked ELF files in the outputs and apply a generic fix +# action provided as a parameter (currently used to add the CUDA or the +# cuda_compat driver to the runpath of binaries) +echo "Sourcing fix-elf-files.sh" + +# Returns the exit code of patchelf --print-rpath. +# A return code of 0 (success) means the ELF file has a dynamic section, while +# a non-zero return code means the ELF file is statically linked (or is not an +# ELF file). +elfHasDynamicSection() { + local libPath + + if [[ $# -eq 0 ]]; then + echo "elfHasDynamicSection: no library path provided" >&2 + exit 1 + elif [[ $# -gt 1 ]]; then + echo "elfHasDynamicSection: too many arguments" >&2 + exit 1 + elif [[ "$1" == "" ]]; then + echo "elfHasDynamicSection: empty library path" >&2 + exit 1 + else + libPath="$1" + shift 1 + fi + + patchelf --print-rpath "$libPath" >& /dev/null + return $? +} + +# Run a fix action on all dynamically linked ELF files in the outputs. +autoFixElfFiles() { + local fixAction + local outputPaths + + if [[ $# -eq 0 ]]; then + echo "autoFixElfFiles: no fix action provided" >&2 + exit 1 + elif [[ $# -gt 1 ]]; then + echo "autoFixElfFiles: too many arguments" >&2 + exit 1 + elif [[ "$1" == "" ]]; then + echo "autoFixElfFiles: empty fix action" >&2 + exit 1 + else + fixAction="$1" + fi + + mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done) + + find "${outputPaths[@]}" -type f -print0 | while IFS= read -rd "" f; do + if ! isELF "$f"; then + continue + elif elfHasDynamicSection "$f"; then + # patchelf returns an error on statically linked ELF files, and in + # practice fixing actions all involve patchelf + echo "autoFixElfFiles: using $fixAction to fix $f" >&2 + $fixAction "$f" + elif (( "${NIX_DEBUG:-0}" >= 1 )); then + echo "autoFixElfFiles: skipping a statically-linked ELF file $f" + fi + done +} diff --git a/pkgs/by-name/au/autoFixElfFiles/package.nix b/pkgs/by-name/au/autoFixElfFiles/package.nix new file mode 100644 index 000000000000..db8258e9b43b --- /dev/null +++ b/pkgs/by-name/au/autoFixElfFiles/package.nix @@ -0,0 +1,5 @@ +{ makeSetupHook }: + +makeSetupHook { + name = "auto-fix-elf-files"; +} ./auto-fix-elf-files.sh From 771398e0cdb2ef31640b16570f39ab1a21ba8988 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 19 Mar 2024 09:24:22 -0700 Subject: [PATCH 218/260] autoAddDriverRunpathHook: init --- .../auto-add-driver-runpath-hook.sh | 14 ++++++++++++++ pkgs/by-name/au/autoAddDriverRunpath/package.nix | 6 ++++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/by-name/au/autoAddDriverRunpath/auto-add-driver-runpath-hook.sh create mode 100644 pkgs/by-name/au/autoAddDriverRunpath/package.nix diff --git a/pkgs/by-name/au/autoAddDriverRunpath/auto-add-driver-runpath-hook.sh b/pkgs/by-name/au/autoAddDriverRunpath/auto-add-driver-runpath-hook.sh new file mode 100644 index 000000000000..5e9ed97375af --- /dev/null +++ b/pkgs/by-name/au/autoAddDriverRunpath/auto-add-driver-runpath-hook.sh @@ -0,0 +1,14 @@ +# shellcheck shell=bash +# Run addDriverRunpath on all dynamically linked, ELF files +echo "Sourcing auto-add-driver-runpath-hook" + +if [ -n "${dontUseAutoAddOpenGLRunpath-}" ]; then + echo "dontUseAutoAddOpenGLRunpath has been deprecated, please use dontUseAutoAddDriverRunpath instead" +fi + +# Respect old toggle value to allow for people to gracefully transition +# See: https://github.com/NixOS/nixpkgs/issues/141803 for transition roadmap +if [ -z "${dontUseAutoAddDriverRunpath-}" -a -z "${dontUseAutoAddOpenGLRunpath-}" ]; then + echo "Using autoAddDriverRunpath" + postFixupHooks+=("autoFixElfFiles addDriverRunpath") +fi diff --git a/pkgs/by-name/au/autoAddDriverRunpath/package.nix b/pkgs/by-name/au/autoAddDriverRunpath/package.nix new file mode 100644 index 000000000000..36af8c90ffbb --- /dev/null +++ b/pkgs/by-name/au/autoAddDriverRunpath/package.nix @@ -0,0 +1,6 @@ +{ addDriverRunpath, autoFixElfFiles, makeSetupHook }: + +makeSetupHook { + name = "auto-add-driver-runpath-hook"; + propagatedBuildInputs = [ addDriverRunpath autoFixElfFiles ]; +} ./auto-add-driver-runpath-hook.sh From bfe244b2344a2463df4b43d0faaaa5f422a5b8de Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 21 Mar 2024 07:09:14 -0700 Subject: [PATCH 219/260] nvidia-container-toolkit: use autoAddDriverRunpath --- pkgs/by-name/nv/nvidia-container-toolkit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix index ba76e4de97e4..bffa785c7c20 100644 --- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix +++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix @@ -10,7 +10,7 @@ , configTemplate ? null , configTemplatePath ? null , libnvidia-container -, cudaPackages +, autoAddDriverRunpath }: assert configTemplate != null -> (lib.isAttrs configTemplate && configTemplatePath == null); @@ -87,7 +87,7 @@ buildGoModule rec { ]; nativeBuildInputs = [ - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath makeWrapper ]; From 13b0f4682558ef551d1115881f5603417fbd8dee Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:17:46 -0700 Subject: [PATCH 220/260] dcgm: use pkgs.autoAddDriverRunpath --- pkgs/os-specific/linux/dcgm/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/dcgm/default.nix b/pkgs/os-specific/linux/dcgm/default.nix index cc9e26d2b707..a7f3511b3f4b 100644 --- a/pkgs/os-specific/linux/dcgm/default.nix +++ b/pkgs/os-specific/linux/dcgm/default.nix @@ -1,6 +1,7 @@ { lib , gcc11Stdenv , fetchFromGitHub +, autoAddDriverRunpath , catch2 , cmake , cudaPackages_10_2 @@ -108,7 +109,7 @@ in gcc11Stdenv.mkDerivation rec { # autoAddDriverRunpath does not actually depend on or incur any dependency # of cudaPackages. It merely adds an impure, non-Nix PATH to the RPATHs of # executables that need to use cuda at runtime. - cudaPackages_12.autoAddDriverRunpath + autoAddDriverRunpath cmake git From 611761a4d8ba48a66ba8a3e58226de8eba145093 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:25:06 -0700 Subject: [PATCH 221/260] prometheus-dcgm-exporter: use pkgs.autoAddDriverRunpath --- pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix index 7c4d2cfae06e..f71cd1776bd4 100644 --- a/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/dcgm-exporter/default.nix @@ -1,7 +1,7 @@ { lib , buildGoModule , fetchFromGitHub -, cudaPackages +, autoAddDriverRunpath , dcgm , linuxPackages }: @@ -48,7 +48,7 @@ buildGoModule rec { vendorHash = "sha256-Fjvx15e/psxoqoS6c6GhiQfe7g2aI40EmPR26xLhrzg="; nativeBuildInputs = [ - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; # Tests try to interact with running DCGM service. From e31bb0051f1788b1c7b00b2fb18c44b4b4095156 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 10:26:13 -0700 Subject: [PATCH 222/260] lammps: use pkgs.autoAddDriverRunpath --- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 4c2a80c2f1b7..b881d339300c 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -7,7 +7,7 @@ , blas , lapack , cmake -, cudaPackages +, autoAddDriverRunpath , pkg-config # Available list of packages can be found near here: # @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config # Although not always needed, it is needed if cmakeFlags include # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; passthru = { From 61a3bf980c894bc6b00e36fb2f85586ebd7a607c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 30 Mar 2024 18:27:33 +0100 Subject: [PATCH 223/260] git-town: fix tests --- pkgs/applications/version-management/git-town/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 993b9150abda..c043ff74b0d8 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -56,7 +56,7 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = git-town; command = "git-town --version"; - version = "v${version}"; + inherit version; }; meta = with lib; { From 9207df9ef39e5258254c8f8015031959a1b60cc1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 30 Mar 2024 20:30:26 +0300 Subject: [PATCH 224/260] wireplumber: 0.5.0 -> 0.5.1 Diff: https://gitlab.freedesktop.org/pipewire/wireplumber/-/compare/0.5.0...0.5.1 --- pkgs/development/libraries/pipewire/wireplumber.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pipewire/wireplumber.nix b/pkgs/development/libraries/pipewire/wireplumber.nix index c60ac184978a..dc0236a378af 100644 --- a/pkgs/development/libraries/pipewire/wireplumber.nix +++ b/pkgs/development/libraries/pipewire/wireplumber.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "wireplumber"; - version = "0.5.0"; + version = "0.5.1"; outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "wireplumber"; rev = version; - hash = "sha256-zcYZvyGsGuiwuL9nOD5mW6RFwa9cPB9HvoQqdw2jlmY="; + hash = "sha256-l5s7GTKpqGvRs1o14QNXq3kyQsoPwwUmd0TKlBKTAKE="; }; nativeBuildInputs = [ From 076cdf587baf32098b44eb198b4aeb7e8ebd086a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 17:34:26 +0000 Subject: [PATCH 225/260] php81Extensions.blackfire: 1.92.10 -> 1.92.13 --- .../tools/misc/blackfire/php-probe.nix | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index 14b293b37e61..748a153624ab 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.10"; + version = "1.92.13"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-U2vcgqnpz1+pS4aE3usj/ktrbnXw70+xpedx1LkbTvI="; - "8.2" = "sha256-rX57nPA6Fduzv5t/lGYnIPXSbW8ddlpQrDDqj3CUzQ0="; - "8.3" = "sha256-DXlMHZvGZMdzVRVe7Mv80sGHwUkWcr99hsWl7VnOrb0="; + "8.1" = "sha256-QpvnhIvjhm5tqOP72T2yVxV92M3ty/iDICaWsOVFpNg="; + "8.2" = "sha256-NhNbhOGRlhGvTcG4uZwTASWqLp7PQnfDW48GzROxkII="; + "8.3" = "sha256-Gn3M0ANj05QoAZB6W3HWj4zNCDya7lqa+OTv57fnEQ8="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-Czua15eOomeIwaVll6THoKWlg2KSoj8TZn/kmpik8no="; - "8.2" = "sha256-oFqbLJUD8IlhdM3qT1zZUqPs/eikDJB7UqEc5RdPWGk="; - "8.3" = "sha256-/ueCOSPGdLDUQpaPOkiOkk1+xKYAFQoRPVUjrbGjkgI="; + "8.1" = "sha256-zhCjSPTO/RGcc+qvkYlEeV+9ulIXpA0dCMRlSWwj8ys="; + "8.2" = "sha256-J+zdMC4q+MHmwADivqdEfSq8h/KeD5TAanCJKZLuEog="; + "8.3" = "sha256-GGNje7mg1uaLN3zrDXG/igLW9+nhxvPp7nIYW6aJBa4="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-F3bxCPvlXnBNXcp1ia47HdEfrronRqftTUQkvV2yeew="; - "8.2" = "sha256-dLUfo13RILacTgHhfLvzFOz8OvwO+Nv6L6hQ7XE2o5c="; - "8.3" = "sha256-NO6n3euYq0Ind6oxLaSRmj6FkmeWJme+ZcIfumQtEgE="; + "8.1" = "sha256-C2ie8tp3F0sr+edYbUBVw0b1YJtnjyneC8/+x6LWENg="; + "8.2" = "sha256-Ku1pulSErVMvBtiNvLgRw2NpE/bEOkjZ5TY7F/PYJto="; + "8.3" = "sha256-/U/qf7Aqxssvcnc06+K5JeG96Ab09zRvUYcwhSAW4b8="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-DNkRaUD+/MsK8K1i48LnekooKjYen/SRMcYNgVTxRfU="; - "8.2" = "sha256-4MwsaqFozn6ybkjDIj+FUQv42I5YyV7gKXyTmNuLdRg="; - "8.3" = "sha256-KZR0oO53S1cdao6JQJKsNGIUk7bqR1xYcJeXUL7RW6g="; + "8.1" = "sha256-OdqG7G3TzuCVzBA0Xf+It05S6XaVlEd+ugM+gk70OiE="; + "8.2" = "sha256-/nCBQzimhcCrzNuwSVybHBmZZJImm75jKGqh2oXyyZA="; + "8.3" = "sha256-C2SxPYYXewU6PekQ3m1MBiPMPS5tE53gda2Qo7rZ1YQ="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-6rglM9HYhNdN4kumAOQibYt95oa5imgnfkhYDuC3Iso="; - "8.2" = "sha256-+Mi+xWdWYFwrKPL9szo4C0jZn+FMPSmdKiVAiH9MxtY="; - "8.3" = "sha256-0CwhF/z0phPYuOSZ0PRTG90DjjXKFKFEtAovCHYtRFw="; + "8.1" = "sha256-W3reCFcN/bM3hrUeekJLG5qntH/Wvfb+JVly5+g2YEY="; + "8.2" = "sha256-d2YSmyV0mq7KBqoD4Bwdh3izh6hcKTBf6kP+q3QVnfI="; + "8.3" = "sha256-JiCw8Lew2laxOyb+2aSDqlZz2MafFwYwV46dqceEcBk="; }; }; }; From 66b556fa4818725854d2ee85e2b5ae33409a5ef1 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:19:45 -0700 Subject: [PATCH 226/260] cudaPackages.nccl: use pkgs.autoAddDriverRunpath --- pkgs/development/cuda-modules/nccl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/cuda-modules/nccl/default.nix b/pkgs/development/cuda-modules/nccl/default.nix index e3d10b79386f..fe99b31e12a8 100644 --- a/pkgs/development/cuda-modules/nccl/default.nix +++ b/pkgs/development/cuda-modules/nccl/default.nix @@ -6,13 +6,13 @@ fetchFromGitHub, python3, which, + autoAddDriverRunpath, cudaPackages, # passthru.updateScript gitUpdater, }: let inherit (cudaPackages) - autoAddDriverRunpath backendStdenv cuda_cccl cuda_cudart From 46f73d4d2fa173108692a6fec8d4c57f46092fd0 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:24:01 -0700 Subject: [PATCH 227/260] jaxlib-bin: use pkgs.autoAddDriverRunpath --- pkgs/development/python-modules/jaxlib/bin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix index e2260aec4b14..54abdfe48c34 100644 --- a/pkgs/development/python-modules/jaxlib/bin.nix +++ b/pkgs/development/python-modules/jaxlib/bin.nix @@ -5,6 +5,7 @@ # See `python3Packages.jax.passthru` for CUDA tests. { absl-py +, autoAddDriverRunpath , autoPatchelfHook , buildPythonPackage , config @@ -23,7 +24,7 @@ }: let - inherit (cudaPackagesGoogle) autoAddDriverRunpath cudaVersion; + inherit (cudaPackagesGoogle) cudaVersion; version = "0.4.24"; From 6a4ceb7cd72597b99d4099a5f202fa5ae2c082be Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sat, 30 Mar 2024 11:31:48 -0700 Subject: [PATCH 228/260] python3Packages.tensorrt: use pkgs.autoAddDriverRunpath --- pkgs/development/python-modules/tensorrt/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix index 58a3e64d5610..2f3606d8562e 100644 --- a/pkgs/development/python-modules/tensorrt/default.nix +++ b/pkgs/development/python-modules/tensorrt/default.nix @@ -1,5 +1,6 @@ { lib , python +, autoAddDriverRunpath , buildPythonPackage , autoPatchelfHook , unzip @@ -22,7 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ unzip autoPatchelfHook - cudaPackages.autoAddDriverRunpath + autoAddDriverRunpath ]; preUnpack = '' From a696dbb65960f52ff06de47f87fe7d96aaa4a8bb Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Sat, 30 Mar 2024 11:55:47 -0700 Subject: [PATCH 229/260] nixos-rebuild: use `substitute` rather than `substituteAll` No change in produced output. --- .../linux/nixos-rebuild/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/default.nix b/pkgs/os-specific/linux/nixos-rebuild/default.nix index 4849ff75c54a..17a9bc51732c 100644 --- a/pkgs/os-specific/linux/nixos-rebuild/default.nix +++ b/pkgs/os-specific/linux/nixos-rebuild/default.nix @@ -1,5 +1,5 @@ { callPackage -, substituteAll +, substitute , runtimeShell , coreutils , gnused @@ -14,19 +14,25 @@ let fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix; in -substituteAll { +substitute { name = "nixos-rebuild"; src = ./nixos-rebuild.sh; dir = "bin"; isExecutable = true; - inherit runtimeShell nix; - nix_x86_64_linux = fallback.x86_64-linux; - nix_i686_linux = fallback.i686-linux; - nix_aarch64_linux = fallback.aarch64-linux; - path = lib.makeBinPath [ coreutils gnused gnugrep jq util-linux ]; + + substitutions = [ + "--subst-var-by" "runtimeShell" runtimeShell + "--subst-var-by" "nix" nix + "--subst-var-by" "nix_x86_64_linux" fallback.x86_64-linux + "--subst-var-by" "nix_i686_linux" fallback.i686-linux + "--subst-var-by" "nix_aarch64_linux" fallback.aarch64-linux + "--subst-var-by" "path" (lib.makeBinPath [ coreutils gnused gnugrep jq util-linux ]) + ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' installManPage ${./nixos-rebuild.8} From 48f469c09b93f7bff61d64500006fc037fba8d88 Mon Sep 17 00:00:00 2001 From: Alex Valiushko Date: Fri, 29 Mar 2024 15:49:38 -0700 Subject: [PATCH 230/260] picat: 3.3p3 -> 3.6 --- pkgs/development/compilers/picat/default.nix | 33 +++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index f52eed6ddf8d..a723e314b3ca 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -2,18 +2,20 @@ let ARCH = { - i686-linux = "linux32"; - x86_64-linux = "linux64"; + x86_64-linux = "linux64"; aarch64-linux = "linux64"; + x86_64-cygwin = "cygwin64"; + x86_64-darwin = "mac64"; + aarch64-darwin = "mac64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); in stdenv.mkDerivation { pname = "picat"; - version = "3.3p3"; + version = "3.6"; src = fetchurl { - url = "http://picat-lang.org/download/picat333_src.tar.gz"; - hash = "sha256-LMmAHCGKgon/wNbrXTUH9hiHyGVwwSDpB1236xawzXs="; + url = "http://picat-lang.org/download/picat36_src.tar.gz"; + hash = "sha256-DjP1cjKxRLxMjiHmYX42+kaG5//09IrPIc1O75gLA6k="; }; buildInputs = [ zlib ]; @@ -23,15 +25,30 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; enableParallelBuilding = true; - buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH"; - installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat"; + buildPhase = '' + cd emu + make -j $NIX_BUILD_CORES -f Makefile.$ARCH + ''; + installPhase = '' + mkdir -p $out/bin $out/share + cp picat $out/bin/ + cp -r ../doc $out/share/doc + cp -r ../exs $out/share/examples + ''; meta = with lib; { description = "Logic-based programming langage"; mainProgram = "picat"; homepage = "http://picat-lang.org/"; license = licenses.mpl20; - platforms = platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-cygwin" + "x86_64-darwin" + "aarch64-darwin" + ]; maintainers = with maintainers; [ earldouglas thoughtpolice ]; }; } + From 74484f9aa1f867a6cfdcfabaf22a9971a4bc33ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 20:13:31 +0000 Subject: [PATCH 231/260] cockpit: 313 -> 314 --- pkgs/by-name/co/cockpit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index db977bafe822..9ad68d2bf1e2 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -44,13 +44,13 @@ in stdenv.mkDerivation rec { pname = "cockpit"; - version = "313"; + version = "314"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; rev = "refs/tags/${version}"; - hash = "sha256-k/JbvotOcVs2OXwGOrnjY0xYRRgvk61p0o7VQTTPqz4="; + hash = "sha256-6iLfUqzBG/pvGNnzMJzMQqnNjPvKJtTHHCSBWtSwwFM="; fetchSubmodules = true; }; From bd0aef53c3d539e7bcfafb41e6203cb2ec2ab5d1 Mon Sep 17 00:00:00 2001 From: Casey Stark Date: Fri, 29 Mar 2024 21:49:56 -0500 Subject: [PATCH 232/260] maintainers: add starkca90 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f5dbcb02b57d..802365b0f6fd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18714,6 +18714,12 @@ githubId = 6362238; name = "Christoph Honal"; }; + starkca90 = { + email = "starkca90@gmail.com"; + github = "starkca90"; + githubId = 2060836; + name = "Casey Stark"; + }; starsep = { email = "nix@starsep.com"; github = "starsep"; From 37f758195529993adfae7642e16afac5eb610b96 Mon Sep 17 00:00:00 2001 From: Casey Stark Date: Fri, 29 Mar 2024 21:29:15 -0500 Subject: [PATCH 233/260] lens: 2023.5.310801 -> 2024.3.191333 & refactor https://k8slens.dev/blog/announcing-lens-2024 Refactor to make overlays possible --- .../networking/cluster/lens/common.nix | 22 ---------- .../networking/cluster/lens/darwin.nix | 33 ++++++-------- .../networking/cluster/lens/default.nix | 44 +++++++++++++++++-- .../networking/cluster/lens/linux.nix | 19 ++------ 4 files changed, 57 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/lens/common.nix diff --git a/pkgs/applications/networking/cluster/lens/common.nix b/pkgs/applications/networking/cluster/lens/common.nix deleted file mode 100644 index e14a176bf464..000000000000 --- a/pkgs/applications/networking/cluster/lens/common.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl }: -let - build = "2023.5.310801-latest"; -in -{ - pname = "lens-desktop"; - version = "6.5.2"; - sources = { - x86_64-darwin = fetchurl { - sha256 = "sha256-AGU1kOQEYBAGqWaxftqSNVdPEblPDujKSBjMeaVNx6M="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.dmg"; - }; - aarch64-darwin = fetchurl { - sha256 = "sha256-Xx+6GPAfjioTrqfFS7cFh6deraR+TtqLlwLbVQxfN8g="; - url = "https://api.k8slens.dev/binaries/Lens-${build}-arm64.dmg"; - }; - x86_64-linux = fetchurl { - sha256 = "sha256-DPgeAhM8k6RXg1Qw2bqJFLPh5q2o7Va6EAe/InQNXLg="; - url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; - }; - }; -} diff --git a/pkgs/applications/networking/cluster/lens/darwin.nix b/pkgs/applications/networking/cluster/lens/darwin.nix index e8f17422ec1f..9b9b752b877b 100644 --- a/pkgs/applications/networking/cluster/lens/darwin.nix +++ b/pkgs/applications/networking/cluster/lens/darwin.nix @@ -1,27 +1,20 @@ -{ lib, stdenv, undmg, fetchurl }: -let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; -in -stdenv.mkDerivation rec { - inherit (common) pname version; - src = common.sources.${system} or (throw "Source for ${pname} is not available for ${system}"); +{ stdenv, pname, version, src, meta, undmg }: - appName = "Lens"; +stdenv.mkDerivation { + inherit pname version src meta; - sourceRoot = "${appName}.app"; + sourceRoot = "."; + + nativeBuildInputs = [ undmg ]; - buildInputs = [ undmg ]; installPhase = '' - mkdir -p "$out/Applications/${appName}.app" - cp -R . "$out/Applications/${appName}.app" + runHook preInstall + + mkdir -p "$out/Applications" + cp -R "Lens.app" "$out/Applications/Lens.app" + + runHook postInstall ''; - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks ]; - platforms = [ "x86_64-darwin" "aarch64-darwin" ]; - }; + dontFixup = true; } diff --git a/pkgs/applications/networking/cluster/lens/default.nix b/pkgs/applications/networking/cluster/lens/default.nix index 455065b07036..3e32f8778f74 100644 --- a/pkgs/applications/networking/cluster/lens/default.nix +++ b/pkgs/applications/networking/cluster/lens/default.nix @@ -1,5 +1,41 @@ -{ stdenv, callPackage }: -if stdenv.isDarwin then - callPackage ./darwin.nix { } +{ stdenv +, callPackage +, fetchurl +, lib }: + +let + + pname = "lens-desktop"; + version = "2024.3.191333"; + + sources = { + x86_64-linux = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; + hash = "sha256-OywOjXzeW/5uyt50JrutiLgem9S1CrlwPFqfK6gUc7U="; + }; + x86_64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; + hash = "sha256-yf+WBcOdOM3XsfiXJThVws2r84vG2jwfNV1c+sq6A4s="; + }; + aarch64-darwin = { + url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; + hash = "sha256-hhd8MnwKWpvG7UebkeEoztS45SJVnpvvJ9Zy+y5swik="; + }; + }; + + src = fetchurl { + inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash; + }; + + meta = with lib; { + description = "The Kubernetes IDE"; + homepage = "https://k8slens.dev/"; + license = licenses.lens; + maintainers = with maintainers; [ dbirks RossComputerGuy starkca90 ]; + platforms = builtins.attrNames sources; + }; + +in if stdenv.isDarwin then + callPackage ./darwin.nix { inherit pname version src meta; } else - callPackage ./linux.nix { } + callPackage ./linux.nix { inherit pname version src meta; } diff --git a/pkgs/applications/networking/cluster/lens/linux.nix b/pkgs/applications/networking/cluster/lens/linux.nix index 8a21ceb432da..b54285fdafcc 100644 --- a/pkgs/applications/networking/cluster/lens/linux.nix +++ b/pkgs/applications/networking/cluster/lens/linux.nix @@ -1,19 +1,16 @@ -{ lib, fetchurl, appimageTools, makeWrapper, nss_latest, stdenv }: +{ lib, stdenv, pname, version, src, meta, appimageTools, makeWrapper, nss_latest }: let - common = import ./common.nix { inherit fetchurl; }; - inherit (stdenv.hostPlatform) system; - - inherit (common) pname version; - src = common.sources.${stdenv.hostPlatform.system} or (throw "Source for ${pname} is not available for ${system}"); name = "${pname}-${version}"; appimageContents = appimageTools.extractType2 { inherit name src; }; + in + appimageTools.wrapType2 { - inherit name src; + inherit name src meta; extraInstallCommands = '' @@ -29,12 +26,4 @@ appimageTools.wrapType2 { ''; extraPkgs = _: [ nss_latest ]; - - meta = with lib; { - description = "The Kubernetes IDE"; - homepage = "https://k8slens.dev/"; - license = licenses.lens; - maintainers = with maintainers; [ dbirks RossComputerGuy ]; - platforms = [ "x86_64-linux" ]; - }; } From 4844f7dad30a6b8f7aa39ab709c306e5b5fe0945 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 21:35:09 +0000 Subject: [PATCH 234/260] warp-terminal: 0.2024.03.19.08.01.stable_01 -> 0.2024.03.26.08.02.stable_02 --- pkgs/by-name/wa/warp-terminal/versions.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 154c7ffdeccc..79bf56085f7b 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,10 +1,10 @@ { "darwin": { - "hash": "sha256-aOw/c6Y+4x6kwxcwnajHh92ZZDeaM/Y1df76HgUjVn8=", - "version": "0.2024.03.19.08.01.stable_01" + "hash": "sha256-4eeu1JlChD9QvFSpuq5Wh8y+cUqpHYKgi3+SBTJqIwA=", + "version": "0.2024.03.26.08.02.stable_02" }, "linux": { - "hash": "sha256-efnYh48xcLneeotH9iSY0xQRgMXI/erM6F2fIH38yjY=", - "version": "0.2024.03.19.08.01.stable_01" + "hash": "sha256-hBwLfxhdy4cru2xH3hY+mGbJpR47Qf3SqEIijIRDstU=", + "version": "0.2024.03.26.08.02.stable_02" } } From 77ed57b3ed7ccdc0ffeaaee40a7970b9973dd471 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 23:01:15 +0100 Subject: [PATCH 235/260] cvemap: init at 0.0.6 Tool to work with CVEs https://github.com/projectdiscovery/cvemap --- pkgs/by-name/cv/cvemap/package.nix | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/cv/cvemap/package.nix diff --git a/pkgs/by-name/cv/cvemap/package.nix b/pkgs/by-name/cv/cvemap/package.nix new file mode 100644 index 000000000000..efd51d838e28 --- /dev/null +++ b/pkgs/by-name/cv/cvemap/package.nix @@ -0,0 +1,36 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "cvemap"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "projectdiscovery"; + repo = "cvemap"; + rev = "refs/tags/v${version}"; + hash = "sha256-aeUYcgBTHWWLTuAXnnc73yXaC3yLZzruqvedUYCnht4="; + }; + + vendorHash = "sha256-VQGWi01mOP2N4oYsaDK7wn/+hSFEDHhSma9DOZ06Z3k="; + + subPackages = [ + "cmd/cvemap/" + ]; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool to work with CVEs"; + homepage = "https://github.com/projectdiscovery/cvemap"; + changelog = "https://github.com/projectdiscovery/cvemap/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "cvemap"; + }; +} From eadd5ec3147a055634af5053a4c78e3606a70adc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 30 Mar 2024 23:08:55 +0100 Subject: [PATCH 236/260] cloudlist: 1.0.7 -> 1.0.8 Diff: https://github.com/projectdiscovery/cloudlist/compare/refs/tags/v1.0.7...v1.0.8 Changelog: https://github.com/projectdiscovery/cloudlist/releases/tag/v1.0.8 --- pkgs/tools/security/cloudlist/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/tools/security/cloudlist/default.nix index ab849a688a29..70e09efd747d 100644 --- a/pkgs/tools/security/cloudlist/default.nix +++ b/pkgs/tools/security/cloudlist/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cloudlist"; rev = "refs/tags/v${version}"; - hash = "sha256-F1oiatNP4tSRWI25r1uoiLT9Et+PyqU0p2HVICMBUNA="; + hash = "sha256-UyZ9KSjFu/NKiz4AZoKwHiWzh+KOARDmveCWcFbOS7A="; }; - vendorHash = "sha256-3QS9YYypqEJhibfBFxFq1gxTVpTWBy35tXcO9+DBehY="; + vendorHash = "sha256-tMrTAbfD+ip/UxrGTaMswgqo94rJZ0lqqxPgYFhZoTY="; ldflags = [ "-w" From 8a08f8dd59077fd5e39d6aa0d422b2f57eb48c78 Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sat, 30 Mar 2024 19:49:20 +0100 Subject: [PATCH 237/260] niri: 0.1.3 -> 0.1.4 --- pkgs/by-name/ni/niri/Cargo.lock | 371 +++++++++++++++++-------------- pkgs/by-name/ni/niri/package.nix | 15 +- 2 files changed, 203 insertions(+), 183 deletions(-) diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index 209a91c01f86..8292783edb7d 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -23,9 +23,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -43,7 +43,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee91c0c2905bae44f84bfa4e044536541df26b7703fd0888deeb9060fcc44289" dependencies = [ "android-properties", - "bitflags 2.4.2", + "bitflags 2.5.0", "cc", "cesu8", "jni", @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" [[package]] name = "appendlist" @@ -186,8 +186,8 @@ dependencies = [ "async-lock 3.3.0", "async-task", "concurrent-queue", - "fastrand 2.0.1", - "futures-lite 2.2.0", + "fastrand 2.0.2", + "futures-lite 2.3.0", "slab", ] @@ -225,18 +225,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" +checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884" dependencies = [ "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "parking", - "polling 3.5.0", - "rustix 0.38.31", + "polling 3.6.0", + "rustix 0.38.32", "slab", "tracing", "windows-sys 0.52.0", @@ -275,19 +275,19 @@ dependencies = [ "cfg-if", "event-listener 3.1.0", "futures-lite 1.13.0", - "rustix 0.38.31", + "rustix 0.38.32", "windows-sys 0.48.0", ] [[package]] name = "async-recursion" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" +checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -296,13 +296,13 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5" dependencies = [ - "async-io 2.3.1", + "async-io 2.3.2", "async-lock 2.8.0", "atomic-waker", "cfg-if", "futures-core", "futures-io", - "rustix 0.38.31", + "rustix 0.38.32", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -316,13 +316,13 @@ checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799" [[package]] name = "async-trait" -version = "0.1.77" +version = "0.1.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" +checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -333,9 +333,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80" [[package]] name = "base64" @@ -350,7 +350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ "annotate-snippets", - "bitflags 2.4.2", + "bitflags 2.5.0", "cexpr", "clang-sys", "itertools", @@ -361,7 +361,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -387,9 +387,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" [[package]] name = "block" @@ -434,9 +434,9 @@ dependencies = [ "async-channel", "async-lock 3.3.0", "async-task", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", - "futures-lite 2.2.0", + "futures-lite 2.3.0", "piper", "tracing", ] @@ -449,22 +449,22 @@ checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" -version = "1.14.3" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +checksum = "4da9a32f3fed317401fa3c862968128267c3106685286e15d5aaa3d7389c2f60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -475,9 +475,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" [[package]] name = "cairo-rs" @@ -485,7 +485,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cairo-sys-rs", "glib", "libc", @@ -509,10 +509,10 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba7adb4dd5aa98e5553510223000e7148f621165ec5f9acd7113f6ca4995298" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "log", - "polling 3.5.0", - "rustix 0.38.31", + "polling 3.6.0", + "rustix 0.38.32", "slab", "thiserror", ] @@ -524,11 +524,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec" dependencies = [ "async-task", - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-io", "log", - "polling 3.5.0", - "rustix 0.38.31", + "polling 3.6.0", + "rustix 0.38.32", "slab", "thiserror", ] @@ -540,7 +540,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0ea9b9476c7fad82841a8dbb380e2eae480c21910feba80725b46931ed8f02" dependencies = [ "calloop 0.12.4", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-client", ] @@ -650,10 +650,10 @@ version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -698,9 +698,12 @@ dependencies = [ [[package]] name = "cookie-factory" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396de984970346b0d9e93d1415082923c679e5ae5c3ee3dcbd104f5610af126b" +checksum = "9885fa71e26b8ab7855e2ec7cae6e9b380edff76cd052e07c683a0319d51b3a2" +dependencies = [ + "futures", +] [[package]] name = "core-foundation" @@ -890,11 +893,11 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0f8a69e60d75ae7dab4ef26a59ca99f2a89d4c142089b537775ae0c198bdcde" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "drm-ffi", "drm-fourcc", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -904,7 +907,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41334f8405792483e32ad05fbb9c5680ff4e84491883d2947a4757dc54cb2ac6" dependencies = [ "drm-sys", - "rustix 0.38.31", + "rustix 0.38.32", ] [[package]] @@ -953,7 +956,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1042,9 +1045,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" [[package]] name = "fdeflate" @@ -1061,7 +1064,7 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "rustc_version", ] @@ -1099,7 +1102,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1117,6 +1120,21 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.30" @@ -1124,6 +1142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -1166,11 +1185,11 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" +checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-core", "futures-io", "parking", @@ -1185,7 +1204,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1206,6 +1225,7 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ + "futures-channel", "futures-core", "futures-io", "futures-macro", @@ -1344,9 +1364,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eae10b27b6dd27e22ed0d812c6387deba295e6fc004a8b379e459b663b05a02" +checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" dependencies = [ "futures-channel", "futures-core", @@ -1390,7 +1410,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1406,17 +1426,17 @@ dependencies = [ [[package]] name = "glam" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3" +checksum = "9e05e7e6723e3455f4818c7b26e855439f7546cf617ef669d1adedb8669e5cb9" [[package]] name = "glib" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" +checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "futures-channel", "futures-core", "futures-executor", @@ -1434,15 +1454,15 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" +checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -1599,6 +1619,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.3.9" @@ -1634,9 +1660,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", "hashbrown", @@ -1648,7 +1674,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7911ce3db9c10c5ab4a35c49af778a5f9a827bd0f7371d9be56175d8dd2740d0" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "input-sys", "io-lifetimes 1.0.11", "libc", @@ -1699,9 +1725,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jni" @@ -1778,7 +1804,7 @@ version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91977f56c49cfb961e3d840e2e7c6e4a56bde7283898cf606861f1421348283d" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro-error", "proc-macro2", "quote", @@ -1857,7 +1883,7 @@ version = "0.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -1868,7 +1894,7 @@ version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3af92c55d7d839293953fcd0fda5ecfe93297cfde6ffbdec13b41d99c0ba6607" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "redox_syscall 0.4.1", ] @@ -1899,7 +1925,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65f3a4b81b2a2d8c7f300643676202debd1b7c929dbf5c9bb89402ea11d19810" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cc", "convert_case", "cookie-factory", @@ -2001,9 +2027,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -2034,9 +2060,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ "autocfg", ] @@ -2061,7 +2087,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2086,7 +2112,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "jni-sys", "log", "ndk-sys", @@ -2112,16 +2138,18 @@ dependencies = [ [[package]] name = "niri" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "arrayvec", "async-channel", "async-io 1.13.0", - "bitflags 2.4.2", + "bitflags 2.5.0", + "bytemuck", "calloop 0.13.0", "clap", "directories", + "drm-ffi", "futures-util", "git-version", "glam", @@ -2155,9 +2183,9 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.3" +version = "0.1.4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "csscolorparser", "knuffel", "miette", @@ -2170,7 +2198,7 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.3" +version = "0.1.4" dependencies = [ "clap", "serde", @@ -2178,7 +2206,7 @@ dependencies = [ [[package]] name = "niri-visual-tests" -version = "0.1.3" +version = "0.1.4" dependencies = [ "anyhow", "gtk4", @@ -2208,7 +2236,7 @@ version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cfg-if", "libc", ] @@ -2280,7 +2308,7 @@ dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2373,9 +2401,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pango" -version = "0.19.2" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7809e8af4df8d024a066106b72ca6bc7253a484ae3867041a96103ef8a13188d" +checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" dependencies = [ "gio", "glib", @@ -2469,7 +2497,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2500,7 +2528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" dependencies = [ "atomic-waker", - "fastrand 2.0.1", + "fastrand 2.0.2", "futures-io", ] @@ -2511,7 +2539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08e645ba5c45109106d56610b3ee60eb13a6f2beb8b74f8dc8186cf261788dda" dependencies = [ "anyhow", - "bitflags 2.4.2", + "bitflags 2.5.0", "libc", "libspa", "libspa-sys", @@ -2587,14 +2615,15 @@ dependencies = [ [[package]] name = "polling" -version = "3.5.0" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f040dee2588b4963afb4e420540439d126f73fdacf4a9c486a96d840bac3c9" +checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6" dependencies = [ "cfg-if", "concurrent-queue", + "hermit-abi", "pin-project-lite", - "rustix 0.38.31", + "rustix 0.38.32", "tracing", "windows-sys 0.52.0", ] @@ -2662,9 +2691,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" dependencies = [ "unicode-ident", ] @@ -2686,7 +2715,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -2697,13 +2726,13 @@ checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", - "bitflags 2.4.2", + "bitflags 2.5.0", "lazy_static", "num-traits", "rand", "rand_chacha", "rand_xorshift", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", "rusty-fork", "tempfile", "unarray", @@ -2829,14 +2858,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", "regex-automata 0.4.6", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -2856,7 +2885,7 @@ checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.2", + "regex-syntax 0.8.3", ] [[package]] @@ -2867,9 +2896,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" [[package]] name = "rustc-hash" @@ -2902,11 +2931,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "errno", "libc", "linux-raw-sys 0.4.13", @@ -2987,14 +3016,14 @@ checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd" dependencies = [ "itoa", "ryu", @@ -3009,7 +3038,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3079,17 +3108,17 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#8287457195cf6a495331f65f5e0119f931ff7e79" +source = "git+https://github.com/Smithay/smithay.git#e5f006818df7ebb92d206985f45e713ba1e9c1c9" dependencies = [ "appendlist", - "bitflags 2.4.2", + "bitflags 2.5.0", "calloop 0.13.0", "cc", "cgmath", @@ -3112,7 +3141,7 @@ dependencies = [ "pkg-config", "profiling", "rand", - "rustix 0.38.31", + "rustix 0.38.32", "scan_fmt", "smallvec", "tempfile", @@ -3136,14 +3165,14 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "922fd3eeab3bd820d76537ce8f582b1cf951eceb5475c28500c7457d9d17f53a" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "calloop 0.12.4", "calloop-wayland-source", "cursor-icon", "libc", "log", "memmap2 0.9.4", - "rustix 0.38.31", + "rustix 0.38.32", "thiserror", "wayland-backend", "wayland-client", @@ -3158,7 +3187,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#8287457195cf6a495331f65f5e0119f931ff7e79" +source = "git+https://github.com/Smithay/smithay.git#e5f006818df7ebb92d206985f45e713ba1e9c1c9" dependencies = [ "drm", "edid-rs", @@ -3208,9 +3237,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "002a1b3dbf967edfafc32655d0f377ab0bb7b994aa1d32c8cc7e9b8bf3ebb8f0" dependencies = [ "proc-macro2", "quote", @@ -3219,12 +3248,12 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.2.0" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" +checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" dependencies = [ "cfg-expr", - "heck", + "heck 0.5.0", "pkg-config", "toml", "version-compare", @@ -3253,29 +3282,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", - "rustix 0.38.31", + "fastrand 2.0.2", + "rustix 0.38.32", "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3324,14 +3353,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.10" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.6", + "toml_edit 0.22.9", ] [[package]] @@ -3367,9 +3396,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.6" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", @@ -3397,7 +3426,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] @@ -3483,7 +3512,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ - "memoffset 0.9.0", + "memoffset 0.9.1", "tempfile", "winapi", ] @@ -3552,9 +3581,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "version-compare" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579a42fc0b8e0c63b76519a339be31bed574929511fa53c1a3acae26eb258f29" +checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" [[package]] name = "version_check" @@ -3614,7 +3643,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-shared", ] @@ -3648,7 +3677,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3667,7 +3696,7 @@ checksum = "9d50fa61ce90d76474c87f5fc002828d81b32677340112b4ef08079a9d459a40" dependencies = [ "cc", "downcast-rs", - "rustix 0.38.31", + "rustix 0.38.32", "scoped-tls", "smallvec", "wayland-sys", @@ -3679,8 +3708,8 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f" dependencies = [ - "bitflags 2.4.2", - "rustix 0.38.31", + "bitflags 2.5.0", + "rustix 0.38.32", "wayland-backend", "wayland-scanner", ] @@ -3691,7 +3720,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "625c5029dbd43d25e6aa9615e88b829a5cad13b2819c4ae129fdbb7c31ab4c7e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "cursor-icon", "wayland-backend", ] @@ -3702,7 +3731,7 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71ce5fa868dd13d11a0d04c5e2e65726d0897be8de247c0c5a65886e283231ba" dependencies = [ - "rustix 0.38.31", + "rustix 0.38.32", "wayland-client", "xcursor", ] @@ -3723,7 +3752,7 @@ version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-scanner", @@ -3736,7 +3765,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa5933740b200188c9b4c38601b8212e8c154d7de0d2cb171944e137a77de1e" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-protocols", "wayland-scanner", @@ -3749,7 +3778,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -3762,7 +3791,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "wayland-backend", "wayland-client", "wayland-protocols", @@ -3787,10 +3816,10 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00e6e4d5c285bc24ba4ed2d5a4bd4febd5fd904451f465973225c8e99772fdb7" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "downcast-rs", "io-lifetimes 2.0.3", - "rustix 0.38.31", + "rustix 0.38.32", "wayland-backend", "wayland-scanner", ] @@ -3804,7 +3833,7 @@ dependencies = [ "dlib", "libc", "log", - "memoffset 0.9.0", + "memoffset 0.9.1", "once_cell", "pkg-config", ] @@ -4088,14 +4117,14 @@ checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" [[package]] name = "winit" -version = "0.29.14" +version = "0.29.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a3db69ffbe53a9babec7804da7a90f21020fcce1f2f5e5291e2311245b993d" +checksum = "0d59ad965a635657faf09c8f062badd885748428933dad8e8bdd64064d92e5ca" dependencies = [ "ahash", "android-activity", "atomic-waker", - "bitflags 2.4.2", + "bitflags 2.5.0", "bytemuck", "calloop 0.12.4", "cfg_aliases", @@ -4115,7 +4144,7 @@ dependencies = [ "percent-encoding", "raw-window-handle", "redox_syscall 0.3.5", - "rustix 0.38.31", + "rustix 0.38.32", "smithay-client-toolkit", "smol_str", "unicode-segmentation", @@ -4173,7 +4202,7 @@ dependencies = [ "libc", "libloading", "once_cell", - "rustix 0.38.31", + "rustix 0.38.32", "x11rb-protocol", ] @@ -4216,7 +4245,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d039de8032a9a8856a6be89cea3e5d12fdd82306ab7c94d74e6deab2460651c5" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.5.0", "dlib", "log", "once_cell", @@ -4342,7 +4371,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.55", ] [[package]] diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index e198d0585d2f..2148c52f18b4 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -16,32 +16,23 @@ , libclang , autoPatchelfHook , clang -, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-VTtXEfxc3OCdtdYiEdtftOQ7gDJNb679Yw8v1Lu3lhY="; + hash = "sha256-lkGIQIMWfg71UOkT/TST8O6hD0IfslENj6oFPevUGl4="; }; - patches = [ - (fetchpatch { - name = "revert-viewporter.patch"; - url = "https://github.com/YaLTeR/niri/commit/40cec34aa4a7f99ab12b30cba1a0ee83a706a413.patch"; - hash = "sha256-3fg8v0eotfjUQY6EVFEPK5BBIBrr6vQpXbjDcsw2E8Q="; - }) - ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-sXdixfPLAUIIVK+PhqRuMZ7XKNJIGkWNlH8nBzXlxCU="; + "smithay-0.3.0" = "sha256-bWan2DCyMvEC8ZQPwM+XpuOGkOZ/RdDV+LmRCN8UAuc="; }; }; From 81d3babe25249ee63d8061bd04b76647c543c06c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:32:06 -0700 Subject: [PATCH 238/260] Avoid top-level `with ...;` in pkgs/games/arx-libertatis/default.nix --- pkgs/games/arx-libertatis/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index de597163a3d1..334219a28901 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -8,7 +8,15 @@ , gdb ? null }: -with lib; +let + inherit (lib) + licenses + maintainers + optionals + optionalString + platforms + ; +in stdenv.mkDerivation rec { pname = "arx-libertatis"; From 8f49dedbcb7e91154c5ff134288859ecbd9e1fb4 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:32:35 -0700 Subject: [PATCH 239/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/default.nix --- pkgs/games/dwarf-fortress/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 55157950c4f2..777866d8fb0e 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -32,9 +32,16 @@ # changes on later launches, but consider extending the wrapper with your # desired options instead. -with lib; - let + inherit (lib) + attrNames + getAttr + importJSON + listToAttrs + recurseIntoAttrs + replaceStrings + ; + callPackage = newScope self; # The latest Dwarf Fortress version. Maintainers: when a new version comes @@ -43,14 +50,14 @@ let latestVersion = "0.47.05"; # Converts a version to a package name. - versionToName = version: "dwarf-fortress_${lib.replaceStrings ["."] ["_"] version}"; + versionToName = version: "dwarf-fortress_${replaceStrings ["."] ["_"] version}"; dwarf-therapist-original = libsForQt5.callPackage ./dwarf-therapist { texlive = texliveBasic.withPackages (ps: with ps; [ float caption wrapfig adjmulticol sidecap preprint enumitem ]); }; # A map of names to each Dwarf Fortress package we know about. - df-games = lib.listToAttrs (map + df-games = listToAttrs (map (dfVersion: { name = versionToName dfVersion; value = @@ -83,10 +90,10 @@ let jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; }) - (lib.attrNames self.df-hashes)); + (attrNames self.df-hashes)); self = rec { - df-hashes = lib.importJSON ./game.json; + df-hashes = importJSON ./game.json; # Aliases for the latest Dwarf Fortress and the selected Therapist install dwarf-fortress = getAttr (versionToName latestVersion) df-games; From 751f1fc693e6a9684cd604f24cccc5f81ca96f66 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:34:15 -0700 Subject: [PATCH 240/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/dfhack/default.nix --- pkgs/games/dwarf-fortress/dfhack/default.nix | 29 ++++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 914ccbb6ab33..12d097c71415 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -18,9 +18,20 @@ , dfVersion }: -with lib; - let + inherit (lib) + getAttr + hasAttr + isAttrs + licenses + maintainers + optional + optionals + optionalString + platforms + versionOlder + ; + dfhack-releases = { "0.44.10" = { dfHackRelease = "0.44.10-r2"; @@ -62,7 +73,7 @@ let }; release = - if lib.isAttrs dfVersion + if isAttrs dfVersion then dfVersion else if hasAttr dfVersion dfhack-releases then getAttr dfVersion dfhack-releases @@ -112,20 +123,20 @@ in fetchSubmodules = true; }; - patches = lib.optional (lib.versionOlder version "0.44.12-r3") (fetchpatch { + patches = optional (versionOlder version "0.44.12-r3") (fetchpatch { name = "fix-stonesense.patch"; url = "https://github.com/DFHack/stonesense/commit/f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae.patch"; extraPrefix = "plugins/stonesense/"; stripLen = 1; hash = "sha256-wje6Mkct29eyMOcJnbdefwBOLJko/s4JcJe52ojuW+8="; - }) ++ lib.optional (lib.versionOlder version "0.47.04-r1") (fetchpatch { + }) ++ optional (versionOlder version "0.47.04-r1") (fetchpatch { name = "fix-protobuf.patch"; url = "https://github.com/DFHack/dfhack/commit/7bdf958518d2892ee89a7173224a069c4a2190d8.patch"; hash = "sha256-p+mKhmYbnhWKNiGPMjbYO505Gcg634n0nudqH0NX3KY="; }); # gcc 11 fix - CXXFLAGS = lib.optionalString (lib.versionOlder version "0.47.05-r3") "-fpermissive"; + CXXFLAGS = optionalString (versionOlder version "0.47.05-r3") "-fpermissive"; # As of # https://github.com/DFHack/dfhack/commit/56e43a0dde023c5a4595a22b29d800153b31e3c4, @@ -142,7 +153,7 @@ in nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] - ++ lib.optionals enableStoneSense [ allegro5 libGLU libGL ]; + ++ optionals enableStoneSense [ allegro5 libGLU libGL ]; preConfigure = '' # Trick build system into believing we have .git @@ -151,7 +162,7 @@ in ''; cmakeFlags = [ "-DDFHACK_BUILD_ARCH=${arch}" "-DDOWNLOAD_RUBY=OFF" ] - ++ lib.optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; + ++ optionals enableStoneSense [ "-DBUILD_STONESENSE=ON" "-DSTONESENSE_INTERNAL_SO=OFF" ]; # dfhack expects an unversioned libruby.so to be present in the hack # subdirectory for ruby plugins to function. @@ -161,7 +172,7 @@ in passthru = { inherit dfVersion; }; - meta = with lib; { + meta = { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; From bb2713d671d55aaa33c96c36aaa2001694f97886 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:35:25 -0700 Subject: [PATCH 241/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/game.nix --- pkgs/games/dwarf-fortress/game.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index 7ce837b7b0b5..8d351cdbbd0d 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -13,9 +13,20 @@ , df-hashes }: -with lib; - let + inherit (lib) + attrNames + elemAt + getAttr + getLib + hasAttr + licenses + maintainers + makeLibraryPath + optionalString + splitVersion + ; + libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; # Map Dwarf Fortress platform names to Nixpkgs platform names. From 1ed3d42bc10eceed4f9ce8443ef773b1704dc52e Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:36:16 -0700 Subject: [PATCH 242/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/lazy-pack.nix --- pkgs/games/dwarf-fortress/lazy-pack.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 17037dbdb278..dcaa8102ae98 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -25,9 +25,16 @@ , enableSound ? true }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + optional + platforms + ; + dfGame = versionToName dfVersion; dwarf-fortress = if hasAttr dfGame df-games @@ -43,10 +50,10 @@ buildEnv { enableIntro enableTruetype enableFPS enableTextMode enableSound; }) ] - ++ lib.optional enableDwarfTherapist dwarf-therapist - ++ lib.optional enableLegendsBrowser legends-browser; + ++ optional enableDwarfTherapist dwarf-therapist + ++ optional enableLegendsBrowser legends-browser; - meta = with lib; { + meta = { description = "An opinionated wrapper for Dwarf Fortress"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; From 118bbb8bcc34d280a8c5bcea50f7742b2b4a4526 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:38:33 -0700 Subject: [PATCH 243/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/themes/default.nix --- pkgs/games/dwarf-fortress/themes/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/themes/default.nix b/pkgs/games/dwarf-fortress/themes/default.nix index d2e2ec5fd19b..ad033b043a46 100644 --- a/pkgs/games/dwarf-fortress/themes/default.nix +++ b/pkgs/games/dwarf-fortress/themes/default.nix @@ -1,6 +1,15 @@ { lib, fetchFromGitHub, ... }: -with builtins; +let + inherit (lib) + importJSON + licenses + listToAttrs + maintainers + platforms + readFile + ; +in listToAttrs (map (v: { @@ -11,11 +20,11 @@ listToAttrs (map repo = v.name; rev = v.version; sha256 = v.sha256; - meta = with lib; { + meta = { platforms = platforms.all; maintainers = [ maintainers.matthewbauer maintainers.shazow ]; license = licenses.free; }; }; }) - (fromJSON (readFile ./themes.json))) + (importJSON ./themes.json)) From 7a546620b231bc271f6a4396c40159dae0a1b23c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:39:12 -0700 Subject: [PATCH 244/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/twbt/default.nix --- pkgs/games/dwarf-fortress/twbt/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 68a5b923aaf4..3c582a67770e 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -5,9 +5,15 @@ , dfVersion }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + platforms + ; + twbt-releases = { "0.44.10" = { twbtRelease = "6.49"; @@ -75,7 +81,7 @@ stdenvNoCC.mkDerivation rec { cp -a *.png $art/data/art/ ''; - meta = with lib; { + meta = { description = "A plugin for Dwarf Fortress / DFHack that improves various aspects the game interface"; maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; From 71488a1fb6d2afbc6f90ff622e5ee151628fe2db Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:39:44 -0700 Subject: [PATCH 245/260] Avoid top-level `with ...;` in pkgs/games/dwarf-fortress/unfuck.nix --- pkgs/games/dwarf-fortress/unfuck.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 9b7de93ecd7d..3aeee27d87a5 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -19,9 +19,16 @@ , pkg-config }: -with lib; - let + inherit (lib) + getAttr + hasAttr + licenses + maintainers + platforms + versionOlder + ; + unfuck-releases = { "0.43.05" = { unfuckRelease = "0.43.05"; @@ -106,7 +113,7 @@ stdenv.mkDerivation { libGL ] # switched to gtk3 in 0.47.05 - ++ (if lib.versionOlder release.unfuckRelease "0.47.05" then [ + ++ (if versionOlder release.unfuckRelease "0.47.05" then [ gtk2 ] else [ gtk3 @@ -124,7 +131,7 @@ stdenv.mkDerivation { passthru = { inherit dfVersion; }; - meta = with lib; { + meta = { description = "Unfucked multimedia layer for Dwarf Fortress"; homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; From 75d2271a90e2fc6f1ececc3e5faa9467901fc9e0 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:40:12 -0700 Subject: [PATCH 246/260] Avoid top-level `with ...;` in pkgs/games/factorio/mods.nix --- pkgs/games/factorio/mods.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 7327b9e22870..9a06453ccce8 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -7,7 +7,7 @@ , allRecommendedMods ? true , allOptionalMods ? false }: -with lib; + let modDrv = factorio-utils.modDrv { inherit allRecommendedMods allOptionalMods; }; in From 9be6e2203771aaa21f2eb373994aef7a0e130fed Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:40:44 -0700 Subject: [PATCH 247/260] Avoid top-level `with ...;` in pkgs/games/factorio/utils.nix --- pkgs/games/factorio/utils.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/games/factorio/utils.nix b/pkgs/games/factorio/utils.nix index d2b52ae48366..b68cc921996e 100644 --- a/pkgs/games/factorio/utils.nix +++ b/pkgs/games/factorio/utils.nix @@ -1,7 +1,18 @@ # This file provides a top-level function that will be used by both nixpkgs and nixos # to generate mod directories for use at runtime by factorio. { lib, stdenv }: -with lib; +let + inherit (lib) + flatten + head + optionals + optionalString + removeSuffix + replaceStrings + splitString + unique + ; +in { mkModDirDrv = mods: modsDatFile: # a list of mod derivations let @@ -18,7 +29,7 @@ with lib; # NB: there will only ever be a single zip file in each mod derivation's output dir ln -s $modDrv/*.zip $out done - '' + (lib.optionalString (modsDatFile != null) '' + '' + (optionalString (modsDatFile != null) '' cp ${modsDatFile} $out/mod-settings.dat ''); }; From 3faad463744af05bb8136dea7fe596e70c0f70bd Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:41:38 -0700 Subject: [PATCH 248/260] Avoid top-level `with ...;` in pkgs/games/koboredux/default.nix --- pkgs/games/koboredux/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/koboredux/default.nix b/pkgs/games/koboredux/default.nix index 46db8b1da57a..5eb482b09cb3 100644 --- a/pkgs/games/koboredux/default.nix +++ b/pkgs/games/koboredux/default.nix @@ -10,9 +10,16 @@ , useProprietaryAssets ? true }: -with lib; - let + inherit (lib) + and + licenses + maintainers + optional + optionalString + platforms + ; + pname = "koboredux"; version = "0.7.5.1"; From 72f827ec28cf3f700af3b649d6fc23695302fecd Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:42:12 -0700 Subject: [PATCH 249/260] Avoid top-level `with ...;` in pkgs/games/lugaru/default.nix --- pkgs/games/lugaru/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index b989195bd5a3..ba8dcdebcec3 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -1,7 +1,13 @@ { lib, stdenv, fetchFromGitLab, cmake, openal, pkg-config, libogg, libvorbis, SDL2, makeWrapper, libpng, libjpeg_turbo, libGLU }: -with lib; +let + inherit (lib) + licenses + maintainers + platforms + ; +in stdenv.mkDerivation rec { @@ -27,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://osslugaru.gitlab.io"; maintainers = [ ]; platforms = platforms.linux; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; }; } From 8809c410214b5584a1a0efbc1c02723235349a1c Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:42:51 -0700 Subject: [PATCH 250/260] Avoid top-level `with ...;` in pkgs/games/openra_2019/common.nix --- pkgs/games/openra_2019/common.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openra_2019/common.nix b/pkgs/games/openra_2019/common.nix index 5932eeb6e6d0..091b56b3d141 100644 --- a/pkgs/games/openra_2019/common.nix +++ b/pkgs/games/openra_2019/common.nix @@ -7,9 +7,16 @@ , zenity }: -with lib; - let + inherit (lib) + licenses + maintainers + makeBinPath + makeLibraryPath + optional + platforms + ; + path = makeBinPath ([ mono python3 ] ++ optional (zenity != null) zenity); rpath = makeLibraryPath [ lua freetype openal SDL2 ]; mkdirp = makeSetupHook { From 4a660d5bb29c955bc776d59f88693a0d7772f3ad Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 14 Mar 2024 11:43:33 -0700 Subject: [PATCH 251/260] Avoid top-level `with ...;` in pkgs/games/tinyfugue/default.nix --- pkgs/games/tinyfugue/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index d6b9647fcc02..e03364f4a1ad 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -3,10 +3,17 @@ , sslSupport ? true }: -with lib; - assert sslSupport -> openssl != null; +let + inherit (lib) + licenses + maintainers + optional + platforms + ; +in + stdenv.mkDerivation rec { pname = "tinyfugue"; version = "50b8"; From 12aee7f3db8b6df91caf74078111a9dc8cfc5524 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Mar 2024 01:27:51 +0000 Subject: [PATCH 252/260] x16-emulator: 46 -> 47 --- pkgs/by-name/x1/x16/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/package.nix b/pkgs/by-name/x1/x16/package.nix index 6a144bea669d..c6e0183a196b 100644 --- a/pkgs/by-name/x1/x16/package.nix +++ b/pkgs/by-name/x1/x16/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-emulator"; - version = "46"; + version = "47"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-emulator"; rev = "r${finalAttrs.version}"; - hash = "sha256-cYr6s69eua1hCFqNkcomZDK9akxBqMTIaGqOl/YX2kc="; + hash = "sha256-v7INa0Xpq7WlrSqc6VNBwLQPUoloqsGbv5rd/VTQtUg="; }; postPatch = '' From cc56d54530eaa0d51c8dd6e461d97b963269fb12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Mar 2024 01:34:38 +0000 Subject: [PATCH 253/260] x16-rom: 46 -> 47 --- pkgs/by-name/x1/x16/rom.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/x1/x16/rom.nix b/pkgs/by-name/x1/x16/rom.nix index 7d17bb8272ce..e44884436f88 100644 --- a/pkgs/by-name/x1/x16/rom.nix +++ b/pkgs/by-name/x1/x16/rom.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "x16-rom"; - version = "46"; + version = "47"; src = fetchFromGitHub { owner = "X16Community"; repo = "x16-rom"; rev = "r${finalAttrs.version}"; - hash = "sha256-PcLHIT84NbH+ejq8SY/UN+TYtRFWtqQBHwHqToFUol8="; + hash = "sha256-+NvuCW8CIj5cnrGh+VQOExhAeXMElqdl9DVJjjGhNPk="; }; nativeBuildInputs = [ From 5d3eb4d1dc4038f6bee911c0c12af02b9e2bb24e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Mar 2024 02:00:34 +0000 Subject: [PATCH 254/260] vhdl-ls: 0.78.1 -> 0.78.2 --- pkgs/development/tools/language-servers/vhdl-ls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index 0090fc1523ff..f0906c865987 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.78.1"; + version = "0.78.2"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-LY9lFZe8MFuDwtNbi9D4JiYY+xKb5bGBHGnH951oRiQ="; + hash = "sha256-hg+OEB4V5kCpno7blMyE6jnDQPHds+BN+RZGG8oAoZU="; }; - cargoHash = "sha256-LcMAau6fJimcyf4Iru5AvrjsSV3nfLPvNqXtyzVHWgc="; + cargoHash = "sha256-jX2vJdFTx0ELXqwMvoCILGvYrfAtL72lfI3KqWCZLYg="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ From b7c2c9602683b0905364f961df485c35002532cd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Mar 2024 02:12:10 +0000 Subject: [PATCH 255/260] postgresql12JitPackages.plpgsql_check: 2.7.4 -> 2.7.5 --- pkgs/servers/sql/postgresql/ext/plpgsql_check.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix index ac6f0e948722..9b990d7048e7 100644 --- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix +++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "plpgsql-check"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "okbob"; repo = "plpgsql_check"; rev = "v${version}"; - hash = "sha256-qPYH6i8XJZVH+5zM/gozf+0Kts/Tzv6fRWkayGEe+5U="; + hash = "sha256-CD/G/wX6o+mC6gowlpFe1DdJWyh3cB9wxSsW2GXrENE="; }; buildInputs = [ postgresql ]; From b96bc828b81140dd3fb096b4e66a6446d6d5c9dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Mar 2024 01:45:09 +0000 Subject: [PATCH 256/260] python312Packages.boost-histogram: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/boost-histogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boost-histogram/default.nix b/pkgs/development/python-modules/boost-histogram/default.nix index ed29be91d81f..14eeb53c93f2 100644 --- a/pkgs/development/python-modules/boost-histogram/default.nix +++ b/pkgs/development/python-modules/boost-histogram/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "boost-histogram"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boost_histogram"; inherit version; - hash = "sha256-z5gmz8/hAzUJa1emH2xlafZfAVklnusiUcW/MdhZ11M="; + hash = "sha256-lxRvc19GfVBpdqBH8/I3zlmECpUv0jH19DH4l/sAbN0="; }; nativeBuildInputs = [ From dbbb97159c755897ebb54734d5955130fcb841f0 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 30 Mar 2024 23:58:19 -0400 Subject: [PATCH 257/260] python311Packages.snakemake-executor-plugin-cluster-generic: 1.0.8 -> 1.0.9 --- .../snakemake-executor-plugin-cluster-generic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix index 0a1f92a9d4f8..8785039c6a18 100644 --- a/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix +++ b/pkgs/development/python-modules/snakemake-executor-plugin-cluster-generic/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "snakemake-executor-plugin-cluster-generic"; - version = "1.0.8"; + version = "1.0.9"; format = "pyproject"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+aGd+E+VQb7MflsiUgFR98AyeetZxbc4gdvU1JWJNcM="; + hash = "sha256-RHMefoJOZb6TjRsFCORLFdHtI5ZpTsV6CHrjHKMat9o="; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic cluster executor for Snakemake"; - homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic/tags"; + homepage = "https://github.com/snakemake/snakemake-executor-plugin-cluster-generic"; license = licenses.mit; maintainers = with maintainers; [ veprbl ]; }; From 415b63c4f623a92a83e6e03deb7625508d25ac0b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 31 Mar 2024 00:13:09 -0400 Subject: [PATCH 258/260] python311Packages.snakemake-interface-report-plugins: init at 1.0.0 --- .../default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix new file mode 100644 index 000000000000..85c4c756b534 --- /dev/null +++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, snakemake-interface-common +}: + +buildPythonPackage rec { + pname = "snakemake-interface-report-plugins"; + version = "1.0.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "snakemake"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-30x4avA3FrqZ4GoTl6Js5h3VG5LW7BNHOcNWxznXoT0="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + snakemake-interface-common + ]; + + pythonImportsCheck = [ "snakemake_interface_report_plugins" ]; + + meta = with lib; { + description = "The interface for Snakemake report plugins"; + homepage = "https://github.com/snakemake/snakemake-interface-report-plugins"; + license = licenses.mit; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b030a14a79b4..f421d07a96b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13838,6 +13838,8 @@ self: super: with self; { snakemake-interface-executor-plugins = callPackage ../development/python-modules/snakemake-interface-executor-plugins { }; + snakemake-interface-report-plugins = callPackage ../development/python-modules/snakemake-interface-report-plugins { }; + snakemake-interface-storage-plugins = callPackage ../development/python-modules/snakemake-interface-storage-plugins { }; snakebite = callPackage ../development/python-modules/snakebite { }; From 924bfa96b679190d52c85e8e9c48c3176a0b00b7 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 31 Mar 2024 00:13:23 -0400 Subject: [PATCH 259/260] snakemake: 8.4.12 -> 8.10.4 --- pkgs/applications/science/misc/snakemake/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 628b40cd1300..1027590d0de8 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "snakemake"; - version = "8.4.12"; + version = "8.10.4"; format = "setuptools"; src = fetchFromGitHub { owner = "snakemake"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ehQIrTw1+klFW+Hu4WsWaCJ0YoN2hIqryqqaoNQb1us="; + hash = "sha256-SZf//Z1rLHyvW/f0U6kEBzV1NjDEDG1OcFl9/JR+i/g="; # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' sed -i "$out"/snakemake/_version.py -e 's#git_refnames = ".*"#git_refnames = " (tag: v${version})"#' @@ -48,6 +48,7 @@ python3.pkgs.buildPythonApplication rec { snakemake-interface-executor-plugins snakemake-interface-common snakemake-interface-storage-plugins + snakemake-interface-report-plugins stopit tabulate throttler From 04e15baaadf09ff9043458d84459d51d94ea2501 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Mar 2024 16:44:10 +0000 Subject: [PATCH 260/260] sgt-puzzles: 20240302.80aac31 -> 20240330.fd304c5 --- pkgs/games/sgt-puzzles/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index bd56416c5918..e5be3c4ae71e 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20240302.80aac31"; + version = "20240330.fd304c5"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - hash = "sha256-0+bmGq4wM+0/ldQz8ieKdkuG0HHazctQr9ul/qLT0gg="; + hash = "sha256-usEgCfbeKOkAg/sHpRxuMcPGHxb+J5+r92aO4Ar7iUA="; }; sgt-puzzles-menu = fetchurl {