diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc71763a8f69..999314e3cab3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10552,6 +10552,11 @@ github = "id3v1669"; githubId = 57532211; }; + idabzo = { + github = "idabzo"; + githubId = 12761234; + name = "Ida Bzowska"; + }; idlip = { name = "Dilip"; email = "igoldlip@gmail.com"; diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index dcfd211470d6..b0af0a6e6ee7 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -92,7 +92,7 @@ in default = config.environment.memoryAllocator.provider != "graphene-hardened" && config.environment.memoryAllocator.provider != "graphene-hardened-light"; - defaultText = ''config.environment.memoryAllocator.provider != "graphene-hardened" && config.environment.memoryAllocator.provider != "graphene-hardened-light"''; + defaultText = lib.literalExpression ''config.environment.memoryAllocator.provider != "graphene-hardened" && config.environment.memoryAllocator.provider != "graphene-hardened-light"''; description = '' Whether to add the `-m` flag to lock memory. ''; diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 8ede4c33ab43..fd53a475f4d9 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3245,6 +3245,8 @@ let }; }; + mkhl.shfmt = callPackage ./mkhl.shfmt { }; + mongodb.mongodb-vscode = callPackage ./mongodb.mongodb-vscode { }; moshfeu.compare-folders = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix new file mode 100644 index 000000000000..84c2bd9a93a0 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/mkhl.shfmt/default.nix @@ -0,0 +1,28 @@ +{ + lib, + vscode-utils, + jq, + shfmt, + moreutils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "shfmt"; + publisher = "mkhl"; + version = "1.3.1"; + hash = "sha256-V7pXPwabmUJLC/T0X4dsc52IZa7SaN70zd4mCjqk4X4="; + }; + + postInstall = '' + cd "$out/$installPrefix" + ${lib.getExe jq} '.contributes.configuration.properties."shfmt.executablePath".default = "${lib.getExe shfmt}"' package.json | ${lib.getExe' moreutils "sponge"} package.json + ''; + + meta = { + description = "Extension uses shfmt to provide a formatter for shell script documents"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=mkhl.shfmt"; + homepage = "https://codeberg.org/mkhl/vscode-shfmt"; + license = lib.licenses.bsd0; + maintainers = [ lib.maintainers.therobot2105 ]; + }; +} diff --git a/pkgs/by-name/ch/check-sieve/package.nix b/pkgs/by-name/ch/check-sieve/package.nix index ac76b9a90868..0a29ac7162d7 100644 --- a/pkgs/by-name/ch/check-sieve/package.nix +++ b/pkgs/by-name/ch/check-sieve/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation rec { pname = "check-sieve"; - version = "0.10-unstable-2025-05-06"; + version = "0.11"; src = fetchFromGitHub { owner = "dburkart"; repo = "check-sieve"; - rev = "794c2b116078af59fa8b7bf7a00450f8de0f06de"; - hash = "sha256-jml+G253cqYco9vKXwI8LW7w/mN74lMthCzlRXl+SWc="; + tag = "check-sieve-${version}"; + hash = "sha256-vmfHXjcZ5J/+kO3/a0p8krLOuC67+q8SxcPJgW+UaTw="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Syntax checker for mail sieves"; mainProgram = "check-sieve"; homepage = "https://github.com/dburkart/check-sieve"; - changelog = "https://github.com/dburkart/check-sieve/blob/master/ChangeLog"; + changelog = "https://github.com/dburkart/check-sieve/blob/${src.tag}/ChangeLog"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ eilvelia ]; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 1e57a56089fb..22bbb16711b4 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "3.13.0"; + version = "3.13.1"; nodejs = nodejs_20; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-E6MD/fQO7cpczaaTbkZOf/lMOywUUXBP9uUVfTH+Iv8="; + hash = "sha256-6QzwZmDCts/ci0J2ok1Met9bNiqDHmdYj/PbvWyd4Wk="; }; - npmDepsHash = "sha256-Q66Gq8LvZEoRVpwzwbK4D9KLVNk6Rc5SztFGwQUuePI="; + npmDepsHash = "sha256-H53g1hbVpArFNy47M5QS2/diWbEyyoLOf86OxVffvwQ="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cp/cpptrace/package.nix b/pkgs/by-name/cp/cpptrace/package.nix index 7e174005a80d..fd2516c65bb9 100644 --- a/pkgs/by-name/cp/cpptrace/package.nix +++ b/pkgs/by-name/cp/cpptrace/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpptrace"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jeremy-rifkin"; repo = "cpptrace"; tag = "v${finalAttrs.version}"; - hash = "sha256-HUUyH9N+e98Gp6TPeT6TCGpdzd09knHVDaQ3KeDp8LY="; + hash = "sha256-Rqj0yFOOOZyK4BJWVFGyYznMSSwNgb+o1HTykyyOWcA="; }; patches = [ diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 1d9e4d1049b3..f614766d74c0 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.21.5"; + version = "0.21.6"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mnd4Hzuzq8aawwDn7qtjbAyM/JLlhtoATF/OUzqQkHc="; + hash = "sha256-9Q66xaQzRwpc/fRvAQsbzBDpXhm0goCNiW/sUjGmUEM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-3BNyoKWPmq2CHiBeliUGWpChtSmfJUEmf4JZoYVVpb8="; + cargoHash = "sha256-Asb6V0R49ZprabXQOi95zBpqc855CLwXUstKVq7+rXs="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index ddaa7f42355c..962596d20570 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -10,23 +10,23 @@ jq, nix-prefetch-github, prefetch-npm-deps, + gitUpdater, }: buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.1.5"; + version = "0.1.7"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; - # Currently there's no release tag - rev = "121bba346411cce23e350b833dc5857ea2239f2f"; - hash = "sha256-2w28N6Fhm6k3wdTYtKH4uLPBIOdELd/aRFDs8UMWMmU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DAenod/w9BydYdYsOnuLj7kCQRcTnZ81tf4MhLUug6c="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-yoUAOo8OwUWG0gyI5AdwfRFzSZvSCd3HYzzpJRvdbiM="; + hash = "sha256-otogkSsKJ5j1BY00y4SRhL9pm7CK9nmzVisvGCDIMlU="; }; preConfigure = '' @@ -36,20 +36,16 @@ buildNpmPackage (finalAttrs: { installPhase = '' runHook preInstall + mkdir -p $out/{bin,share/gemini-cli} - mkdir -p "$out/lib" + cp -r node_modules $out/share/gemini-cli/ - cp -r node_modules "$out/lib/" - - rm -f "$out/lib/node_modules/@google/gemini-cli" - rm -f "$out/lib/node_modules/@google/gemini-cli-core" - - cp -r packages/cli "$out/lib/node_modules/@google/gemini-cli" - cp -r packages/core "$out/lib/node_modules/@google/gemini-cli-core" - - mkdir -p "$out/bin" - ln -s ../lib/node_modules/@google/gemini-cli/dist/index.js "$out/bin/gemini" + rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli + rm -f $out/share/gemini-cli/node_modules/@google/gemini-cli-core + cp -r packages/cli $out/share/gemini-cli/node_modules/@google/gemini-cli + cp -r packages/core $out/share/gemini-cli/node_modules/@google/gemini-cli-core + ln -s $out/share/gemini-cli/node_modules/@google/gemini-cli/dist/index.js $out/bin/gemini runHook postInstall ''; @@ -57,33 +53,7 @@ buildNpmPackage (finalAttrs: { chmod +x "$out/bin/gemini" ''; - passthru.updateScript = lib.getExe (writeShellApplication { - name = "gemini-cli-update-script"; - runtimeInputs = [ - cacert - curl - gnused - jq - nix-prefetch-github - prefetch-npm-deps - ]; - text = '' - latest_version=$(curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/package-lock.json" | jq -r '.version') - latest_rev=$(curl -s "https://api.github.com/repos/google-gemini/gemini-cli/commits/main" | jq -r '.sha') - - src_hash=$(nix-prefetch-github google-gemini gemini-cli --rev "$latest_rev" | jq -r '.hash') - - temp_dir=$(mktemp -d) - curl -s "https://raw.githubusercontent.com/google-gemini/gemini-cli/$latest_rev/package-lock.json" > "$temp_dir/package-lock.json" - npm_deps_hash=$(prefetch-npm-deps "$temp_dir/package-lock.json") - rm -rf "$temp_dir" - - sed -i "s|version = \".*\";|version = \"$latest_version\";|" "pkgs/by-name/ge/gemini-cli/package.nix" - sed -i "s|rev = \".*\";|rev = \"$latest_rev\";|" "pkgs/by-name/ge/gemini-cli/package.nix" - sed -i "/src = fetchFromGitHub/,/};/s|hash = \".*\";|hash = \"$src_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix" - sed -i "/npmDeps = fetchNpmDeps/,/};/s|hash = \".*\";|hash = \"$npm_deps_hash\";|" "pkgs/by-name/ge/gemini-cli/package.nix" - ''; - }); + passthru.updateScript = gitUpdater { }; meta = { description = "AI agent that brings the power of Gemini directly into your terminal"; diff --git a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch index 8f2bd8579ed8..c0b7df147b24 100644 --- a/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch +++ b/pkgs/by-name/hd/hdf5-blosc/no-external-blosc.patch @@ -1,12 +1,15 @@ ---- a/CMakeLists.txt 2019-10-11 12:12:27.445417039 -0400 -+++ b/CMakeLists.txt 2019-10-11 12:27:26.630691742 -0400 -@@ -22,14 +22,6 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9ec0f23..35953d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,15 +24,6 @@ message("BLOSC_INSTALL_DIR='${BLOSC_INSTALL_DIR}'") message("BLOSC_CMAKE_ARGS='${BLOSC_CMAKE_ARGS}'") message("GIT_EXECUTABLE='${GIT_EXECUTABLE}'") -ExternalProject_Add(project_blosc - PREFIX ${BLOSC_PREFIX} - GIT_REPOSITORY https://github.com/Blosc/c-blosc.git +- GIT_TAG main - INSTALL_DIR ${BLOSC_INSTALL_DIR} - CMAKE_ARGS ${BLOSC_CMAKE_ARGS} -) @@ -15,10 +18,10 @@ # sources set(SOURCES src/blosc_filter.c) set(PLUGIN_SOURCES src/blosc_filter.c src/blosc_plugin.c ) -@@ -53,7 +45,6 @@ +@@ -56,7 +47,6 @@ include_directories(${HDF5_INCLUDE_DIRS}) # add blosc libraries add_library(blosc_shared SHARED IMPORTED) - set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX}) + set_property(TARGET blosc_shared PROPERTY IMPORTED_LOCATION ${BLOSC_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}blosc${CMAKE_SHARED_LIBRARY_SUFFIX}) -add_dependencies(blosc_shared project_blosc) include_directories(${BLOSC_INSTALL_DIR}/include) diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix index 1a0eaea6c2f6..d0eb807a72a3 100644 --- a/pkgs/by-name/hd/hdf5-blosc/package.nix +++ b/pkgs/by-name/hd/hdf5-blosc/package.nix @@ -5,17 +5,18 @@ cmake, hdf5, fetchFromGitHub, + nix-update-script, }: stdenv.mkDerivation rec { pname = "hdf5-blosc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "hdf5-blosc"; rev = "v${version}"; - sha256 = "1nj2bm1v6ymm3fmyvhbn6ih5fgdiapavlfghh1pvbmhw71cysyqs"; + sha256 = "sha256-pM438hUEdzdZEGYxoKlBAHi1G27auj9uGSeiXwVPAE8="; }; patches = [ ./no-external-blosc.patch ]; @@ -33,11 +34,13 @@ stdenv.mkDerivation rec { ]; preConfigure = '' - substituteInPlace CMakeLists.txt --replace 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")' + substituteInPlace CMakeLists.txt --replace-fail 'set(BLOSC_INSTALL_DIR "''${CMAKE_CURRENT_BINARY_DIR}/blosc")' 'set(BLOSC_INSTALL_DIR "${c-blosc}")' ''; cmakeFlags = [ "-DPLUGIN_INSTALL_PATH=${placeholder "plugin"}/hdf5/lib/plugin" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DBUILD_TESTS=ON" ]; postInstall = '' @@ -45,6 +48,10 @@ stdenv.mkDerivation rec { substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc ''; + doCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Filter for HDF5 that uses the Blosc compressor"; homepage = "https://github.com/Blosc/hdf5-blosc"; diff --git a/pkgs/development/libraries/hunspell/dictionaries-chromium.nix b/pkgs/by-name/hu/hunspell/dictionaries-chromium.nix similarity index 100% rename from pkgs/development/libraries/hunspell/dictionaries-chromium.nix rename to pkgs/by-name/hu/hunspell/dictionaries-chromium.nix diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix similarity index 100% rename from pkgs/development/libraries/hunspell/dictionaries.nix rename to pkgs/by-name/hu/hunspell/dictionaries.nix diff --git a/pkgs/by-name/hu/hunspell/package.nix b/pkgs/by-name/hu/hunspell/package.nix index 64e5ad4979fd..ce0e7db16a7b 100644 --- a/pkgs/by-name/hu/hunspell/package.nix +++ b/pkgs/by-name/hu/hunspell/package.nix @@ -58,13 +58,11 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "format" ]; passthru = { + withDicts = callPackage ./wrapper.nix { hunspell = finalAttrs.finalPackage; }; tests = { pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; version = testers.testVersion { package = finalAttrs.finalPackage; }; - wrapper = callPackage ./wrapper.nix { - hunspell = finalAttrs.finalPackage; - dicts = [ hunspellDicts.en_US ]; - }; + wrapper = finalAttrs.finalPackage.withDicts (d: [ d.en_US ]); }; updateScript = nix-update-script { }; @@ -95,11 +93,14 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://hunspell.github.io/"; changelog = "https://github.com/hunspell/hunspell/releases/tag/${finalAttrs.src.rev}"; license = with lib.licenses; [ - gpl2 - lgpl21 + gpl2Plus + lgpl21Plus mpl11 ]; - maintainers = with lib.maintainers; [ getchoo ]; + maintainers = with lib.maintainers; [ + getchoo + RossSmyth + ]; mainProgram = "hunspell"; platforms = lib.platforms.all; pkgConfigModules = [ "hunspell" ]; diff --git a/pkgs/development/libraries/hunspell/update-chromium-dictionaries.py b/pkgs/by-name/hu/hunspell/update-chromium-dictionaries.py similarity index 100% rename from pkgs/development/libraries/hunspell/update-chromium-dictionaries.py rename to pkgs/by-name/hu/hunspell/update-chromium-dictionaries.py diff --git a/pkgs/by-name/hu/hunspell/wrapper.nix b/pkgs/by-name/hu/hunspell/wrapper.nix index 678a16bee80e..c18fb4a21871 100644 --- a/pkgs/by-name/hu/hunspell/wrapper.nix +++ b/pkgs/by-name/hu/hunspell/wrapper.nix @@ -1,33 +1,39 @@ { - stdenv, lib, + buildEnv, hunspell, + hunspellDicts, makeBinaryWrapper, - dicts ? [ ], }: -let - searchPath = lib.makeSearchPath "share/hunspell" dicts; -in -stdenv.mkDerivation { - inherit (lib.appendToName "with-dicts" hunspell) name; - nativeBuildInputs = [ makeBinaryWrapper ]; +lib.makeOverridable ( + { ... }@dicts: + f: + buildEnv { + inherit (lib.appendToName "with-dicts" hunspell) name; - buildCommand = '' - makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \ - --prefix DICPATH : ${lib.escapeShellArg searchPath} - ''; + paths = f dicts; - meta = { - inherit (hunspell.meta) - description - longDescription - homepage - changelog - license - maintainers - mainProgram - platforms - ; - }; -} + pathsToLink = [ "/share/hunspell" ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + makeWrapper ${lib.getExe hunspell} $out/bin/hunspell \ + --prefix DICPATH : $out/share/hunspell + ''; + + meta = { + inherit (hunspell.meta) + description + longDescription + homepage + changelog + license + maintainers + mainProgram + platforms + ; + }; + } +) hunspellDicts diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index 49ced0d5dd64..e58c2e1dd5cc 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.21.3"; + version = "1.22.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-NFj/C1oNRh9PzAi5TUv+4vVea1Nsn/frxf4aZjuYfvA="; + sha256 = "sha256-buc79CIADeZjQycEymTmskRD2+aY6nQecf0QqVDEgV8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix index aab719eb2e53..4b81872a65d8 100644 --- a/pkgs/by-name/ma/mattermost/tests.nix +++ b/pkgs/by-name/ma/mattermost/tests.nix @@ -145,9 +145,12 @@ mattermost.overrideAttrs ( "TestRunServerNoSystemd" # Appear to be broken. - "TestSessionStore/MySQL/SessionGetWithDeviceId" - "TestSessionStore/MySQL/GetMobileSessionMetadata" - "TestSessionStore/MySQL/GetSessionsWithActiveDeviceIds" + "TestSessionStore/MySQL" + "TestAccessControlPolicyStore/MySQL" + "TestAttributesStore/MySQL" + "TestBasicAPIPlugins" + + "TestRunExportJobE2EByType" "TestUpdateTeam" "TestSyncSyncableRoles" ] diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index e696c9130df2..1d2c2d4ff029 100644 --- a/pkgs/by-name/ne/netbird-dashboard/package.nix +++ b/pkgs/by-name/ne/netbird-dashboard/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "netbird-dashboard"; - version = "2.12.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-AZ8vrDtpVADW8NMq/MBpYd6VSMcuFzk67UXoXdPeiPk="; + hash = "sha256-uJfXBRN8rr51nmXhpqW/P/fj+hr2yIxamL36JH7vTQI="; }; - npmDepsHash = "sha256-XNAphh1zNi4enf0Mz9TUgWyZHezTuctMPTBswKO4eW8="; + npmDepsHash = "sha256-5a2OXxTjamRpm1PBrJWYtrvAT1c9qfAOja7gpkt2stI="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/on/onboard/package.nix b/pkgs/by-name/on/onboard/package.nix index 804c89170235..8ea4bde90745 100644 --- a/pkgs/by-name/on/onboard/package.nix +++ b/pkgs/by-name/on/onboard/package.nix @@ -15,7 +15,6 @@ gtk3, hunspell, hunspellDicts, - hunspellWithDicts, intltool, isocodes, libappindicator-gtk3, @@ -33,14 +32,11 @@ let - customHunspell = hunspellWithDicts [ - hunspellDicts.en-us - ]; + customHunspell = hunspell.withDicts (di: [ di.en-us ]); majorVersion = "1.4"; in - python3.pkgs.buildPythonApplication rec { pname = "onboard"; version = "${majorVersion}.1"; @@ -51,9 +47,7 @@ python3.pkgs.buildPythonApplication rec { }; patches = [ - (replaceVars ./fix-paths.patch { - inherit mousetweaks; - }) + (replaceVars ./fix-paths.patch { inherit mousetweaks; }) # Allow loading hunspell dictionaries installed in NixOS system path ./hunspell-use-xdg-datadirs.patch @@ -110,9 +104,7 @@ python3.pkgs.buildPythonApplication rec { systemd ]; - propagatedUserEnvPkgs = [ - dconf - ]; + propagatedUserEnvPkgs = [ dconf ]; nativeCheckInputs = [ # for Onboard.SpellChecker.aspell_cmd doctests diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix index e9c91a1a10d6..adc1427480ce 100644 --- a/pkgs/by-name/qm/qmmp/package.nix +++ b/pkgs/by-name/qm/qmmp/package.nix @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { pname = "qmmp"; - version = "2.2.6"; + version = "2.2.7"; src = fetchurl { url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2"; - hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s="; + hash = "sha256-3c/wthj0eQgC9tUtmnlrXzLLfQ8jyZGBuAT2FPq1+7I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/re/rebuilderd/package.nix b/pkgs/by-name/re/rebuilderd/package.nix index 303677626ab2..9016df3118ef 100644 --- a/pkgs/by-name/re/rebuilderd/package.nix +++ b/pkgs/by-name/re/rebuilderd/package.nix @@ -20,13 +20,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rebuilderd"; - version = "0.23.1"; + version = "0.24.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = "rebuilderd"; tag = "v${finalAttrs.version}"; - hash = "sha256-ARm81++VByh/erog1aDQTOaxd60M9OuTbJGdgHx24pw="; + hash = "sha256-6LBTUb6kCR/oSyIhiVADSz+oE2xLSY5GKxUQ4HcDFJk="; }; postPatch = '' @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; useFetchCargoVendor = true; - cargoHash = "sha256-O+1ARimSN26geZanLV5E94vnZk0HsE4pyjNS3dADg8Y="; + cargoHash = "sha256-s6gXinH706tAxDyHrhPV4u+Z1tbLvBOhI1JhdiwrHG8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/re/renderdoc/package.nix b/pkgs/by-name/re/renderdoc/package.nix index 7555e26de182..ae571d74e7ec 100644 --- a/pkgs/by-name/re/renderdoc/package.nix +++ b/pkgs/by-name/re/renderdoc/package.nix @@ -33,13 +33,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "renderdoc"; - version = "1.38"; + version = "1.39"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${finalAttrs.version}"; - hash = "sha256-6DvBV2amPfQff3LleXaqfoKzWvoHUJ0dh/bg/WcGIeA="; + hash = "sha256-UFaZtSA3oYOYKuV2loh5tX1rLnoKgRypaJe6H+j/uHU="; }; outputs = [ diff --git a/pkgs/by-name/rs/rsop/package.nix b/pkgs/by-name/rs/rsop/package.nix index 1ace6ca857e6..f1722067888a 100644 --- a/pkgs/by-name/rs/rsop/package.nix +++ b/pkgs/by-name/rs/rsop/package.nix @@ -11,18 +11,18 @@ rustPlatform.buildRustPackage rec { pname = "rsop"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "heiko"; repo = "rsop"; rev = "rsop/v${version}"; - hash = "sha256-jbAv4uTG+ffp6mc9EsezPORh9KqDfUBNXxQuaOIbNfQ="; + hash = "sha256-8Zp+sdEV+HJfreBuIaB952Go0LBxMzYFl557TWSxxMk="; }; useFetchCargoVendor = true; - cargoHash = "sha256-G1N76ZG43eiTjxhOfRCSwjz7XOAolj88tex8qoZuC2Y="; + cargoHash = "sha256-3/pdOkgd4X9HpJN3LHMCmWchb/qwaNM7pE/dKHxSi5U="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/sc/sccmhunter/package.nix b/pkgs/by-name/sc/sccmhunter/package.nix index b47540c07f19..2d4a4f773e44 100644 --- a/pkgs/by-name/sc/sccmhunter/package.nix +++ b/pkgs/by-name/sc/sccmhunter/package.nix @@ -1,25 +1,27 @@ { lib, fetchFromGitHub, - python3Packages, + # Pinned to Python 3.12 because future-1.0.0 is not supported for Python 3.13: + # error: future-1.0.0 not supported for interpreter python3.13 + python312Packages, }: -python3Packages.buildPythonApplication rec { +python312Packages.buildPythonApplication rec { pname = "sccmhunter"; - version = "1.0.9"; + version = "1.0.10"; pyproject = true; src = fetchFromGitHub { owner = "garrettfoster13"; repo = "sccmhunter"; rev = "v${version}"; - hash = "sha256-Db+kBLy2ejIKKjCskAE4arppk/sq9qQ3w1nCQmeLYhs="; + hash = "sha256-h7P+ry4J26Hm1s9U37t1EDWBaYRL32WA3sk8caA1edg="; }; - build-system = with python3Packages; [ + build-system = with python312Packages; [ setuptools ]; - dependencies = with python3Packages; [ + dependencies = with python312Packages; [ cmd2 cryptography impacket diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix index 3d2aee9a4498..3c61ab703de1 100644 --- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix +++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix @@ -24,23 +24,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-node"; - version = "0.72.1"; + version = "0.74.1"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-A8EAHHcBFSD4ZlvFig64g4+eoZQCuqE/qv509hA3I4s="; + hash = "sha256-ZMi+/d051CS7TcWVZnVItNpok0ac+vAvvZL/buNrtL0="; }; useFetchCargoVendor = true; - cargoHash = "sha256-+vJrywIi/RcGGGns42XlN6S63RBil3fB4XByTLsaFVc="; + cargoHash = "sha256-pRMFWJSRjhZYfX7dmOQXK3BjhJKzPR1Pg+TZzTfPnd4="; npmRoot = "node"; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-npm-deps"; inherit (finalAttrs) version src; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; - hash = "sha256-ZD0ZN2b7KReGbnvarqvGpOlQ5TsJfnaHmmOWQ42Y48E="; + hash = "sha256-9x1oCzZLBeX0AN+R4qcyBNwsJ/AY6mebCEEfQ5JKpl8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix index 65bfd38acbf4..9045fb74a423 100644 --- a/pkgs/by-name/si/signal-desktop/package.nix +++ b/pkgs/by-name/si/signal-desktop/package.nix @@ -52,13 +52,13 @@ let ''; }); - version = "7.58.0"; + version = "7.59.0"; src = fetchFromGitHub { owner = "signalapp"; repo = "Signal-Desktop"; tag = "v${version}"; - hash = "sha256-0WO4cjbZLVaf/ju7PdfZJKOa7qGXsjWZHGY8lxOvr3w="; + hash = "sha256-Brvr4SQ2TzAqrvXm9C7a1ejaP4kviJoQhgRBP3R3dIg="; }; sticker-creator = stdenv.mkDerivation (finalAttrs: { @@ -120,15 +120,15 @@ stdenv.mkDerivation (finalAttrs: { ; hash = if withAppleEmojis then - "sha256-h2yaGRqAtVh/8Jv+YZAcXw3/b8+fi+cKFSqcRhMH2sM=" + "sha256-mVC7dOsBcBrOEuz7t4xMv1QX2ZgfA5EjnRYunZEx73E=" else - "sha256-1dkJBIQVJxpsd8IQIlRncDYHp+2j0fowlbEEWpQSPtI="; + "sha256-9hvqLZGSrzJD5vMTdHoIpDeRM6fu2JSRNdHgyeSWmDY="; }; env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; SIGNAL_ENV = "production"; - SOURCE_DATE_EPOCH = 1750276003; + SOURCE_DATE_EPOCH = 1750885921; }; preBuild = '' diff --git a/pkgs/by-name/st/steamguard-cli/package.nix b/pkgs/by-name/st/steamguard-cli/package.nix index e7faa8dc414f..849b69c5028c 100644 --- a/pkgs/by-name/st/steamguard-cli/package.nix +++ b/pkgs/by-name/st/steamguard-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "steamguard-cli"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "dyc3"; repo = "steamguard-cli"; rev = "v${version}"; - hash = "sha256-o4hJ8+FsFLKJwifLP3pGbn35SOsTTnQosO4IejitUeI="; + hash = "sha256-IoWLPpFPQC1QU1EgJSiiAQqMcDQnHa5WRLiya3WN+6w="; }; useFetchCargoVendor = true; - cargoHash = "sha256-OBftq8bPqmc77oeOStAeXZN5DHfASdOJCrmgDTgHFWc="; + cargoHash = "sha256-7csGZp5dAz0j7pTxeex/yrgzNFU7Qz3zNcZ/K4dV7GE="; nativeBuildInputs = [ installShellFiles ]; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' diff --git a/pkgs/by-name/ta/tanka/package.nix b/pkgs/by-name/ta/tanka/package.nix index 3acd0f5ac34b..5bda8d7657b7 100644 --- a/pkgs/by-name/ta/tanka/package.nix +++ b/pkgs/by-name/ta/tanka/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "grafana"; repo = "tanka"; rev = "v${version}"; - sha256 = "sha256-+875PMDATNarFhnAhpi9QxBNgV9irrjRWd/hHsqlH+c="; + sha256 = "sha256-B4ebheUeBf1E/bdwSZoMiMCAmbbuBki6EBn6ZDT4ocM="; }; - vendorHash = "sha256-pgtkTpEnRBjao/78Zc8qVJXZGRmKbO5wIy/7G4y0DgU="; + vendorHash = "sha256-I8acIMTxn7w+b9Z/4TxycQZp1LK7CphtTPOZFcfoEvU="; doCheck = false; # Required for versions >= 0.28 as they introduce a gowork.sum file. This is only used for tests so we can safely disable GOWORK diff --git a/pkgs/by-name/ty/typeinc/package.nix b/pkgs/by-name/ty/typeinc/package.nix index a38ab3d9adf6..58635da69898 100644 --- a/pkgs/by-name/ty/typeinc/package.nix +++ b/pkgs/by-name/ty/typeinc/package.nix @@ -8,27 +8,21 @@ }: python3Packages.buildPythonApplication rec { pname = "typeinc"; - version = "1.0.1"; + version = "1.0.3"; + + pyproject = true; src = fetchFromGitHub { owner = "AnirudhG07"; repo = "Typeinc"; tag = "v${version}"; - hash = "sha256-p549vz4PoZgFybu/X/6BZfEnQAeQEA1jZAgqB5nD5UM="; + hash = "sha256-/R3mNxZE4Pt4UlCljsQphHBCoA2JIZrTorqU4Adcdp0="; }; - pyproject = true; build-system = [ python3Packages.hatchling ]; nativeBuildInputs = [ installShellFiles ]; - dependencies = with python3Packages; [ - setuptools - pyttsx3 - pyperclip - keyboard - ]; - postInstall = '' installManPage docs/man/typeinc.1 ''; diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json index 0676e9288632..3349b87ed8a4 100644 --- a/pkgs/by-name/wi/windsurf/info.json +++ b/pkgs/by-name/wi/windsurf/info.json @@ -1,20 +1,20 @@ { "aarch64-darwin": { - "version": "1.10.3", + "version": "1.10.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-arm64-1.10.3.zip", - "sha256": "1d48996a9a695ddce474e4a268e687752c5f856446298c58fdbca3b21f19ec88" + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-darwin-arm64-1.10.5.zip", + "sha256": "e402aeb4c1fdc758cc31063fd5cfab1795f45bb2928df1b4c494a778be9d3db3" }, "x86_64-darwin": { - "version": "1.10.3", + "version": "1.10.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-darwin-x64-1.10.3.zip", - "sha256": "ab46ad5bed1c8e577fee8cfe249981af88c504a357f82a769cd698b3bc9c2b4d" + "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-darwin-x64-1.10.5.zip", + "sha256": "4fb21084c4e077d3c667b061688afe66ea083ec62f6d5620255277cd241926a0" }, "x86_64-linux": { - "version": "1.10.3", + "version": "1.10.5", "vscodeVersion": "1.99.3", - "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/c1afeb8ae2b17dbdda415f9aa5dec23422c1fe47/Windsurf-linux-x64-1.10.3.tar.gz", - "sha256": "638f31624714189f6c3272635d1089debbe1fb9a96eb290a8b5b4471eb288dfb" + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/ff497a1ec3dde399fde9c001a3e69a58f2739dac/Windsurf-linux-x64-1.10.5.tar.gz", + "sha256": "4639e428f23cd9e3cfefcd9730518e136cd6d1bb9faac23d7f4c0d4c53ff88ff" } } diff --git a/pkgs/applications/audio/zrythm/default.nix b/pkgs/by-name/zr/zrythm/package.nix similarity index 97% rename from pkgs/applications/audio/zrythm/default.nix rename to pkgs/by-name/zr/zrythm/package.nix index 91389dd07254..a61eef83bc09 100644 --- a/pkgs/applications/audio/zrythm/default.nix +++ b/pkgs/by-name/zr/zrythm/package.nix @@ -7,7 +7,6 @@ appstream, bash-completion, boost, - breeze-icons, carla, chromaprint, cmake, @@ -42,6 +41,7 @@ ninja, pcre2, pkg-config, + plasma5Packages, python3, rtaudio_6, rtmidi, @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: { preFixup = '' gappsWrapperArgs+=( --prefix GSETTINGS_SCHEMA_DIR : "$out/share/gsettings-schemas/${finalAttrs.pname}-${finalAttrs.version}/glib-2.0/schemas/" - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${breeze-icons}/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${plasma5Packages.breeze-icons}/share" ) ''; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index cc272049520a..3e42ae21591e 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2025.05"; + version = "2025.06"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "rakudo"; repo = "rakudo"; rev = version; - hash = "sha256-F4CWVUlDtPjnZaOPIoTMAw6kxM7FlQqr3Lm+Mg0CV2M="; + hash = "sha256-vZ8U18TS+L6P8jTwUxasKH+nrDMElAnGKvgT3nXdpwU="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 52a2a4661e7b..8a5e630b2ceb 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2025.05"; + version = "2025.06"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "moarvm"; repo = "moarvm"; rev = version; - hash = "sha256-ikzi0DsKb/HDL+rmMcm/LbYXZWhYzysERHvcmSemfJ0="; + hash = "sha256-QtJ8cLAbsFJ26wkfQCbIMVU1ArWlAXjsQ/RJbQ0wRNo="; fetchSubmodules = true; }; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index e7dc771e01e9..d6bf9d254faa 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2025.05"; + version = "2025.06"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "raku"; repo = "nqp"; rev = version; - hash = "sha256-CNanRrK9ReK1OoM82ytCRh/tZfnvAs4vCyy5BRYIwCU="; + hash = "sha256-zI/Br2GwZuhX7X+vnRDPERVmx5hW64+t79P1oFIeVnI="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/fugashi/default.nix b/pkgs/development/python-modules/fugashi/default.nix index 63c19f1215a3..25fedaf96d94 100644 --- a/pkgs/development/python-modules/fugashi/default.nix +++ b/pkgs/development/python-modules/fugashi/default.nix @@ -4,7 +4,7 @@ pythonOlder, pytestCheckHook, buildPythonPackage, - cython_0, + cython, mecab, setuptools-scm, ipadic, @@ -14,19 +14,19 @@ buildPythonPackage rec { pname = "fugashi"; - version = "1.3.0"; - format = "setuptools"; - disabled = pythonOlder "3.7"; + version = "1.5.1"; + format = "pyproject"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "polm"; repo = "fugashi"; tag = "v${version}"; - hash = "sha256-4i7Q+TtXTQNSJ1EIcS8KHrVPdCJAgZh86Y6lB8772XU="; + hash = "sha256-rkQskRz7lgVBrqBeyj9kWO2/7POrZ0TaM+Z7mhpZLvM="; }; nativeBuildInputs = [ - cython_0 + cython mecab setuptools-scm ]; diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index fec68830047f..aff9b5aa52ca 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -7,7 +7,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.6.0"; + version = "5.7.0"; ldflags = let @@ -23,13 +23,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-KsdOosKDT+wWWLzeph5NfCOx96D7GncM0qDSBJxAzJ8="; + hash = "sha256-O8avyJ1secafVP+Edr7PCTKjcmUFFbB1Dx74qoLxD0M="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-ZYDrYhEWUEJFxFWj/LLrW8epLX2hJNqQ1CteShEbQ+M="; + vendorHash = "sha256-Qo2KmNbj9OYThOrt/dk6U0CnK8awUOAagYQ2iX5szVQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/os-specific/linux/freeipa/default.nix b/pkgs/os-specific/linux/freeipa/default.nix index e967f01fd6be..b50e3f79e488 100644 --- a/pkgs/os-specific/linux/freeipa/default.nix +++ b/pkgs/os-specific/linux/freeipa/default.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "freeipa"; - version = "4.12.3"; + version = "4.12.4"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${version}.tar.gz"; - sha256 = "sha256-bVttsyn99DX01CmthIxzxuJPGgqZB2+pgamviO4LBJI="; + hash = "sha256-Nn3dHoaAt6+MZ0gMFCJniXginq4guNM8HjChren9adY="; }; patches = [ diff --git a/pkgs/os-specific/linux/r8168/default.nix b/pkgs/os-specific/linux/r8168/default.nix index 77d91d039bc6..e272449933ac 100644 --- a/pkgs/os-specific/linux/r8168/default.nix +++ b/pkgs/os-specific/linux/r8168/default.nix @@ -13,18 +13,18 @@ in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.053.00"; + version = "8.055.00"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. # [1] https://www.realtek.com/Download/List?cate_id=584 - # I've verified manually (`diff -r`) that the source code for version 8.053.00 + # I've verified manually (`diff -r`) that the source code for version 8.055.00 # is the same as the one available on the realtek website. src = fetchFromGitHub { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "0bHGs8jyWd+ZiixOoNkBqhS9RjDpRp3vveAgk1YuOWU="; + sha256 = "sha256-qL64+jlF1biWaYc5Ga/fjz8ZY3u72bcKVtDpiozHb1g="; }; hardeningDisable = [ "pic" ]; @@ -61,6 +61,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; - broken = lib.versionAtLeast kernel.modDirVersion "6.9"; + broken = lib.versionAtLeast kernel.modDirVersion "6.13"; }; } diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index ffa7dfb1615d..f6d0fc894f44 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -28,7 +28,7 @@ buildFishPlugin rec { meta = { description = "Pretty, minimal and fast Fish prompt, ported from zsh"; - homepage = "https://github.com/rafaelrinaldi/pure"; + homepage = "https://github.com/pure-fish/pure"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ euxane ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5494b11d3e0..fe7df15b1e56 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8385,15 +8385,17 @@ with pkgs; hspellDicts = callPackage ../development/libraries/hspell/dicts.nix { }; - hunspellDicts = recurseIntoAttrs ( - callPackages ../development/libraries/hunspell/dictionaries.nix { } - ); + hunspellDicts = recurseIntoAttrs (callPackages ../by-name/hu/hunspell/dictionaries.nix { }); hunspellDictsChromium = recurseIntoAttrs ( - callPackages ../development/libraries/hunspell/dictionaries-chromium.nix { } + callPackages ../by-name/hu/hunspell/dictionaries-chromium.nix { } ); - hunspellWithDicts = dicts: callPackage ../by-name/hu/hunspell/wrapper.nix { inherit dicts; }; + hunspellWithDicts = + dicts: + lib.warn "hunspellWithDicts is deprecated, please use hunspell.withDicts instead." + hunspell.withDicts + (_: dicts); hydra = callPackage ../by-name/hy/hydra/package.nix { nix = nixVersions.nix_2_29; }; @@ -16594,10 +16596,6 @@ with pkgs; inherit (callPackage ../applications/misc/zettlr { }) zettlr; - zrythm = callPackage ../applications/audio/zrythm { - inherit (plasma5Packages) breeze-icons; - }; - swift-corelibs-libdispatch = swiftPackages.Dispatch; aitrack = libsForQt5.callPackage ../applications/misc/aitrack { }; diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 06f235b3606c..5bce39ba5e0e 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -49,7 +49,7 @@ let ); jobs = { - lib-tests = import ../../lib/tests/release.nix { inherit pkgs; }; + # for pkgs.formats tests, which rely on remarshal pkgs-lib-tests = import ../pkgs-lib/tests { inherit pkgs; }; tested = pkgs.releaseTools.aggregate {