diff --git a/nixos/modules/system/activation/switchable-system.nix b/nixos/modules/system/activation/switchable-system.nix index f6aeb70d7aa4..d34223bc96a1 100644 --- a/nixos/modules/system/activation/switchable-system.nix +++ b/nixos/modules/system/activation/switchable-system.nix @@ -71,41 +71,31 @@ preSwitchChecks.switchInhibitors = let - realpath = lib.getExe' pkgs.coreutils "realpath"; - mktemp = lib.getExe' pkgs.coreutils "mktemp"; - rm = lib.getExe' pkgs.coreutils "rm"; - jq = lib.getExe' pkgs.jq "jq"; + jq = lib.getExe pkgs.jq; + empty = pkgs.writeText "empty-inhibitors" "{}"; in # bash '' incoming="''${1-}" action="''${2-}" - if [ "$action" == "boot" ]; then - echo "Not checking switch inhibitors (action = $action)" - exit - fi + case "$action" in + boot|dry-activate) + echo "Not checking switch inhibitors (action = $action)" + exit + ;; + esac echo -n "Checking switch inhibitors..." - # Create a temporary file that we use in case a generation does not have - # the switch-inhibitors file. - empty="$(${mktemp} -t switch_inhibit.XXXX)" - # shellcheck disable=SC2329 - clean_up() { - ${rm} -f "$empty" - } - trap clean_up EXIT - echo "{}" > "$empty" - - current_inhibitors="$(${realpath} /run/current-system)/switch-inhibitors" + current_inhibitors="/run/current-system/switch-inhibitors" if [ ! -f "$current_inhibitors" ]; then - current_inhibitors="$empty" + current_inhibitors="${empty}" fi - new_inhibitors="$(${realpath} "$incoming")/switch-inhibitors" + new_inhibitors="$incoming/switch-inhibitors" if [ ! -f "$new_inhibitors" ]; then - new_inhibitors="$empty" + new_inhibitors="${empty}" fi diff="$( @@ -115,8 +105,8 @@ --rawfile current "$current_inhibitors" \ --rawfile newgen "$new_inhibitors" \ ' - $current | try fromjson catch {} as $old | - $newgen | try fromjson catch {} as $new | + ($current | fromjson) as $old | + ($newgen | fromjson) as $new | $old | to_entries | map( diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 595f069202e3..2d9584c7563e 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -776,6 +776,9 @@ in assert_contains(out, "baz") # Confirm that we can set that same generation as the new boot default switch_to_specialisation("${machine}", "inhibitors_changed", action="boot") + # Confirm that dry-activate is not blocked by inhibitors + out = switch_to_specialisation("${machine}", "inhibitors_changed", action="dry-activate") + assert_contains(out, "Not checking switch inhibitors") # Check that we can switch into a new generation with new inhibitors, but same values for existing ones switch_to_specialisation("${machine}", "inhibitors_new", action="switch") # Check that we can switch back into a generation without inhibitors diff --git a/pkgs/by-name/cp/cpeditor/package.nix b/pkgs/by-name/cp/cpeditor/package.nix index 2cd870c271ad..839d49adf4a8 100644 --- a/pkgs/by-name/cp/cpeditor/package.nix +++ b/pkgs/by-name/cp/cpeditor/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpeditor"; - version = "7.0.2"; + version = "7.1.1"; src = fetchFromGitHub { owner = "cpeditor"; repo = "cpeditor"; tag = finalAttrs.version; - hash = "sha256-rdGdbMJ3j01RAS/xPZ9zimL0mv8ZW3vYXht6jNFyheI="; + hash = "sha256-zEK3137DjQmuc7Y4c/HF0n37bdokj9ci2/agSaG7nZE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix index 248d400b58c4..eaa744782835 100644 --- a/pkgs/by-name/en/envoy-bin/package.nix +++ b/pkgs/by-name/en/envoy-bin/package.nix @@ -67,7 +67,6 @@ stdenvNoCC.mkDerivation { license = lib.licenses.asl20; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ - katexochen charludo ]; mainProgram = "envoy"; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 1e76907960a3..b7d3c0af79cc 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -29,13 +29,13 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.17.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-E0GfYznHj4CKsRWQm6zHTAJ8hJw9ieFoKIOT9tcumYQ="; + hash = "sha256-V1yOSFN2g5MHPIXF/UFymgXrfN5tE99cuIFnWpdCVCA="; }; npmDepsHash = "sha256-DyPfylne9Ku7sEUNN0LLlN0EOnCjcklsh+F6YP+rXv4="; diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 799226b51fde..bf611919b08e 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -58,16 +58,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "34.3.0"; + version = "34.4.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-Se+GIx+Uea/lMOdTDhbt/H+F0yeyMHclpSp52U+pmtA="; + hash = "sha256-eOh1jdrgaMYhqxP+QSCBxqhkJUGYrWLTkYwGmKSNrRA="; }; - npmDepsHash = "sha256-LSfVuNP2Ck0PUbrjHsCXmoiZfT3x/Mk+CpC9cAj96bE="; + npmDepsHash = "sha256-9v4PKlS8FNuhnhdJmu3J1Bl+uSPS4KqE3PBrOhf9jQw="; nativeBuildInputs = [ remarshal diff --git a/pkgs/by-name/li/libnvidia-container/package.nix b/pkgs/by-name/li/libnvidia-container/package.nix index 44d3055d8969..aef01c5c4696 100644 --- a/pkgs/by-name/li/libnvidia-container/package.nix +++ b/pkgs/by-name/li/libnvidia-container/package.nix @@ -175,7 +175,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ cpcloud msanft - katexochen ]; }; }) diff --git a/pkgs/by-name/si/similarity/package.nix b/pkgs/by-name/si/similarity/package.nix index 95d384534cb8..a88d61544a85 100644 --- a/pkgs/by-name/si/similarity/package.nix +++ b/pkgs/by-name/si/similarity/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "similarity"; - version = "0.3.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "mizchi"; repo = "similarity"; tag = "v${finalAttrs.version}"; - hash = "sha256-eZQ0FTmysFYwqg3sjasZW3S0lps2XbFWUbWuZzkFWkA="; + hash = "sha256-xYA1o4nmZLo0TY56KOtm2eTR9xL4/uEVTKmFaQT+kCQ="; }; - cargoHash = "sha256-7qLC1RvjBXd9JFrJdDTIngZhMvyQV1ko3MXRr/2y7hA="; + cargoHash = "sha256-r/9Yq1h8i7OWMicK9z36TzUTQRDOk6cND+5RvL045yA="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/similarity-ts"; diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index 1aeb7495b531..3bdaaee15a92 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "spicetify-cli"; - version = "2.43.1"; + version = "2.43.2"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-yAoIHKPN1o0Ls6klPvDodu+uWCYRmbh437KNbNv3F0k="; + hash = "sha256-77OZVDtybkYI5R3tZ7q2cLJ+Ixn8WB4CP4qP6Yp535g="; }; vendorHash = "sha256-uuvlu5yocqnDh6OO5a4Ngp5SahqURc/14fcg1Kr9sec="; diff --git a/pkgs/development/python-modules/pocket-tts/default.nix b/pkgs/development/python-modules/pocket-tts/default.nix index 12bdc0787598..47da5a38b838 100644 --- a/pkgs/development/python-modules/pocket-tts/default.nix +++ b/pkgs/development/python-modules/pocket-tts/default.nix @@ -25,18 +25,20 @@ # optional-dependencies soundfile, + torchao, }: buildPythonPackage (finalAttrs: { pname = "pocket-tts"; - version = "1.1.1"; + version = "2.0.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "kyutai-labs"; repo = "pocket-tts"; tag = "v${finalAttrs.version}"; - hash = "sha256-9Y/q/6Ti/oTyOgRzK+UT+LSM/iH3RGey+XojxbPvPS0="; + hash = "sha256-NbqL75EOS262L1km89raKXhgQVVOfi5yFP5Y4APH3yw="; }; build-system = [ @@ -69,6 +71,9 @@ buildPythonPackage (finalAttrs: { audio = [ soundfile ]; + quantize = [ + torchao + ]; }; pythonImportsCheck = [ "pocket_tts" ];